diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
| commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
| tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /sys-fs/cryptsetup | |
| parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) | |
gentoo resync : 06.08.2019
Diffstat (limited to 'sys-fs/cryptsetup')
| -rw-r--r-- | sys-fs/cryptsetup/Manifest | 2 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index 6c24d8ede072..a304f73da90d 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -13,5 +13,5 @@ EBUILD cryptsetup-1.7.5-r1.ebuild 4033 BLAKE2B 77146c613eefaf677f4a0f77cb773b488 EBUILD cryptsetup-2.0.5-r1.ebuild 4151 BLAKE2B eb67cb9e3424b5444bf298fafeb3cbf050e5420b4a2137c75e437a13b2b8a1ff642b40186d37f10ee92785074833f833cad44eca3bc3e9c0f91fd710ac9fcc50 SHA512 71c6948ff51c919ac6052ad65355ffb620049049ef21fe6545d39bb6d56adb843d5de25b722911d979becca9945f7d05d7cf1b240bb0d5448513a4fa7baad8cd EBUILD cryptsetup-2.0.6.ebuild 4167 BLAKE2B 0aaa413b365a5b3986e3908709e54af38af8191c2086168076d380321c8577cc686826b7f57fb1671bdf45adf141630f65e815842f0cf4703636a8caf7cee46b SHA512 c707d533fcfc71e5adcd3eacd9556ae0d87c65b9e283008daafe5aaa29056ed175bf5354c08638454677b75e99f0f77d51a0ea76a0006bb8812d721a46e8cef7 EBUILD cryptsetup-2.1.0.ebuild 4411 BLAKE2B 4098102c4571866c9030bb68c489d078b590fe0e7b5cac6e134a90ecff3e083277d82cb9bad9778eaec098268d3ce5b8d89dcbf34f4108334536cc5e7529c789 SHA512 4fc4743afac269525e2bd108bf7bf033719df987acf5d1431be98d75f4af1fee9a3abb07397ec9cba2bb527cbf7f225e235142ed4bb6968eb3a2a721c9f25579 -EBUILD cryptsetup-2.2.0.ebuild 4435 BLAKE2B caca1edde30b54c6617434cf975406cd5d6f8ee6f272bc40f2cd9c6aed31756b6cfc88dcf8160e70abc33f2833843a630b68b8ef1fbcf10473968ec8aa837ecd SHA512 14141c72fe9d5bed000a20d0775e5e001604e94b2b8ef02949bdd987d12af765d0cbbabc01842da1d9115eeb891d521267eb154761cb2076882924661f3823d7 +EBUILD cryptsetup-2.2.0.ebuild 4230 BLAKE2B b79655191d45d68eeece99538db185206cfe825042e98e055d83149d04c538b813ae350733b1bc7ab77fcbdeb6092f47cf10b67124b6f8199d94c39202c1704a SHA512 d1c10829bf880cb841b622819d16148e606f7654758f2e0943143d85292d074c1a52e756151e0a0526aeee5908f782d55d36f44b7c89855e9f38c916272dac2d MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild index 49cad800b719..8cb062389bc5 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild @@ -13,13 +13,12 @@ LICENSE="GPL-2+" SLOT="0/12" # libcryptsetup.so version [[ ${PV} != *_rc* ]] && \ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -# cryptsetup does _not_ have a libressl backend. We only have this for REQUIRED_USE -# and change "libressl" to "openssl" in our econf call. -CRYPTO_BACKENDS="gcrypt kernel libressl nettle +openssl" +CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" # we don't support nss since it doesn't allow cryptsetup to be built statically # and it's missing ripemd160 support so it can't provide full backward compatibility IUSE="${CRYPTO_BACKENDS} +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom" REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) + libressl? ( openssl ) static? ( !gcrypt )" #496612 LIB_DEPEND=" @@ -32,7 +31,7 @@ LIB_DEPEND=" nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:=[static-libs(+)] ) + libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] @@ -83,11 +82,6 @@ src_configure() { ewarn "userspace crypto libraries." fi - local x cryptobackend - for x in ${CRYPTO_BACKENDS//+/} ; do - use ${x} && cryptobackend="${x/libressl/openssl}" - done - local myeconfargs=( --disable-internal-argon2 --enable-shared @@ -95,7 +89,7 @@ src_configure() { # for later use --with-default-luks-format=LUKS$(usex luks1_default 1 2) --with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d" - --with-crypto_backend=${cryptobackend} + --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) $(use_enable argon2 libargon2) $(use_enable nls) $(use_enable pwquality) |