diff options
author | Unit 193 <unit193@ubuntu.com> | 2019-12-19 17:40:28 -0500 |
---|---|---|
committer | Unit 193 <unit193@ubuntu.com> | 2019-12-19 17:40:28 -0500 |
commit | f8d25eaeb3958f0ec7350c4c0f456fc980753ced (patch) | |
tree | d2d0769be0ea39508724f16d6ba5849d817a9296 | |
parent | 5c7ca91ba88b5c73f399e4aff6edf68c7bfdd740 (diff) | |
download | veracrypt-f8d25eaeb3958f0ec7350c4c0f456fc980753ced.tar.bz2 veracrypt-f8d25eaeb3958f0ec7350c4c0f456fc980753ced.tar.xz veracrypt-f8d25eaeb3958f0ec7350c4c0f456fc980753ced.tar.zst |
Drop upstream patches, refresh remaining.
-rw-r--r-- | debian/patches/001-indicator-support.patch | 10 | ||||
-rw-r--r-- | debian/patches/002-Fix_compilation_on_non-x86_platforms.patch | 54 | ||||
-rw-r--r-- | debian/patches/003-Fix_compilation_error_if_type___u64_already_defined.patch | 52 | ||||
-rw-r--r-- | debian/patches/series | 2 |
4 files changed, 5 insertions, 113 deletions
diff --git a/debian/patches/001-indicator-support.patch b/debian/patches/001-indicator-support.patch index 192a9fa..54414c7 100644 --- a/debian/patches/001-indicator-support.patch +++ b/debian/patches/001-indicator-support.patch @@ -22,7 +22,7 @@ Index: veracrypt/src/Main/Forms/MainFrame.cpp ListItemRightClickEventPending (false), SelectedItemIndex (-1), SelectedSlotNumber (0), -@@ -1550,6 +1553,32 @@ namespace VeraCrypt +@@ -1557,6 +1560,32 @@ namespace VeraCrypt } } @@ -55,7 +55,7 @@ Index: veracrypt/src/Main/Forms/MainFrame.cpp void MainFrame::ShowTaskBarIcon (bool show) { if (!show && mTaskBarIcon->IsIconInstalled()) -@@ -1559,8 +1588,47 @@ namespace VeraCrypt +@@ -1566,8 +1595,47 @@ namespace VeraCrypt else if (show && !mTaskBarIcon->IsIconInstalled()) { #ifndef TC_MACOSX @@ -123,8 +123,8 @@ Index: veracrypt/src/Main/Forms/MainFrame.h + #include "Forms.h" #include "ChangePasswordDialog.h" - -@@ -35,6 +45,18 @@ namespace VeraCrypt + #ifdef TC_MACOSX +@@ -38,6 +48,18 @@ namespace VeraCrypt static FilePath GetShowRequestFifoPath () { return Application::GetConfigFilePath (L".show-request-queue", true); } #endif @@ -143,7 +143,7 @@ Index: veracrypt/src/Main/Forms/MainFrame.h protected: enum { -@@ -68,7 +90,6 @@ namespace VeraCrypt +@@ -71,7 +93,6 @@ namespace VeraCrypt void LoadFavoriteVolumes (); void LoadPreferences (); void MountAllDevices (); diff --git a/debian/patches/002-Fix_compilation_on_non-x86_platforms.patch b/debian/patches/002-Fix_compilation_on_non-x86_platforms.patch deleted file mode 100644 index 4404555..0000000 --- a/debian/patches/002-Fix_compilation_on_non-x86_platforms.patch +++ /dev/null @@ -1,54 +0,0 @@ -From afe6b2f45b15393026a1159e5f3d165ac7d0b94a Mon Sep 17 00:00:00 2001 -From: Mounir IDRASSI <mounir.idrassi@idrix.fr> -Date: Mon, 28 Oct 2019 23:16:15 +0100 -Subject: [PATCH] Linux: Fix compilation error on non-x86 platform by providing - generic implementation for jent_get_nstime function - ---- - src/Crypto/jitterentropy-base-user.h | 25 +++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) - -diff --git a/src/Crypto/jitterentropy-base-user.h b/src/Crypto/jitterentropy-base-user.h -index 0ebbac5d6..3502dd4f2 100644 ---- a/src/Crypto/jitterentropy-base-user.h -+++ b/src/Crypto/jitterentropy-base-user.h -@@ -75,6 +75,8 @@ static VC_INLINE void jent_get_nstime(uint64 *out) - - #else - -+#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64 -+ - /* taken from Linux kernel */ - #if CRYPTOPP_BOOL_X64 - #define DECLARE_ARGS(val, low, high) unsigned low, high -@@ -93,6 +95,29 @@ VC_INLINE void jent_get_nstime(uint64 *out) - *out = EAX_EDX_VAL(val, low, high); - } - -+#else -+ -+#include <time.h> -+ -+VC_INLINE void jent_get_nstime(uint64 *out) -+{ -+ /* we could use CLOCK_MONOTONIC(_RAW), but with CLOCK_REALTIME -+ * we get some nice extra entropy once in a while from the NTP actions -+ * that we want to use as well... though, we do not rely on that -+ * extra little entropy */ -+ uint64_t tmp = 0; -+ struct timespec time; -+ if (clock_gettime(CLOCK_REALTIME, &time) == 0) -+ { -+ tmp = time.tv_sec; -+ tmp = tmp << 32; -+ tmp = tmp | time.tv_nsec; -+ } -+ *out = tmp; -+} -+ -+#endif -+ - #endif - - #ifdef _MSC_VER - diff --git a/debian/patches/003-Fix_compilation_error_if_type___u64_already_defined.patch b/debian/patches/003-Fix_compilation_error_if_type___u64_already_defined.patch deleted file mode 100644 index ac4f11a..0000000 --- a/debian/patches/003-Fix_compilation_error_if_type___u64_already_defined.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 3fa636d477119fff6e372074568edb42d038f508 Mon Sep 17 00:00:00 2001 -From: Mounir IDRASSI <mounir.idrassi@idrix.fr> -Date: Mon, 28 Oct 2019 18:57:07 +0100 -Subject: [PATCH] Linux: Fix compilation error if type __u64 is already defined - by gcc - -This is the case with Mageia Cauldron which has gcc 9.2.1 ---- - src/Crypto/jitterentropy-base-user.h | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/src/Crypto/jitterentropy-base-user.h b/src/Crypto/jitterentropy-base-user.h -index 04c193618..0ebbac5d6 100644 ---- a/src/Crypto/jitterentropy-base-user.h -+++ b/src/Crypto/jitterentropy-base-user.h -@@ -49,8 +49,6 @@ - #include <stdlib.h> - #include <string.h> - --typedef uint64 __u64; -- - #ifdef _MSC_VER - - typedef uint64 uint64_t; -@@ -70,7 +68,7 @@ typedef int32 ssize_t; - #endif - #endif - --static VC_INLINE void jent_get_nstime(__u64 *out) -+static VC_INLINE void jent_get_nstime(uint64 *out) - { - *out = __rdtsc();; - } -@@ -80,7 +78,7 @@ static VC_INLINE void jent_get_nstime(__u64 *out) - /* taken from Linux kernel */ - #if CRYPTOPP_BOOL_X64 - #define DECLARE_ARGS(val, low, high) unsigned low, high --#define EAX_EDX_VAL(val, low, high) ((low) | ((__u64)(high) << 32)) -+#define EAX_EDX_VAL(val, low, high) ((low) | ((uint64)(high) << 32)) - #define EAX_EDX_RET(val, low, high) "=a" (low), "=d" (high) - #else - #define DECLARE_ARGS(val, low, high) unsigned long long val -@@ -88,7 +86,7 @@ static VC_INLINE void jent_get_nstime(__u64 *out) - #define EAX_EDX_RET(val, low, high) "=A" (val) - #endif - --VC_INLINE void jent_get_nstime(__u64 *out) -+VC_INLINE void jent_get_nstime(uint64 *out) - { - DECLARE_ARGS(val, low, high); - asm volatile("rdtsc" : EAX_EDX_RET(val, low, high)); - diff --git a/debian/patches/series b/debian/patches/series index ecee136..f62fa66 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ 001-indicator-support.patch -002-Fix_compilation_on_non-x86_platforms.patch -003-Fix_compilation_error_if_type___u64_already_defined.patch |