Add a patch to update secure_path description in sudoers man page by default.

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

4 files changed, 64 insertions, 7 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 553ca0418262..1709a962d6a6 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.188 2009/09/20 13:32:09 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.189 2009/09/24 22:10:06 flameeyes Exp $
+
+  24 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  sudo-1.7.2_p1.ebuild, +files/sudo-1.7.2p1-securepath.patch:
+  Add a patch to update secure_path description in sudoers man page by
+  default.
 
   20 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> sudo-1.7.2_p1.ebuild:
   Stable on ppc. Bug 284089
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index ce461d63f2ab..cdda02c8ba8d 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX sudo-1.7.1-bug348.patch 449 RMD160 68d3066d595d3e8f7b15da4a52129d332f4da65a SHA1 50439aa618dc3b941111364275d06752ff8b42fd SHA256 c3f361764b41755331ae711b1647d09dec5324381176b9633f762f1c9381b563
+AUX sudo-1.7.2p1-securepath.patch 1719 RMD160 e8db558c04873de58c46cfbe0c1992a9f0832732 SHA1 0ea0d723258b8b8ca834115835f1d4c2caa6fad6 SHA256 1d7958aca43426213ab3685a012ce3667b7bc24b52a2fe7a1b8b0230db0f6141
 AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d
 DIST sudo-1.7.1.tar.gz 755823 RMD160 e9c2e165ead15e5cab6a8d32facc0d38135d0ff9 SHA1 f76ad5ff5dac253c14dfedfdbddd99b4cf7f54a2 SHA256 e51c39eb4fca981b28b02c1cc58eef0b079258dce90cc87d5d91fcecedabe1db
 DIST sudo-1.7.2p1.tar.gz 771059 RMD160 5f345d6062f178700fd78c93c04ee47c03bbcc50 SHA1 2ef461d840110d2c9160db142336591775ede67a SHA256 34d11a1dd8bace0885f55b4c8bddda1da29993ff8d7174099e25bd80db1eaf7f
 EBUILD sudo-1.7.1-r1.ebuild 6546 RMD160 b530672cdf2b8b831a87743ef20cd4addb2a35c1 SHA1 8e4b06e7843ddc85986ea987202486f478ed2873 SHA256 af3889ebea0d7c57d8ddd10366b32d813f27069916a7ff63f4d45d871548001d
-EBUILD sudo-1.7.2_p1.ebuild 6478 RMD160 0d5b9bace288799def3af1fb8b08788ec6aa1b65 SHA1 39cb6617ed9cb8a5d77edbc89a2be4d71beceb7f SHA256 50f1bceb8c863cf0fe59d8e497269b3b8c6772f87eb1d4841b0ffecf947b6885
-MISC ChangeLog 26209 RMD160 16a32c06970b434a2aa0d861a1cc30462dda96a7 SHA1 5af25e830f0522836cd5c21a640f0a09ac17643e SHA256 fb5ec3d99bb06cf23316a808e7fed01d1e2c6c5fba8ab1e74a6e41376a938b96
+EBUILD sudo-1.7.2_p1.ebuild 6509 RMD160 76f45dfad0b3c3bc519902520e927f10614f7f8b SHA1 d6f3a80c97e679ba76d8dfa43d03924d158c642a SHA256 e9607f18a7701f773056ee3fd3624098d2a14d45aecbecf0e010ee7aa87d28c4
+MISC ChangeLog 26412 RMD160 9c9cbe74ee0f3b921c524bbf51853d0f73fb3f17 SHA1 14fafb32ee95f8451131b9fbc75e0c81b2dab831 SHA256 32a375d3ec9c7a2c251cc2aabbd71603a1917b53044d500a15d6ea7cb983e8bb
 MISC metadata.xml 501 RMD160 74dd36daa51d7ad5ce1659f0279e1245cd1ef4bc SHA1 e447d21dc61ee4a6de8cc0f66aa28aa422d9990a SHA256 5f399b83a90977486ff92847caa884d16f8b71705fd0d2203acb35f56c9a6db6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq77kcACgkQAiZjviIA2Xhr4gCfRoVFERa5DEDWNqyy8sgBQ1KU
