Merge branch 'veracrypt-bump' into 'master'

Veracrypt 1.25.4

See merge request bgstack15/stackrpms!275

11 files changed, 136 insertions, 215 deletions

diff --git a/veracrypt/debian/changelog b/veracrypt/debian/changelog
index fb2c98b..759cd06 100644
--- a/veracrypt/debian/changelog
+++ b/veracrypt/debian/changelog
@@ -1,3 +1,10 @@
+veracrypt (1.25.4-1+devuan) obs; urgency=medium
+
+  * Update Standards-Version to 4.6.0.
+  * Use libfuse3-dev now instead of libefuse-dev
+
+ -- B. Stack <bgstack15@gmail.com>  Mon, 06 Dec 2021 11:21:56 -0500
+
 veracrypt (1.24-Update7-1+devuan) obs; urgency=medium
 
   * d/gbp.conf: Pass '--controlmaint' to dch.
diff --git a/veracrypt/debian/control b/veracrypt/debian/control
index 3c964b9..db1dc3e 100644
--- a/veracrypt/debian/control
+++ b/veracrypt/debian/control
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: B Stack <bgstack15@gmail.com>
 Build-Depends: debhelper-compat (= 12),
  libayatana-appindicator3-dev | libappindicator3-dev,
- libfuse-dev,
+ libfuse3-dev,
  libwxgtk3.0-gtk3-dev,
  pkg-config,
  yasm [any-i386 any-amd64]
 Rules-Requires-Root: no
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
 Homepage: https://veracrypt.fr/
 
 Package: veracrypt
