Drop unused patches.

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

5 files changed, 20 insertions, 81 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/Manifest b/app-admin/sudo/Manifest
index 9d461958916d..9fd6123ddf29 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,22 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX sudo-1.8.2-fix-pwutil-alignment.patch 1641 RMD160 d136752a7180bf46dfa24c522ad6ade3979e689c SHA1 36c518048ffc601d04b3edc4007528fd425328e7 SHA256 7922f150462214312ca00048b93aa99aac454e5a61cc92fbe6d57354694ca2ef
-AUX sudo-1.8.2-parallel-build.patch 517 RMD160 1fa308ce579f9c3e8d32b6155ee6e89044c2997e SHA1 8237b096164527704e865f95cd563b5d5aa01d22 SHA256 f21f4c60c8d9bbbf8ff372393e5d753a123021573dc4ace9665ff451dda9326c
 AUX sudo-1.8.3_p1-linguas.patch 1004 RMD160 ba9f5d2ac57ed53de0388da02d29ef3e84a7b4fd SHA1 0d6d629e11eda546e1a9486bc93ede54b8019fe1 SHA256 68687a3817c8ca38802c93cbbdf24ad7fde8ef4515da691929362e85a14336ec
-AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d
 DIST sudo-1.8.3p2.tar.gz 1536943 RMD160 5a6b8574d2245cc89d2ac982eae9cb6ca2414033 SHA1 37d70b133f809116ce631229fa0e727d9f5125ad SHA256 7edcf02ef4dc4f26f524726e8faaa90d7939772c186409ab150d2934e3a9ba31
 DIST sudo-1.8.4p2.tar.gz 1608580 RMD160 62c52bf05ac4a236e7cdf56c15cc271928635d85 SHA1 949c39a0191584ded1044a0f729d54a8dc7b3e72 SHA256 b1310b8548db5ea92f3063011c0fe6e843a1f95f548a4aeae54bcc2fdfea88a9
 DIST sudo-1.8.4p4.tar.gz 1608969 RMD160 02875946f3bb9a40637efde20c1a9a3f0b0cfca8 SHA1 49373706709bd4c30d9b3c513eff7be04aecd812 SHA256 bf965b09bde9b0cf7fd2355c53a81884d02d522af2d539cf40218436e9a5051e
 EBUILD sudo-1.8.3_p2.ebuild 4901 RMD160 19759297aeb2f1d0b0ec849032d52a56b0fbe86f SHA1 af073c081fcc8cf8099ea45275226be9e4c732da SHA256 eaed00db933deac05e2554f72208842741a57864f22d8ed975205ad63bc7aa08
 EBUILD sudo-1.8.4_p2.ebuild 4865 RMD160 1eac12234da0914cf4e04f448f3cae8f92263443 SHA1 ec3d7243739ba592579abc64a983248943169a24 SHA256 baa2673fd738a4966c6dff486b2fdbcf767cadb1a48cd3d9d4d859f7222b03ee
 EBUILD sudo-1.8.4_p4.ebuild 4865 RMD160 a0801f59c6df68cf6188cc140c64b6c017ed4dac SHA1 d1f3e975cb5e772d539780320bb727d4bdb427fe SHA256 82fe5663ccd8d5cacf047636ab7794e1bf7d93161b4368e84ddab9bd619ce4bf
-MISC ChangeLog 44550 RMD160 8d05c0319ab636385b0adeff2acc936f98d7f9e5 SHA1 ef43a4b04827f3c1be17700d7b41a796d46b9da1 SHA256 33bc6a16f7ab274c07a2668cc8908d683cc361d7e43197411f00c756be88335f
+MISC ChangeLog 44747 RMD160 f8ac750c9a9f1d8924431856a0ea4ca0ec664470 SHA1 854b6634d857af0b24051e951c38ca801109f098 SHA256 510a84cd3ae6d5987c15a709e43b3540e176e0b1f72b1a3b88faf6dcb4d15c9c
 MISC metadata.xml 560 RMD160 4e8bb9df73a4095b15b23d4ca31dea29b3f376d2 SHA1 a29e70672a1c039c4a97ee65e3e077ba0a01f26b SHA256 465d0ea14b7db3ecd0bad7c175f9e17003794145f5f59c4941f848960c91048a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9fdEcACgkQAiZjviIA2Xg/GQCgjaFzkfcZRVK69Boe2OcZUmzT
-d6UAoMf3hH+wY8U1VeZCthrqk7RmJPCu
-=ylTd
+iQIcBAEBAgAGBQJPc5DVAAoJELEHsLL7fEFWLWEP/1sE6MypmsDyGDjbPTe08ybZ
+JyC898TEAzY6bn2julXybgj4AuBYPXEkFy+BzYtrKk1QmbmhQWEoOC3UxWeKANsD
+vAoKbwtEWBCmExFnRTuNxiN5yda1R1Roha/QKBeOCBQzvdSoUHQZ89x2MeGhphqg
+ff48ocnsdm4HxWOsQowQ/OQRNllKUsxA9+m456c7J6FJaZ09tchlyY4iPk6KOhSm
+LeDBK3ezzF8ErKejXEBj2CX4vzMzGMyUeLUC8YU8ns5eIUqyBTUkPimN44I7SLaw
+j/jHrL9iPbS+8vVqgsvX6Y5rlLsEO/jyIGyN4RIepXkXmotxPEuGHKw+5+MUr+4e
+nzcHe6/f1gMUVQV1iGupAD78Mby3fBL9bao0b1PoBqu5y+eY/JBILKQv6R9UFDl3
+xK6zFfSk0QpwD3HySkJYAlR7JjD4rKqhEAf9YWZnvvghS40cOpkMHMA07cJzfMTS
+bRoZXhWmftv74zyB7kpki3zml7eQckDz0gIYrP0UHFhCLbQYWBzeo6acfqcCD9qA
+2Qup4pDaya/N2xYtmlyPQIz1JhGKN5lWLgN8T0hho8t/JYSzILWC2skVUchYLp6W
+CduO567GxUQqdCe5yZyL2Uy0GlY8RIGS52EgiuD5dfO17L5BIZcnZxOHpTJoxHsj
+yKUJ9LAZ86T/lFo/sjsU
+=dAV3
 -----END PGP SIGNATURE-----
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>