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.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 17 insertions, 46 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/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
 }