diff --git a/veracrypt/debian/patches/001-indicator-support.patch b/veracrypt/debian/patches/001-indicator-support.patch
deleted file mode 100644
index 54414c7..0000000
--- a/veracrypt/debian/patches/001-indicator-support.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From: Stefan Sundin <stefan@stefansundin.com>, Unit 193 <unit193@ubuntu.com>
-Date: Fri, 06 July 2017
-Subject: Add support for Ubuntu and Ayatana application indicators.
-
-This patch adds compile-time support for application indicators.
-
-Forwarded: no
-
-Signed-off-by: Unit 193 <unit193@ubuntu.com>
-
-Index: veracrypt/src/Main/Forms/MainFrame.cpp
-===================================================================
---- veracrypt.orig/src/Main/Forms/MainFrame.cpp
-+++ veracrypt/src/Main/Forms/MainFrame.cpp
-@@ -46,6 +46,9 @@ namespace VeraCrypt
- 	DEFINE_EVENT_TYPE(wxEVT_COMMAND_SHOW_WARNING)
- 
- 	MainFrame::MainFrame (wxWindow* parent) : MainFrameBase (parent),
-+#ifdef HAVE_INDICATORS
-+		indicator (NULL),
-+#endif
- 		ListItemRightClickEventPending (false),
- 		SelectedItemIndex (-1),
- 		SelectedSlotNumber (0),
-@@ -1557,6 +1560,32 @@ namespace VeraCrypt
- 		}
- 	}
- 
-+#ifdef HAVE_INDICATORS
-+	void MainFrame::SetBusy (bool busy)
-+	{
-+		gtk_widget_set_sensitive(indicator_item_mountfavorites, !busy);
-+		gtk_widget_set_sensitive(indicator_item_dismountall, !busy);
-+		gtk_widget_set_sensitive(indicator_item_prefs, !busy);
-+		gtk_widget_set_sensitive(indicator_item_exit, !busy /*&& CanExit()*/);
-+	}
-+
-+	static void IndicatorOnShowHideMenuItemSelected (GtkWidget *widget, MainFrame *self) { Gui->SetBackgroundMode (!Gui->IsInBackgroundMode()); }
-+	static void IndicatorOnMountAllFavoritesMenuItemSelected (GtkWidget *widget, MainFrame *self) { self->SetBusy(true); self->MountAllFavorites (); self->SetBusy(false); }
-+	static void IndicatorOnDismountAllMenuItemSelected (GtkWidget *widget, MainFrame *self) { self->SetBusy(true); Gui->DismountAllVolumes(); self->SetBusy(false); }
-+	static void IndicatorOnPreferencesMenuItemSelected (GtkWidget *widget, MainFrame *self) {
-+		self->SetBusy(true);
-+		PreferencesDialog dialog (self);
-+		dialog.ShowModal();
-+		self->SetBusy(false);
-+	}
-+	static void IndicatorOnExitMenuItemSelected (GtkWidget *widget, MainFrame *self) {
-+		self->SetBusy(true);
-+		if (Core->GetMountedVolumes().empty() || Gui->AskYesNo (LangString ["CONFIRM_EXIT"], false, true))
-+			self->Close (true);
-+		self->SetBusy(false);
-+	}
-+
-+#endif
- 	void MainFrame::ShowTaskBarIcon (bool show)
- 	{
- 		if (!show && mTaskBarIcon->IsIconInstalled())
-@@ -1566,8 +1595,47 @@ namespace VeraCrypt
- 		else if (show && !mTaskBarIcon->IsIconInstalled())
- 		{
- #ifndef TC_MACOSX
-+#ifndef HAVE_INDICATORS
- 			mTaskBarIcon->SetIcon (Resources::GetVeraCryptIcon(), L"VeraCrypt");
- #endif
-+#endif
-+#ifdef HAVE_INDICATORS
-+			if (indicator == NULL) {
-+				indicator = app_indicator_new ("veracrypt", "veracrypt", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-+				app_indicator_set_status (indicator, APP_INDICATOR_STATUS_ACTIVE);
-+
-+				GtkWidget *menu = gtk_menu_new();
-+
-+				indicator_item_showhide = gtk_menu_item_new_with_label (LangString[Gui->IsInBackgroundMode() ? "SHOW_TC" : "HIDE_TC"].mb_str());
-+				gtk_menu_shell_append (GTK_MENU_SHELL (menu), indicator_item_showhide);
-+				g_signal_connect (indicator_item_showhide, "activate", G_CALLBACK (IndicatorOnShowHideMenuItemSelected), this);
-+
-+				gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new());
-+
-+				indicator_item_mountfavorites = gtk_menu_item_new_with_label ("Mount All Favorite Volumes");
-+				gtk_menu_shell_append (GTK_MENU_SHELL (menu), indicator_item_mountfavorites);
-+				g_signal_connect (indicator_item_mountfavorites, "activate", G_CALLBACK (IndicatorOnMountAllFavoritesMenuItemSelected), this);
-+
-+				indicator_item_dismountall = gtk_menu_item_new_with_label ("Dismount All Mounted Volumes");
-+				gtk_menu_shell_append (GTK_MENU_SHELL (menu), indicator_item_dismountall);
-+				g_signal_connect (indicator_item_dismountall, "activate", G_CALLBACK (IndicatorOnDismountAllMenuItemSelected), this);
-+
-+				gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new());
-+
-+				indicator_item_prefs = gtk_menu_item_new_with_label ("Preferences...");
-+				gtk_menu_shell_append (GTK_MENU_SHELL (menu), indicator_item_prefs);
-+				g_signal_connect (indicator_item_prefs, "activate", G_CALLBACK (IndicatorOnPreferencesMenuItemSelected), this);
-+
-+				gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new());
-+
-+				indicator_item_exit = gtk_menu_item_new_with_label ("Exit");
-+				gtk_menu_shell_append (GTK_MENU_SHELL (menu), indicator_item_exit);
-+				g_signal_connect (indicator_item_exit, "activate", G_CALLBACK (IndicatorOnExitMenuItemSelected), this);
-+
-+				gtk_widget_show_all (menu);
-+				app_indicator_set_menu (indicator, GTK_MENU (menu));
-+			}
-+#endif
- 		}
- 	}
- 
-Index: veracrypt/src/Main/Forms/MainFrame.h
-===================================================================
---- veracrypt.orig/src/Main/Forms/MainFrame.h
-+++ veracrypt/src/Main/Forms/MainFrame.h
-@@ -13,6 +13,16 @@
- #ifndef TC_HEADER_Main_Forms_MainFrame
- #define TC_HEADER_Main_Forms_MainFrame
- 
-+#ifdef HAVE_INDICATORS
-+#define GSocket GlibGSocket
-+#ifdef UBUNTU_INDICATOR
-+#include <libappindicator/app-indicator.h>
-+#elif AYATANA_INDICATOR
-+#include <libayatana-appindicator/app-indicator.h>
-+#endif
-+#undef GSocket
-+#endif
-+
- #include "Forms.h"
- #include "ChangePasswordDialog.h"
- #ifdef TC_MACOSX
-@@ -38,6 +48,18 @@ namespace VeraCrypt
- 		static FilePath GetShowRequestFifoPath () { return Application::GetConfigFilePath (L".show-request-queue", true); }
- #endif
- 
-+		void MountAllFavorites ();
-+
-+#ifdef HAVE_INDICATORS
-+		AppIndicator *indicator;
-+		GtkWidget *indicator_item_showhide;
-+		GtkWidget *indicator_item_mountfavorites;
-+		GtkWidget *indicator_item_dismountall;
-+		GtkWidget *indicator_item_prefs;
-+		GtkWidget *indicator_item_exit;
-+		void SetBusy (bool busy);
-+
-+#endif
- 	protected:
- 		enum
- 		{
-@@ -71,7 +93,6 @@ namespace VeraCrypt
- 		void LoadFavoriteVolumes ();
- 		void LoadPreferences ();
- 		void MountAllDevices ();
--		void MountAllFavorites ();
- 		void MountVolume ();
- 		void OnAboutMenuItemSelected (wxCommandEvent& event);
- 		void OnQuit(wxCommandEvent& event) { Close(true); }
-Index: veracrypt/src/Main/GraphicUserInterface.cpp
-===================================================================
---- veracrypt.orig/src/Main/GraphicUserInterface.cpp
-+++ veracrypt/src/Main/GraphicUserInterface.cpp
-@@ -1754,6 +1754,10 @@ namespace VeraCrypt
- 		}
- 
- 		BackgroundMode = state;
-+
-+#ifdef HAVE_INDICATORS
-+		gtk_menu_item_set_label ((GtkMenuItem*) ((MainFrame*) mMainFrame)->indicator_item_showhide, LangString[Gui->IsInBackgroundMode() ? "SHOW_TC" : "HIDE_TC"].mb_str());
-+#endif
- 	}
- 
- 	void GraphicUserInterface::SetListCtrlColumnWidths (wxListCtrl *listCtrl, list <int> columnWidthPermilles, bool hasVerticalScrollbar) const
-Index: veracrypt/src/Makefile
-===================================================================
---- veracrypt.orig/src/Makefile
-+++ veracrypt/src/Makefile
-@@ -58,6 +58,21 @@ export WXCONFIG_CFLAGS :=
- export WXCONFIG_CXXFLAGS :=
- WX_ROOT ?= ..
- 
-+ifneq (,$(findstring gtk3,$(shell $(WX_CONFIG) --selected-config)))
-+   INDICATOR_LIBRARY=appindicator3-0.1
-+else
-+   INDICATOR_LIBRARY=appindicator-0.1
-+endif
-+
-+ifeq ($(shell pkg-config --exists $(INDICATOR_LIBRARY) && echo $$?),0)
-+	export C_CXX_FLAGS += -DHAVE_INDICATORS -DUBUNTU_INDICATOR
-+	export LIBS += $(shell pkg-config --libs $(INDICATOR_LIBRARY))
-+	C_CXX_FLAGS += $(shell pkg-config --cflags $(INDICATOR_LIBRARY))
-+else ifeq ($(shell pkg-config --exists ayatana-$(INDICATOR_LIBRARY) && echo $$?),0)
-+	export C_CXX_FLAGS += -DHAVE_INDICATORS -DAYATANA_INDICATOR
-+	export LIBS += $(shell pkg-config --libs ayatana-$(INDICATOR_LIBRARY))
-+	C_CXX_FLAGS += $(shell pkg-config --cflags ayatana-$(INDICATOR_LIBRARY))
-+endif
- 
- export TC_BUILD_CONFIG := Release
- 
diff --git a/veracrypt/debian/patches/1001-port-to-libfuse3.patch b/veracrypt/debian/patches/1001-port-to-libfuse3.patch
new file mode 100644
index 0000000..9325f08
--- /dev/null
+++ b/veracrypt/debian/patches/1001-port-to-libfuse3.patch
@@ -0,0 +1,109 @@
+Description: Port from libfuse2 to libfuse3.
+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(-)
+
+--- 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 @@
+ 
+ #------ FUSE configuration ------
+ 
+-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 @@
+ OBJS :=
+ OBJS += FuseService.o
+ 
+-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
+@@ -13,7 +13,7 @@
+ #ifdef TC_OPENBSD
+ #define FUSE_USE_VERSION  26
+ #else
+-#define FUSE_USE_VERSION  25
++#define FUSE_USE_VERSION  30
+ #endif
+ 
+ #include <errno.h>
+@@ -56,11 +56,7 @@
+ 		return 0;
+ 	}
+ 
+-#ifdef TC_OPENBSD
+-	static void *fuse_service_init (struct fuse_conn_info *)
+-#else
+-	static void *fuse_service_init ()
+-#endif
++	static void *fuse_service_init (struct fuse_conn_info *, struct fuse_config *config)
+ 	{
+ 		try
+ 		{
+@@ -104,7 +100,7 @@
+ 		}
+ 	}
+ 
+-	static int fuse_service_getattr (const char *path, struct stat *statData)
++	static int fuse_service_getattr (const char *path, struct stat *statData, struct fuse_file_info *fi)
+ 	{
+ 		try
+ 		{
+@@ -261,7 +257,7 @@
+ 		return -ENOENT;
+ 	}
+ 
+-	static int fuse_service_readdir (const char *path, void *buf, fuse_fill_dir_t filler, off_t offset, struct fuse_file_info *fi)
++	static int fuse_service_readdir (const char *path, void *buf, fuse_fill_dir_t filler, off_t offset, struct fuse_file_info *fi, enum fuse_readdir_flags fl)
+ 	{
+ 		try
+ 		{
+@@ -271,10 +267,10 @@
+ 			if (strcmp (path, "/") != 0)
+ 				return -ENOENT;
+ 
+-			filler (buf, ".", NULL, 0);
+-			filler (buf, "..", NULL, 0);
+-			filler (buf, FuseService::GetVolumeImagePath() + 1, NULL, 0);
+-			filler (buf, FuseService::GetControlPath() + 1, NULL, 0);
++			filler (buf, ".", NULL, 0, (enum fuse_fill_dir_flags)0);
++			filler (buf, "..", NULL, 0, (enum fuse_fill_dir_flags)0);
++			filler (buf, FuseService::GetVolumeImagePath() + 1, NULL, 0, (enum fuse_fill_dir_flags)0);
++			filler (buf, FuseService::GetControlPath() + 1, NULL, 0, (enum fuse_fill_dir_flags)0);
+ 		}
+ 		catch (...)
+ 		{
+@@ -450,7 +446,7 @@
+ 		}
+ 
+ 		ExecFunctor execFunctor (openVolume, slotNumber);
+-		Process::Execute ("fuse", args, -1, &execFunctor);
++		Process::Execute ("fusermount3", args, -1, &execFunctor);
+ 
+ 		for (int t = 0; true; t++)
+ 		{
+@@ -592,11 +588,7 @@
+ 
+ 		SignalHandlerPipe->GetWriteFD();
+ 
+-#ifdef TC_OPENBSD
+ 		_exit (fuse_main (argc, argv, &fuse_service_oper, NULL));
+-#else
+-		_exit (fuse_main (argc, argv, &fuse_service_oper));
+-#endif
+ 	}
+ 
+ 	VolumeInfo FuseService::OpenVolumeInfo;
diff --git a/veracrypt/debian/patches/series b/veracrypt/debian/patches/series
index b3dc56a..8518785 100644
--- a/veracrypt/debian/patches/series
+++ b/veracrypt/debian/patches/series
@@ -1,2 +1,2 @@
-001-indicator-support.patch
+1001-port-to-libfuse3.patch
 vc_devuan.patch
diff --git a/veracrypt/debian/patches/vc_devuan.patch b/veracrypt/debian/patches/vc_devuan.patch
index 7a12b73..76e889a 100644
--- a/veracrypt/debian/patches/vc_devuan.patch
+++ b/veracrypt/debian/patches/vc_devuan.patch
@@ -3,7 +3,7 @@ diff -x '*.rej' -x '*.orig' -Naur VeraCrypt_1.22/src/Common/Dlgcode.c VeraCrypt_
 +++ VeraCrypt_1.22-1/src/Common/Dlgcode.c	2018-09-02 08:22:00.007030589 -0400
 @@ -1280,7 +1280,7 @@
  			L"This software as a whole:\r\n"
- 			L"Copyright \xA9 2013-2020 IDRIX. All rights reserved.\r\n\r\n"
+ 			L"Copyright \xA9 2013-2021 IDRIX. All rights reserved.\r\n\r\n"
  
 -			L"An IDRIX Release");
 +			L"Packaged for Devuan");
