diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/john/Makefile | 4 | ||||
| -rw-r--r-- | security/john/distinfo | 12 | ||||
| -rw-r--r-- | security/john/patches/patch-aa | 40 | ||||
| -rw-r--r-- | security/john/patches/patch-ab | 12 |
4 files changed, 28 insertions, 40 deletions
diff --git a/security/john/Makefile b/security/john/Makefile index 08404a11be3..e07a90707be 100644 --- a/security/john/Makefile +++ b/security/john/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2009/08/06 19:14:52 zafer Exp $ +# $NetBSD: Makefile,v 1.18 2010/12/13 10:32:35 wiz Exp $ # -DISTNAME= john-1.7.3.1 +DISTNAME= john-1.7.6 CATEGORIES= security textproc MASTER_SITES= http://www.openwall.com/john/g/ diff --git a/security/john/distinfo b/security/john/distinfo index 42e3e319f7f..fde3530eb1a 100644 --- a/security/john/distinfo +++ b/security/john/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.11 2009/11/05 19:16:47 tez Exp $ +$NetBSD: distinfo,v 1.12 2010/12/13 10:32:35 wiz Exp $ -SHA1 (john-1.7.3.1.tar.gz) = 29a283933219dabe0f363618a0c8a083e79e6748 -RMD160 (john-1.7.3.1.tar.gz) = c810466241889f307c0e7096bcdd4fb39d8638ca -Size (john-1.7.3.1.tar.gz) = 814903 bytes -SHA1 (patch-aa) = a12e01816bdf586ea53c6a1504c1afea8f148474 -SHA1 (patch-ab) = 331fa2333860879edabdbf1beeb3323d303406ec +SHA1 (john-1.7.6.tar.gz) = da0b6298e6e045606d48880df045096e8bc87fcb +RMD160 (john-1.7.6.tar.gz) = 294fa9a381b45df6fda6e537bc920e74c1d966b0 +Size (john-1.7.6.tar.gz) = 832790 bytes +SHA1 (patch-aa) = c7f027cec0ee565312fd4417ded8fe43005b01d1 +SHA1 (patch-ab) = 4f8c9e1bba14f64b651c6d08337f004a3e278e44 diff --git a/security/john/patches/patch-aa b/security/john/patches/patch-aa index fefaa499685..6bb222b575b 100644 --- a/security/john/patches/patch-aa +++ b/security/john/patches/patch-aa @@ -1,32 +1,20 @@ -$NetBSD: patch-aa,v 1.7 2009/11/05 19:16:47 tez Exp $ +$NetBSD: patch-aa,v 1.8 2010/12/13 10:32:35 wiz Exp $ ---- src/Makefile.orig 2008-07-17 20:28:55.000000000 -0500 -+++ src/Makefile 2009-11-05 13:04:49.538488300 -0600 -@@ -15,11 +15,11 @@ - PERL = perl - NULL = /dev/null - CPPFLAGS = -E --CFLAGS = -c -Wall -O2 -fomit-frame-pointer -+CFLAGS = -c - ASFLAGS = -c --LDFLAGS = -s +--- src/Makefile.orig 2010-06-13 21:12:37.000000000 +0000 ++++ src/Makefile +@@ -19,11 +19,11 @@ OMPFLAGS = + #OMPFLAGS = -fopenmp + # Sun Studio with OpenMP (set the OMP_NUM_THREADS env var at runtime) + #OMPFLAGS = -xopenmp +-CFLAGS = -c -Wall -O2 -fomit-frame-pointer $(OMPFLAGS) ++CFLAGS = -c $(OMPFLAGS) + ASFLAGS = -c $(OMPFLAGS) +-LDFLAGS = -s $(OMPFLAGS) -OPT_NORMAL = -funroll-loops -OPT_INLINE = -finline-functions -+LDFLAGS += -s ++LDFLAGS += -s $(OMPFLAGS) +OPT_NORMAL = +OPT_INLINE = - JOHN_OBJS_MINIMAL = \ - DES_fmt.o DES_std.o DES_bs.o \ -@@ -396,7 +396,10 @@ - $(MAKE) solaris-sparc-any HAMMER=use-solaris-sparcv8-cc - - solaris-sparc-gcc: -- $(MAKE) solaris-sparc-any HAMMER=use-solaris-sparc-gcc -+ $(LN) sparc32.h arch.h -+ $(MAKE) $(PROJ) \ -+ CFLAGS="$(CFLAGS) -m32" \ -+ LDFLAGS="$(LDFLAGS) -m32 -lrt" - - use-solaris-sparcv9-cc: - $(MAKE) $(NAIL) \ + JOHN_OBJS = \ + DES_fmt.o DES_std.o DES_bs.o DES_bs_b.o \ diff --git a/security/john/patches/patch-ab b/security/john/patches/patch-ab index d218b52ce82..440db43d2a7 100644 --- a/security/john/patches/patch-ab +++ b/security/john/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2006/03/14 10:17:25 martti Exp $ +$NetBSD: patch-ab,v 1.2 2010/12/13 10:32:35 wiz Exp $ ---- src/params.h.orig 2006-03-14 09:16:37.000000000 +0200 -+++ src/params.h 2006-03-14 09:21:51.000000000 +0200 -@@ -49,15 +49,15 @@ +--- src/params.h.orig 2010-06-14 02:38:55.000000000 +0000 ++++ src/params.h +@@ -51,15 +51,15 @@ * notes above. */ #ifndef JOHN_SYSTEMWIDE @@ -21,7 +21,7 @@ $NetBSD: patch-ab,v 1.1 2006/03/14 10:17:25 martti Exp $ #endif #define JOHN_PRIVATE_HOME "~/.john" #endif -@@ -101,8 +101,8 @@ +@@ -103,8 +103,8 @@ /* * File names. */ @@ -32,7 +32,7 @@ $NetBSD: patch-ab,v 1.1 2006/03/14 10:17:25 martti Exp $ #if JOHN_SYSTEMWIDE #define CFG_PRIVATE_FULL_NAME JOHN_PRIVATE_HOME "/john.conf" #define CFG_PRIVATE_ALT_NAME JOHN_PRIVATE_HOME "/john.ini" -@@ -116,7 +116,7 @@ +@@ -118,7 +118,7 @@ #endif #define LOG_SUFFIX ".log" #define RECOVERY_SUFFIX ".rec" |