remove stale patch.

Package-Manager: portage-2.0.51.19

5 files changed, 17 insertions, 20 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 227b66df9103..ce39481dc385 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,10 @@
 # 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.46 2005/06/06 18:55:32 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.47 2005/06/06 22:57:30 taviso Exp $
+
+  06 Jun 2005; Tavis Ormandy <taviso@gentoo.org>
+  -files/sudo-1.6.8_p1-suid_fix.patch, files/sudoers, sudo-1.6.8_p8-r2.ebuild:
+  remove stale patch.
 
   06 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   sudo-1.6.7_p5-r4.ebuild:
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 892d79d31a4e..c734907bd92f 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,15 +1,14 @@
-MD5 aacc2f00cf9ce9e2f1bcab35a02ae8fa sudo-1.6.8_p8-r2.ebuild 4644
+MD5 eec74c7e7844116754be94ca7ed74d49 sudo-1.6.8_p8-r2.ebuild 4708
 MD5 1830dd653b9b5b92fa5cc86823e06d65 sudo-1.6.7_p5-r2.ebuild 1438
 MD5 8f413fa2cd1bd4b050e48043f28479ad sudo-1.6.7_p5-r4.ebuild 1501
-MD5 458b21505f3309d3613a3127efbaf31a ChangeLog 6252
+MD5 c43af63ae3bb27a8638da0d6c74ff6b0 ChangeLog 6401
 MD5 a5463236fbb98e4ee6b1a0faba8c9c52 files/sudo 135
 MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5-r2 64
 MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5-r4 64
 MD5 6c08a6d5527a45278ebc165df7f0031d files/sudo-1.6.8_p8 223
 MD5 0c8a06b3d3d86e988a826c8d9e86dbbf files/digest-sudo-1.6.8_p8-r2 64
 MD5 0b50aabedf9bb326893b5f1c333e46b2 files/sudo-skeychallengeargs.diff 567
-MD5 d8444174d148ea0ad28b01b1ef50b2de files/sudoers 1244
-MD5 46618a1b8f9dd4b3d35476c1e63217b0 files/sudo-1.6.8_p1-suid_fix.patch 434
+MD5 7d96f3ce4a5f858afd5962b8ba8118e0 files/sudoers 1339
 MD5 b906eb71f7564707384cfa9fc80c1b5f files/sudo-1.6.7_p5-strip-bash-functions.diff 1101
 MD5 b1fc3dd8440dc02690820c01190106a3 files/sudo-strip-shellopts.diff 316
 MD5 774b75e759fe13c7334c523b1db8ab2e files/sudo_include 67
diff --git a/app-admin/sudo/files/sudo-1.6.8_p1-suid_fix.patch b/app-admin/sudo/files/sudo-1.6.8_p1-suid_fix.patch
deleted file mode 100644
index 8697a1e352ed..000000000000
--- a/app-admin/sudo/files/sudo-1.6.8_p1-suid_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in	2004-09-17 15:26:12.578416939 +0000
-+++ Makefile.in	2004-09-17 15:26:28.361587463 +0000
-@@ -172,7 +172,7 @@
- 	$(NROFF) -man $< > $(srcdir)/$@
- 
- sudo: $(SUDOBJS) $(LIBOBJS)
--	$(CC) -o $@ $(SUDOBJS) $(LIBOBJS) $(SUDO_LDFLAGS) $(SUDO_LIBS)
-+	$(CC) -o $@ $(SUDOBJS) $(LIBOBJS) $(SUDO_LDFLAGS) $(SUDO_LIBS) -Wl,-z,now
- 
- visudo: $(VISUDOBJS) $(LIBOBJS)
- 	$(CC) -o $@ $(VISUDOBJS) $(LIBOBJS) $(LDFLAGS) $(LIBS) $(NET_LIBS)
diff --git a/app-admin/sudo/files/sudoers b/app-admin/sudo/files/sudoers
index 3dee43c73aec..923472b93468 100644
--- a/app-admin/sudo/files/sudoers
+++ b/app-admin/sudo/files/sudoers
@@ -15,12 +15,16 @@
 
 # Reset environment by default
 Defaults	env_reset
-# Uncomment to allow people in group wheel to export variables
+
+# Uncomment to allow users in group wheel to export variables
 # Defaults:%wheel	!env_reset
 
-# Allow people in group users to export specific variables
+# Allow users in group users to export specific variables
 # Defaults:%users	env_keep=TZ
 
+# Allow specific user to bypass env_delete for TERMCAP
+# Defaults:user     env_delete-=TERMCAP
+
 # Runas alias specification
 
 # *** REMEMBER ***************************************************
diff --git a/app-admin/sudo/sudo-1.6.8_p8-r2.ebuild b/app-admin/sudo/sudo-1.6.8_p8-r2.ebuild
index 7f6e005154cd..6d5f241ae2de 100644
--- a/app-admin/sudo/sudo-1.6.8_p8-r2.ebuild
+++ b/app-admin/sudo/sudo-1.6.8_p8-r2.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_p8-r2.ebuild,v 1.15 2005/06/06 19:35:49 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.6.8_p8-r2.ebuild,v 1.16 2005/06/06 22:57:30 taviso Exp $
 
 inherit eutils pam
 
@@ -41,9 +41,10 @@ src_unpack() {
 	#       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_reset)..."
+	einfo "Blacklisting common variables (env_delete)..."
 		sudo_bad_var 'SHELLOPTS'      # bash, change shoptions.
 		sudo_bad_var 'PERLIO_DEBUG'   # perl, write debug to file.
 		sudo_bad_var 'PERL5LIB'       # perl, change search path.