+314AniC6ac1Jv0WpcI85PwwaQKpJfo51
+=TsGv
+-----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/files/sudo-1.7.2p1-securepath.patch b/app-admin/sudo/files/sudo-1.7.2p1-securepath.patch
new file mode 100644
index 000000000000..3f68c9c49c77
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.7.2p1-securepath.patch
@@ -0,0 +1,40 @@
+Index: sudo-1.7.2p1/configure.in
+===================================================================
+--- sudo-1.7.2p1.orig/configure.in
++++ sudo-1.7.2p1/configure.in
+@@ -985,18 +985,22 @@ if test "$insults" = "on"; then
+     AC_MSG_RESULT([$i])
+ fi
+ 
++SECURE_PATH_SET="not set"
+ AC_MSG_CHECKING(whether to override the user's path)
+ AC_ARG_WITH(secure-path, [AS_HELP_STRING([--with-secure-path], [override the user's path with a built-in one])],
+ [case $with_secure_path in
+     yes)	AC_DEFINE_UNQUOTED(SECURE_PATH, "/bin:/usr/ucb:/usr/bin:/usr/sbin:/sbin:/usr/etc:/etc")
+ 		AC_MSG_RESULT([:/usr/ucb:/usr/bin:/usr/sbin:/sbin:/usr/etc:/etc])
++		SECURE_PATH_SET="set"
+ 		;;
+     no)		AC_MSG_RESULT(no)
+ 		;;
+     *)		AC_DEFINE_UNQUOTED(SECURE_PATH, "$with_secure_path")
+ 		AC_MSG_RESULT([$with_secure_path])
++		SECURE_PATH_SET="set"
+ 		;;
+ esac], AC_MSG_RESULT(no))
++AC_SUBST([SECURE_PATH_SET])
+ 
+ AC_MSG_CHECKING(whether to get ip addresses from the network interfaces)
+ AC_ARG_WITH(interfaces, [AS_HELP_STRING([--without-interfaces], [don't try to read the ip addr of ether interfaces])],
+Index: sudo-1.7.2p1/sudoers.man.in
+===================================================================
+--- sudo-1.7.2p1.orig/sudoers.man.in
++++ sudo-1.7.2p1/sudoers.man.in
+@@ -1216,7 +1216,7 @@ people running \fBsudo\fR to have a sane
+ want to use this.  Another use is if you want to have the \*(L"root path\*(R"
+ be separate from the \*(L"user path.\*(R"  Users in the group specified by the
+ \&\fIexempt_group\fR option are not affected by \fIsecure_path\fR.
+-This is not set by default.
++This is @SECURE_PATH_SET@ by default.
+ .IP "syslog" 12
+ .IX Item "syslog"
+ Syslog facility if syslog is being used for logging (negate to
diff --git a/app-admin/sudo/sudo-1.7.2_p1.ebuild b/app-admin/sudo/sudo-1.7.2_p1.ebuild
index 03b78b5fb727..dda71138aa15 100644
--- a/app-admin/sudo/sudo-1.7.2_p1.ebuild
+++ b/app-admin/sudo/sudo-1.7.2_p1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.2_p1.ebuild,v 1.5 2009/09/20 13:32:09 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.2_p1.ebuild,v 1.6 2009/09/24 22:10:06 flameeyes Exp $
 
-inherit eutils pam confutils
+inherit eutils pam confutils autotools
 
 MY_P=${P/_/}
 MY_P=${MY_P/beta/b}
@@ -97,8 +97,9 @@ src_unpack() {
 	# prevent binaries from being stripped.
 	sed -i 's/\($(INSTALL).*\) -s \(.*[(sudo|visudo)]\)/\1 \2/g' Makefile.in
 
-	# remove useless c++ checks
-	epunt_cxx
+	epatch "${FILESDIR}"/${MY_P}-securepath.patch
+
+	eautoconf
 }
 
 src_compile() {