Drop unused patches.

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

4 files changed, 6 insertions, 74 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 6b01fa80b8a6..8803b4b323d2 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.305 2012/03/13 16:22:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.306 2012/03/28 22:29:34 vapier Exp $
+
+  28 Mar 2012; Mike Frysinger <vapier@gentoo.org>
+  -files/sudo-1.8.2-fix-pwutil-alignment.patch,
+  -files/sudo-1.8.2-parallel-build.patch, -files/sudo-skeychallengeargs.diff:
+  Drop unused patches.
 
 *sudo-1.8.4_p4 (13 Mar 2012)
 
diff --git a/app-admin/sudo/files/sudo-1.8.2-fix-pwutil-alignment.patch b/app-admin/sudo/files/sudo-1.8.2-fix-pwutil-alignment.patch
deleted file mode 100644
index a25871c79d2f..000000000000
--- a/app-admin/sudo/files/sudo-1.8.2-fix-pwutil-alignment.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-status: upstream
-
-> Program received signal SIGBUS, Bus error.
-> 0x0000020005ff64e0 in make_grlist_item (user=0x120037090 "root", gids=0x120037140, ngids=11) at ./pwutil.c:552
-> 552                 grlist->groups[ngroups++] = cp;
-
-Found by armin76.
-
-On alpha gid_t (grlist->gids) is 4-bytes long (and 4-bytes algned)
-while char** (grlist->groups) is 8-bytes aligned.
-Reorder to satisfy both alignmens.
-
-# HG changeset patch
-# User Todd C. Miller <Todd.Miller@courtesan.com>
-# Date 1316193166 14400
-# Branch 1.8
-# Node ID e877c89ae32fc1fa7c3933f9599761d43f79dc96
-# Parent  f31543c80b9857cf4d14048be0c3ff34a47201c4
-# Parent  c89508c73c46bca11b6b9d3980cd4a511efcde6f
-Fix a crash in make_grlist_item() on 64-bit machines with strict
-alignment.
-
-diff -r f31543c80b98 -r e877c89ae32f plugins/sudoers/pwutil.c
---- a/plugins/sudoers/pwutil.c	Fri Sep 16 13:12:34 2011 -0400
-+++ b/plugins/sudoers/pwutil.c	Fri Sep 16 13:12:46 2011 -0400
-@@ -508,16 +508,16 @@
- 
-     /*
-      * Copy in group list and make pointers relative to space
--     * at the end of the buffer.  Note that the gids array must come
-+     * at the end of the buffer.  Note that the groups array must come
-      * immediately after struct group to guarantee proper alignment.
-      */
-     grlist = (struct group_list *)cp;
-     zero_bytes(grlist, sizeof(struct group_list));
-     cp += sizeof(struct group_list);
-+    grlist->groups = (char **)cp;
-+    cp += sizeof(char *) * ngids;
-     grlist->gids = (gid_t *)cp;
-     cp += sizeof(gid_t) * ngids;
--    grlist->groups = (char **)cp;
--    cp += sizeof(char *) * ngids;
- 
-     /* Set key and datum. */
-     memcpy(cp, user, nsize);
diff --git a/app-admin/sudo/files/sudo-1.8.2-parallel-build.patch b/app-admin/sudo/files/sudo-1.8.2-parallel-build.patch
deleted file mode 100644
index 4f7b78f707e0..000000000000
--- a/app-admin/sudo/files/sudo-1.8.2-parallel-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://crosbug.com/20607
-
---- a/plugins/sudoers/Makefile.in
-+++ b/plugins/sudoers/Makefile.in
-@@ -164,7 +164,7 @@
- visudo: libparsesudoers.la $(VISUDO_OBJS) $(LT_LIBS)
- 	$(LIBTOOL) --mode=link $(CC) -o $@ $(VISUDO_OBJS) $(LDFLAGS) libparsesudoers.la $(LIBS) $(NET_LIBS)
- 
--sudoreplay: $(REPLAY_OBJS) $(LT_LIBS)
-+sudoreplay: $(REPLAY_OBJS) $(LT_LIBS) timestr.lo
- 	$(LIBTOOL) --mode=link $(CC) -o $@ $(REPLAY_OBJS) $(LDFLAGS) timestr.lo $(REPLAY_LIBS) $(LIBS)
- 
- testsudoers: libparsesudoers.la $(TEST_OBJS) $(LT_LIBS)
diff --git a/app-admin/sudo/files/sudo-skeychallengeargs.diff b/app-admin/sudo/files/sudo-skeychallengeargs.diff
deleted file mode 100644
index 3c90cfa8dbd1..000000000000
--- a/app-admin/sudo/files/sudo-skeychallengeargs.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- sudo-1.6.7p5/auth/rfc1938.c	2003-04-16 01:39:15.000000000 +0100
-+++ sudo-1.6.7p5/auth/rfc1938.c.new	2004-09-17 20:01:00.996902672 +0100
-@@ -64,11 +64,7 @@
- #if defined(HAVE_SKEY)
- # include <skey.h>
- # define RFC1938				skey
--#  ifdef __NetBSD__
--#   define rfc1938challenge(a,b,c,d)	skeychallenge((a),(b),(c),(d))
--#  else
--#   define rfc1938challenge(a,b,c,d)	skeychallenge((a),(b),(c))
--#  endif
-+#  define rfc1938challenge(a,b,c,d)	skeychallenge((a),(b),(c),(d))
- # define rfc1938verify(a,b)		skeyverify((a),(b))
- #elif defined(HAVE_OPIE)
- # include <opie.h>