[gentoo-commits] repo/gentoo:master commit in: app-crypt/veracrypt/, app-crypt/veracrypt/files/
commit: e966297d2d3474ff29f967fbe8f931ce18034eae
Author: Pacho Ramos gentoo org>
AuthorDate: Fri Jul 5 18:39:22 2024 +
Commit: Pacho Ramos gentoo org>
CommitDate: Fri Jul 5 18:39:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e966297d
app-crypt/veracrypt: Restore a 1.25.x version
It seems Mageia people were able to patch it to be compatible with
wxGTK-3.2 and, like that, this old version can live a bit longer.
Closes: https://bugs.gentoo.org/935349
Signed-off-by: Pacho Ramos gentoo.org>
app-crypt/veracrypt/Manifest | 1 +
.../files/veracrypt-1.25.9-wxGTK3.2.patch | 311 +
app-crypt/veracrypt/veracrypt-1.25.9-r1.ebuild | 105 +++
3 files changed, 417 insertions(+)
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 4d2cc1223ab1..e8159d9074cf 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1 +1,2 @@
+DIST veracrypt-1.25.9.tar.gz 26200897 BLAKE2B
e48f060343f875a0660040dde35fa826ca87c3659d97a039c2b84193276075b4d3596119bde6727e51eead0c876c91a5a1a3ea77717e74061d5d20a4ea1a6fed
SHA512
e83bf7ca52d3893347dd06295db0534931f6f388fc6b0f26dc80ffef77f13918bf9558ab8ac2e6225945415f3291646d7c1c8de382dbe8e468ab1e927251982c
DIST veracrypt-1.26.7.tar.gz 30322472 BLAKE2B
a71adf9fa5a2aafb9694ccf7a7ac45e6e16cf8277a57f9f52e2fd0ddb2657bd1a28dd4b2c0bf9167298251b4a87ab3f0ca0a8a8424b612be0cd7a4bcc630a438
SHA512
1b0fae30e3a8eb20e1ddcf7697f5b1ce947ddc3555442a561e50fe10bd82183ff5b21dc1c06ce2024eecab869fe38616ac47931c880816f814b961bbd1dec8e2
diff --git a/app-crypt/veracrypt/files/veracrypt-1.25.9-wxGTK3.2.patch
b/app-crypt/veracrypt/files/veracrypt-1.25.9-wxGTK3.2.patch
new file mode 100644
index ..d6ee103c4f3d
--- /dev/null
+++ b/app-crypt/veracrypt/files/veracrypt-1.25.9-wxGTK3.2.patch
@@ -0,0 +1,311 @@
+diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp
+index d281feb..3ac5bbb 100644
+--- a/Main/Forms/Forms.cpp
b/Main/Forms/Forms.cpp
+@@ -253,7 +253,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID
id, const wxString& t
+
+ bSizer18->SetMinSize( wxSize( 138,34 ) );
+ VolumePropertiesButton = new wxButton(
LowStaticBoxSizer->GetStaticBox(), wxID_ANY, _("IDC_VOLUME_PROPERTIES"),
wxDefaultPosition, wxDefaultSize, 0 );
+- bSizer18->Add( VolumePropertiesButton, 1,
wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
++ bSizer18->Add( VolumePropertiesButton, 1, wxALL|wxEXPAND, 5 );
+
+
+ gSizer1->Add( bSizer18, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+@@ -263,7 +263,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID
id, const wxString& t
+
+ bSizer19->SetMinSize( wxSize( 138,34 ) );
+ WipeCacheButton = new wxButton( LowStaticBoxSizer->GetStaticBox(),
wxID_ANY, _("HK_WIPE_CACHE"), wxDefaultPosition, wxDefaultSize, 0 );
+- bSizer19->Add( WipeCacheButton, 1, wxALL|wxALIGN_RIGHT|wxEXPAND, 5 );
++ bSizer19->Add( WipeCacheButton, 1, wxALL|wxEXPAND, 5 );
+
+
+ gSizer1->Add( bSizer19, 0, wxALIGN_RIGHT, 5 );
+@@ -345,7 +345,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID
id, const wxString& t
+
+ VolumeButton->SetMinSize( wxSize( -1,32 ) );
+
+- sbSizer4->Add( VolumeButton, 1,
wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
++ sbSizer4->Add( VolumeButton, 1, wxEXPAND|wxALL, 2 );
+
+
+ gSizer2->Add( sbSizer4, 1, wxEXPAND, 0 );
+@@ -357,7 +357,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID
id, const wxString& t
+ MountAllDevicesButton = new wxButton( sbSizer41->GetStaticBox(),
wxID_ANY, _("IDC_MOUNTALL"), wxDefaultPosition, wxDefaultSize, 0 );
+ MountAllDevicesButton->SetMinSize( wxSize( -1,32 ) );
+
+- sbSizer41->Add( MountAllDevicesButton, 1,
wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
++ sbSizer41->Add( MountAllDevicesButton, 1, wxEXPAND|wxALL, 2 );
+
+
+ gSizer2->Add( sbSizer41, 1, wxEXPAND, 5 );
+@@ -369,7 +369,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID
id, const wxString& t
+ DismountAllButton = new wxButton( sbSizer42->GetStaticBox(), wxID_ANY,
_("IDC_UNMOUNTALL"), wxDefaultPosition, wxDefaultSize, 0 );
+ DismountAllButton->SetMinSize( wxSize( -1,32 ) );
+
+- sbSizer42->Add( DismountAllButton, 1,
wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
++ sbSizer42->Add( DismountAllButton, 1, wxEXPAND|wxALL, 2 );
+
+
+ gSizer2->Add( sbSizer42, 1, wxEXPAND, 5 );
+@@ -381,7 +381,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID
id, const wxString& t
+ ExitButton = new wxButton( sbSizer43->GetStaticBox(), wxID_ANY,
_("IDC_EXIT"), wxDefaultPosition, wxDefaultSize, 0 );
+ ExitButton->SetMinSize( wxSize( -1,32 ) );
+
+- sbSizer43->Add( ExitButton, 1,
wxALIGN_CENTER_HORIZONTAL|
[gentoo-commits] repo/gentoo:master commit in: app-crypt/veracrypt/, app-crypt/veracrypt/files/
commit: e0c8532e4a7e474d277547b65061a3f3219e85a3
Author: Göktürk Yüksek gentoo org>
AuthorDate: Thu Nov 26 03:09:48 2020 +
Commit: Göktürk Yüksek gentoo org>
CommitDate: Thu Nov 26 03:09:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0c8532e
app-crypt/veracrypt: remove old
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Göktürk Yüksek gentoo.org>
app-crypt/veracrypt/Manifest | 2 -
.../files/veracrypt-1.24-no-gui-fix.patch | 35 --
...racrypt-1.24_p2-revert-wxwidgets-breakage.patch | 100 -
app-crypt/veracrypt/files/veracrypt.init | 17 ---
app-crypt/veracrypt/veracrypt-1.24_p2.ebuild | 120 -
app-crypt/veracrypt/veracrypt-1.24_p4.ebuild | 101 -
6 files changed, 375 deletions(-)
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 9926a221c11..7ccdd48d8c8 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,3 +1 @@
-DIST veracrypt-1.24_p2.tar.gz 25208374 BLAKE2B
2667fb93e6884d97a673fe793b5f83f73961c2362e7704199b5ed0163c03f19313843583f7f2a15e05ee71516e45db97752350d2c27d22f1f278668b7c07aff9
SHA512
f778b8f6288f6f9886a15fa582f6c7126d9eaea319e854ad11bd5d44105ad5a3cb8b750d410ed8fd531ec3b23f9bad83934e6cefedd1352603d4882d2ca0ad84
-DIST veracrypt-1.24_p4.tar.gz 25212608 BLAKE2B
12d124cc5c869b8112e29624fcc5af3dd96d3c5e0179c643bf16cd361cc01677c09710faa192e7c9fe5f2ca78fbd826bc9df99f34e83ce4534f26dec01185761
SHA512
e077d6fe6a35234737387c4a6997399a251e238ab75524f53efe8ed742a35164fa4d5fcb0f15816dcb29d31fb8a4bb175d45b9aefb912c4747194fb320fa408d
DIST veracrypt-1.24_p7.tar.gz 25113248 BLAKE2B
8ead3325ce6fadf4ca8211ea45daaa82a655f29006f224235f44200839289d42fabe84da2e731fc6a169a7d157535c719b2cd9294524e68532c0065e41ed733c
SHA512
d149736d4d6740a89bfce892f44757600c6411776b471a208a75b4573bbc6125535ef1b68c2f55903ff82f4d0fff13b8b07d3cf15c7a301c39158aefffc29e17
diff --git a/app-crypt/veracrypt/files/veracrypt-1.24-no-gui-fix.patch
b/app-crypt/veracrypt/files/veracrypt-1.24-no-gui-fix.patch
deleted file mode 100644
index c4433c561d8..000
--- a/app-crypt/veracrypt/files/veracrypt-1.24-no-gui-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 482311ef1041918d791e498744f8e0ddeebc91fe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?=
-Date: Fri, 11 Oct 2019 18:16:41 -0400
-Subject: [PATCH v1] src/Main/Main.make: simplify the WX_CONFIG_LIBS logic
-
-Irrespective of whether we are linking against widgets statically or
-dynamically, pull in only 'base' when GUI is disabled, and
-'adv,core,base' when GUI is enabled. When GUI is disabled, the C/CXX
-flag must include '-DwxUSE_GUI=0' for this to work.
- src/Main/Main.make | 4
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/Main/Main.make b/src/Main/Main.make
-index 0bdd951d..259a1f08 100755
a/src/Main/Main.make
-+++ b/src/Main/Main.make
-@@ -82,14 +82,10 @@ CXXFLAGS += -I$(BASE_DIR)/Main
- #-- wxWidgets configuration --
-
- ifdef TC_NO_GUI
--ifdef VC_WX_STATIC
- WX_CONFIG_LIBS := base
- else
- WX_CONFIG_LIBS := adv,core,base
- endif
--else
--WX_CONFIG_LIBS := adv,core,base
--endif
-
- ifeq "$(TC_BUILD_CONFIG)" "Release"
-
---
-2.23.0
-
diff --git
a/app-crypt/veracrypt/files/veracrypt-1.24_p2-revert-wxwidgets-breakage.patch
b/app-crypt/veracrypt/files/veracrypt-1.24_p2-revert-wxwidgets-breakage.patch
deleted file mode 100644
index 029b683e7d6..000
---
a/app-crypt/veracrypt/files/veracrypt-1.24_p2-revert-wxwidgets-breakage.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 6ab07ac9a30fe48839e31f9c374fd6a6ddeeb382 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?=
-Date: Thu, 19 Dec 2019 17:04:37 -0500
-Subject: [PATCH] Revert "Linux: Fix failure to run VeraCrypt binary built for
- console mode on headless machines (fix issue
- https://github.com/veracrypt/VeraCrypt/issues/531)"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The build failure still exists for system wxGTK compiled with '--disable-gui':
-
-```
-In file included from TextUserInterface.cpp:27:
-TextUserInterface.h: In member function ‘virtual bool
VeraCrypt::TextUserInterface::Initialize(int&, wxChar**)’:
-TextUserInterface.h:50:63: error: ‘wxAppBase’ has not been declared
- 50 | virtual bool Initialize (int &argc, wxChar **argv) { return
wxAppBase::Initialize(argc, argv); }
-```
-
-This reverts commit 737e1f126b8826ed02418266e590e195aebdd7c0.
- src/Main/TextUserInterface.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/Main/TextUserInterface.h b/src/Main/TextUserInterface.h
-index 95db02d7..78874b8c 100644
a/src/Main/TextUserInterface.h
-+++ b/src/Main/TextUserInterface.h
-@@ -47,7 +47,9 @@ namespace VeraCrypt
- virtual void ExportSecurityTokenKeyfile () const;
- virtual shared_ptr
G
[gentoo-commits] repo/gentoo:master commit in: app-crypt/veracrypt/, app-crypt/veracrypt/files/
commit: 203783d176b8f801bd640c5c1eaa372b6ea29e3e
Author: Göktürk Yüksek gentoo org>
AuthorDate: Thu Dec 19 22:42:33 2019 +
Commit: Göktürk Yüksek gentoo org>
CommitDate: Thu Dec 19 22:48:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203783d1
app-crypt/veracrypt: bump to 1.24-Update2
Bug: https://bugs.gentoo.org/703340
Closes: https://bugs.gentoo.org/698936
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Göktürk Yüksek gentoo.org>
app-crypt/veracrypt/Manifest | 1 +
...racrypt-1.24_p2-revert-wxwidgets-breakage.patch | 100 +
app-crypt/veracrypt/veracrypt-1.24_p2.ebuild | 120 +
3 files changed, 221 insertions(+)
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 15dd13cdf1e..a96fc6991a0 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,3 +1,4 @@
DIST VeraCrypt_1.23.tar.gz 24941166 BLAKE2B
f9760342678f771192434f88a9b6c3bcc348ef312197232346731f51e972c230a4627f92fd655f7a3c7582b1f728274b7f170f885cceadce6ad53c9b404cd8d6
SHA512
433e717403560fc4f9081f528168f346ed7f14f9621b78a176c6801f14caba3d57e3228b940fb746637de29893f278ade650cf5eca63490bc236987a9db4d48d
DIST VeraCrypt_1.24.tar.gz 25046467 BLAKE2B
e8535f981d898efd797ff736a03e4a65b75bd40ed62d75e3f159932e93d9684e8601da277839b40efcd9bdda801427468386f37e9c57cd81dbc470f23693cd12
SHA512
b4a3155ec8455c51044c2aabcc785a6974d9ee740e0c77bae934a017976e715d45701811405dadfbbd9ceb2a957acbefbe15a717003c86ea38d52735de4f2e56
DIST veracrypt-1.24_p1.tar.gz 25052008 BLAKE2B
215af344a5e57e16319d6aec5f439517f774ee92b11d11060e98708d2e5390b54965eecda55bdc56e8e5f01a945b6782a8b695f24a747dd4e7ff2346b9af96e9
SHA512
2564c6b579bc3609d93fb3e6ec12c0e9e90b6b423ce06dab8870583d6b6ce0da9d864d64da67f4d1d6096e4dd750d335c66c0eed9199ec1b38c0690090f317a6
+DIST veracrypt-1.24_p2.tar.gz 25208374 BLAKE2B
2667fb93e6884d97a673fe793b5f83f73961c2362e7704199b5ed0163c03f19313843583f7f2a15e05ee71516e45db97752350d2c27d22f1f278668b7c07aff9
SHA512
f778b8f6288f6f9886a15fa582f6c7126d9eaea319e854ad11bd5d44105ad5a3cb8b750d410ed8fd531ec3b23f9bad83934e6cefedd1352603d4882d2ca0ad84
diff --git
a/app-crypt/veracrypt/files/veracrypt-1.24_p2-revert-wxwidgets-breakage.patch
b/app-crypt/veracrypt/files/veracrypt-1.24_p2-revert-wxwidgets-breakage.patch
new file mode 100644
index 000..029b683e7d6
--- /dev/null
+++
b/app-crypt/veracrypt/files/veracrypt-1.24_p2-revert-wxwidgets-breakage.patch
@@ -0,0 +1,100 @@
+From 6ab07ac9a30fe48839e31f9c374fd6a6ddeeb382 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?=
+Date: Thu, 19 Dec 2019 17:04:37 -0500
+Subject: [PATCH] Revert "Linux: Fix failure to run VeraCrypt binary built for
+ console mode on headless machines (fix issue
+ https://github.com/veracrypt/VeraCrypt/issues/531)"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The build failure still exists for system wxGTK compiled with '--disable-gui':
+
+```
+In file included from TextUserInterface.cpp:27:
+TextUserInterface.h: In member function ‘virtual bool
VeraCrypt::TextUserInterface::Initialize(int&, wxChar**)’:
+TextUserInterface.h:50:63: error: ‘wxAppBase’ has not been declared
+ 50 | virtual bool Initialize (int &argc, wxChar **argv) { return
wxAppBase::Initialize(argc, argv); }
+```
+
+This reverts commit 737e1f126b8826ed02418266e590e195aebdd7c0.
+---
+ src/Main/TextUserInterface.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/Main/TextUserInterface.h b/src/Main/TextUserInterface.h
+index 95db02d7..78874b8c 100644
+--- a/src/Main/TextUserInterface.h
b/src/Main/TextUserInterface.h
+@@ -47,7 +47,9 @@ namespace VeraCrypt
+ virtual void ExportSecurityTokenKeyfile () const;
+ virtual shared_ptr
GetAdminPasswordRequestHandler ();
+ virtual void ImportSecurityTokenKeyfiles () const;
++#ifndef TC_NO_GUI
+ virtual bool Initialize (int &argc, wxChar **argv) { return
wxAppBase::Initialize(argc, argv); }
++#endif
+ virtual void InitSecurityTokenLibrary () const;
+ virtual void ListSecurityTokenKeyfiles () const;
+ virtual VolumeInfoList MountAllDeviceHostedVolumes
(MountOptions &options) const;
+--
+2.24.0
+
+From d168eadc536552fbf76fe86c8ad0fa77130081e1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?=
+Date: Thu, 19 Dec 2019 17:15:43 -0500
+Subject: [PATCH] Revert "Linux: fix compilation error when building
+ console-only version of VeraCrypt that is statically linked to wxWidgets"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The build failure still exists for system wxGTK compiled with '--disable-gui':
+
+```
+In file included from TextUserInterface.cpp:27:
+TextUserInterface.h: In member function ‘virtual bool
VeraCrypt::TextUserInterface
[gentoo-commits] repo/gentoo:master commit in: app-crypt/veracrypt/, app-crypt/veracrypt/files/
commit: ac3f1a90286538ec943337d34552553205aa3d05
Author: Göktürk Yüksek gentoo org>
AuthorDate: Fri Oct 11 22:31:32 2019 +
Commit: Göktürk Yüksek gentoo org>
CommitDate: Tue Oct 15 23:20:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac3f1a90
app-crypt/veracrypt: fix the linking against wxGTK[X] when USE='-X'
veracrypt[-X] fails to properly link against wxGTK[X] only using the
'base' library because the wx's setup.h implicitly defines
wxUSE_GUI=1, which then changes the definition of various structures,
requiring symbols from the core library as well.
For example, wxwidgets include/wx/app.h defines:
#if wxUSE_GUI
class WXDLLIMPEXP_CORE wxAppBase : public wxAppConsole
...
[snip]
...
#else // !GUI
// wxApp is defined in core and we cannot define another one in wxBase,
// so use the preprocessor to allow using wxApp in console programs too
#define wxApp wxAppConsole
#endif // GUI/!GUI
To fix this, pass '-DwxUSE_GUI=0' when compiling veracrypt[-X].
Closes: https://bugs.gentoo.org/605018
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Göktürk Yüksek gentoo.org>
.../files/veracrypt-1.24-no-gui-fix.patch | 35 ++
app-crypt/veracrypt/veracrypt-1.24-r1.ebuild | 117 +
2 files changed, 152 insertions(+)
diff --git a/app-crypt/veracrypt/files/veracrypt-1.24-no-gui-fix.patch
b/app-crypt/veracrypt/files/veracrypt-1.24-no-gui-fix.patch
new file mode 100644
index 000..c4433c561d8
--- /dev/null
+++ b/app-crypt/veracrypt/files/veracrypt-1.24-no-gui-fix.patch
@@ -0,0 +1,35 @@
+From 482311ef1041918d791e498744f8e0ddeebc91fe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?=
+Date: Fri, 11 Oct 2019 18:16:41 -0400
+Subject: [PATCH v1] src/Main/Main.make: simplify the WX_CONFIG_LIBS logic
+
+Irrespective of whether we are linking against widgets statically or
+dynamically, pull in only 'base' when GUI is disabled, and
+'adv,core,base' when GUI is enabled. When GUI is disabled, the C/CXX
+flag must include '-DwxUSE_GUI=0' for this to work.
+---
+ src/Main/Main.make | 4
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/Main/Main.make b/src/Main/Main.make
+index 0bdd951d..259a1f08 100755
+--- a/src/Main/Main.make
b/src/Main/Main.make
+@@ -82,14 +82,10 @@ CXXFLAGS += -I$(BASE_DIR)/Main
+ #-- wxWidgets configuration --
+
+ ifdef TC_NO_GUI
+-ifdef VC_WX_STATIC
+ WX_CONFIG_LIBS := base
+ else
+ WX_CONFIG_LIBS := adv,core,base
+ endif
+-else
+-WX_CONFIG_LIBS := adv,core,base
+-endif
+
+ ifeq "$(TC_BUILD_CONFIG)" "Release"
+
+--
+2.23.0
+
diff --git a/app-crypt/veracrypt/veracrypt-1.24-r1.ebuild
b/app-crypt/veracrypt/veracrypt-1.24-r1.ebuild
new file mode 100644
index 000..11c26807218
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.24-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html";
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz";
+
+# The modules not linked against in Linux include (but not limited to):
+# libzip, chacha-xmm, chacha256, chachaRng, jitterentropy, rdrand, t1ha2
+# Tested by actually removing the source files and performing a build
+# For this reason, We don't have to worry about their licenses
+LICENSE="Apache-2.0 truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
+RESTRICT="bindist mirror"
+
+WX_GTK_VER="3.0"
+
+RDEPEND="
+ sys-fs/lvm2
+ sys-fs/fuse:0
+ x11-libs/wxGTK:${WX_GTK_VER}[X?]
+ app-admin/sudo
+ dev-libs/pkcs11-helper
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ asm? ( dev-lang/yasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+
+pkg_setup() {
+ local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+ linux-info_pkg_setup
+
+ setup-wxwidgets
+}
+
+src_prepare() {
+ eapply -p2 "${FILESDIR}"/${PN}-1.24-no-gui-fix.patch
+ default
+}
+
+src_compile() {
+ local TC_EXTRA_CFLAGS="${CFLAGS}"
+ local TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+ local myemakeargs=(
+ NOSTRIP=1
+ NOTEST=1
+ VERBOSE=1
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ AR="$(tc-getAR)"
+ RANLIB="$(tc-getRANLIB)"
+ TC_EXTRA_LFLAGS="${LDFLAGS}"
+ WX_CONFIG="${WX_CONFIG}"
+ $(usex X "" "NOGUI=1")
+ $(usex asm "" "NOASM=1")
+ $(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
+ $(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+ $(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+ )
+
[gentoo-commits] repo/gentoo:master commit in: app-crypt/veracrypt/, app-crypt/veracrypt/files/
commit: 84c3c30ebb39b2b7fdef328d4e11793dd3eb6d45
Author: Göktürk Yüksek gentoo org>
AuthorDate: Wed Apr 4 03:49:10 2018 +
Commit: Göktürk Yüksek gentoo org>
CommitDate: Wed Apr 4 03:49:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c3c30e
app-crypt/veracrypt: bump to 1.22
- Add support for SSSE3 and SSE4_1 through cpu_flags_x86_*.
- Rework some of the USE logic using usex.
- Fix the desktop file category.
"Encryption;Encryption Tools;Utility;" is unregistered
according to the desktop menu specification. Replace it
with "Utility;Security".
Bug: https://bugs.gentoo.org/611362
Closes: https://bugs.gentoo.org/652052
Package-Manager: Portage-2.3.27, Repoman-2.3.9
app-crypt/veracrypt/Manifest | 1 +
.../files/veracrypt-1.22-sysmacros-fix.patch | 36 +
app-crypt/veracrypt/veracrypt-1.22.ebuild | 90 ++
3 files changed, 127 insertions(+)
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 0ae36bd7ab8..59a6f010b51 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,2 +1,3 @@
DIST VeraCrypt_1.19.tar.gz 23235780 BLAKE2B
0d02b3c6783d233f7cc64956eef58077e8a125fd5db28c1374921d8f2ca6dc9e1cde5402917c1ed4e4a626901e24c566ee834a12e41b6bcd150b8d64851f1ebc
SHA512
ebce681099e04d938ff0dc10a1af848c82dafd80b165b2431ec355d64e29be4e60d1d63f0d5c9fd1182394080d00f0f573e3ae90f3e2167533dea2b895bd0164
DIST VeraCrypt_1.21.tar.gz 24106162 BLAKE2B
5afe48830bde81d91d16f0bdf16010bdbdb885df84b9cd3e48191e468be51a485dfb3fc4f95da71d6d973a2f22dfbb92ee2b912dcf019921b37e1d4479c8c8d8
SHA512
5186d339f8fb0d88acfc35b1e7a916f797e30be93e8f252cca542b6d5c1cd916110111ef7b859d66b1790ce05d7d02bc72def26857eb003ea114a911fcec6c41
+DIST VeraCrypt_1.22.tar.gz 24820384 BLAKE2B
52fb822d07af96a9f47c17f8aacf13a949fb5a7c5d064a720e003e6d1bfbb5f221a5823720527e1f2c82f08547d77349cc90bc839336a622efcf1836dd97bb88
SHA512
83cdaf673bc9cdeadeb70b2beeabf87a2a9a65d3b0b0cc7fdf9c87671714af1e207ddd1db716302919e2d14414f5d4dd9d8f5203847d72834f53544a04c1a62a
diff --git a/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch
b/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch
new file mode 100644
index 000..702e8f702ec
--- /dev/null
+++ b/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch
@@ -0,0 +1,36 @@
+From 0a50becec3a3cca71e575dfec35d69ab295c85cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?=
+Date: Tue, 3 Apr 2018 23:06:20 -0400
+Subject: [PATCH] Platform/Unix: include for major/minor
+ macros
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting with glibc 2.26, macros "major" and "minor" are only
+available from [0]. The build fails with the
+following without including this header:
+
+Unix/FilesystemPath.cpp:84:49: error: ‘major’ was not declared in this scope
+Unix/FilesystemPath.cpp:84:113: error: ‘minor’ was not declared in this scope
+
+[0] https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html
+---
+ src/Platform/Unix/FilesystemPath.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Platform/Unix/FilesystemPath.cpp
b/src/Platform/Unix/FilesystemPath.cpp
+index d6c9cd2..7c28af4 100644
+--- a/Platform/Unix/FilesystemPath.cpp
b/Platform/Unix/FilesystemPath.cpp
+@@ -15,6 +15,7 @@
+ #include "Platform/StringConverter.h"
+ #include
+ #include
++#include
+
+ namespace VeraCrypt
+ {
+--
+2.16.3
+
diff --git a/app-crypt/veracrypt/veracrypt-1.22.ebuild
b/app-crypt/veracrypt/veracrypt-1.22.ebuild
new file mode 100644
index 000..98de71aa670
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.22.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html";
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz";
+
+LICENSE="Apache-2.0 truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 +doc X"
+RESTRICT="bindist mirror"
+
+WX_GTK_VER="3.0"
+
+RDEPEND="
+ sys-fs/lvm2
+ sys-fs/fuse:0
+ x11-libs/wxGTK:${WX_GTK_VER}[X?]
+ app-admin/sudo
+ dev-libs/pkcs11-helper
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ asm? ( dev-lang/yasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+HTML_DOCS=( "${S}"/../doc/html/. )
+DOCS=( Readme.txt )
+PATCHES=( "${FILESDIR}"/${PN}-1.22-sysmacros-fix.patch )
+
+pkg_setup() {
+ local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+ linux-info_pkg_setup
+
+ setup-wxwidgets
+}
+
+src_compile() {
+ local myemakeargs=(
+ NOSTRIP=1
+ NOTEST=1
+ VERBOS
