Remove stray file.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

2 files changed, 5 insertions, 103 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/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
-