summaryrefslogtreecommitdiff
path: root/app-admin/sudo
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/sudo')
-rw-r--r--app-admin/sudo/Manifest6
-rw-r--r--app-admin/sudo/metadata.xml9
-rw-r--r--app-admin/sudo/sudo-1.8.27-r1.ebuild20
-rw-r--r--app-admin/sudo/sudo-9999.ebuild20
4 files changed, 40 insertions, 15 deletions
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 972cf43f8286..09a8f5a1346f 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -3,6 +3,6 @@ DIST sudo-1.8.26.tar.gz 3286368 BLAKE2B 8df947f3dfa32081020b8a19921ea5daf6f9250c
DIST sudo-1.8.27.tar.gz 3293178 BLAKE2B 174d63ece5c24309dc0d237fadfc4131243aca333491ffa6dcdb3c44b53cb8149d3bf2f3aea2aa49529ea811d4727a11ac1909305e342b858a4c14f923f12956 SHA512 0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac
EBUILD sudo-1.8.25_p1-r1.ebuild 6418 BLAKE2B 54b1649420ec20b8f34b4ceb51549d1d04382c42cb31a90c0b3b20fc9f50a8f7bd111eac0702e9d6229c8c908df3030d0fe040c80eab22e52e71574c1ecc011f SHA512 beb5ca170c8e149d550d6c2ee96326af2c63780c4e9ae69493af2e7612dd1458aef187c193acafac16d3b003775f9d2a53ad778254468bc0d68620149a918fe1
EBUILD sudo-1.8.26-r1.ebuild 6497 BLAKE2B 0ba8ace2f8e5ea21652e3b4d2f935068090396fd094247f216a5ea689171157a6494a7fa250e85963953e98f44c08e0e398bb9009a1a29826407dc3c6c8f56e5 SHA512 1709e1cb5c272a8885c42fa9b3216ec0ab00a1a97ec330b7982db6d67e1627d6cf2f40dadab7eab53e261ed69d3a548b1063b4d9efc8a19e34fad863ebf4941a
-EBUILD sudo-1.8.27-r1.ebuild 6497 BLAKE2B bded8f8ec0a4e5ce9e69c563aaf14726cd7a1ee4f20271a5ad07a1645f64df2a25a2ac6155285db1fd050700c163a58a59ea365e2955f09a520c73948ad35ee6 SHA512 cec8523fd05b76e93d13fdd11c827562c65e31c299e2beac7ef2a13c2e45e995214c846f2893bcfac7c1e906e04ceac7e3bf80b207bff20eda31c852f1437144
-EBUILD sudo-9999.ebuild 6497 BLAKE2B bded8f8ec0a4e5ce9e69c563aaf14726cd7a1ee4f20271a5ad07a1645f64df2a25a2ac6155285db1fd050700c163a58a59ea365e2955f09a520c73948ad35ee6 SHA512 cec8523fd05b76e93d13fdd11c827562c65e31c299e2beac7ef2a13c2e45e995214c846f2893bcfac7c1e906e04ceac7e3bf80b207bff20eda31c852f1437144
-MISC metadata.xml 1147 BLAKE2B b0e011395c241b5f6a9fb83efeced5acac1b8623091353db3cf7c1f0a74aa8692b29b56669cff6e9414f1c5a03d5f77f9252bac0ee5bf4a6ce28b8c4f5f96478 SHA512 12f02da02d296556b259aac07b5d2d82e91cd77fe58821331fd1ba42eabba64845bb989d74adfb3dc5d4b4929560002784f8144f9672d404ae549bc08d44d67c
+EBUILD sudo-1.8.27-r1.ebuild 6675 BLAKE2B 7a82b93effbb00aff99eb793120b3f512d74790f24737fd024669720a8da4843db0f65e2a746b9a61f6369aed4eec93d1e31b7eb5cff54ec47095751451ab344 SHA512 21b1835c6f39e46c79c740d00b87062cb17f7f5378e06047324eeccf977e310f74bf1a5d7185f1f4202d6e37ea6cc29a764a54dbe6713dd93c3c4dd72b0713be
+EBUILD sudo-9999.ebuild 6675 BLAKE2B 7a82b93effbb00aff99eb793120b3f512d74790f24737fd024669720a8da4843db0f65e2a746b9a61f6369aed4eec93d1e31b7eb5cff54ec47095751451ab344 SHA512 21b1835c6f39e46c79c740d00b87062cb17f7f5378e06047324eeccf977e310f74bf1a5d7185f1f4202d6e37ea6cc29a764a54dbe6713dd93c3c4dd72b0713be
+MISC metadata.xml 1489 BLAKE2B 3739b522115082830f82f509804b6f6f5e3ad55633c20b51b1cfa48960af6189bd33dd71d1e9432d4adf7bb4ad7790d7eed62996ab5ad12aa55732eee85b50a0 SHA512 6fa51671c5fa3ca442da0982542a8290ed39c835106c40d2db278ae16ec45eed28e563e203c1d5519bbf637483d0779094bca2ec3505d6f466d0a2b62b5248f8
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
index de20459ab49a..8e31d55ef942 100644
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@@ -12,12 +12,17 @@
arguments.
</longdescription>
<use>
- <flag name="gcrypt">Use SHA2 from <pkg>dev-libs/libgcrypt</pkg> instead of sudo's internal SHA2</flag>
+ <flag name="gcrypt">Use message digest functions from <pkg>dev-libs/libgcrypt</pkg> instead of sudo's</flag>
+ <flag name="libressl">Use message digest functions from <pkg>dev-libs/libressl</pkg> instead of sudo's</flag>
<flag name="offensive">Let sudo print insults when the user types the wrong password</flag>
- <flag name="openssl">Use SHA2 from <pkg>dev-libs/openssl</pkg> instead of sudo's internal SHA2</flag>
+ <flag name="openssl">Use message digest functions from <pkg>dev-libs/openssl</pkg> instead of sudo's</flag>
<flag name="sendmail">Allow sudo to send emails with sendmail</flag>
<flag name="sssd">Add System Security Services Daemon support</flag>
<flag name="secure-path">Replace PATH variable with compile time secure paths</flag>
+ <flag name="system-digest">
+ Use message digest functions from <pkg>dev-libs/libgcrypt</pkg>, <pkg>dev-libs/libressl</pkg>
+ or <pkg>dev-libs/openssl</pkg> instead of sudo's internal SHA2 implementation
+ </flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:todd_miller:sudo</remote-id>
diff --git a/app-admin/sudo/sudo-1.8.27-r1.ebuild b/app-admin/sudo/sudo-1.8.27-r1.ebuild
index 39da1e74a42d..7dded75d56c5 100644
--- a/app-admin/sudo/sudo-1.8.27-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.27-r1.ebuild
@@ -31,20 +31,25 @@ fi
# 3-clause BSD license
LICENSE="ISC BSD"
SLOT="0"
-IUSE="gcrypt ldap nls offensive openssl pam sasl +secure-path selinux +sendmail skey sssd"
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest"
CDEPEND="
sys-libs/zlib:=
- gcrypt? ( dev-libs/libgcrypt:= )
ldap? (
>=net-nds/openldap-2.1.30-r1
dev-libs/cyrus-sasl
)
- openssl? ( dev-libs/openssl:0= )
pam? ( virtual/pam )
sasl? ( dev-libs/cyrus-sasl )
skey? ( >=sys-auth/skey-1.1.5-r1 )
sssd? ( sys-auth/sssd[sudo] )
+ system-digest? (
+ gcrypt? ( dev-libs/libgcrypt:= )
+ !gcrypt? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )
"
RDEPEND="
${CDEPEND}
@@ -65,7 +70,6 @@ S="${WORKDIR}/${MY_P}"
REQUIRED_USE="
pam? ( !skey )
skey? ( !pam )
- ?? ( gcrypt openssl )
"
MAKEOPTS+=" SAMPLES="
@@ -145,7 +149,6 @@ src_configure() {
--without-opie
$(use_enable gcrypt)
$(use_enable nls)
- $(use_enable openssl)
$(use_enable sasl)
$(use_with offensive insults)
$(use_with offensive all-insults)
@@ -157,6 +160,13 @@ src_configure() {
$(use_with selinux)
$(use_with sendmail)
)
+
+ if use system-digest && ! use gcrypt; then
+ myeconfargs+=("--enable-openssl")
+ else
+ myeconfargs+=("--disable-openssl")
+ fi
+
econf "${myeconfargs[@]}"
}
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 39da1e74a42d..7dded75d56c5 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -31,20 +31,25 @@ fi
# 3-clause BSD license
LICENSE="ISC BSD"
SLOT="0"
-IUSE="gcrypt ldap nls offensive openssl pam sasl +secure-path selinux +sendmail skey sssd"
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest"
CDEPEND="
sys-libs/zlib:=
- gcrypt? ( dev-libs/libgcrypt:= )
ldap? (
>=net-nds/openldap-2.1.30-r1
dev-libs/cyrus-sasl
)
- openssl? ( dev-libs/openssl:0= )
pam? ( virtual/pam )
sasl? ( dev-libs/cyrus-sasl )
skey? ( >=sys-auth/skey-1.1.5-r1 )
sssd? ( sys-auth/sssd[sudo] )
+ system-digest? (
+ gcrypt? ( dev-libs/libgcrypt:= )
+ !gcrypt? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )
"
RDEPEND="
${CDEPEND}
@@ -65,7 +70,6 @@ S="${WORKDIR}/${MY_P}"
REQUIRED_USE="
pam? ( !skey )
skey? ( !pam )
- ?? ( gcrypt openssl )
"
MAKEOPTS+=" SAMPLES="
@@ -145,7 +149,6 @@ src_configure() {
--without-opie
$(use_enable gcrypt)
$(use_enable nls)
- $(use_enable openssl)
$(use_enable sasl)
$(use_with offensive insults)
$(use_with offensive all-insults)
@@ -157,6 +160,13 @@ src_configure() {
$(use_with selinux)
$(use_with sendmail)
)
+
+ if use system-digest && ! use gcrypt; then
+ myeconfargs+=("--enable-openssl")
+ else
+ myeconfargs+=("--disable-openssl")
+ fi
+
econf "${myeconfargs[@]}"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 00:41:17 +0000