Removed two unnecessary patches wrt 340194.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 7 insertions, 57 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 9ac9f1ea8c9b..52a2be1cc3cd 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.115 2010/08/14 10:46:42 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.116 2010/10/08 22:08:43 c1pher Exp $
+
+  08 Oct 2010; Dane Smith <c1pher@gentoo.org>
+  -files/johntheripper-1.7.2-params.h.patch,
+  -files/johntheripper-1.7.2-stripping.patch:
+  Removed unnecessary patches wrt #340194. Thanks jalan for reporting.
 
   14 Aug 2010; Harald van Dijk <truedfx@gentoo.org>
   johntheripper-1.7.4.2.ebuild:
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 85d890b60fd5..ce4e67ed2f1f 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,12 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX johntheripper-1.7.2-mkdir-sandbox.patch 554 RMD160 2dfa6d0e912d15ac6205ea89450a0a43c90e563b SHA1 5cd63044c33774f795f32184c486b88df9bb6fc1 SHA256 ced75f4476fc2fe412f630083a5be1102fbbd5ceafc2f34d703cccefdc03e588
-AUX johntheripper-1.7.2-params.h.patch 526 RMD160 f32582a6bfb5a4a2c8b1813d81dfd065d7f46cbf SHA1 030450dafbbc613aff20fd28e230bd35ecf05cd3 SHA256 fc050acd68ce5f7f79312c0dc54a110c92f074c908ec32394baaf0b172b7d611
 AUX johntheripper-1.7.2-sha1-memset.patch 388 RMD160 71190df1e84e543eef49e95391596280d01b3601 SHA1 ec901d34075b32d515993a1918089e29084d234f SHA256 eb5a126c521b34dea476deccf4afe20816ccc861b41910dda7dd5e3625f75028
 AUX johntheripper-1.7.2-stackdef-2.S.patch 363 RMD160 dfb0912bcff9ded13a50ccc153448423c0f00831 SHA1 ea3b75eb936adc98ebfe41650f608173b6b272f9 SHA256 9ce4d1e7ee1440208a7b8ed48fd4270c558772df10d3b2bb8ecaffc26152a073
 AUX johntheripper-1.7.2-stackdef.S.patch 1845 RMD160 947aa7be3186c13f87b35e2bbd1bd63f28c5e1a9 SHA1 705a85daf7a65b9b0908b638144c4eaae2ee7316 SHA256 952f076de0eef22db086864ca95e84aab16eb5fcb7035cb3d9c23340b3e2311f
-AUX johntheripper-1.7.2-stripping.patch 840 RMD160 9001329b0fcda4ed244c746cdd6dc2d5bde9ae94 SHA1 e60f41af985f12a431b9c272e3964d166d552782 SHA256 e2b989facd64aa1634de13df5a76c3c5579ad90d75a4af63f68b5ad970eca0b8
 AUX johntheripper-1.7.3.1-all-5-stackdef.S.patch 668 RMD160 77560c448ab9586cb51da3009ce25b0babab9c9e SHA1 2d7e3c97405e793193378577149fd0ef311b20e7 SHA256 b307f7c76f0baa2441e53da4f0db9c90fdaef06f3f7b34080513d518ba8b5890
 AUX johntheripper-1.7.3.1-cflags.patch 2215 RMD160 86e02a71dad29cdb59190b3e5fa6bdb8aa476a72 SHA1 9e346f2e7886ea405e937185bb897096d7c98308 SHA256 b734db5141aed15574c8e2f8e9b476cb17fd2f7753c7cf7d6695b8d4b7cb10e0
 AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 RMD160 10fa90b61b07aa902bd88d14eed38be2b66573bf SHA1 1f4520d3e339b853dc480cd6e3a4956aa878a15f SHA256 9bf9577ed74048b4df82bc6fcf546469e07c93d27de438dd3aa36b5b360b27f0
