commit:     70752cc1550f96a1400f6eeffe87d1c0a7f389c2
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 09:33:12 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 09:33:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70752cc1

app-admin/sudo: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 app-admin/sudo/metadata.xml            | 1 -
 app-admin/sudo/sudo-1.9.5_p2-r1.ebuild | 7 ++-----
 app-admin/sudo/sudo-1.9.6_p1-r1.ebuild | 7 ++-----
 app-admin/sudo/sudo-9999.ebuild        | 7 ++-----
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
index a99f4f7e613..13a39991dab 100644
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@@ -13,7 +13,6 @@
        </longdescription>
        <use>
                <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="sendmail">Allow sudo to send emails with 
sendmail</flag>
                <flag name="sssd">Add System Security Services Daemon 
support</flag>

diff --git a/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild 
b/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
index 73aaae21c24..8a80098cbc6 100644
--- a/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
@@ -30,7 +30,7 @@ fi
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux 
+sendmail skey ssl sssd"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey 
ssl sssd"
 
 DEPEND="
        sys-libs/zlib:=
@@ -45,10 +45,7 @@ DEPEND="
        pam? ( sys-libs/pam )
        sasl? ( dev-libs/cyrus-sasl )
        skey? ( >=sys-auth/skey-1.1.5-r1 )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl:0= )
-       )
+       ssl? ( dev-libs/openssl:0= )
        sssd? ( sys-auth/sssd[sudo] )
 "
 RDEPEND="

diff --git a/app-admin/sudo/sudo-1.9.6_p1-r1.ebuild 
b/app-admin/sudo/sudo-1.9.6_p1-r1.ebuild
index 32c7ad77309..4d5f317bd54 100644
--- a/app-admin/sudo/sudo-1.9.6_p1-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.6_p1-r1.ebuild
@@ -30,7 +30,7 @@ fi
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux 
+sendmail skey ssl sssd"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey 
ssl sssd"
 
 DEPEND="
        sys-libs/zlib:=
@@ -45,10 +45,7 @@ DEPEND="
        pam? ( sys-libs/pam )
        sasl? ( dev-libs/cyrus-sasl )
        skey? ( >=sys-auth/skey-1.1.5-r1 )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl:0= )
-       )
+       ssl? ( dev-libs/openssl:0= )
        sssd? ( sys-auth/sssd[sudo] )
 "
 RDEPEND="

diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 32c7ad77309..4d5f317bd54 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -30,7 +30,7 @@ fi
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux 
+sendmail skey ssl sssd"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey 
ssl sssd"
 
 DEPEND="
        sys-libs/zlib:=
@@ -45,10 +45,7 @@ DEPEND="
        pam? ( sys-libs/pam )
        sasl? ( dev-libs/cyrus-sasl )
        skey? ( >=sys-auth/skey-1.1.5-r1 )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl:0= )
-       )
+       ssl? ( dev-libs/openssl:0= )
        sssd? ( sys-auth/sssd[sudo] )
 "
 RDEPEND="

Reply via email to