bump, +secure_path now enabled.

Package-Manager: portage-2.0.51.19

6 files changed, 49 insertions, 36 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 0c13af02bf1f..22768cfd4b6f 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/sudo
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.40 2005/05/20 12:37:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.41 2005/06/05 19:46:28 taviso Exp $
+
+  05 Jun 2005; Tavis Ormandy <taviso@gentoo.org> sudo-1.6.8_p8.ebuild:
+  enabling secure_path, which currently extracts the value from profile.env,
+  awaiting inspiration for a more robust solution. 
+  This change is sure to generate some bug reports, but makes sense in the
+  long term if a nice solution can be found for determining the path.
 
   20 May 2005; Diego Pettenò <flameeyes@gentoo.org> sudo-1.6.6.ebuild,
   sudo-1.6.7_p5.ebuild, sudo-1.6.7_p5-r1.ebuild, sudo-1.6.7_p5-r2.ebuild,
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index cc0acd40534b..80040a063252 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,36 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0da59e98ed62c8ed087705ed76d3c212 ChangeLog 4980
+MD5 1830dd653b9b5b92fa5cc86823e06d65 sudo-1.6.7_p5-r2.ebuild 1438
 MD5 6ef36794000d315b6771461e5e605952 sudo-1.6.6.ebuild 804
+MD5 f73599202e738a765394adc784b5a912 sudo-1.6.8_p1.ebuild 1015
+MD5 921c9330fc7c927056c25ca33877ea49 sudo-1.6.8_p1-r1.ebuild 1392
+MD5 115c90f01d3ca91735b2f23209d0e73e sudo-1.6.8_p8.ebuild 2044
 MD5 2f145ffda82bd23cf6412fd3db3d041d sudo-1.6.7_p5-r1.ebuild 1326
-MD5 1830dd653b9b5b92fa5cc86823e06d65 sudo-1.6.7_p5-r2.ebuild 1438
 MD5 3caf601661b996de760001c5ec276596 sudo-1.6.7_p5-r3.ebuild 1452
 MD5 f534927c7324a2161eb766e4360e9858 sudo-1.6.7_p5.ebuild 901
-MD5 921c9330fc7c927056c25ca33877ea49 sudo-1.6.8_p1-r1.ebuild 1392
+MD5 19e7d40e9b48b25bc7591cd67cd9a3f8 ChangeLog 5323
 MD5 d4b757bf84c48678558dbabc443fcfc6 sudo-1.6.8_p1-r2.ebuild 1512
-MD5 f73599202e738a765394adc784b5a912 sudo-1.6.8_p1.ebuild 1015
-MD5 de5d176033f5bdd6c8c49f95417c52cc sudo-1.6.8_p2.ebuild 1468
-MD5 d3a1edd41e6a44e7dae35d250aea266e files/digest-sudo-1.6.6 62
-MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5 64
+MD5 a5463236fbb98e4ee6b1a0faba8c9c52 files/sudo 135
 MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5-r1 64
 MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5-r2 64
 MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5-r3 64
-MD5 703a1c523c89153f9bf6f11be6b65778 files/digest-sudo-1.6.8_p1 64
 MD5 703a1c523c89153f9bf6f11be6b65778 files/digest-sudo-1.6.8_p1-r1 64
 MD5 703a1c523c89153f9bf6f11be6b65778 files/digest-sudo-1.6.8_p1-r2 64
-MD5 2a0f63ce27c6d8b9d304ece23ca43a5e files/digest-sudo-1.6.8_p2 64
-MD5 a5463236fbb98e4ee6b1a0faba8c9c52 files/sudo 135
-MD5 b906eb71f7564707384cfa9fc80c1b5f files/sudo-1.6.7_p5-strip-bash-functions.diff 1101
-MD5 46618a1b8f9dd4b3d35476c1e63217b0 files/sudo-1.6.8_p1-suid_fix.patch 434
 MD5 0b50aabedf9bb326893b5f1c333e46b2 files/sudo-skeychallengeargs.diff 567
-MD5 4362800877ccb8e27de5437707d8a954 files/sudo-strip-bash-functions.diff 1335
+MD5 d3a1edd41e6a44e7dae35d250aea266e files/digest-sudo-1.6.6 62
+MD5 d8444174d148ea0ad28b01b1ef50b2de files/sudoers 1244
+MD5 46618a1b8f9dd4b3d35476c1e63217b0 files/sudo-1.6.8_p1-suid_fix.patch 434
+MD5 b906eb71f7564707384cfa9fc80c1b5f files/sudo-1.6.7_p5-strip-bash-functions.diff 1101
 MD5 774b75e759fe13c7334c523b1db8ab2e files/sudo_include 67
