Remove stray file.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

3 files changed, 9 insertions, 108 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 37e7facb12ee..aac78acac769 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.262 2011/04/06 14:18:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.263 2011/04/06 14:41:24 flameeyes Exp $
+
+  06 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/sudo-CVE-2010-2956.patch:
+  Remove stray file.
 
 *sudo-1.8.1_rc2 (06 Apr 2011)
 *sudo-1.7.6_rc2 (06 Apr 2011)
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index d7f8b762c2d9..1b3ab22b5a07 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -4,7 +4,6 @@ Hash: SHA1
 AUX sudo-1.8.1_rc1-recursion.patch 1181 RMD160 8e487d3811e6ba20c376841a129b83cfb1ff1925 SHA1 588b3aa68853f2d04582f5e96b43d53939fa7cc9 SHA256 3ec7997b9f7143175160b2358e65e9a899bca1fdca9b359b6d197b5be35c5624
 AUX sudo-1.8.1_rc1-skey.patch 2304 RMD160 02bd31547a8758ba53c18b9e0d84c6a8a7efff98 SHA1 e066158141459005f2dc4f6e746df421c786da08 SHA256 27b0a78270b3af9a307f250a0ed444fe4828db8c5bdc2ebe102bdabe0437cb1f
 AUX sudo-1.8.1_rc2-plugindir.patch 753 RMD160 2472fc771ad313287e6b50c55c8adceb2baf9ba9 SHA1 490e9b5725743faee2371e8795f4def09436479d SHA256 79a32861c7dee57deefefc04903a2c6b31c3c505dd675dd09cc359e4ee30e11e
-AUX sudo-CVE-2010-2956.patch 2815 RMD160 6d48eb1dce125a129e56a208ee47bd502f0cd18a SHA1 ab3dbcc8de166bdf01aef0cf0bc53a6d86950c95 SHA256 4cc2c68d65a8ce95e3b248a426774a20896d36cbf21980137c77af1f0b674c4b
 AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d
 DIST sudo-1.7.4p4.tar.gz 963663 RMD160 3b5eb69b4317c72def0e811c58a24df8c9c1c892 SHA1 c873f509f80d5722989a912a42a61ad27b71453f SHA256 38de3c3e08346b2b8dcb3cf7ed0813300d1a1d5696d0f338ea8a4ef232aacf97
 DIST sudo-1.7.4p5.tar.gz 966176 RMD160 24fcaa065f9efc229abcf2b70ec4faca03efa32d SHA1 bb9c9ff6ce6d4c70bdc546316442e7021ca754c2 SHA256 72e8e3545f314d342f178b0fee4b483e26d70ef132b081699be035da0f0acbba
@@ -16,12 +15,12 @@ EBUILD sudo-1.7.4_p5.ebuild 7208 RMD160 3e8714403edb762e6e31c084001a82fb7160fbf7
 EBUILD sudo-1.7.5.ebuild 7219 RMD160 23211092f3a5c1ba5c7cc3a637949bd867339ffc SHA1 1a0d66757f6015a29683ea4bbf865e83ae6b47e6 SHA256 07c6400d605592153f3ffcaad57400d1fd9c07a878d9cb67e100d83326a9bedd
 EBUILD sudo-1.7.6_rc2.ebuild 5323 RMD160 efca702a6b6f1bbe7171b244ee33a86e2003b5b7 SHA1 4ca1f5c268335fd3ebe92358789f89d071c135c2 SHA256 2144e0324735aed0f2995eb5957d551d2d3d2eb2be318b2894de1cd1ac5e67e7
 EBUILD sudo-1.8.1_rc2.ebuild 5244 RMD160 309fa5bccfddf340bcdeb01aa860b5dbfef21c50 SHA1 682b3cde897856272a54327a2f6573b5e2d45785 SHA256 dda14f629ad305e2a805851f80f992313273c21c3dcf464805a4c7530f0abf77
-MISC ChangeLog 37806 RMD160 4ab24598ef8b2da24e0e10e45bb74158435f10f0 SHA1 8a2b9ef2e89961ae1089b01fc1539f37783a942f SHA256 fbd461d88eab5400385f0474429d1e62306b3e29d950c0f08b473fcd544a9986
+MISC ChangeLog 37919 RMD160 734d8ddc19246d87fe3ebc20c003266ea724f873 SHA1 ec2df2053fd3ed72cb1a578b0ba344e0caac3cc2 SHA256 e077b7e71f6ead32e6976caba346b88c590ca61aa57d4d7b0b9578402f28e9ee
 MISC metadata.xml 560 RMD160 4e8bb9df73a4095b15b23d4ca31dea29b3f376d2 SHA1 a29e70672a1c039c4a97ee65e3e077ba0a01f26b SHA256 465d0ea14b7db3ecd0bad7c175f9e17003794145f5f59c4941f848960c91048a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2cdkMACgkQAiZjviIA2XjkBQCeJsbP+CK+NbGjWxNUJ+LVsU1j
