Hi, This diff updates aide to the latest release 1.7.6. Tested on amd64/sparc64.
Comments ? OK ? Cheers, benoit
Index: Makefile =================================================================== RCS file: /cvs/ports/security/john/Makefile,v retrieving revision 1.39 diff -u -r1.39 Makefile --- Makefile 24 Sep 2009 10:32:40 -0000 1.39 +++ Makefile 17 Jul 2010 10:35:28 -0000 @@ -2,7 +2,7 @@ COMMENT = extremely fast password cracker -DISTNAME = john-1.7.3.4 +DISTNAME = john-1.7.6 CATEGORIES = security HOMEPAGE = http://www.openwall.com/john/ @@ -49,11 +49,7 @@ .endif do-configure: - @perl -pi -e "s,%%PREFIX%%,${PREFIX},;" \ - -e "s,%%SYSCONFDIR%%,${SYSCONFDIR},;" ${WRKSRC}/params.h - - @perl -pi -e 's,%%JOHN%%,${PREFIX}\/share\/john,g;' \ - ${WRKDIST}/run/john.conf + ${SUBST_CMD} ${WRKSRC}/params.h do-install: @grep -h -v '^#!comment:' ${WRKDIST}/run/password.lst \ Index: distinfo =================================================================== RCS file: /cvs/ports/security/john/distinfo,v retrieving revision 1.12 diff -u -r1.12 distinfo --- distinfo 24 Sep 2009 10:32:40 -0000 1.12 +++ distinfo 17 Jul 2010 10:35:28 -0000 @@ -1,5 +1,5 @@ -MD5 (john-1.7.3.4.tar.gz) = uAVbUwdmka3XenF3IeixcA== -RMD160 (john-1.7.3.4.tar.gz) = l1EWBZom5wMM3VcxCdrjaBIWBUM= -SHA1 (john-1.7.3.4.tar.gz) = n9MnQWGIxAXUknoy8ajnVrSiWeE= -SHA256 (john-1.7.3.4.tar.gz) = AXk2oqmOCkvOxWxTF35O6PUV69Xjn9l+VbGWIHbrXRY= -SIZE (john-1.7.3.4.tar.gz) = 816259 +MD5 (john-1.7.6.tar.gz) = zh3/xuNHkGIF0UxNaiEEkQ== +RMD160 (john-1.7.6.tar.gz) = KU+po4G0Xfb9puU3vJIOdMHZZrA= +SHA1 (john-1.7.6.tar.gz) = 2gtimObgRWBtSIgN8EUJbovIf8s= +SHA256 (john-1.7.6.tar.gz) = d+RNBo0xdkjEHTrGG46h3xjVx0AQg+ek9mgYFpAMGnM= +SIZE (john-1.7.6.tar.gz) = 832790 Index: patches/patch-src_Makefile =================================================================== RCS file: /cvs/ports/security/john/patches/patch-src_Makefile,v retrieving revision 1.5 diff -u -r1.5 patch-src_Makefile --- patches/patch-src_Makefile 24 Sep 2009 10:32:42 -0000 1.5 +++ patches/patch-src_Makefile 17 Jul 2010 10:35:28 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_Makefile,v 1.5 2009/09/24 10:32:42 benoit Exp $ ---- src/Makefile.orig Wed Sep 9 06:17:35 2009 -+++ src/Makefile Mon Sep 21 09:43:21 2009 -@@ -268,7 +268,7 @@ freebsd-x86-any-a.out: +$OpenBSD$ +--- src/Makefile.orig Sun Jun 13 23:12:37 2010 ++++ src/Makefile Sat Jul 17 12:27:56 2010 +@@ -279,7 +279,7 @@ $(LN) x86-any.h arch.h $(MAKE) $(PROJ) \ JOHN_OBJS="$(JOHN_OBJS) x86.o" \ @@ -10,12 +10,12 @@ freebsd-alpha: $(LN) alpha.h arch.h -@@ -336,7 +336,7 @@ use-openbsd-sparc-a.out: - $(MAKE) $(NAIL) \ - BENCH_DES_OBJS_DEPEND="$(BENCH_DES_OBJS_ORIG) sparc.o" \ - JOHN_OBJS="$(JOHN_OBJS_ORIG) sparc.o" \ -- ASFLAGS="-c -DUNDERSCORES -DBSD" -+ ASFLAGS="-c -DBSD" +@@ -313,7 +313,7 @@ + $(LN) x86-any.h arch.h + $(MAKE) $(PROJ) \ + JOHN_OBJS="$(JOHN_OBJS) x86.o" \ +- ASFLAGS="$(ASFLAGS) -DUNDERSCORES -DALIGN_LOG -DBSD" ++ ASFLAGS="$(ASFLAGS) -DALIGN_LOG -DBSD" - openbsd-ppc32: - $(LN) ppc32.h arch.h + openbsd-alpha: + $(LN) alpha.h arch.h Index: patches/patch-src_params_h =================================================================== RCS file: /cvs/ports/security/john/patches/patch-src_params_h,v retrieving revision 1.6 diff -u -r1.6 patch-src_params_h --- patches/patch-src_params_h 24 Sep 2009 10:32:42 -0000 1.6 +++ patches/patch-src_params_h 17 Jul 2010 10:35:28 -0000 @@ -12,11 +12,11 @@ #if JOHN_SYSTEMWIDE #ifndef JOHN_SYSTEMWIDE_EXEC /* please refer to the notes above */ -#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john" -+#define JOHN_SYSTEMWIDE_EXEC "%%PREFIX%%/bin/john" ++#define JOHN_SYSTEMWIDE_EXEC "${PREFIX}/bin/john" #endif #ifndef JOHN_SYSTEMWIDE_HOME -#define JOHN_SYSTEMWIDE_HOME "/usr/share/john" -+#define JOHN_SYSTEMWIDE_HOME "%%PREFIX%%/share/john" ++#define JOHN_SYSTEMWIDE_HOME "${PREFIX}/share/john" #endif #define JOHN_PRIVATE_HOME "~/.john" #endif @@ -25,7 +25,7 @@ * File names. */ -#define CFG_FULL_NAME "$JOHN/john.conf" -+#define CFG_FULL_NAME "%%SYSCONFDIR%%/john.conf" ++#define CFG_FULL_NAME "${SYSCONFDIR}/john.conf" #define CFG_ALT_NAME "$JOHN/john.ini" #if JOHN_SYSTEMWIDE #define CFG_PRIVATE_FULL_NAME JOHN_PRIVATE_HOME "/john.conf"
