commit: 27de80068de9259b38894b8d59bcfd0107f5f55b Author: Andrey Volkov <volkov <AT> ekb-info <DOT> ru> AuthorDate: Thu Oct 17 20:35:00 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Nov 6 15:10:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27de8006
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 <AT> ekb-info.ru> Closes: https://github.com/gentoo/gentoo/pull/13330 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> app-admin/sudo/sudo-1.8.28_p1.ebuild | 13 ++++++++++++- app-admin/sudo/sudo-1.8.29.ebuild | 13 ++++++++++++- app-admin/sudo/sudo-9999.ebuild | 13 ++++++++++++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/app-admin/sudo/sudo-1.8.28_p1.ebuild b/app-admin/sudo/sudo-1.8.28_p1.ebuild index d22f403b443..06397f8cdcb 100644 --- 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 d53e24703c6..4aba6ef09a1 100644 --- 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 d53e24703c6..4aba6ef09a1 100644 --- 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