-xBcAnRkpCtiGSzBwGgcQi4pwdSde14qR
-=7fU4
+iEYEARECAAYFAk2ce5QACgkQAiZjviIA2XjXkACffBq7SSuH3mWLiHpjxfcS72Zl
+vS0An0Zvrxl9mQjygbYc1mwb31ouolPl
+=YAVB
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/files/sudo-CVE-2010-2956.patch b/app-admin/sudo/files/sudo-CVE-2010-2956.patch
deleted file mode 100644
index 1fda2fb790fa..000000000000
--- a/app-admin/sudo/files/sudo-CVE-2010-2956.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -r 24a695707b67 match.c
---- a/match.c	Thu Aug 26 11:36:47 2010 -0400
-+++ b/match.c	Mon Aug 30 07:22:49 2010 -0400
-@@ -170,15 +170,9 @@
- {
-     struct member *m;
-     struct alias *a;
--    int rval, matched = UNSPEC;
--
--    if (runas_gr != NULL) {
--	if (tq_empty(group_list))
--	    return(DENY); /* group was specified but none in sudoers */
--	if (runas_pw != NULL && strcmp(runas_pw->pw_name, user_name) &&
--	    tq_empty(user_list))
--	    return(DENY); /* user was specified but none in sudoers */
--    }
-+    int rval;
-+    int user_matched = UNSPEC;
-+    int group_matched = UNSPEC;
- 
-     if (tq_empty(user_list) && tq_empty(group_list))
- 	return(userpw_matches(def_runas_default, runas_pw->pw_name, runas_pw));
-@@ -187,59 +181,67 @@
- 	tq_foreach_rev(user_list, m) {
- 	    switch (m->type) {
- 		case ALL:
--		    matched = !m->negated;
-+		    user_matched = !m->negated;
- 		    break;
- 		case NETGROUP:
- 		    if (netgr_matches(m->name, NULL, NULL, runas_pw->pw_name))
--			matched = !m->negated;
-+			user_matched = !m->negated;
- 		    break;
- 		case USERGROUP:
- 		    if (usergr_matches(m->name, runas_pw->pw_name, runas_pw))
--			matched = !m->negated;
-+			user_matched = !m->negated;
- 		    break;
- 		case ALIAS:
- 		    if ((a = alias_find(m->name, RUNASALIAS)) != NULL) {
- 			rval = _runaslist_matches(&a->members, &empty);
- 			if (rval != UNSPEC)
--			    matched = m->negated ? !rval : rval;
-+			    user_matched = m->negated ? !rval : rval;
- 			break;
- 		    }
- 		    /* FALLTHROUGH */
- 		case WORD:
- 		    if (userpw_matches(m->name, runas_pw->pw_name, runas_pw))
--			matched = !m->negated;
-+			user_matched = !m->negated;
- 		    break;
- 	    }
--	    if (matched != UNSPEC)
-+	    if (user_matched != UNSPEC)
- 		break;
- 	}
-     }
- 
-     if (runas_gr != NULL) {
-+	if (user_matched == UNSPEC) {
-+	    if (runas_pw == NULL || strcmp(runas_pw->pw_name, user_name) == 0)
-+		user_matched = ALLOW;	/* only changing group */
-+	}
- 	tq_foreach_rev(group_list, m) {
- 	    switch (m->type) {
- 		case ALL:
--		    matched = !m->negated;
-+		    group_matched = !m->negated;
- 		    break;
- 		case ALIAS:
- 		    if ((a = alias_find(m->name, RUNASALIAS)) != NULL) {
- 			rval = _runaslist_matches(&a->members, &empty);
- 			if (rval != UNSPEC)
--			    matched = m->negated ? !rval : rval;
-+			    group_matched = m->negated ? !rval : rval;
- 			break;
- 		    }
- 		    /* FALLTHROUGH */
- 		case WORD:
- 		    if (group_matches(m->name, runas_gr))
--			matched = !m->negated;
-+			group_matched = !m->negated;
- 		    break;
- 	    }
--	    if (matched != UNSPEC)
-+	    if (group_matched != UNSPEC)
- 		break;
- 	}
-     }
- 
--    return(matched);
-+    if (user_matched == DENY || group_matched == DENY)
-+	return(DENY);
-+    if (user_matched == group_matched || runas_gr == NULL)
-+	return(user_matched);
-+    return(UNSPEC);
- }
- 
- int
-