@@ -32,12 +27,5 @@ EBUILD johntheripper-1.7.3.1-r1.ebuild 3802 RMD160 cd748e97576a721d12c02cde6eed2
 EBUILD johntheripper-1.7.3.1.ebuild 3991 RMD160 339f70feb161e7bc6e5716cd02c99a77e8a9ed1a SHA1 f20d2ae314093f270393814abc7dba0a245d3e0d SHA256 249101538909c1a303923662c360c44e5eb0ac99069b8744674bbf2e62f5f812
 EBUILD johntheripper-1.7.3.4.ebuild 3735 RMD160 5267feff38ecbaa90d01eb0da95595e5b3873e63 SHA1 b52b728619943229ebcfe4de336484b4b2f83f5a SHA256 108b17217b5aa0d801077cdc2a35c448c9b8b5cc58f879961ce8a2363b6cc19b
 EBUILD johntheripper-1.7.4.2.ebuild 3765 RMD160 b75a724991f5bd390beafacd304a36ac95c4d574 SHA1 1c865c064aed90a8e86c3ff9b22db6766047029f SHA256 d7ac7825f96b5cca459037a7d2baa800444e00fc8cf8c18767513e057c43b1cf
-MISC ChangeLog 18340 RMD160 5ada2cac6cde7d6ec486dc40c69af4be19bd01c3 SHA1 561e020a4f72d339b8087122d4aab86745f59ad3 SHA256 3bc081d2293d4e6ad376a258fe797e749c4f2e276ac629879653140f92dd3dcd
+MISC ChangeLog 18548 RMD160 37391879a39f971bcbf15d43ab0c5867c5445062 SHA1 c7e98c8539a91c3191884a56eee394c13f1ae908 SHA256 f6cd7ade1aeec77d1d235c932e91aa114d9595bb99c1e80c672c9018b33d4765
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxmdK8ACgkQwnQyISwouHwcgwCgrhV4p+PzwHtpTIMgh7vybv2y
-IRoAoJx1PPqseE5neKowrdckrdYRa+uZ
-=ht8t
------END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-params.h.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-params.h.patch
deleted file mode 100644
index 04d22015e8a8..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.2-params.h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: john-1.7.2/src/params.h
-===================================================================
---- john-1.7.2.orig/src/params.h
-+++ john-1.7.2/src/params.h
-@@ -101,8 +101,8 @@
- /*
-  * File names.
-  */
--#define CFG_FULL_NAME			"$JOHN/john.conf"
--#define CFG_ALT_NAME			"$JOHN/john.ini"
-+#define CFG_FULL_NAME			"/etc/john/john.conf"
-+#define CFG_ALT_NAME			"/etc/john/john.ini"
- #if JOHN_SYSTEMWIDE
- #define CFG_PRIVATE_FULL_NAME		JOHN_PRIVATE_HOME "/john.conf"
- #define CFG_PRIVATE_ALT_NAME		JOHN_PRIVATE_HOME "/john.ini"
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-stripping.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-stripping.patch
deleted file mode 100644
index 8c1afb19eec9..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.2-stripping.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: john-1.7.2/src/Makefile
-===================================================================
---- john-1.7.2.orig/src/Makefile
-+++ john-1.7.2/src/Makefile
-@@ -718,23 +718,18 @@ john.com: john.asm
- 
- ../run/john.exe: $(JOHN_OBJS)
- 	$(LD) $(JOHN_OBJS) -lkernel32 -o ../run/john.exe
--	strip ../run/john.exe
- 
- ../run/unshadow.exe: symlink.c
- 	$(CC) symlink.c -o ../run/unshadow.exe
--	strip ../run/unshadow.exe
- 
- ../run/unafs.exe: symlink.c
- 	$(CC) symlink.c -o ../run/unafs.exe
--	strip ../run/unafs.exe
- 
- ../run/undrop.exe: symlink.c
- 	$(CC) symlink.c -o ../run/undrop.exe
--	strip ../run/undrop.exe
- 
- ../run/unique.exe: symlink.c
- 	$(CC) symlink.c -o ../run/unique.exe
--	strip ../run/unique.exe
- 
- # Inlining the S-boxes produces faster code, as long as they fit in the cache
- # (that is, on RISC with at least 8 KB of L1 code cache).