| 1 |
commit: f9b12654e76a35de5c98cbaf31bdc40cb9abca89 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 2 17:50:00 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 2 17:50:00 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b12654 |
| 7 |
|
| 8 |
app-admin/sudo: update live ebuild |
| 9 |
|
| 10 |
Add changes from commit 163afe017bcc932e043a5422af897e5073df37da. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 14 |
|
| 15 |
app-admin/sudo/sudo-9999.ebuild | 20 +++++++++++++++----- |
| 16 |
1 file changed, 15 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild |
| 19 |
index 39da1e74a42..7dded75d56c 100644 |
| 20 |
--- a/app-admin/sudo/sudo-9999.ebuild |
| 21 |
+++ b/app-admin/sudo/sudo-9999.ebuild |
| 22 |
@@ -31,20 +31,25 @@ fi |
| 23 |
# 3-clause BSD license |
| 24 |
LICENSE="ISC BSD" |
| 25 |
SLOT="0" |
| 26 |
-IUSE="gcrypt ldap nls offensive openssl pam sasl +secure-path selinux +sendmail skey sssd" |
| 27 |
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest" |
| 28 |
|
| 29 |
CDEPEND=" |
| 30 |
sys-libs/zlib:= |
| 31 |
- gcrypt? ( dev-libs/libgcrypt:= ) |
| 32 |
ldap? ( |
| 33 |
>=net-nds/openldap-2.1.30-r1 |
| 34 |
dev-libs/cyrus-sasl |
| 35 |
) |
| 36 |
- openssl? ( dev-libs/openssl:0= ) |
| 37 |
pam? ( virtual/pam ) |
| 38 |
sasl? ( dev-libs/cyrus-sasl ) |
| 39 |
skey? ( >=sys-auth/skey-1.1.5-r1 ) |
| 40 |
sssd? ( sys-auth/sssd[sudo] ) |
| 41 |
+ system-digest? ( |
| 42 |
+ gcrypt? ( dev-libs/libgcrypt:= ) |
| 43 |
+ !gcrypt? ( |
| 44 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 45 |
+ libressl? ( dev-libs/libressl:0= ) |
| 46 |
+ ) |
| 47 |
+ ) |
| 48 |
" |
| 49 |
RDEPEND=" |
| 50 |
${CDEPEND} |
| 51 |
@@ -65,7 +70,6 @@ S="${WORKDIR}/${MY_P}" |
| 52 |
REQUIRED_USE=" |
| 53 |
pam? ( !skey ) |
| 54 |
skey? ( !pam ) |
| 55 |
- ?? ( gcrypt openssl ) |
| 56 |
" |
| 57 |
|
| 58 |
MAKEOPTS+=" SAMPLES=" |
| 59 |
@@ -145,7 +149,6 @@ src_configure() { |
| 60 |
--without-opie |
| 61 |
$(use_enable gcrypt) |
| 62 |
$(use_enable nls) |
| 63 |
- $(use_enable openssl) |
| 64 |
$(use_enable sasl) |
| 65 |
$(use_with offensive insults) |
| 66 |
$(use_with offensive all-insults) |
| 67 |
@@ -157,6 +160,13 @@ src_configure() { |
| 68 |
$(use_with selinux) |
| 69 |
$(use_with sendmail) |
| 70 |
) |
| 71 |
+ |
| 72 |
+ if use system-digest && ! use gcrypt; then |
| 73 |
+ myeconfargs+=("--enable-openssl") |
| 74 |
+ else |
| 75 |
+ myeconfargs+=("--disable-openssl") |
| 76 |
+ fi |
| 77 |
+ |
| 78 |
econf "${myeconfargs[@]}" |
| 79 |
} |
Archives