summaryrefslogtreecommitdiff
path: root/veracrypt
diff options
context:
space:
mode:
Diffstat (limited to 'veracrypt')
-rw-r--r--veracrypt/README.md6
-rw-r--r--veracrypt/debian/_service2
-rw-r--r--veracrypt/debian/changelog24
-rw-r--r--veracrypt/debian/control4
-rw-r--r--veracrypt/debian/patches/1001-port-to-libfuse3.patch33
-rw-r--r--veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch33
-rw-r--r--veracrypt/debian/patches/series1
-rw-r--r--veracrypt/debian/patches/vc_devuan.patch11
-rwxr-xr-xveracrypt/debian/rules2
-rw-r--r--veracrypt/debian/veracrypt+stackrpms.dsc4
10 files changed, 50 insertions, 70 deletions
diff --git a/veracrypt/README.md b/veracrypt/README.md
index de20d12..39fd74b 100644
--- a/veracrypt/README.md
+++ b/veracrypt/README.md
@@ -2,10 +2,10 @@
https://www.veracrypt.fr/code/VeraCrypt/snapshot/VeraCrypt_1.24.tar.gz
https://gitlab.com/bgstack15/big-sources/raw/master/veracrypt/VeraCrypt_1.24.tar.gz
Rpm spec forked from [scx copr](https://copr-be.cloud.fedoraproject.org/results/scx/veracrypt/fedora-27-x86_64/00657099-veracrypt/veracrypt.spec which also provides) which also provides the GTK2/3 options
-My dpkg is now an overlay on top of [Unit193 on salsa](https://salsa.debian.org/debian-edu-pkg-team/veracrypt)
+My dpkg is now an overlay on top of [Unit193 on salsa](https://salsa.debian.org/debian-edu-pkg-team/veracrypt) which is also at his [cgit](https://git.unit193.net/cgit/veracrypt.git)
# Reason for being in stackrpms
-Fedora does not package veracrypt because its license is tricky. Devuan does not package the application either.
+Fedora does not package veracrypt because its license is tricky. Devuan does not package the application either. I want to compile this myself, and also I don't need some of the systemd features in the unit193 debianized package anyways.
# Alternatives
* pmdpalma
@@ -18,7 +18,7 @@ Fedora does not package veracrypt because its license is tricky. Devuan does not
# Reverse dependency matrix
Distro | VeraCrypt version
---------- | -----------------
-All | 1.24
+Devuan | 1.26.14
# Differences from upstream
##Dpkg
diff --git a/veracrypt/debian/_service b/veracrypt/debian/_service
index f35bf13..cf97edb 100644
--- a/veracrypt/debian/_service
+++ b/veracrypt/debian/_service
@@ -14,7 +14,7 @@
<service name="tar_scm">
<param name="scm">git</param>
<param name="url">https://github.com/veracrypt/VeraCrypt.git</param>
- <param name="revision">VeraCrypt_1.26.7</param>
+ <param name="revision">VeraCrypt_1.26.14</param>
<param name="version">_none_</param>
</service>
<service name="recompress">
diff --git a/veracrypt/debian/changelog b/veracrypt/debian/changelog
index ce42bbd..89faafa 100644
--- a/veracrypt/debian/changelog
+++ b/veracrypt/debian/changelog
@@ -1,3 +1,27 @@
+veracrypt (1.26.14-1+stackrpms) obs; urgency=low
+
+ * All OSes:
+ * Update translations and documentation
+ * Implement language selection settings in non-Windows versions.
+ * Make codebase compatible with wxWidgets 3.3 in non-Windows versions.
+ * Implement detection of volumes affected by XTS master key
+ vulnerability and warn user about it.
+ * Update mount failure error messages to mention removal of TrueCrypt
+ support and old algorithms.
+ * Linux:
+ * Focus PIM field when selected (#1239)
+ * Fix generic installation script on Konsole in Wayland (#1244)
+ * Added the ability to build using wolfCrypt as the cryptographic
+ backend. Disabled by default. (Contributed by wolfSSL, GH PR #1227)
+ * Allows GUI to launch in a Wayland-only environment (GH #1264)
+ * CLI: Don't initially re-ask PIM if it was already specified (GH #1288)
+ * CLI: Fix incorrect max hidden volume size for file containers (GH
+ #1338))
+ * Enhance ASLR security of generic installer binaries by adding linked
+ flag for old GCC version (reported by @morton-f on Sourceforge)
+
+ -- B. Stack <bgstack15@gmail.com> Tue, 03 Sep 2024 11:09:24 -0400
+
veracrypt (1.26.7-1+stackrpms) obs; urgency=low
* All OSes:
diff --git a/veracrypt/debian/control b/veracrypt/debian/control
index 0b08c8a..77d08e4 100644
--- a/veracrypt/debian/control
+++ b/veracrypt/debian/control
@@ -2,12 +2,12 @@ Source: veracrypt
Section: non-free/utils
Priority: optional
Maintainer: B. Stack <bgstack15@gmail.com>
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
libayatana-appindicator3-dev | libappindicator3-dev,
libfuse3-dev,
libpcsclite-dev,
libwxgtk3.2-dev | libwxgtk3.0-gtk3-dev,
- pkg-config,
+ pkgconf,
yasm [any-i386 any-amd64]
Rules-Requires-Root: no
Standards-Version: 4.6.0
diff --git a/veracrypt/debian/patches/1001-port-to-libfuse3.patch b/veracrypt/debian/patches/1001-port-to-libfuse3.patch
index 5f2860e..d0b9565 100644
--- a/veracrypt/debian/patches/1001-port-to-libfuse3.patch
+++ b/veracrypt/debian/patches/1001-port-to-libfuse3.patch
@@ -3,32 +3,21 @@ From: Unit 193 <unit193@unit193.net>
Forwarded: https://github.com/veracrypt/VeraCrypt/issues/528
---
- src/Driver/Fuse/Driver.make | 2 +-
src/Driver/Fuse/FuseService.cpp | 26 +++++++++-----------------
- src/Main/Main.make | 2 +-
- 3 files changed, 11 insertions(+), 19 deletions(-)
+ src/Makefile | 2 +-
+ 2 files changed, 10 insertions(+), 18 deletions(-)
---- a/src/Main/Main.make
-+++ b/src/Main/Main.make
-@@ -102,7 +102,7 @@ endif
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -52,7 +52,7 @@ export LFLAGS :=
- #------ FUSE configuration ------
+ export PKG_CONFIG ?= pkg-config
+ export PKG_CONFIG_PATH ?= /usr/local/lib/pkgconfig
+-export VC_FUSE_PACKAGE := fuse
++export VC_FUSE_PACKAGE := fuse3
+ export VC_OSX_FUSET ?= 0
--FUSE_LIBS = $(shell $(PKG_CONFIG) fuse --libs)
-+FUSE_LIBS = $(shell $(PKG_CONFIG) fuse3 --libs)
-
- #------ Executable ------
-
---- a/src/Driver/Fuse/Driver.make
-+++ b/src/Driver/Fuse/Driver.make
-@@ -15,6 +15,6 @@ NAME := Driver
- OBJS :=
- OBJS += FuseService.o
-
--CXXFLAGS += $(shell $(PKG_CONFIG) fuse --cflags)
-+CXXFLAGS += $(shell $(PKG_CONFIG) fuse3 --cflags)
-
- include $(BUILD_INC)/Makefile.inc
+ export WX_CONFIG ?= wx-config
--- a/src/Driver/Fuse/FuseService.cpp
+++ b/src/Driver/Fuse/FuseService.cpp
@@ -13,7 +13,7 @@
diff --git a/veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch b/veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch
deleted file mode 100644
index 9cd566f..0000000
--- a/veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From bd843ffa05147aab80e38ee668b0556302d2bfc9 Mon Sep 17 00:00:00 2001
-From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
-Date: Mon, 2 Oct 2023 18:02:33 +0200
-Subject: [PATCH] Linux: Fix compilation error on some 32-bit machines.
-
----
- src/Common/PCSCException.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/Common/PCSCException.cpp b/src/Common/PCSCException.cpp
-index 93fff18187..dc5eead323 100644
---- a/src/Common/PCSCException.cpp
-+++ b/src/Common/PCSCException.cpp
-@@ -140,14 +140,17 @@ namespace VeraCrypt
- {
- Exception::Deserialize(stream);
- Serializer sr(stream);
-- sr.Deserialize("ErrorCode", ErrorCode);
-+ int64 v;
-+ sr.Deserialize("ErrorCode", v);
-+ ErrorCode = (LONG_PCSC)v;
- }
-
- void PCSCException::Serialize(shared_ptr <Stream> stream) const
- {
- Exception::Serialize(stream);
- Serializer sr(stream);
-- sr.Serialize("ErrorCode", ErrorCode);
-+ int64 v = (int64)ErrorCode;
-+ sr.Serialize("ErrorCode", v);
- }
-
- # define TC_EXCEPTION(TYPE) TC_SERIALIZER_FACTORY_ADD(TYPE)
diff --git a/veracrypt/debian/patches/series b/veracrypt/debian/patches/series
index 831301f..8518785 100644
--- a/veracrypt/debian/patches/series
+++ b/veracrypt/debian/patches/series
@@ -1,3 +1,2 @@
1001-port-to-libfuse3.patch
-1002-fix-ftbfs-32bit.patch
vc_devuan.patch
diff --git a/veracrypt/debian/patches/vc_devuan.patch b/veracrypt/debian/patches/vc_devuan.patch
index 386e777..b55dbaf 100644
--- a/veracrypt/debian/patches/vc_devuan.patch
+++ b/veracrypt/debian/patches/vc_devuan.patch
@@ -1,10 +1,11 @@
-Version: 1.26.7
-Date: 2023-10-03
+Version: 1.26.14
+Date: 2024-09-03
+Message: Change distributor name
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -2171,7 +2171,7 @@ BOOL CALLBACK AboutDlgProc (HWND hwndDlg
L"This software as a whole:\r\n"
- L"Copyright \xA9 2013-2023 IDRIX. All rights reserved.\r\n\r\n"
+ L"Copyright \xA9 2013-2024 IDRIX. All rights reserved.\r\n\r\n"
- L"An IDRIX Release");
+ L"Packaged for Devuan");
@@ -13,7 +14,7 @@ Date: 2023-10-03
--- a/src/Common/Tcdefs.h
+++ b/src/Common/Tcdefs.h
-@@ -447,7 +447,7 @@ void EraseMemory (void *memory, int size
+@@ -451,7 +451,7 @@ void EraseMemory (void *memory, int size
#define TC_MAX_PATH 260 /* Includes the null terminator */
#endif
@@ -24,7 +25,7 @@ Date: 2023-10-03
--- a/src/Main/Forms/AboutDialog.cpp
+++ b/src/Main/Forms/AboutDialog.cpp
-@@ -74,6 +74,6 @@ namespace VeraCrypt
+@@ -78,6 +78,6 @@ namespace VeraCrypt
L"This software uses wxWidgets library, which is copyright \xA9 1998-2011 Julian Smart, Robert Roebling et al.\n\n"
diff --git a/veracrypt/debian/rules b/veracrypt/debian/rules
index 6b929d1..f0b4bac 100755
--- a/veracrypt/debian/rules
+++ b/veracrypt/debian/rules
@@ -17,7 +17,7 @@ export TC_EXTRA_LFLAGS = $(LDFLAGS)
override_dh_auto_build:
dh_auto_build -- ARCH=$(DEB_HOST_ARCH) INDICATOR=1 NOSTRIP=1 VERBOSE=1
- unset DISPLAY && src/Main/veracrypt --text --help 2>/dev/null | perl debian/veracrypt_help_to_troff.pl > veracrypt.1
+ unset DISPLAY && src/Main/veracrypt --text --help 2>/dev/null | debian/veracrypt_help_to_troff.pl > veracrypt.1
override_dh_clean:
dh_clean veracrypt.1
diff --git a/veracrypt/debian/veracrypt+stackrpms.dsc b/veracrypt/debian/veracrypt+stackrpms.dsc
index 10bdbf7..a0f747d 100644
--- a/veracrypt/debian/veracrypt+stackrpms.dsc
+++ b/veracrypt/debian/veracrypt+stackrpms.dsc
@@ -2,11 +2,11 @@ Format: 3.0 (quilt)
Source: veracrypt
Binary: veracrypt
Architecture: any
-Version: 1.26.7-1+stackrpms
+Version: 1.26.14-1+stackrpms
Maintainer: B. Stack <bgstack15@gmail.com>
Homepage: https://veracrypt.fr/
Standards-Version: 4.6.0
-Build-Depends: debhelper-compat (= 12), libayatana-appindicator3-dev | libappindicator3-dev, libfuse3-dev, libpcsclite-dev, libwxgtk3.2-dev | libwxgtk3.0-gtk3-dev, pkg-config, yasm [any-i386 any-amd64]
+Build-Depends: debhelper-compat (= 12), libayatana-appindicator3-dev | libappindicator3-dev, libfuse3-dev, libpcsclite-dev, libwxgtk3.2-dev | libwxgtk3.0-gtk3-dev, pkgconf, yasm [any-i386 any-amd64]
Package-List:
veracrypt deb non-free/utils optional arch=any
Files:
bgstack15