Version bump for both stable and beta series.

Package-Manager: portage-2.1.4.4

4 files changed, 412 insertions, 2 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 0a9cd9136405..70eabe249ff6 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/sudo
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.121 2008/03/17 15:17:04 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.122 2008/04/05 14:39:28 flameeyes Exp $
+
+*sudo-1.7_beta4 (05 Apr 2008)
+*sudo-1.6.9_p15 (05 Apr 2008)
+
+  05 Apr 2008; Diego Pettenò <flameeyes@gentoo.org> +sudo-1.6.9_p15.ebuild,
+  +sudo-1.7_beta4.ebuild:
+  Version bump for both stable and beta series.
 
   17 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> sudo-1.6.9_p14.ebuild,
   sudo-1.7_beta3.ebuild:
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index c27ecf1ba0ed..7fdc9b3d4607 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX sudo 223 RMD160 4bc9a3e5d2dfd73bb1f14e5bad3b644ba80758d3 SHA1 fa6377c699ff2061c77cb87737fa2b4aaa8e8b9f SHA256 3f8dae2c663ed62bbe19e9b3e24f0e206fd1a4929bbafdff2e577e1aed9f2b58
 AUX sudo-1.6.8_p8-ldap-tls_cacert.diff 542 RMD160 cff54e31749796f732ce176b568797999325715e SHA1 3e7e493055998034d2b5a91160041e93d2246556 SHA256 2bc04b2b3ccd20f0ca545b74ca7ac68b708a1852af2fe2c620e78a92a45c2b23
 AUX sudo-ldap_timelimit.diff 2550 RMD160 b34a41e3fc4016ff182ed1800e0f1b0f82d3bfdf SHA1 c3c15eea9cf2e552010e27d0282246fa770d2fae SHA256 fc6eedb3435edbf5ccfcd5f62d8f31a78bf01afbb519c6b40bbe1329d82d6cea
@@ -7,13 +10,24 @@ DIST sudo-1.6.8p12.tar.gz 585643 RMD160 d7ff9f18ca0973615258c2e975300b94567451d5
 DIST sudo-1.6.9p12.tar.gz 581936 RMD160 fe07ead5c328b35fc0c84946d71469f4620ddd06 SHA1 c2b07c68d2026fb3e7786b2c9a8fb0c519a830f8 SHA256 d25c7a04f0db65c4a4e587df337fb6c4bd5165155d7ab64e8b00a89f745dd4aa
 DIST sudo-1.6.9p13.tar.gz 589079 RMD160 eb2a4d835553061f9a15d71abee83a5574215c28 SHA1 0e84a265bb18772bc99d0f37c65dd6564962a6c4 SHA256 c54b8f10eca330cb3181e4a16bd743b145d4fcf9d1d85df6127d7e9979d4a805
 DIST sudo-1.6.9p14.tar.gz 589298 RMD160 8516c9f0a6468e07174ffda310f55013841e3fba SHA1 71ac10f51c1b3d6338ac936fe39be3009ea4dbb4 SHA256 cffccc9090df1daf3aba129f94bf5e01724e723e3264124b9d57d4a1437f097a
+DIST sudo-1.6.9p15.tar.gz 593065 RMD160 af7278bddef79962ea086a5120cd815d13b2909c SHA1 23beafa1d7c9c85c4535648923323cab34ff7810 SHA256 654376e31ac76028e02a603c67ced319304a1aa6bdfae72431574cef5c59a382
 DIST sudo-1.7b2.tar.gz 711994 RMD160 aaec1acc7274ce6c2564768321947eab42c10a42 SHA1 83422e1be04498052a456c88abbaa5e64d9703b7 SHA256 ca5872d45f70d4890f7ba15fd506580043fcb4f528856a1f76a44057cbd263bf
 DIST sudo-1.7b3.tar.gz 734143 RMD160 753eb5dcc0dc4e71ff4f8a074583bec9784a696c SHA1 f76af7f9ef8eb098c98b3b549ea49691a0cf9b16 SHA256 6141ae32d639a4d0c883b3d4f6f5876c2f36d495fedfea20b539dd9c89c48c00
