diff options
Diffstat (limited to 'app-crypt')
-rw-r--r-- | app-crypt/Manifest.gz | bin | 25163 -> 25167 bytes | |||
-rw-r--r-- | app-crypt/tpm2-tss/Manifest | 8 | ||||
-rw-r--r-- | app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild (renamed from app-crypt/tpm2-tss/tpm2-tss-2.4.4.ebuild) | 0 | ||||
-rw-r--r-- | app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild (renamed from app-crypt/tpm2-tss/tpm2-tss-3.0.2.ebuild) | 0 | ||||
-rw-r--r-- | app-crypt/veracrypt/Manifest | 8 | ||||
-rw-r--r-- | app-crypt/veracrypt/files/veracrypt-1.24-no-gui-fix.patch | 35 | ||||
-rw-r--r-- | app-crypt/veracrypt/files/veracrypt-1.24_p2-revert-wxwidgets-breakage.patch | 100 | ||||
-rw-r--r-- | app-crypt/veracrypt/files/veracrypt.init | 2 | ||||
-rw-r--r-- | app-crypt/veracrypt/veracrypt-1.24_p2.ebuild | 120 | ||||
-rw-r--r-- | app-crypt/veracrypt/veracrypt-1.24_p4.ebuild | 101 |
10 files changed, 6 insertions, 368 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz Binary files differindex 84add7a6e4fc..54a67cac06e8 100644 --- a/app-crypt/Manifest.gz +++ b/app-crypt/Manifest.gz diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest index 80aa0f97c88c..247a992788fd 100644 --- a/app-crypt/tpm2-tss/Manifest +++ b/app-crypt/tpm2-tss/Manifest @@ -4,9 +4,9 @@ AUX tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch 452 BLAKE2B 8b05b AUX tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch 478 BLAKE2B 0739aa873be6b3faa025fc38ab562da07afc0a7016856bc99f5b1fdd9202a24124d8f5789de0381ec136480cf24337754ae795f84252d8b38ead94dee1362317 SHA512 d94fab5dca4823a5839e54a1a284331dda449b7a76b01de390cf21535e88531b002b433ec0b4b8246c0f16417b2116ef4a6c63863c0aaf151f1885f0bab66945 AUX tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch 990 BLAKE2B 275ce64a386e1d3a5e458b7914c9885e196d40f44d1af57bf2925f0c794946884ea9ebbf60e82ccd747986f9f8feaefa07f43742353a4da99f1fd13d17196975 SHA512 02c3c6f0cbb9f5a70988e7ba7c27d2b19b2ba74c024ca34f71f9803bdac4935b19bd0650bd9069b0c628e2a72449ed69710f59f576261aa68884777bf8f0d7f7 DIST tpm2-tss-2.4.3.tar.gz 1439120 BLAKE2B 21acce29f96e8039124874c024b43eb8d2c4ffda27db58bb4f34446747c0fa6953c6ca390f8e87d22c1349123bada81051b119eaf7a28c7d1ad8a9195287c312 SHA512 4adaeb2724b720017e9d488f66de879ebdc0dbc2a4f7536493214913a49d2c631e302be26f710f0f45b0d514212cb036ca7ba9715ee13c29dda1d4a61595aa27 -DIST tpm2-tss-2.4.4.tar.gz 1440127 BLAKE2B f5db64281af92bc74d92ecffedbaa051aef21277d8c1c56fb0eb2c47fdebc12772eb18a7c2a2cb671730a1089227f756314ee02acfaa5307fedbfddb86565a81 SHA512 df35bace1744a93e5072a26490e7724604fcc8b04f2b1be71be0069750b8cff7ca4c5c6134e54fbe76f0797d5e83dcfbc8ce248a800d064fbf3be9e3e4745f73 -DIST tpm2-tss-3.0.2.tar.gz 1489725 BLAKE2B e68a6ce24070c9f4966367ecd55cef324b0bef2786dbcdedb894a19dcd71fbb2eda473f612885db4c816c6c2c15711ee192d441be6eb6fd665dd13180e70b556 SHA512 0b295bb1a135c904344e8a11ae9a293f71d60ea045bacd59a9b778ba19e88e1b91022f24a4775615c215db450584574901838146bc4d4d286ee8b686b72b0bab +DIST tpm2-tss-2.4.5.tar.gz 1439394 BLAKE2B 644d917f545e93dd81856611522329caf4ff038e4ddb04d761f03339cc7308095abc1c9b46a4d601cad67deea6f917ee5e4236c59f3d7042a7fdf2d33630dd3f SHA512 2c92af07ed1cc3665c19479c00ce5608883081f311192a264a4f7d9119c75ac582596c53b910534c4b66dbb60de2ffd3d6218169748332609c2e0fc89f519259 +DIST tpm2-tss-3.0.3.tar.gz 1489136 BLAKE2B 5bf24cf2c36e579388f62eea06ab3811eab1a89c0cd5d12f6f61cee7f6836487f25fefb864432ff8920931ff37327ca867d1d40fad89e0305d5e1edfb8f0e883 SHA512 54a926db55790250d69c81ac6e436556072057dd7c610d2718689030287dee69d533d4e04b3325dd73d9fc7635dad0bf0a7bfb082957bb51cb420efdb68efaf8 EBUILD tpm2-tss-2.4.3.ebuild 1706 BLAKE2B 8093b404fa89ac49f22375f59b4f9e4f77e6f73fbb63841734f02413ce26d78c5f689630ee085419e3abb70e0b27d9bc341ca10ed329c5f0e676fdd65a760cbb SHA512 96e2af5daf4e0ad4ac2fa98afa35438383b56a61da704db591ffe502d35ae092c952674504d93758ddfdf7d39ee1bf91bd8a1b41f807188858a6314d6fc4a393 -EBUILD tpm2-tss-2.4.4.ebuild 1789 BLAKE2B e87e5282b9fffc2a2cc69ec2fe2911abea2ae8b2f339c8f15a1224c3dc747a2762d92ffd708ddc97b20c296ed9d61a7bdf94c60982a7eca8594abaac896b760d SHA512 b998791025a6a3ceff0a874b69bb3fa846462d19f99864a8abdef1915e7f8663ae183ea09c79e8c36f00e37f9d5513a6bb4cfbadb1ee0e4889534484ceafbdb6 -EBUILD tpm2-tss-3.0.2.ebuild 1780 BLAKE2B 89aad07e3a6bf66825d898bb98001a42f0cdcac534723e8ea6a2d5506eeabed823eb2958f4a1d50d35e10f4ff3699eb506ec5dee9da04415a04f92815d4f1807 SHA512 222bb72f83518a459fd777773034a101f352a8cfe67f9d6b06e2b5f8658b6b25cf6be522c07f0a6008a32bb9dad73b0e5f6fcd064f0fe7dada7f56dbd245b37b +EBUILD tpm2-tss-2.4.5.ebuild 1789 BLAKE2B e87e5282b9fffc2a2cc69ec2fe2911abea2ae8b2f339c8f15a1224c3dc747a2762d92ffd708ddc97b20c296ed9d61a7bdf94c60982a7eca8594abaac896b760d SHA512 b998791025a6a3ceff0a874b69bb3fa846462d19f99864a8abdef1915e7f8663ae183ea09c79e8c36f00e37f9d5513a6bb4cfbadb1ee0e4889534484ceafbdb6 +EBUILD tpm2-tss-3.0.3.ebuild 1780 BLAKE2B 89aad07e3a6bf66825d898bb98001a42f0cdcac534723e8ea6a2d5506eeabed823eb2958f4a1d50d35e10f4ff3699eb506ec5dee9da04415a04f92815d4f1807 SHA512 222bb72f83518a459fd777773034a101f352a8cfe67f9d6b06e2b5f8658b6b25cf6be522c07f0a6008a32bb9dad73b0e5f6fcd064f0fe7dada7f56dbd245b37b MISC metadata.xml 792 BLAKE2B fe3f4ee796a06707683eb6fab993d34075a23267c4838bec5f063187c323b74e81e4e21c9e314be01d2a07853b7d2bbb0288b379c77053d6f6d2c99c372ba3a0 SHA512 7d1441a4bb5fbeb10fce0673f5b572edd4eef3be89184d2296e019b676cddd39d590da558ee3a83eba31cba56caf0eab6ec4b8bff9bed421660a5688ad38ae64 diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.4.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild index 67d6b4fa14c7..67d6b4fa14c7 100644 --- a/app-crypt/tpm2-tss/tpm2-tss-2.4.4.ebuild +++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.0.2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild index a5458854763f..a5458854763f 100644 --- a/app-crypt/tpm2-tss/tpm2-tss-3.0.2.ebuild +++ b/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest index fa6fe88cad6e..199353069d6b 100644 --- a/app-crypt/veracrypt/Manifest +++ b/app-crypt/veracrypt/Manifest @@ -1,10 +1,4 @@ -AUX veracrypt-1.24-no-gui-fix.patch 1004 BLAKE2B 5a6d5a8537e284e5f8f3b18a271ed18f0719dff20fbe180c64289cf6841cb987db5132760d16329b0fe2a0d80be41647d7e5438d27b2b4991fb09940a955ae3b SHA512 6955a7c267bb4949e4873d436eeafb1009404dcd7eb6ebc5b7795a45aaf78f840eed44bad533d38775eaa416879f334c392dc2f42b3749da17fd4422b451d54b -AUX veracrypt-1.24_p2-revert-wxwidgets-breakage.patch 3475 BLAKE2B 2401f507277a1496210359b65fced9665584457b4c5b94a8f69b95452f7a59747c0b90fbaed1d6f3f7cf2932efb76e78902d639f65f9a2976c185067ca00f5a1 SHA512 9390d6702a3e38bc2b79c5f6aeb9289fe20abd9fa5a5d451a6fad531970ea3adf41a64fa5a37558fa5b7d77c34af7f3a4754de3f4653e3369beed4029c371120 -AUX veracrypt.init 387 BLAKE2B 7f16dee40bceed81ca092a3be6a2cd71f24f5cc8b4e4b143bd6ddde046e1ecce0cd674f52e7adb406893ef57c5b73462157832ff279114a2079c0ff84839e0dc SHA512 986b52c454abd9a64a6e8eb93247983c48d9524c396f253bc16f68894fed0abe87614343ce9c9127f8fb180f12912b21f57063f8f3b43bdca5344c130eb6c72d -DIST veracrypt-1.24_p2.tar.gz 25208374 BLAKE2B 2667fb93e6884d97a673fe793b5f83f73961c2362e7704199b5ed0163c03f19313843583f7f2a15e05ee71516e45db97752350d2c27d22f1f278668b7c07aff9 SHA512 f778b8f6288f6f9886a15fa582f6c7126d9eaea319e854ad11bd5d44105ad5a3cb8b750d410ed8fd531ec3b23f9bad83934e6cefedd1352603d4882d2ca0ad84 -DIST veracrypt-1.24_p4.tar.gz 25212608 BLAKE2B 12d124cc5c869b8112e29624fcc5af3dd96d3c5e0179c643bf16cd361cc01677c09710faa192e7c9fe5f2ca78fbd826bc9df99f34e83ce4534f26dec01185761 SHA512 e077d6fe6a35234737387c4a6997399a251e238ab75524f53efe8ed742a35164fa4d5fcb0f15816dcb29d31fb8a4bb175d45b9aefb912c4747194fb320fa408d +AUX veracrypt.init 384 BLAKE2B 0325852e3bb9d8427298c46b0e7caefb1f62d957a158c8a6f898c6609c0363449ef5f48c9cd5a1092efbd9d2e1077a6218bdbebacebde936afc40ec3bfd0b3eb SHA512 574b18b7cbc5f4ea71bb35ec3343af5bdcc7848801decf3b93157bc4fde44ca5daec01847e3ff9f3a638b297f33023ea46a0ada5cc64bab0d14cbe12b93b66ed DIST veracrypt-1.24_p7.tar.gz 25113248 BLAKE2B 8ead3325ce6fadf4ca8211ea45daaa82a655f29006f224235f44200839289d42fabe84da2e731fc6a169a7d157535c719b2cd9294524e68532c0065e41ed733c SHA512 d149736d4d6740a89bfce892f44757600c6411776b471a208a75b4573bbc6125535ef1b68c2f55903ff82f4d0fff13b8b07d3cf15c7a301c39158aefffc29e17 -EBUILD veracrypt-1.24_p2.ebuild 3122 BLAKE2B 1fee5173e4c599692ccaa0737c3103405478cdba846055002a0c7c803e90c4886da8aa8c18d37a669b5964fda4e5ee022311239b8edb3caff000dde40cda51d8 SHA512 b908d997ceec7ecbbd1fdca1ccc92a205b40879d29730cd5148a57734d4038386a656ac6ed5afc29b8f369764a8e4032e2ca382eda4c59089fffe6282126d171 -EBUILD veracrypt-1.24_p4.ebuild 2538 BLAKE2B 5860c80d59157f5eb10a6017d837a7eaaf746aba035760b3d4a03bfa00f53fed9b62e83c706ff729a7c873c71cf80ef32eba7269b75c9a9ea5d4d3eb14e20094 SHA512 ecb74dbd33d71828558fab05e246cd7d2bda552f3b9998ecd97b5259a3cee54fb8fb3fcf1b75399fbd41c3d308e91d3f188795baffb7f5284561e9bd3a0856e4 EBUILD veracrypt-1.24_p7.ebuild 2538 BLAKE2B 5860c80d59157f5eb10a6017d837a7eaaf746aba035760b3d4a03bfa00f53fed9b62e83c706ff729a7c873c71cf80ef32eba7269b75c9a9ea5d4d3eb14e20094 SHA512 ecb74dbd33d71828558fab05e246cd7d2bda552f3b9998ecd97b5259a3cee54fb8fb3fcf1b75399fbd41c3d308e91d3f188795baffb7f5284561e9bd3a0856e4 MISC metadata.xml 399 BLAKE2B a7d22abada8009869e82b80f8b2274e1acc2fb1488d584c9d730f231057519404445a0d048ad70a47f7d946bc987f836fdfd87da296537a307e234175e521acc SHA512 ac0676510d8d2ac2430dd244ed5e4d18de1cbb7050563fcdd46fc8511c9813dc3609565a6c071f75d9cd26e73c1f453cc8cf9b9b47e0822bd93548a8baaf62ca 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 c4433c561d86..000000000000 --- 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?= <gokturk@gentoo.org> -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 029b683e7d62..000000000000 --- 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?= <gokturk@gentoo.org> -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 <GetStringFunctor> 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?= <gokturk@gentoo.org> -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::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 14bee5e6a227701e78c5fec04064c0494f6361f0. ---- - src/Main/Main.make | 8 ++++++++ - src/Makefile | 1 + - 2 files changed, 9 insertions(+) - -diff --git a/src/Main/Main.make b/src/Main/Main.make -index 0cb4e15d..a154a846 100755 ---- a/src/Main/Main.make -+++ b/src/Main/Main.make -@@ -81,7 +81,15 @@ 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" - -diff --git a/src/Makefile b/src/Makefile -index 1b084421..f102a28c 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -70,6 +70,7 @@ endif - ifeq "$(origin NOGUI)" "command line" - export TC_NO_GUI := 1 - C_CXX_FLAGS += -DTC_NO_GUI -+ WX_CONFIGURE_FLAGS += --disable-gui - endif - - ifdef PKCS11_INC --- -2.24.0 - diff --git a/app-crypt/veracrypt/files/veracrypt.init b/app-crypt/veracrypt/files/veracrypt.init index 972a9daef809..bbf5a97d2b61 100644 --- a/app-crypt/veracrypt/files/veracrypt.init +++ b/app-crypt/veracrypt/files/veracrypt.init @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 depend() { diff --git a/app-crypt/veracrypt/veracrypt-1.24_p2.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p2.ebuild deleted file mode 100644 index 8c98f9531ee2..000000000000 --- a/app-crypt/veracrypt/veracrypt-1.24_p2.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop 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_1.24-Update2.tar.gz -> ${P}.tar.gz" - -# The modules not linked against in Linux include (but not limited to): -# libzip, chacha-xmm, chacha256, chachaRng, 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 BSD 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-gtk3" - -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_1.24-Update2/src" - -pkg_setup() { - local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS" - linux-info_pkg_setup - - setup-wxwidgets -} - -src_prepare() { - # 1.24_p2 breaks the compilation against wxGTK[-X] - # See: https://github.com/veracrypt/VeraCrypt/issues/531 - eapply -p2 "${FILESDIR}"/${PN}-1.24_p2-revert-wxwidgets-breakage.patch - 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" "") - ) - - # We need to explicitly disable the GUI support when linking against - # wxwidgets, in case it was compiled with USE=X - if ! use X; then - TC_EXTRA_CFLAGS="${TC_EXTRA_CFLAGS} -DwxUSE_GUI=0" - TC_EXTRA_CXXFLAGS="${TC_EXTRA_CXXFLAGS} -DwxUSE_GUI=0" - fi - - myemakeargs+=( - TC_EXTRA_CFLAGS="${TC_EXTRA_CFLAGS}" - TC_EXTRA_CXXFLAGS="${TC_EXTRA_CXXFLAGS}" - ) - - emake "${myemakeargs[@]}" -} - -src_test() { - "${S}/Main/veracrypt" --text --test || die "tests failed" -} - -src_install() { - local DOCS=( Readme.txt ) - local HTML_DOCS=( ) - - dobin Main/veracrypt - if use doc; then - DOCS+=( "${S}"/../doc/EFI-DCS ) - docompress -x "/usr/share/doc/${PF}/EFI-DCS" - HTML_DOCS+=( "${S}"/../doc/html/. ) - fi - einstalldocs - - newinitd "${FILESDIR}/${PN}.init" ${PN} - - if use X; then - local s - for s in 16 48 128 256; do - newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm - done - make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security" - fi - - pax-mark -m "${D%/}/usr/bin/veracrypt" -} - -pkg_postinst() { - ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware" - ewarn "of the limitations on redistribution of binaries or modified source." -} diff --git a/app-crypt/veracrypt/veracrypt-1.24_p4.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p4.ebuild deleted file mode 100644 index 10a8cfcacd0a..000000000000 --- a/app-crypt/veracrypt/veracrypt-1.24_p4.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop eapi7-ver linux-info pax-utils toolchain-funcs wxwidgets - -MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)" -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_${MY_PV}.tar.gz -> ${P}.tar.gz" - -# The modules not linked against in Linux include (but not limited to): -# libzip, chacha-xmm, chacha256, chachaRng, 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 BSD 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-gtk3" - -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_${MY_PV}/src" - -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 - VERBOSE=1 - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - AR="$(tc-getAR)" - RANLIB="$(tc-getRANLIB)" - TC_EXTRA_CFLAGS="${CFLAGS}" - TC_EXTRA_CXXFLAGS="${CXXFLAGS}" - 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" "") - ) - - emake "${myemakeargs[@]}" -} - -src_test() { - "${S}/Main/veracrypt" --text --test || die "tests failed" -} - -src_install() { - local DOCS=( Readme.txt ) - local HTML_DOCS=( ) - - dobin Main/veracrypt - if use doc; then - DOCS+=( "${S}"/../doc/EFI-DCS ) - docompress -x "/usr/share/doc/${PF}/EFI-DCS" - HTML_DOCS+=( "${S}"/../doc/html/. ) - fi - einstalldocs - - newinitd "${FILESDIR}/${PN}.init" ${PN} - - if use X; then - local s - for s in 16 48 128 256; do - newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm - done - make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security" - fi - - pax-mark -m "${D%/}/usr/bin/veracrypt" -} - -pkg_postinst() { - ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware" - ewarn "of the limitations on redistribution of binaries or modified source." -} |