| 1 |
commit: 092137c6c10a8bc01ec9ecf04f91eb78b441047c |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Mon Dec 28 12:42:51 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 28 12:42:51 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=092137c6 |
| 7 |
|
| 8 |
app-crypt/zulucrypt: Port to EAPI 7 |
| 9 |
|
| 10 |
* Fix eclass inheritance order |
| 11 |
* Fix build with gcc-10 |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/711350 |
| 14 |
Closes: https://bugs.gentoo.org/740230 |
| 15 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
| 16 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 17 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 18 |
|
| 19 |
app-crypt/zulucrypt/Manifest | 2 +- |
| 20 |
.../zulucrypt-5.5.0_pre20180223-fno-common.patch | 11 +++++++++++ |
| 21 |
...223.ebuild => zulucrypt-5.5.0_pre20180223.ebuild} | 20 ++++++++------------ |
| 22 |
3 files changed, 20 insertions(+), 13 deletions(-) |
| 23 |
|
| 24 |
diff --git a/app-crypt/zulucrypt/Manifest b/app-crypt/zulucrypt/Manifest |
| 25 |
index 72a0136f262..30e3a65907f 100644 |
| 26 |
--- a/app-crypt/zulucrypt/Manifest |
| 27 |
+++ b/app-crypt/zulucrypt/Manifest |
| 28 |
@@ -1,3 +1,3 @@ |
| 29 |
DIST zulucrypt-5.1.0.tar.bz2 1610597 BLAKE2B 3b77676912f0cd8990ba307ff04309f308ec29cf76cad37ac28ebb317a7e42ee93ffe9deb1db12a80c4d5b235c2a83bc8e5ddeb6082e5f1be9d91425d06f4334 SHA512 b916d43f8c889f1593c506d95360b195f0639024463eb77b5b21b544468f99719b877d8c94725504305f307efe5cb18e203dc8f9b015bd55825dc1d4fffb42f0 |
| 30 |
DIST zulucrypt-5.4.0.tar.bz2 1704452 BLAKE2B b0ef9e33b7261087b97186dd49672ea115c4792c04a64700cba5caa9c9e63d84818904c078a4d6663c6f420bbd19b0593af84210010821e2b8bae5f19947ffec SHA512 65361ef885b68a13f435704e0e1dbc9b7ae4df9525900ab60665c29e24574dcadb4afb27a7c595db33021c07086de92332f1a52189cfd674991b95e208040074 |
| 31 |
-DIST zulucrypt-5.4.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15 |
| 32 |
+DIST zulucrypt-5.5.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15 |
| 33 |
|
| 34 |
diff --git a/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch b/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch |
| 35 |
new file mode 100644 |
| 36 |
index 00000000000..ea5bcd7a6d1 |
| 37 |
--- /dev/null |
| 38 |
+++ b/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch |
| 39 |
@@ -0,0 +1,11 @@ |
| 40 |
+--- a/zuluCrypt-cli/bin/security.h |
| 41 |
++++ b/zuluCrypt-cli/bin/security.h |
| 42 |
+@@ -35,7 +35,7 @@ extern "C" { |
| 43 |
+ * set the function to be called when an attempt to evelate or downgrade privileges fail |
| 44 |
+ * zuluCryptSecurityPrivilegeElevationError global variable is defined in security.c |
| 45 |
+ */ |
| 46 |
+-void ( *zuluCryptSecurityPrivilegeElevationError )( const char * ) ; |
| 47 |
++extern void ( *zuluCryptSecurityPrivilegeElevationError )( const char * ) ; |
| 48 |
+ |
| 49 |
+ void zuluCryptSecuritySetPrivilegeElevationErrorFunction( void ( * ) ( const char * ) ) ; |
| 50 |
+ |
| 51 |
|
| 52 |
diff --git a/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild b/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild |
| 53 |
similarity index 86% |
| 54 |
rename from app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild |
| 55 |
rename to app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild |
| 56 |
index ae369a3926e..c037845c99d 100644 |
| 57 |
--- a/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild |
| 58 |
+++ b/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild |
| 59 |
@@ -1,9 +1,9 @@ |
| 60 |
# Copyright 1999-2020 Gentoo Authors |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
|
| 63 |
-EAPI=6 |
| 64 |
+EAPI=7 |
| 65 |
|
| 66 |
-inherit cmake-utils xdg |
| 67 |
+inherit xdg cmake |
| 68 |
|
| 69 |
DESCRIPTION="Front end to cryptsetup" |
| 70 |
HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/" |
| 71 |
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86" |
| 72 |
IUSE="gnome kwallet +qt5 udev" |
| 73 |
REQUIRED_USE="kwallet? ( qt5 )" |
| 74 |
|
| 75 |
-CDEPEND=" |
| 76 |
+DEPEND=" |
| 77 |
dev-libs/libgcrypt:0= |
| 78 |
sys-fs/cryptsetup:= |
| 79 |
gnome? ( app-crypt/libsecret ) |
| 80 |
@@ -28,17 +28,14 @@ CDEPEND=" |
| 81 |
dev-qt/qtwidgets:5 |
| 82 |
kwallet? ( kde-frameworks/kwallet:5 ) |
| 83 |
)" |
| 84 |
- |
| 85 |
-RDEPEND=" |
| 86 |
- ${CDEPEND} |
| 87 |
+RDEPEND="${DEPEND} |
| 88 |
udev? ( virtual/udev )" |
| 89 |
- |
| 90 |
-DEPEND=" |
| 91 |
- ${CDEPEND} |
| 92 |
- virtual/pkgconfig" |
| 93 |
+BDEPEND="virtual/pkgconfig" |
| 94 |
|
| 95 |
S="${WORKDIR}/zuluCrypt-${EGIT_COMMIT}" |
| 96 |
|
| 97 |
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) |
| 98 |
+ |
| 99 |
src_configure() { |
| 100 |
local mycmakeargs=( |
| 101 |
-DLIB_SUFFIX="$(get_libdir)" |
| 102 |
@@ -47,8 +44,7 @@ src_configure() { |
| 103 |
-DNOGUI=$(usex !qt5) |
| 104 |
-DQT5=true |
| 105 |
-DUDEVSUPPORT=$(usex udev) |
| 106 |
- -DINTERNAL_LXQT_WALLET=true |
| 107 |
-DINTERNAL_ZULUPLAY=true |
| 108 |
) |
| 109 |
- cmake-utils_src_configure |
| 110 |
+ cmake_src_configure |
| 111 |
} |
Archives