+DIST sudo-1.7b4.tar.gz 734580 RMD160 f6171dec47afbd483cc24c4c0d77c3feb3b3005f SHA1 7b4d6d2a2aa619a5baa6ede9e14e67d75a14c963 SHA256 c42eb4022a1426e15703a5674a07276a37e32d952196d70b78dea566b610a517
 EBUILD sudo-1.6.8_p12-r1.ebuild 6599 RMD160 033bebdfad4d67e96572b6a4c4fa918c04f54e3a SHA1 38e9cae0c5cdfd04608790e14c6936c392747915 SHA256 74c1b9bff370d9e7040e10ede8347676d419ed6c73793426b6cfc8abfa89fe78
 EBUILD sudo-1.6.9_p12.ebuild 5840 RMD160 f72c7fcad3769de48ec41181ad2c513ba5a01250 SHA1 a39c311f143c459011e34303db53a5157eeec055 SHA256 ae34dd669d9ce86feac16754dc7f541b8c4bb112a1fc6a8b2d3014a01393ea19
 EBUILD sudo-1.6.9_p13.ebuild 5889 RMD160 c062903f85a9f75e336afad00057b0f540818026 SHA1 8d9575111f0dba3cae19d46b9e4f4280118309bb SHA256 90b6804d0a78e7a3de252c42c09e3f2a669eadc2a37c5f58e000506738f40930
 EBUILD sudo-1.6.9_p14.ebuild 5862 RMD160 a2bb89a2d033965fff080cb7a9e01283c3bac6d1 SHA1 1988294cd452376ab055cbe4672f5bec5df27715 SHA256 8ebf3f0c15025a44e54d805b5bd484d9e34c2d57cd327f36f5176a7778f489be
+EBUILD sudo-1.6.9_p15.ebuild 5862 RMD160 a07220cb40730a3141e7dd8d82cdb69df21b6cbd SHA1 9d6cfd227f374c9ab76a82b6f226035c57dad5fe SHA256 d6a0049eb08c85f87ff2ae7b33390f470307cd066ef6d6b7809c57b3c47e0dbd
 EBUILD sudo-1.7_beta2.ebuild 6315 RMD160 158c235d44673da192d634d2c4ea6626a0303222 SHA1 dca682f6f5874b1fb4049e8197351bd3c62cc3d5 SHA256 add857afe38e8ec7bb2c3210dbd98a5df4115bcc876bdc66f35065ba7b1548e2
 EBUILD sudo-1.7_beta3.ebuild 6288 RMD160 d1231df2a45576e576f130ecd2e50b747122a0be SHA1 0b28fb5c723aba31a950c42d03cbc554419a5378 SHA256 87031c9d02fa10283c9d1e9554c1e041cebfddadaf27ed94bdc5594fc092460a
-MISC ChangeLog 16622 RMD160 3ca9de6c85a11f2c92b6ddc6a6bce3216327af16 SHA1 7362f33f905371c33f84ae829369b8e3761463c9 SHA256 f586bc592934ae135704eb91c365764558215b7dcdd5979212a894d5ff85f4f6
+EBUILD sudo-1.7_beta4.ebuild 6288 RMD160 1be1b5c4e9b499e33cd4fdeb8cd58076012a9523 SHA1 5b03462aca0040b397543ed85c653dfe8e9acb31 SHA256 1c8677d6fc3ccded72be5a5afda320849a8adbc89928162c770fd308ea64d4a2
+MISC ChangeLog 16836 RMD160 3a828b9690071c79737bcf44cc1ad989d52156ce SHA1 e036e4312d1f1b329326f8887a0789647c09b438 SHA256 884f594a3cf7e2fa2616d35d25b7f98c1466fb32c3e3979c26d158a6775c36ba
 MISC metadata.xml 501 RMD160 74dd36daa51d7ad5ce1659f0279e1245cd1ef4bc SHA1 e447d21dc61ee4a6de8cc0f66aa28aa422d9990a SHA256 5f399b83a90977486ff92847caa884d16f8b71705fd0d2203acb35f56c9a6db6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkf3jygACgkQAiZjviIA2XguAgCfRh1o49g7YGHFOgbZiYE0q3if