-MD5 74f9541ba3dfec492975db7223bdf386 files/sudoers 1311
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCjdlRj5H05b2HAEkRAjMMAKCM653Jut1iuPdbKXYt6YFfLM5ZKgCeIeOV
-Gupq8LxzyrAkpKvsVfwPF8g=
-=UEFv
------END PGP SIGNATURE-----
+MD5 4362800877ccb8e27de5437707d8a954 files/sudo-strip-bash-functions.diff 1335
+MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5 64
+MD5 703a1c523c89153f9bf6f11be6b65778 files/digest-sudo-1.6.8_p1 64
+MD5 0c8a06b3d3d86e988a826c8d9e86dbbf files/digest-sudo-1.6.8_p8 64
diff --git a/app-admin/sudo/files/digest-sudo-1.6.8_p2 b/app-admin/sudo/files/digest-sudo-1.6.8_p2
deleted file mode 100644
index dbbec6e4d5f7..000000000000
--- a/app-admin/sudo/files/digest-sudo-1.6.8_p2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03b92a99b37f22351f4bae5119dabe3d sudo-1.6.8p2.tar.gz 583690
diff --git a/app-admin/sudo/files/digest-sudo-1.6.8_p8 b/app-admin/sudo/files/digest-sudo-1.6.8_p8
new file mode 100644
index 000000000000..943da7ce48cd
--- /dev/null
+++ b/app-admin/sudo/files/digest-sudo-1.6.8_p8
@@ -0,0 +1 @@
+MD5 7a60e95d0931dcf3caff7929e974d5cc sudo-1.6.8p8.tar.gz 585608
diff --git a/app-admin/sudo/files/sudoers b/app-admin/sudo/files/sudoers
index f39e1f374d61..3dee43c73aec 100644
--- a/app-admin/sudo/files/sudoers
+++ b/app-admin/sudo/files/sudoers
@@ -27,8 +27,7 @@ Defaults	env_reset
 # * GIVING SUDO ACCESS TO USERS ALLOWS THEM TO RUN THE SPECIFIED *
 # * COMMANDS WITH ELEVATED PRIVILEGES.                           *
 # *                                                              *
-# * ONLY PERMIT SUDO ACCESS SPARINGLY, AND NEVER ALLOW ACCESS TO *
-# * UNTRUSTED USERS.                                             *
+# * NEVER PERMIT UNTRUSTED USERS TO ACCESS SUDO.                 *
 # ****************************************************************
 
 # User privilege specification
diff --git a/app-admin/sudo/sudo-1.6.8_p2.ebuild b/app-admin/sudo/sudo-1.6.8_p8.ebuild
index 9034e40ec96e..b70bffa3a836 100644
--- a/app-admin/sudo/sudo-1.6.8_p2.ebuild
+++ b/app-admin/sudo/sudo-1.6.8_p8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.6.8_p2.ebuild,v 1.4 2005/05/20 12:37:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.6.8_p8.ebuild,v 1.1 2005/06/05 19:46:28 taviso Exp $
 
 inherit eutils pam
 
@@ -14,9 +14,8 @@ SRC_URI="ftp://ftp.sudo.ws/pub/sudo/${P/_/}.tar.gz"
 
 LICENSE="Sudo"
 SLOT="0"
-KEYWORDS="-*"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="pam skey"
+KEYWORDS="~x86"
+IUSE="pam skey offensive"
 
 DEPEND="pam? ( >=sys-libs/pam-0.73-r1 )
 	skey? ( >=app-admin/skey-1.1.5-r1 )"
@@ -31,13 +30,30 @@ src_unpack() {
 }
 
 src_compile() {
+	local line ROOTPATH
+
+	# secure_path must be compiled into sudo, so find the current setting
+	# of ROOTPATH. This is not perfect, but until it is available as a
+	# sudoers setting this will do.
+	einfo "Setting secure_path..."
+
+	# why not use grep? variable might be expanded other variables declared
+	# in that file, and would have to eval the result anyway.
+	eval `PS4= bash -x /etc/profile.env 2>&1 | \
+		while read -a line; do
+			case $line in
+				ROOTPATH=*) echo $line; break;;
+				*) continue;;
+			esac
+		done` || ewarn "failed to find secure_path, please report this"
+
 	econf \
-		--with-all-insults \
-		--disable-path-info \
+		--with-secure-path="/bin:/sbin:/usr/bin:/usr/sbin:${ROOTPATH:-/usr/local/bin}" \
 		--with-env-editor \
+		`use_with offensive all-insults`\
 		`use_with pam` \
 		`use_with skey` \
-		|| die "econf failed"
+		|| die
 	emake || die
 }
 
@@ -45,10 +61,12 @@ src_install() {
 	einstall || die
 	dodoc BUGS CHANGES HISTORY PORTING README RUNSON TODO \
 		TROUBLESHOOTING UPGRADE sample.*
-	dopamd ${FILESDIR}/sudo
+
+	use pam && dopamd ${FILESDIR}/sudo
 
 	insinto /etc
 	doins ${FILESDIR}/sudoers
+
 	fperms 0440 /etc/sudoers
 }