| 1 |
commit: 4ea95c8cdc5213b05dc062806744605c5832dec6 |
| 2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 16 23:33:18 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 27 07:28:48 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea95c8c |
| 7 |
|
| 8 |
sys-fs/cryptsetup: remove USE=libressl from REQUIRED_USE |
| 9 |
|
| 10 |
USE=libressl must not be mutually exclusive to USE=openssl or any other |
| 11 |
USE flag. Also USE=openssl must be enabled when using USE=libressl, so |
| 12 |
that dependencies are checked correctly. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/692314 |
| 15 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 16 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/12728 |
| 18 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 19 |
|
| 20 |
sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild | 14 ++++---------- |
| 21 |
1 file changed, 4 insertions(+), 10 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild |
| 24 |
index 49cad800b71..8cb062389bc 100644 |
| 25 |
--- a/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild |
| 26 |
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild |
| 27 |
@@ -13,13 +13,12 @@ LICENSE="GPL-2+" |
| 28 |
SLOT="0/12" # libcryptsetup.so version |
| 29 |
[[ ${PV} != *_rc* ]] && \ |
| 30 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 31 |
-# cryptsetup does _not_ have a libressl backend. We only have this for REQUIRED_USE |
| 32 |
-# and change "libressl" to "openssl" in our econf call. |
| 33 |
-CRYPTO_BACKENDS="gcrypt kernel libressl nettle +openssl" |
| 34 |
+CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" |
| 35 |
# we don't support nss since it doesn't allow cryptsetup to be built statically |
| 36 |
# and it's missing ripemd160 support so it can't provide full backward compatibility |
| 37 |
IUSE="${CRYPTO_BACKENDS} +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom" |
| 38 |
REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) |
| 39 |
+ libressl? ( openssl ) |
| 40 |
static? ( !gcrypt )" #496612 |
| 41 |
|
| 42 |
LIB_DEPEND=" |
| 43 |
@@ -32,7 +31,7 @@ LIB_DEPEND=" |
| 44 |
nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) |
| 45 |
openssl? ( |
| 46 |
!libressl? ( dev-libs/openssl:0=[static-libs(+)] ) |
| 47 |
- libressl? ( dev-libs/libressl:=[static-libs(+)] ) |
| 48 |
+ libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
| 49 |
) |
| 50 |
pwquality? ( dev-libs/libpwquality[static-libs(+)] ) |
| 51 |
sys-fs/lvm2[static-libs(+)] |
| 52 |
@@ -83,11 +82,6 @@ src_configure() { |
| 53 |
ewarn "userspace crypto libraries." |
| 54 |
fi |
| 55 |
|
| 56 |
- local x cryptobackend |
| 57 |
- for x in ${CRYPTO_BACKENDS//+/} ; do |
| 58 |
- use ${x} && cryptobackend="${x/libressl/openssl}" |
| 59 |
- done |
| 60 |
- |
| 61 |
local myeconfargs=( |
| 62 |
--disable-internal-argon2 |
| 63 |
--enable-shared |
| 64 |
@@ -95,7 +89,7 @@ src_configure() { |
| 65 |
# for later use |
| 66 |
--with-default-luks-format=LUKS$(usex luks1_default 1 2) |
| 67 |
--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d" |
| 68 |
- --with-crypto_backend=${cryptobackend} |
| 69 |
+ --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) |
| 70 |
$(use_enable argon2 libargon2) |
| 71 |
$(use_enable nls) |
| 72 |
$(use_enable pwquality) |
Archives