+64EAoN/Zh5OQCbxCW82EYG9/YLP461po
+=h9oL
+-----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/sudo-1.6.9_p15.ebuild b/app-admin/sudo/sudo-1.6.9_p15.ebuild
new file mode 100644
index 000000000000..956fab807a99
--- /dev/null
+++ b/app-admin/sudo/sudo-1.6.9_p15.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.6.9_p15.ebuild,v 1.1 2008/04/05 14:39:28 flameeyes Exp $
+
+inherit eutils pam confutils
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="http://www.sudo.ws/"
+SRC_URI="ftp://ftp.sudo.ws/pub/sudo/${P/_/}.tar.gz"
+LICENSE="Sudo"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="pam skey offensive ldap selinux"
+
+DEPEND="pam? ( virtual/pam )
+	ldap? ( >=net-nds/openldap-2.1.30-r1 )
+	skey? ( >=app-admin/skey-1.1.5-r1 )
+	virtual/editor
+	virtual/mta"
+RDEPEND="selinux? ( sec-policy/selinux-sudo )
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	${DEPEND}"
+DEPEND="${RDEPEND} sys-devel/bison"
+
+S=${WORKDIR}/${P/_/}
+
+pkg_setup() {
+	confutils_use_conflict skey pam
+}
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+
+	# compatability fix.
+	epatch "${FILESDIR}"/${PN}-skeychallengeargs.diff
+
+	# additional variables to disallow, should user disable env_reset.
+
+	# NOTE: this is not a supported mode of operation, these variables
+	#       are added to the blacklist as a convenience to administrators
+	#       who fail to heed the warnings of allowing untrusted users
+	#       to access sudo.
+	#
+	#       there is *no possible way* to foresee all attack vectors in
+	#       all possible applications that could potentially be used via
+	#       sudo, these settings will just delay the inevitable.
+	#
+	#       that said, I will accept suggestions for variables that can
+	#       be misused in _common_ interpreters or libraries, such as
+	#       perl, bash, python, ruby, etc., in the hope of dissuading
+	#       a casual attacker.
+
+	# XXX: perl should be using suid_perl.
+	# XXX: users can remove/add more via env_delete and env_check.
+	# XXX: <?> = probably safe enough for most circumstances.
+
+	einfo "Blacklisting common variables (env_delete)..."
+		sudo_bad_var 'PERLIO_DEBUG'   # perl, write debug to file.
+		sudo_bad_var 'FPATH'          # ksh, search path for functions.
+		sudo_bad_var 'NULLCMD'        # zsh, command on null-redir. <?>
+		sudo_bad_var 'READNULLCMD'    # zsh, command on null-redir. <?>
+		sudo_bad_var 'GLOBIGNORE'     # bash, glob paterns to ignore. <?>
+		sudo_bad_var 'PYTHONHOME'     # python, module search path.
+		sudo_bad_var 'PYTHONPATH'     # python, search path.
+		sudo_bad_var 'PYTHONINSPECT'  # python, allow inspection.
+		sudo_bad_var 'RUBYLIB'        # ruby, lib load path.
+		sudo_bad_var 'RUBYOPT'        # ruby, cl options.
+		sudo_bad_var 'ZDOTDIR'        # zsh, path to search for dotfiles.
+	einfo "...done."
+
+	# prevent binaries from being stripped.
+	sed -i 's/\($(INSTALL).*\) -s \(.*[(sudo|visudo)]\)/\1 \2/g' Makefile.in
+
+	# remove useless c++ checks
+	epunt_cxx
+}
+
+src_compile() {
+	local line ROOTPATH
+
+	# FIXME: secure_path is a compile time setting. using ROOTPATH
+	# is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path..."
+
+		# why not use grep? variable might be expanded from other variables
+		# declared in that file. cannot just source the file, would override
+		# any variables already set.
+		eval `PS4= bash -x /etc/profile.env 2>&1 | \
+			while read line; do
+				case $line in
+					ROOTPATH=*) echo $line; break;;
+					*) continue;;
+				esac
+			done`  && einfo "	Found ROOTPATH..." || \
+				ewarn "	Failed to find ROOTPATH, please report this."
+
+		# remove any duplicate entries
+		ROOTPATH=$(cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}})
+
+		# strip gcc path (bug #136027)
+		rmpath ROOTPATH '*/gcc-bin/*'
+
+	einfo "...done."
+
+	# XXX: --disable-path-info closes an info leak, but may be confusing.
+	# XXX: /bin/vi may not be available, make nano visudo's default.
+	econf --with-secure-path="${ROOTPATH}" \
+		--with-editor=/bin/nano \
+		--with-env-editor \
+		$(use_with offensive insults) \
+		$(use_with offensive all-insults) \
+		$(use_with pam) \
+		$(use_with skey) \
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \
+		$(use_with ldap) || die
+
+	emake || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die
+	dodoc BUGS CHANGES HISTORY PORTING README TROUBLESHOOTING \
+		UPGRADE sample.sudoers sample.syslog.conf
+
+	if use ldap; then
+		dodoc README.LDAP schema.OpenLDAP
+		dosbin sudoers2ldif
+
+		cat - > "${T}"/ldap.conf.sudo <<EOF
+# See ldap.conf(5) and README.LDAP for details\n"
+# This file should only be readable by root\n\n"
+# supported directives: host, port, ssl, ldap_version\n"
+# uri, binddn, bindpw, sudoers_base, sudoers_debug\n"
+# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key
+EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+	fi
+
+	pamd_mimic system-auth sudo auth account password session
+
+	insinto /etc
+	doins "${FILESDIR}"/sudoers
+	fperms 0440 /etc/sudoers
+}
+
+# remove duplicate path entries from $1
+cleanpath() {
+	local i=1 x n IFS=:
+	local -a paths;	paths=($1)
+
+	for ((n=${#paths[*]}-1;i<=n;i++)); do
+		for ((x=0;x<i;x++)); do
+			test "${paths[i]}" == "${paths[x]}" && {
+				einfo "	Duplicate entry ${paths[i]} removed..." 1>&2
+				unset paths[i]; continue 2; }
+		done; # einfo "	Adding ${paths[i]}..." 1>&2
+	done; echo "${paths[*]}"
+}
+
+# add $1 to default env_delete list.
+sudo_bad_var() {
+	local target='env.c' marker='\*initial_badenv_table\[\]'
+
+	ebegin "	$1"
+		sed -i 's#\(^.*'${marker}'.*$\)#\1\n\t"'${1}'",#' "${S}"/${target}
+	eend $?
+}
+
+rmpath() {
+	declare e newpath oldpath=${!1} PATHvar=$1 thisp IFS=:
+	shift
+	for thisp in $oldpath; do
+		for e; do [[ $thisp == $e ]] && continue 2; done
+		newpath=$newpath:$thisp
+	done
+	eval $PATHvar='${newpath#:}'
+}
+
+pkg_postinst() {
+	use ldap && {
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+	}
+}
diff --git a/app-admin/sudo/sudo-1.7_beta4.ebuild b/app-admin/sudo/sudo-1.7_beta4.ebuild
new file mode 100644
index 000000000000..860f60eb86b3
--- /dev/null
+++ b/app-admin/sudo/sudo-1.7_beta4.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7_beta4.ebuild,v 1.1 2008/04/05 14:39:28 flameeyes Exp $
+
+inherit eutils pam confutils
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+[[ ${P} == *_beta* ]] && uri_prefix=beta/ || uri_prefix=""
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="http://www.sudo.ws/"
+SRC_URI="ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+LICENSE="Sudo"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="pam skey offensive ldap selinux"
+
+DEPEND="pam? ( virtual/pam )
+	ldap? ( >=net-nds/openldap-2.1.30-r1 )
+	skey? ( >=app-admin/skey-1.1.5-r1 )
+	virtual/editor
+	virtual/mta"
+RDEPEND="selinux? ( sec-policy/selinux-sudo )
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	${DEPEND}"
+DEPEND="${RDEPEND} sys-devel/bison"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	confutils_use_conflict skey pam
+}
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+
+	# compatability fix.
+	epatch "${FILESDIR}"/${PN}-skeychallengeargs.diff
+
+	# additional variables to disallow, should user disable env_reset.
+
+	# NOTE: this is not a supported mode of operation, these variables
+	#       are added to the blacklist as a convenience to administrators
+	#       who fail to heed the warnings of allowing untrusted users
+	#       to access sudo.
+	#
+	#       there is *no possible way* to foresee all attack vectors in
+	#       all possible applications that could potentially be used via
+	#       sudo, these settings will just delay the inevitable.
+	#
+	#       that said, I will accept suggestions for variables that can
+	#       be misused in _common_ interpreters or libraries, such as
+	#       perl, bash, python, ruby, etc., in the hope of dissuading
+	#       a casual attacker.
+
+	# XXX: perl should be using suid_perl.
+	# XXX: users can remove/add more via env_delete and env_check.
+	# XXX: <?> = probably safe enough for most circumstances.
+
+	einfo "Blacklisting common variables (env_delete)..."
+		sudo_bad_var() {
+			local target='env.c' marker='\*initial_badenv_table\[\]'
+
+			ebegin "	$1"
+			sed -i 's#\(^.*'${marker}'.*$\)#\1\n\t"'${1}'",#' "${S}"/${target}
+			eend $?
+		}
+
+		sudo_bad_var 'PERLIO_DEBUG'   # perl, write debug to file.
+		sudo_bad_var 'FPATH'          # ksh, search path for functions.
+		sudo_bad_var 'NULLCMD'        # zsh, command on null-redir. <?>
+		sudo_bad_var 'READNULLCMD'    # zsh, command on null-redir. <?>
+		sudo_bad_var 'GLOBIGNORE'     # bash, glob paterns to ignore. <?>
+		sudo_bad_var 'PYTHONHOME'     # python, module search path.
+		sudo_bad_var 'PYTHONPATH'     # python, search path.
+		sudo_bad_var 'PYTHONINSPECT'  # python, allow inspection.
+		sudo_bad_var 'RUBYLIB'        # ruby, lib load path.
+		sudo_bad_var 'RUBYOPT'        # ruby, cl options.
+		sudo_bad_var 'ZDOTDIR'        # zsh, path to search for dotfiles.
+	einfo "...done."
+
+	# prevent binaries from being stripped.
+	sed -i 's/\($(INSTALL).*\) -s \(.*[(sudo|visudo)]\)/\1 \2/g' Makefile.in
+
+	# remove useless c++ checks
+	epunt_cxx
+}
+
+src_compile() {
+	local line ROOTPATH
+
+	# FIXME: secure_path is a compile time setting. using ROOTPATH
+	# is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path..."
+
+		# why not use grep? variable might be expanded from other variables
+		# declared in that file. cannot just source the file, would override
+		# any variables already set.
+		eval `PS4= bash -x /etc/profile.env 2>&1 | \
+			while read line; do
+				case $line in
+					ROOTPATH=*) echo $line; break;;
+					*) continue;;
+				esac
+			done`  && einfo "	Found ROOTPATH..." || \
+				ewarn "	Failed to find ROOTPATH, please report this."
+
+		# remove duplicate path entries from $1
+		cleanpath() {
+			local i=1 x n IFS=:
+			local -a paths;	paths=($1)
+
+			for ((n=${#paths[*]}-1;i<=n;i++)); do
+				for ((x=0;x<i;x++)); do
+					test "${paths[i]}" == "${paths[x]}" && {
+						einfo "	Duplicate entry ${paths[i]} removed..." 1>&2
+						unset paths[i]; continue 2; }
+				done; # einfo "	Adding ${paths[i]}..." 1>&2
+			done; echo "${paths[*]}"
+		}
+
+		ROOTPATH=$(cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}})
+
+		# strip gcc path (bug #136027)
+		rmpath() {
+			declare e newpath oldpath=${!1} PATHvar=$1 thisp IFS=:
+			shift
+			for thisp in $oldpath; do
+				for e; do [[ $thisp == $e ]] && continue 2; done
+				newpath=$newpath:$thisp
+			done
+			eval $PATHvar='${newpath#:}'
+		}
+
+		rmpath ROOTPATH '*/gcc-bin/*'
+
+	einfo "...done."
+
+	# XXX: --disable-path-info closes an info leak, but may be confusing.
+	# XXX: /bin/vi may not be available, make nano visudo's default.
+	econf --with-secure-path="${ROOTPATH}" \
+		--with-editor=/bin/nano \
+		--with-env-editor \
+		$(use_with offensive insults) \
+		$(use_with offensive all-insults) \
+		$(use_with pam) \
+		$(use_with skey) \
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \
+		$(use_with ldap) || die
+
+	emake || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die
+	dodoc ChangeLog HISTORY PORTING README TROUBLESHOOTING \
+		UPGRADE sample.sudoers sample.syslog.conf
+
+	if use ldap; then
+		dodoc README.LDAP schema.OpenLDAP
+		dosbin sudoers2ldif
+
+		cat - > "${T}"/ldap.conf.sudo <<EOF
+# See ldap.conf(5) and README.LDAP for details\n"
+# This file should only be readable by root\n\n"
+# supported directives: host, port, ssl, ldap_version\n"
+# uri, binddn, bindpw, sudoers_base, sudoers_debug\n"
+# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key
+EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+	fi
+
+	pamd_mimic system-auth sudo auth account password session
+
+	insinto /etc
+	doins "${FILESDIR}"/sudoers
+	fperms 0440 /etc/sudoers
+}
+
+pkg_postinst() {
+	if use ldap; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if egrep -q '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+}