Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/
Date: Thu, 29 Apr 2021 18:28:13
Message-Id: 1619720885.73de8fdef3d85f1db4f751a95b2b033a022f821a.zlogene@gentoo
1 commit: 73de8fdef3d85f1db4f751a95b2b033a022f821a
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 29 18:21:26 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 29 18:28:05 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73de8fde
7
8 sys-fs/cryptsetup: remove libressl support
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild | 8 ++------
14 sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild | 8 ++------
15 2 files changed, 4 insertions(+), 12 deletions(-)
16
17 diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
18 index 506cc07dfd9..641a9c76c68 100644
19 --- a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
20 +++ b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
21 @@ -16,9 +16,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x
22 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
23 # we don't support nss since it doesn't allow cryptsetup to be built statically
24 # and it's missing ripemd160 support so it can't provide full backward compatibility
25 -IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality reencrypt static static-libs +udev urandom"
26 +IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom"
27 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
28 - libressl? ( openssl )
29 static? ( !gcrypt )" #496612
30
31 LIB_DEPEND="
32 @@ -29,10 +28,7 @@ LIB_DEPEND="
33 argon2? ( app-crypt/argon2:=[static-libs(+)] )
34 gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
35 nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
36 - openssl? (
37 - !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
38 - libressl? ( dev-libs/libressl:0=[static-libs(+)] )
39 - )
40 + openssl? ( dev-libs/openssl:0=[static-libs(+)] )
41 pwquality? ( dev-libs/libpwquality[static-libs(+)] )
42 sys-fs/lvm2[static-libs(+)]
43 udev? ( virtual/libudev[static-libs(-)] )"
44
45 diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
46 index c752e6c2722..30f4962b68e 100644
47 --- a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
48 +++ b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
49 @@ -16,9 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
50 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
51 # we don't support nss since it doesn't allow cryptsetup to be built statically
52 # and it's missing ripemd160 support so it can't provide full backward compatibility
53 -IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality reencrypt static static-libs +udev urandom"
54 +IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom"
55 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
56 - libressl? ( openssl )
57 static? ( !gcrypt )" #496612
58
59 LIB_DEPEND="
60 @@ -29,10 +28,7 @@ LIB_DEPEND="
61 argon2? ( app-crypt/argon2:=[static-libs(+)] )
62 gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
63 nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
64 - openssl? (
65 - !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
66 - libressl? ( dev-libs/libressl:0=[static-libs(+)] )
67 - )
68 + openssl? ( dev-libs/openssl:0=[static-libs(+)] )
69 pwquality? ( dev-libs/libpwquality[static-libs(+)] )
70 sys-fs/lvm2[static-libs(+)]
71 udev? ( virtual/libudev[static-libs(-)] )"