From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CD0EE138335 for ; Wed, 6 Nov 2019 15:10:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5E84E09A6; Wed, 6 Nov 2019 15:10:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C2FF4E09A6 for ; Wed, 6 Nov 2019 15:10:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35D5834C97C for ; Wed, 6 Nov 2019 15:10:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 132D68BC for ; Wed, 6 Nov 2019 15:10:35 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1573053027.27de80068de9259b38894b8d59bcfd0107f5f55b.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/sudo/sudo-1.8.28_p1.ebuild app-admin/sudo/sudo-1.8.29.ebuild app-admin/sudo/sudo-9999.ebuild X-VCS-Directories: app-admin/sudo/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 27de80068de9259b38894b8d59bcfd0107f5f55b X-VCS-Branch: master Date: Wed, 6 Nov 2019 15:10:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 403d8312-98c3-424e-96fc-1bdb2ddcd177 X-Archives-Hash: b0445e8f720ddf4ba4fd2c04e38b0424 commit: 27de80068de9259b38894b8d59bcfd0107f5f55b Author: Andrey Volkov ekb-info ru> AuthorDate: Thu Oct 17 20:35:00 2019 +0000 Commit: Lars Wendler gentoo 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 ekb-info.ru> Closes: https://github.com/gentoo/gentoo/pull/13330 Signed-off-by: Lars Wendler 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