diff --git a/veracrypt/debian/rules b/veracrypt/debian/rules
index e96ca1b..6b929d1 100755
--- a/veracrypt/debian/rules
+++ b/veracrypt/debian/rules
@@ -16,7 +16,7 @@ export TC_EXTRA_LFLAGS = $(LDFLAGS)
 	dh  $@ --sourcedirectory=src
 
 override_dh_auto_build:
-	dh_auto_build -- VERBOSE=1 NOSTRIP=1 ARCH=$(DEB_HOST_ARCH)
+	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
 
 override_dh_clean:
diff --git a/veracrypt/debian/veracrypt+devuan.dsc b/veracrypt/debian/veracrypt+devuan.dsc
index b69b761..0d763f6 100644
--- a/veracrypt/debian/veracrypt+devuan.dsc
+++ b/veracrypt/debian/veracrypt+devuan.dsc
@@ -2,11 +2,11 @@ Format: 3.0 (quilt)
 Source: veracrypt
 Binary: veracrypt
 Architecture: any
-Version: 1.24-Update7-1+devuan
-Maintainer: B Stack <bgstack15@gmail.com>
+Version: 1.25.4-1+devuan
+Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://veracrypt.fr/
-Standards-Version: 4.5.0
-Build-Depends: debhelper-compat (= 12), libayatana-appindicator3-dev | libappindicator3-dev, libfuse-dev, libwxgtk3.0-gtk3-dev, pkg-config, yasm [any-i386 any-amd64]
+Standards-Version: 4.6.0
+Build-Depends: debhelper-compat (= 12), libayatana-appindicator3-dev | libappindicator3-dev, libfuse3-dev, libwxgtk3.0-gtk3-dev, pkg-config, yasm [any-i386 any-amd64]
 Package-List:
  veracrypt deb non-free/utils optional arch=any
 Files:
