summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDane Smith <c1pher@gentoo.org>2010-10-08 22:08:43 +0000
committerDane Smith <c1pher@gentoo.org>2010-10-08 22:08:43 +0000
commit4fc0bbb3ed5aef81030a60883e8944af8e82e471 (patch)
treedf99c7ca9806aaaa03ac80a78d974ed6b5ad4699 /app-crypt
parentVersion bump. (diff)
downloadgentoo-2-4fc0bbb3ed5aef81030a60883e8944af8e82e471.tar.gz
gentoo-2-4fc0bbb3ed5aef81030a60883e8944af8e82e471.tar.bz2
gentoo-2-4fc0bbb3ed5aef81030a60883e8944af8e82e471.zip
Removed two unnecessary patches wrt 340194.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/johntheripper/ChangeLog7
-rw-r--r--app-crypt/johntheripper/files/johntheripper-1.7.2-params.h.patch15
-rw-r--r--app-crypt/johntheripper/files/johntheripper-1.7.2-stripping.patch28
3 files changed, 6 insertions, 44 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/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).