Bump to 1.7.0 final release, remove old 1.7.0_rc, remove older versions.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-gentoo-r6 x86_64

5 files changed, 16 insertions, 389 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index e084485204df..b514a3bdf0f2 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.151 2008/12/04 18:56:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.152 2008/12/19 20:17:38 flameeyes Exp $
+
+*sudo-1.7.0 (19 Dec 2008)
+
+  19 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  -sudo-1.6.9_p16.ebuild, -sudo-1.6.9_p18.ebuild, -sudo-1.7.0_rc5.ebuild,
+  +sudo-1.7.0.ebuild:
+  Bump to 1.7.0 final release, remove old 1.7.0_rc, remove older versions.
 
 *sudo-1.6.9_p19 (04 Dec 2008)
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index b8910947283b..307e37d40eb0 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -5,23 +5,19 @@ AUX sudo 223 RMD160 4bc9a3e5d2dfd73bb1f14e5bad3b644ba80758d3 SHA1 fa6377c699ff20
 AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d
 AUX sudoers 1612 RMD160 f61c372791112feecae7e0a762a9aa9f30285099 SHA1 b27d644dcd9d7d3727db9355a81cebf7deaa6a7a SHA256 4ff5355e2d1dcac48bdd8420982a5b437546cd40b3dc445f9fbfb9464a4af1a0
 DIST sudo-1.6.9p13.tar.gz 589079 RMD160 eb2a4d835553061f9a15d71abee83a5574215c28 SHA1 0e84a265bb18772bc99d0f37c65dd6564962a6c4 SHA256 c54b8f10eca330cb3181e4a16bd743b145d4fcf9d1d85df6127d7e9979d4a805
-DIST sudo-1.6.9p16.tar.gz 593175 RMD160 b36b1ecc4383a6e411a8f0c2e90f9bfb6df4a220 SHA1 6c9248441eb6f5d56a9ba3545b83fceb875bd4ee SHA256 634e2b596bc6fc6a9143e00387ae79941980f548c9a20ea651ce755cc4e35f6a
 DIST sudo-1.6.9p17.tar.gz 593534 RMD160 4d1a4bb3558ddeaa4c8c095067a5696afb6ea50a SHA1 576a584eee413e12294cbd2ca6f445e51a1cb103 SHA256 1e2cd4ff684c6f542b7e392010021f36b201d074620dad4d7689da60f9c74596
-DIST sudo-1.6.9p18.tar.gz 595655 RMD160 b94a2c07e0f53aa6a0b8bc81b79151097b908442 SHA1 dca220f16c4ea0067297bdce40353fd001a7e4cf SHA256 360a7e95a62a782096f09868a6ad94c87ad3f49f4d29da420d0a528f6101be38
 DIST sudo-1.6.9p19.tar.gz 595755 RMD160 a05d529893e95db5d3408ea23cc053822c9f4f55 SHA1 313eb671c87333926a401d7d050e31e5609f82c7 SHA256 7da5fdc8c6a97adf37ce87472b2368c068b3efad4a2af60de123c3ecd0febe47
-DIST sudo-1.7.0rc5.tar.gz 742324 RMD160 340a28c79d5400d4fd0acefce9c223add894a98e SHA1 f431e90feb12690ea8729961c3aa18675e50378d SHA256 866c0928da6e0c34f3aa8a094cde8b8f134b4d52a0fe84fbb074838130f2de56
+DIST sudo-1.7.0.tar.gz 744311 RMD160 62c1dbe97a4b46ea2352023ecb8b30dc4afedf58 SHA1 77bb230148b305e8608a3e552f1747507a84a55c SHA256 5f7de94287f39c8b3b8d86aed147967e9286f45740412004233858b637391978
 EBUILD sudo-1.6.9_p13.ebuild 5874 RMD160 106af8524e301e8e3e96ff2ae8216ce600184785 SHA1 74510ac2ad4ac13161e46069305b36a2528bb30b SHA256 ec0458aeed5691e00d176dec39b26aa6d92ba9019265286b8fd82b0a2107840d
-EBUILD sudo-1.6.9_p16.ebuild 5895 RMD160 edd0bb4ec1686028a48650e0efe7d90a13ab39da SHA1 c8a611d5d03f3f3f8d45302adb64e01932ec62d9 SHA256 d3eb6b457280c410e7e4f1192199517d91e475f732a3b25d3887a8614eafebfb
 EBUILD sudo-1.6.9_p17.ebuild 5894 RMD160 bcb3bb2f082b4e9c6995eec5ad3691d375bc50a1 SHA1 eb09c29f36e49fa50fcbcc55d0a6cd365ff73fa0 SHA256 7e569b5baec5228c5552a2bf56d704d9857f84c4110707dfcc2ee6a3824808c3
