| 1 |
commit: 163afe017bcc932e043a5422af897e5073df37da |
| 2 |
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Feb 27 03:35:45 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 2 17:46:04 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163afe01 |
| 7 |
|
| 8 |
app-admin/sudo: add USE=system-digest & USE=libressl |
| 9 |
|
| 10 |
Add system-digest USE flag for building with support of using message |
| 11 |
digest functions from libgcrypt, LibreSSL or OpenSSL, depending on |
| 12 |
USE gcrypt or libressl, instead of sudo's own implementation. |
| 13 |
|
| 14 |
Minor amend of USE flag descriptions as per descriptions from sudo's |
| 15 |
configure.ac and ChangeLog. |
| 16 |
|
| 17 |
Closes: https://bugs.gentoo.org/678888 |
| 18 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 19 |
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com> |
| 20 |
Closes: https://github.com/gentoo/gentoo/pull/11168 |
| 21 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 22 |
|
| 23 |
app-admin/sudo/metadata.xml | 9 +++++++-- |
| 24 |
app-admin/sudo/sudo-1.8.27-r1.ebuild | 20 +++++++++++++++----- |
| 25 |
2 files changed, 22 insertions(+), 7 deletions(-) |
| 26 |
|
| 27 |
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml |
| 28 |
index de20459ab49..8e31d55ef94 100644 |
| 29 |
--- a/app-admin/sudo/metadata.xml |
| 30 |
+++ b/app-admin/sudo/metadata.xml |
| 31 |
@@ -12,12 +12,17 @@ |
| 32 |
arguments. |
| 33 |
</longdescription> |
| 34 |
<use> |
| 35 |
- <flag name="gcrypt">Use SHA2 from <pkg>dev-libs/libgcrypt</pkg> instead of sudo's internal SHA2</flag> |
| 36 |
+ <flag name="gcrypt">Use message digest functions from <pkg>dev-libs/libgcrypt</pkg> instead of sudo's</flag> |
| 37 |
+ <flag name="libressl">Use message digest functions from <pkg>dev-libs/libressl</pkg> instead of sudo's</flag> |
| 38 |
<flag name="offensive">Let sudo print insults when the user types the wrong password</flag> |
| 39 |
- <flag name="openssl">Use SHA2 from <pkg>dev-libs/openssl</pkg> instead of sudo's internal SHA2</flag> |
| 40 |
+ <flag name="openssl">Use message digest functions from <pkg>dev-libs/openssl</pkg> instead of sudo's</flag> |
| 41 |
<flag name="sendmail">Allow sudo to send emails with sendmail</flag> |
| 42 |
<flag name="sssd">Add System Security Services Daemon support</flag> |
| 43 |
<flag name="secure-path">Replace PATH variable with compile time secure paths</flag> |
| 44 |
+ <flag name="system-digest"> |
| 45 |
+ Use message digest functions from <pkg>dev-libs/libgcrypt</pkg>, <pkg>dev-libs/libressl</pkg> |
| 46 |
+ or <pkg>dev-libs/openssl</pkg> instead of sudo's internal SHA2 implementation |
| 47 |
+ </flag> |
| 48 |
</use> |
| 49 |
<upstream> |
| 50 |
<remote-id type="cpe">cpe:/a:todd_miller:sudo</remote-id> |
| 51 |
|
| 52 |
diff --git a/app-admin/sudo/sudo-1.8.27-r1.ebuild b/app-admin/sudo/sudo-1.8.27-r1.ebuild |
| 53 |
index 39da1e74a42..7dded75d56c 100644 |
| 54 |
--- a/app-admin/sudo/sudo-1.8.27-r1.ebuild |
| 55 |
+++ b/app-admin/sudo/sudo-1.8.27-r1.ebuild |
| 56 |
@@ -31,20 +31,25 @@ fi |
| 57 |
# 3-clause BSD license |
| 58 |
LICENSE="ISC BSD" |
| 59 |
SLOT="0" |
| 60 |
-IUSE="gcrypt ldap nls offensive openssl pam sasl +secure-path selinux +sendmail skey sssd" |
| 61 |
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest" |
| 62 |
|
| 63 |
CDEPEND=" |
| 64 |
sys-libs/zlib:= |
| 65 |
- gcrypt? ( dev-libs/libgcrypt:= ) |
| 66 |
ldap? ( |
| 67 |
>=net-nds/openldap-2.1.30-r1 |
| 68 |
dev-libs/cyrus-sasl |
| 69 |
) |
| 70 |
- openssl? ( dev-libs/openssl:0= ) |
| 71 |
pam? ( virtual/pam ) |
| 72 |
sasl? ( dev-libs/cyrus-sasl ) |
| 73 |
skey? ( >=sys-auth/skey-1.1.5-r1 ) |
| 74 |
sssd? ( sys-auth/sssd[sudo] ) |
| 75 |
+ system-digest? ( |
| 76 |
+ gcrypt? ( dev-libs/libgcrypt:= ) |
| 77 |
+ !gcrypt? ( |
| 78 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 79 |
+ libressl? ( dev-libs/libressl:0= ) |
| 80 |
+ ) |
| 81 |
+ ) |
| 82 |
" |
| 83 |
RDEPEND=" |
| 84 |
${CDEPEND} |
| 85 |
@@ -65,7 +70,6 @@ S="${WORKDIR}/${MY_P}" |
| 86 |
REQUIRED_USE=" |
| 87 |
pam? ( !skey ) |
| 88 |
skey? ( !pam ) |
| 89 |
- ?? ( gcrypt openssl ) |
| 90 |
" |
| 91 |
|
| 92 |
MAKEOPTS+=" SAMPLES=" |
| 93 |
@@ -145,7 +149,6 @@ src_configure() { |
| 94 |
--without-opie |
| 95 |
$(use_enable gcrypt) |
| 96 |
$(use_enable nls) |
| 97 |
- $(use_enable openssl) |
| 98 |
$(use_enable sasl) |
| 99 |
$(use_with offensive insults) |
| 100 |
$(use_with offensive all-insults) |
| 101 |
@@ -157,6 +160,13 @@ src_configure() { |
| 102 |
$(use_with selinux) |
| 103 |
$(use_with sendmail) |
| 104 |
) |
| 105 |
+ |
| 106 |
+ if use system-digest && ! use gcrypt; then |
| 107 |
+ myeconfargs+=("--enable-openssl") |
| 108 |
+ else |
| 109 |
+ myeconfargs+=("--disable-openssl") |
| 110 |
+ fi |
| 111 |
+ |
| 112 |
econf "${myeconfargs[@]}" |
| 113 |
} |
Archives