app-admin/sudo: improve sasl support

Bug: https://bugs.gentoo.org/698830
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andrey Volkov <volkov@ekb-info.ru>
Closes: https://github.com/gentoo/gentoo/pull/13330
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/app-admin/sudo/sudo-1.8.28_p1.ebuild b/app-admin/sudo/sudo-1.8.28_p1.ebuild
index d22f403b4434fea0a93cd876b884b4ec644819de..06397f8cdcbe9762caa0e0cb203520b8e9c2b64e 100644 (file)
--- a/app-admin/sudo/sudo-1.8.28_p1.ebuild
+++ b/app-admin/sudo/sudo-1.8.28_p1.ebuild
@@ -36,7 +36,10 @@ DEPEND="
        sys-libs/zlib:=
        ldap? (
                >=net-nds/openldap-2.1.30-r1
-               dev-libs/cyrus-sasl
+               sasl? (
+                       dev-libs/cyrus-sasl
+                       net-nds/openldap[sasl]
+               )
        )
        pam? ( sys-libs/pam )
        sasl? ( dev-libs/cyrus-sasl )
@@ -183,6 +186,14 @@ src_install() {
                # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
                EOF
 
+               if use sasl ; then
+                       cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+                       # SASL directives: use_sasl, sasl_mech, sasl_auth_id
+                       # sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+                       EOF
+               fi
+
                insinto /etc
                doins "${T}"/ldap.conf.sudo
                fperms 0440 /etc/ldap.conf.sudo

diff --git a/app-admin/sudo/sudo-1.8.29.ebuild b/app-admin/sudo/sudo-1.8.29.ebuild
index d53e24703c68c6aad7fec0aaaba222a95bd10b6d..4aba6ef09a1a8cd895657eb320804a04c98df717 100644 (file)
--- a/app-admin/sudo/sudo-1.8.29.ebuild
+++ b/app-admin/sudo/sudo-1.8.29.ebuild
@@ -36,7 +36,10 @@ DEPEND="
        sys-libs/zlib:=
        ldap? (
                >=net-nds/openldap-2.1.30-r1
-               dev-libs/cyrus-sasl
+               sasl? (
+                       dev-libs/cyrus-sasl
+                       net-nds/openldap[sasl]
+               )
        )
        pam? ( sys-libs/pam )
        sasl? ( dev-libs/cyrus-sasl )
@@ -183,6 +186,14 @@ src_install() {
                # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
                EOF
 
+               if use sasl ; then
+                       cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+                       # SASL directives: use_sasl, sasl_mech, sasl_auth_id
+                       # sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+                       EOF
+               fi
+
                insinto /etc
                doins "${T}"/ldap.conf.sudo
                fperms 0440 /etc/ldap.conf.sudo

diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index d53e24703c68c6aad7fec0aaaba222a95bd10b6d..4aba6ef09a1a8cd895657eb320804a04c98df717 100644 (file)
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -36,7 +36,10 @@ DEPEND="
        sys-libs/zlib:=
        ldap? (
                >=net-nds/openldap-2.1.30-r1
-               dev-libs/cyrus-sasl
+               sasl? (
+                       dev-libs/cyrus-sasl
+                       net-nds/openldap[sasl]
+               )
        )
        pam? ( sys-libs/pam )
        sasl? ( dev-libs/cyrus-sasl )
@@ -183,6 +186,14 @@ src_install() {
                # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
                EOF
 
+               if use sasl ; then
+                       cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+                       # SASL directives: use_sasl, sasl_mech, sasl_auth_id
+                       # sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+                       EOF
+               fi
+
                insinto /etc
                doins "${T}"/ldap.conf.sudo
                fperms 0440 /etc/ldap.conf.sudo