Drop upstream patch, refresh remaining patches.

5 files changed, 4 insertions, 59 deletions

diff --git a/debian/patches/001-user-guide-location.diff b/debian/patches/001-user-guide-location.diff
index 970fa2b..d866d1c 100644
--- a/debian/patches/001-user-guide-location.diff
+++ b/debian/patches/001-user-guide-location.diff
@@ -11,7 +11,7 @@ Index: veracrypt/src/Main/GraphicUserInterface.cpp
 ===================================================================
 --- veracrypt.orig/src/Main/GraphicUserInterface.cpp
 +++ veracrypt/src/Main/GraphicUserInterface.cpp
-@@ -1216,7 +1216,7 @@ namespace VeraCrypt
+@@ -1243,7 +1243,7 @@ namespace VeraCrypt
  #elif defined (TC_MACOSX)
  			docPath += L"/../Resources/VeraCrypt User Guide.pdf";
  #elif defined (TC_UNIX)
diff --git a/debian/patches/002-build-flags.diff b/debian/patches/002-build-flags.diff
index 25f3e69..ac8c426 100644
--- a/debian/patches/002-build-flags.diff
+++ b/debian/patches/002-build-flags.diff
@@ -8,7 +8,7 @@ Index: veracrypt/src/Makefile
 ===================================================================
 --- veracrypt.orig/src/Makefile
 +++ veracrypt/src/Makefile
-@@ -54,6 +54,10 @@ export WXCONFIG_CFLAGS :=
+@@ -56,6 +56,10 @@ export WXCONFIG_CFLAGS :=
  export WXCONFIG_CXXFLAGS :=
  WX_ROOT ?= ..
  
diff --git a/debian/patches/003-indicator-support.diff b/debian/patches/003-indicator-support.diff
index 5c7d17d..97fcb23 100644
--- a/debian/patches/003-indicator-support.diff
+++ b/debian/patches/003-indicator-support.diff
@@ -153,7 +153,7 @@ Index: veracrypt/src/Main/GraphicUserInterface.cpp
 ===================================================================
 --- veracrypt.orig/src/Main/GraphicUserInterface.cpp
 +++ veracrypt/src/Main/GraphicUserInterface.cpp
-@@ -1626,6 +1626,8 @@ namespace VeraCrypt
+@@ -1653,6 +1653,8 @@ namespace VeraCrypt
  		}
  
  		BackgroundMode = state;
@@ -166,7 +166,7 @@ Index: veracrypt/src/Makefile
 ===================================================================
 --- veracrypt.orig/src/Makefile
 +++ veracrypt/src/Makefile
-@@ -58,6 +58,7 @@ CPPFLAGS+=$(shell dpkg-buildflags --get
+@@ -60,6 +60,7 @@ CPPFLAGS+=$(shell dpkg-buildflags --get
  CFLAGS+=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -Wno-sequence-point
  CXXFLAGS+=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) -Wno-narrowing
  LFLAGS+=$(shell dpkg-buildflags --get LDFLAGS)
diff --git a/debian/patches/004-gcc5-compatibility.diff b/debian/patches/004-gcc5-compatibility.diff
deleted file mode 100644
index b64bbb6..0000000
--- a/debian/patches/004-gcc5-compatibility.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-From 646679da4d79bf7f8af22c44c7ae8498086a88a6 Mon Sep 17 00:00:00 2001
-From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
-Date: Fri, 18 Mar 2016 16:25:48 +0100
-Subject: [PATCH] Linux: Completely fix gcc-5 "Invalid characters encountered"
- issue on mount. It was caused by an issue of gcc-5 STL implementation that is
- causing char* pointers retrieved from std::string using c_str method to
- become invalid in the child of a child process (after two fork calls). The
- workaround is to first copy the std:string values in the child before calling
- the second fork.
-
----
- src/Platform/Unix/Process.cpp | 24 ++++++++++++++++++++++--
- 1 file changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/src/Platform/Unix/Process.cpp b/src/Platform/Unix/Process.cpp
-index 388bda6..0770364 100644
---- a/src/Platform/Unix/Process.cpp
-+++ b/src/Platform/Unix/Process.cpp
-@@ -53,13 +53,33 @@ namespace VeraCrypt
- 				try
- 				{
- 					int argIndex = 0;
-+					/* Workaround for gcc 5.X issue related to the use of STL (string and list) with muliple fork calls. 
-+					 * 
-+					 * The char* pointers retrieved from the elements of parameter "arguments" are no longer valid after
-+					 * a second fork is called. "arguments" was created in the parent of the current child process.
-+					 * 
-+					 * The only solution is to copy the elements of "arguments" parameter in a local string array on this 
-+					 * child process and then use char* pointers retrieved from this local copies before calling fork. 
-+					 * 
-+					 * gcc 4.x doesn't suffer from this issue.
-+					 * 
-+					 */
-+					string argsCopy[array_capacity (args)];
- 					if (!execFunctor)
--						args[argIndex++] = const_cast <char*> (processName.c_str());
-+					{
-+						argsCopy[argIndex++] = processName;
-+					}
- 
- 					foreach (const string &arg, arguments)
- 					{
--						args[argIndex++] = const_cast <char*> (arg.c_str());
-+						argsCopy[argIndex++] = arg;
- 					}
-+					
-+					for (int i = 0; i < argIndex; i++)
-+					{
-+						args[i] = const_cast <char*> (argsCopy[i].c_str());
-+					}
-+
- 					args[argIndex] = nullptr;
- 
- 					if (inputData)
diff --git a/debian/patches/series b/debian/patches/series
index c7b7c51..2694b0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 001-user-guide-location.diff
 002-build-flags.diff
 003-indicator-support.diff
-004-gcc5-compatibility.diff