diff --git a/veracrypt/vc_desktop.patch b/veracrypt/vc_desktop.patch
index 2ba9ccc..0993325 100644
--- a/veracrypt/vc_desktop.patch
+++ b/veracrypt/vc_desktop.patch
@@ -1,15 +1,14 @@
 diff -x '*.rej' -x '*.orig' -Naur VeraCrypt_1.22/src/Setup/Linux/veracrypt.desktop VeraCrypt_1.22-1/src/Setup/Linux/veracrypt.desktop
 --- VeraCrypt_1.22/src/Setup/Linux/veracrypt.desktop	2018-03-30 07:54:10.000000000 -0400
 +++ VeraCrypt_1.22-1/src/Setup/Linux/veracrypt.desktop	2018-09-02 08:27:55.491897497 -0400
-@@ -2,9 +2,9 @@
- Encoding=UTF-8
- Name=VeraCrypt
- GenericName=VeraCrypt
--Comment=VeraCrypt
-+Comment=Disk encryption based on TrueCrypt
- Exec=/usr/bin/veracrypt
+@@ -5,7 +5,7 @@
+ Comment=Create and mount VeraCrypt encrypted volumes
  Icon=veracrypt
+ Exec=/usr/bin/veracrypt %f
+-Categories=Security;Utility;Filesystem
++Categories=Security;Utility;Filesystem;X-Encryption;X-Encryption-Tools;
+ Keywords=encryption,filesystem
  Terminal=false
