Update to latest beta; drop all keywords but the two that haven't updated from the (very) old and unsafe sudo version. Remove a stray file.

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

5 files changed, 24 insertions, 54 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 3e6c897638da..3336294cca57 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.226 2010/06/15 22:17:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.227 2010/06/24 13:38:03 flameeyes Exp $
+
+*sudo-1.7.3_beta4 (24 Jun 2010)
+
+  24 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  sudo-1.7.2_p2-r1.ebuild, -files/sudo-1.7.2p1-securepath.patch,
+  -sudo-1.7.3_beta3.ebuild, +sudo-1.7.3_beta4.ebuild:
+  Update to latest beta; drop all keywords but the two that haven't updated
+  from the (very) old and unsafe sudo version. Remove a stray file.
 
 *sudo-1.7.3_beta3 (15 Jun 2010)
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 023c9b897273..5d0593b61c9d 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-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.2p2.tar.gz 772399 RMD160 4ab92524639b5d6822c48d0f74f80dc1c674ab0e SHA1 b729c158f81f5cff4ce6193f3db7bee00a2c2fbe SHA256 3d93aa2d52873b1fc82dc6dd64f1046e4636735f55d9ca7861ef02235b7c7e45
 DIST sudo-1.7.2p7.tar.gz 772356 RMD160 7ed1976bbce6d66939b85ce08a97c089dbeb1ec4 SHA1 0504e0d7b1d3c987e48325ec4caa6ebfe5237ff5 SHA256 07a9c83e628a088314523e558236ac3c4cb0d54d7d7093e5b3e4c8101b1a2bea
-DIST sudo-1.7.3b3.tar.gz 890839 RMD160 4b3a175921a4826b78bddebadf3d9e76441c3721 SHA1 86a912a385b6193b7e4c273d34f16226d8bf0ddd SHA256 6621de39aaed89b0018af9f3c1ffea18c74e0c398eb87547d16af746126d2747
-EBUILD sudo-1.7.2_p2-r1.ebuild 6459 RMD160 c2bb35cad09bec61ae4edfd41349b8f8e8a6c113 SHA1 15e6f298104f7b3b432b153183c7b9fb8e303a92 SHA256 08d1088270ce4b29017cb0229204bdb3128e71581b68afd720a3137cb5125cfb
+DIST sudo-1.7.3b4.tar.gz 893506 RMD160 dacc37d1d36e182d95cd837611cabfba71563c20 SHA1 f77599a7c204ded344cead38409b078aac628d59 SHA256 d82a055d1f970d272e047bf419af490e27caabb807290143aefc49e08bc23c14
+EBUILD sudo-1.7.2_p2-r1.ebuild 6378 RMD160 b1eba647750a5620926e79b63feb755eacceb68a SHA1 68e6b19890c47bd2f6151154f880460ac580b484 SHA256 819fa9e6d5e1daf928cd0d3700504e3fe8b6b5ada27465a810b7f6dc69330c38
 EBUILD sudo-1.7.2_p7.ebuild 6858 RMD160 0fbbf36e50e76922733554be5a99a89b0929ccff SHA1 83ce71088583cc6d59b57f4d884931bb5ed7b650 SHA256 10c3a41490d42de446bf8344e9652e4f1b47c0be9f26de3a2ff24ed36502bafa
-EBUILD sudo-1.7.3_beta3.ebuild 6876 RMD160 73d725ca51e55c906a925478058026a45bc77eab SHA1 c3880588d1c6e85f017310bcb8d0ad136e979ae4 SHA256 05be70d10228e73196fecef9adbf4f072f7490ec0008f9d86e56578f083a83b8
-MISC ChangeLog 31562 RMD160 9f8ac0befff2019797222373dc2529b296ace3c0 SHA1 cfcdc7c96975b26f98b6a7ceb97d1383cd920a72 SHA256 c582c686078e324e8502cd10149d4ca8f225bae41832de240a102e11ef43b852
+EBUILD sudo-1.7.3_beta4.ebuild 6986 RMD160 70469d675370f4d357b02c4258e2e9fffa17fac1 SHA1 330e4753d3e9c3e645d8291d86d61affa42f0d92 SHA256 c99fb141ed11480b84fac5459cf524a3be63b6f774dc517cd654aee29ba85360
+MISC ChangeLog 31915 RMD160 782ebb94163161a40d5d12ac36cd988cc26b12b8 SHA1 9ca307ca28bf177366d25bf51b8b2062b4620a56 SHA256 8828047398eef7e49382b7186b118e430d1d859046da422a538d7ff77c94c4fb
 MISC metadata.xml 434 RMD160 a713e5ffdcc2216a46f5023ab77c6e3aeed0d183 SHA1 49a31df517e1ec39344ac83c13e9fca87379d261 SHA256 87e2d9f4535e80f4ba1f73366040bb23cfb4b1f3101c0e33df73aff2e77fc13f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwX+4oACgkQAiZjviIA2XjR4gCeKtG1Q2BebvclB7z4XRM0rGcH
-8qwAn3Sk2y5ZbZYAHgcSBBbkyxljinuc
-=0s84
+iEYEARECAAYFAkwjXucACgkQAiZjviIA2XhlBACcD+oe0OUoU2E+dwBKZUILzu+Q
+puoAoLgzS1+E0NDqDoA76xKkKKAEoNb0
+=raiR
 -----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
deleted file mode 100644
index 3f68c9c49c77..000000000000
--- a/app-admin/sudo/files/sudo-1.7.2p1-securepath.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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_p2-r1.ebuild b/app-admin/sudo/sudo-1.7.2_p2-r1.ebuild
index 2d5dd520042e..5e8e87395084 100644
--- a/app-admin/sudo/sudo-1.7.2_p2-r1.ebuild
+++ b/app-admin/sudo/sudo-1.7.2_p2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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_p2-r1.ebuild,v 1.1 2009/12/07 23:19:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.2_p2-r1.ebuild,v 1.2 2010/06/24 13:38:03 flameeyes Exp $
 
 inherit eutils pam confutils
 
@@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 # 3-clause BSD license
 LICENSE="as-is BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~mips ~sparc-fbsd"
 IUSE="pam skey offensive ldap selinux"
 
 DEPEND="pam? ( virtual/pam )
diff --git a/app-admin/sudo/sudo-1.7.3_beta3.ebuild b/app-admin/sudo/sudo-1.7.3_beta4.ebuild
index 0814e4838704..cbaccc8dfa3b 100644
--- a/app-admin/sudo/sudo-1.7.3_beta3.ebuild
+++ b/app-admin/sudo/sudo-1.7.3_beta4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.3_beta3.ebuild,v 1.1 2010/06/15 22:17:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.3_beta4.ebuild,v 1.1 2010/06/24 13:38:03 flameeyes Exp $
 
 inherit eutils pam confutils
 
@@ -151,6 +151,8 @@ src_compile() {
 	einfo "...done."
 
 	# XXX: --disable-path-info closes an info leak, but may be confusing.
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. — Diego
 	econf --with-secure-path="${ROOTPATH}" \
 		--with-editor=/usr/libexec/gentoo-editor \
 		--with-env-editor \
@@ -159,7 +161,8 @@ src_compile() {
 		$(use_with pam) \
 		$(use_with skey) \
 		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \
-		$(use_with ldap) || die
+		$(use_with ldap) \
+		--without-linux-audit
 
 	emake || die
 }