diff options
| author |   Andrey Volkov <volkov@ekb-info.ru> | 2019-10-18 01:35:00 +0500 |
|---|---|---|
| committer |   Lars Wendler <polynomial-c@gentoo.org> | 2019-11-06 16:10:27 +0100 |
| commit | 27de80068de9259b38894b8d59bcfd0107f5f55b (patch) | |
| tree | 464268baf29ee180595d56e55672b9d1584730c7 | |
| parent | app-backup/restic: add missing licenses (diff) | |
| download | gentoo-27de80068de9259b38894b8d59bcfd0107f5f55b.tar.gz gentoo-27de80068de9259b38894b8d59bcfd0107f5f55b.tar.bz2 gentoo-27de80068de9259b38894b8d59bcfd0107f5f55b.zip | |
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>
| -rw-r--r-- | app-admin/sudo/sudo-1.8.28_p1.ebuild | 13 | ||||
| -rw-r--r-- | app-admin/sudo/sudo-1.8.29.ebuild | 13 | ||||
| -rw-r--r-- | 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 d22f403b4434..06397f8cdcbe 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 d53e24703c68..4aba6ef09a1a 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 d53e24703c68..4aba6ef09a1a 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 |