-EBUILD sudo-1.6.9_p18.ebuild 5909 RMD160 4eb2133d415c03bc7094779a292479edef6ba17b SHA1 df57451b7f551ca81e2f1f03447f7870f1597044 SHA256 863e83870787d5bbdd21b457d2a502cee5d0cede6fa9769ec229cd0f2513d4cf
 EBUILD sudo-1.6.9_p19.ebuild 5909 RMD160 ad89799a00f71f8f4420904009e232e7009168da SHA1 be119cc723df779947d6d3c377c8814ca0e5566c SHA256 89ea1b702bea7dd76de0622f66d3620eb86b69875897948e25ba242b0026a014
-EBUILD sudo-1.7.0_rc5.ebuild 6396 RMD160 01d3e313a56444bf4a111fe9ad82de8b49efb230 SHA1 0e7517151628a5f07a6a5efc9edf022d191321ee SHA256 a0aa827b48f3497050390f21c7dd1116f188b5270b3a275217f947fb76b2cd88
-MISC ChangeLog 21049 RMD160 9677d5c52c65db73f544db698eccc90118e42d86 SHA1 9b3139a03e08638d549bb7f7a1dfe1f5c97ca79d SHA256 9bf803ca340f802e858fb5ea02b8a135377aaa66061642a7d42b1e6578a06476
+EBUILD sudo-1.7.0.ebuild 6385 RMD160 f6ade6ddf7a4050ce5e5730a2da161511295d60e SHA1 04fd2d2196fa86325476dbd978101b5e16026637 SHA256 ce7114223fea030c1501242c8527c8b6a5f9c4e519b5b4bdc60ac765ad592788
+MISC ChangeLog 21304 RMD160 6b33fe3c57fa84fa68dda089ff45bbb2ac97dabe SHA1 bf7059ce04db57e7f936ae6faf04c8e5b2678f7e SHA256 d7c083ccefe3462b6e12a6b75f850dec22b3ae7b59e841dc951601d01204b648
 MISC metadata.xml 501 RMD160 74dd36daa51d7ad5ce1659f0279e1245cd1ef4bc SHA1 e447d21dc61ee4a6de8cc0f66aa28aa422d9990a SHA256 5f399b83a90977486ff92847caa884d16f8b71705fd0d2203acb35f56c9a6db6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk7t8YACgkQ67wieSYcaxfKzwCaAt6EeTnOPKTUYLk5ZNanP3fp
-mFQAnjavXeoYKTNd3kumVzAGr5RM/3Qf
-=FkW8
+iEYEARECAAYFAklMAWgACgkQAiZjviIA2XjhmACeK6iyWElwOsYWJhtvHOoTVYGR
+luIAoJgU2vE9zLjOs2i18g8b1f4Fhqbb
+=+07G
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/sudo-1.6.9_p16.ebuild b/app-admin/sudo/sudo-1.6.9_p16.ebuild
deleted file mode 100644
index c8b76d3dd8a4..000000000000
--- a/app-admin/sudo/sudo-1.6.9_p16.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# 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_p16.ebuild,v 1.10 2008/10/25 21:31:48 vapier 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 arm hppa ia64 m68k ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="pam skey offensive ldap selinux"
-
-DEPEND="pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-2.1.30-r1 )
-	skey? ( >=sys-auth/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.6.9_p18.ebuild b/app-admin/sudo/sudo-1.6.9_p18.ebuild
deleted file mode 100644
index f550387e288a..000000000000
--- a/app-admin/sudo/sudo-1.6.9_p18.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# 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_p18.ebuild,v 1.1 2008/11/14 14:52:10 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 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="pam skey offensive ldap selinux"
-
-DEPEND="pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-2.1.30-r1 )
-	skey? ( >=sys-auth/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.0_rc5.ebuild b/app-admin/sudo/sudo-1.7.0.ebuild
index 6091cc992eb0..1f3c5c9f8d44 100644
--- a/app-admin/sudo/sudo-1.7.0_rc5.ebuild
+++ b/app-admin/sudo/sudo-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # 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.0_rc5.ebuild,v 1.1 2008/11/13 01:46:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.0.ebuild,v 1.1 2008/12/19 20:17:38 flameeyes Exp $
 
 inherit eutils pam confutils
 
@@ -190,7 +190,7 @@ EOF
 	pamd_mimic system-auth sudo auth account password session
 
 	insinto /etc
-	doins "${FILESDIR}"/sudoers
+	doins "${S}"/sudoers
 	fperms 0440 /etc/sudoers
 }