- Type=Application
--Categories=Encryption;Encryption Tools;Utility;
-+Categories=X-Encryption;X-Encryption-Tools;Utility;
+ MimeType=application/x-veracrypt-volume;application/x-truecrypt-volume;
+\ No newline at end of file
++MimeType=application/x-veracrypt-volume;application/x-truecrypt-volume;
diff --git a/veracrypt/vc_fedora.patch b/veracrypt/vc_fedora.patch
index a2b7024..a2ce19a 100644
--- a/veracrypt/vc_fedora.patch
+++ b/veracrypt/vc_fedora.patch
@@ -3,7 +3,7 @@ diff -x '*.rej' -x '*.orig' -Naur VeraCrypt_1.22/src/Common/Dlgcode.c VeraCrypt_
 +++ VeraCrypt_1.22-1/src/Common/Dlgcode.c	2018-09-02 08:22:00.007030589 -0400
 @@ -1280,7 +1280,7 @@
  			L"This software as a whole:\r\n"
- 			L"Copyright \xA9 2013-2020 IDRIX. All rights reserved.\r\n\r\n"
+ 			L"Copyright \xA9 2013-2021 IDRIX. All rights reserved.\r\n\r\n"
  
 -			L"An IDRIX Release");
 +			L"A Fedora copr release");
diff --git a/veracrypt/veracrypt.spec b/veracrypt/veracrypt.spec
index 2948353..fa3c832 100644
--- a/veracrypt/veracrypt.spec
+++ b/veracrypt/veracrypt.spec
@@ -74,7 +74,7 @@
   %endif
 %endif
 
-%define upstream_version 1.24-Update7
+%define upstream_version 1.25.4
 
 Name:		veracrypt
 Version:	%( echo %{upstream_version} | tr '-' '_' )