From 2e9f0a169debcd4a507bff1931c6be57c894b5b8 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Tue, 3 Oct 2023 20:11:50 -0400 Subject: vc 1.26.7 rc1 --- .../debian/patches/1001-port-to-libfuse3.patch | 36 +++++++++++----------- .../debian/patches/1002-fix-ftbfs-32bit.patch | 33 ++++++++++++++++++++ veracrypt/debian/patches/series | 1 + veracrypt/debian/patches/vc_devuan.patch | 27 ++++++++-------- 4 files changed, 64 insertions(+), 33 deletions(-) create mode 100644 veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch (limited to 'veracrypt/debian/patches') diff --git a/veracrypt/debian/patches/1001-port-to-libfuse3.patch b/veracrypt/debian/patches/1001-port-to-libfuse3.patch index 9325f08..5f2860e 100644 --- a/veracrypt/debian/patches/1001-port-to-libfuse3.patch +++ b/veracrypt/debian/patches/1001-port-to-libfuse3.patch @@ -8,29 +8,29 @@ Forwarded: https://github.com/veracrypt/VeraCrypt/issues/528 src/Main/Main.make | 2 +- 3 files changed, 11 insertions(+), 19 deletions(-) ---- a/src/Main/Main.make 2021-10-07 03:51:22.964715592 -0400 -+++ b/src/Main/Main.make 2021-10-07 03:51:22.948715727 -0400 -@@ -102,7 +102,7 @@ +--- a/src/Main/Main.make ++++ b/src/Main/Main.make +@@ -102,7 +102,7 @@ endif #------ FUSE configuration ------ --FUSE_LIBS = $(shell pkg-config fuse --libs) -+FUSE_LIBS = $(shell pkg-config fuse3 --libs) +-FUSE_LIBS = $(shell $(PKG_CONFIG) fuse --libs) ++FUSE_LIBS = $(shell $(PKG_CONFIG) fuse3 --libs) #------ Executable ------ ---- a/src/Driver/Fuse/Driver.make 2021-10-07 03:51:22.964715592 -0400 -+++ b/src/Driver/Fuse/Driver.make 2021-10-07 03:51:22.948715727 -0400 -@@ -15,6 +15,6 @@ +--- 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) +-CXXFLAGS += $(shell $(PKG_CONFIG) fuse --cflags) ++CXXFLAGS += $(shell $(PKG_CONFIG) fuse3 --cflags) include $(BUILD_INC)/Makefile.inc ---- a/src/Driver/Fuse/FuseService.cpp 2021-10-07 03:51:22.964715592 -0400 -+++ b/src/Driver/Fuse/FuseService.cpp 2021-10-07 03:51:22.948715727 -0400 +--- a/src/Driver/Fuse/FuseService.cpp ++++ b/src/Driver/Fuse/FuseService.cpp @@ -13,7 +13,7 @@ #ifdef TC_OPENBSD #define FUSE_USE_VERSION 26 @@ -40,7 +40,7 @@ Forwarded: https://github.com/veracrypt/VeraCrypt/issues/528 #endif #include -@@ -56,11 +56,7 @@ +@@ -56,11 +56,7 @@ namespace VeraCrypt return 0; } @@ -53,7 +53,7 @@ Forwarded: https://github.com/veracrypt/VeraCrypt/issues/528 { try { -@@ -104,7 +100,7 @@ +@@ -104,7 +100,7 @@ namespace VeraCrypt } } @@ -62,7 +62,7 @@ Forwarded: https://github.com/veracrypt/VeraCrypt/issues/528 { try { -@@ -261,7 +257,7 @@ +@@ -261,7 +257,7 @@ namespace VeraCrypt return -ENOENT; } @@ -71,7 +71,7 @@ Forwarded: https://github.com/veracrypt/VeraCrypt/issues/528 { try { -@@ -271,10 +267,10 @@ +@@ -271,10 +267,10 @@ namespace VeraCrypt if (strcmp (path, "/") != 0) return -ENOENT; @@ -86,7 +86,7 @@ Forwarded: https://github.com/veracrypt/VeraCrypt/issues/528 } catch (...) { -@@ -450,7 +446,7 @@ +@@ -450,7 +446,7 @@ namespace VeraCrypt } ExecFunctor execFunctor (openVolume, slotNumber); @@ -95,7 +95,7 @@ Forwarded: https://github.com/veracrypt/VeraCrypt/issues/528 for (int t = 0; true; t++) { -@@ -592,11 +588,7 @@ +@@ -592,11 +588,7 @@ namespace VeraCrypt SignalHandlerPipe->GetWriteFD(); diff --git a/veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch b/veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch new file mode 100644 index 0000000..9cd566f --- /dev/null +++ b/veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch @@ -0,0 +1,33 @@ +From bd843ffa05147aab80e38ee668b0556302d2bfc9 Mon Sep 17 00:00:00 2001 +From: Mounir IDRASSI +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) 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 8518785..831301f 100644 --- a/veracrypt/debian/patches/series +++ b/veracrypt/debian/patches/series @@ -1,2 +1,3 @@ 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 9ce5efb..386e777 100644 --- a/veracrypt/debian/patches/vc_devuan.patch +++ b/veracrypt/debian/patches/vc_devuan.patch @@ -1,21 +1,19 @@ -Version: 1.25.7 -Date: 2022-02-10 -diff -x '*.rej' -x '*.orig' -Naur VeraCrypt_1.22/src/Common/Dlgcode.c VeraCrypt_1.22-1/src/Common/Dlgcode.c ---- VeraCrypt_1.22/src/Common/Dlgcode.c 2018-03-30 07:54:10.000000000 -0400 -+++ VeraCrypt_1.22-1/src/Common/Dlgcode.c 2018-09-02 08:22:00.007030589 -0400 -@@ -1280,7 +1280,7 @@ +Version: 1.26.7 +Date: 2023-10-03 +--- 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-2022 IDRIX. All rights reserved.\r\n\r\n" + L"Copyright \xA9 2013-2023 IDRIX. All rights reserved.\r\n\r\n" - L"An IDRIX Release"); + L"Packaged for Devuan"); return 1; -diff -x '*.rej' -x '*.orig' -Naur VeraCrypt_1.22/src/Common/Tcdefs.h VeraCrypt_1.22-1/src/Common/Tcdefs.h ---- VeraCrypt_1.22/src/Common/Tcdefs.h 2018-03-30 07:54:10.000000000 -0400 -+++ VeraCrypt_1.22-1/src/Common/Tcdefs.h 2018-09-02 08:23:02.200707158 -0400 -@@ -383,7 +383,7 @@ +--- a/src/Common/Tcdefs.h ++++ b/src/Common/Tcdefs.h +@@ -447,7 +447,7 @@ void EraseMemory (void *memory, int size #define TC_MAX_PATH 260 /* Includes the null terminator */ #endif @@ -24,10 +22,9 @@ diff -x '*.rej' -x '*.orig' -Naur VeraCrypt_1.22/src/Common/Tcdefs.h VeraCrypt_1 #define MAX_URL_LENGTH 2084 /* Internet Explorer limit. Includes the terminating null character. */ -diff -x '*.rej' -x '*.orig' -Naur VeraCrypt_1.22/src/Main/Forms/AboutDialog.cpp VeraCrypt_1.22-1/src/Main/Forms/AboutDialog.cpp ---- VeraCrypt_1.22/src/Main/Forms/AboutDialog.cpp 2018-03-30 07:54:10.000000000 -0400 -+++ VeraCrypt_1.22-1/src/Main/Forms/AboutDialog.cpp 2018-09-02 08:23:41.447134097 -0400 -@@ -72,6 +72,6 @@ +--- a/src/Main/Forms/AboutDialog.cpp ++++ b/src/Main/Forms/AboutDialog.cpp +@@ -74,6 +74,6 @@ namespace VeraCrypt L"This software uses wxWidgets library, which is copyright \xA9 1998-2011 Julian Smart, Robert Roebling et al.\n\n" -- cgit