update to john 1.6.38
from Alexandre Anriot <aanriot at atlantilde.com> clean up while here and add sparc64 target
This commit is contained in:
sturm
parent
a995aae6f8
commit
f45f162602
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.28 2004/12/27 13:28:34 alek Exp $
|
||||
# $OpenBSD: Makefile,v 1.29 2005/05/31 08:08:52 sturm Exp $
|
||||
|
||||
COMMENT= "extremely fast password cracker"
|
||||
|
||||
DISTNAME= john-1.6.37
|
||||
DISTNAME= john-1.6.38
|
||||
CATEGORIES= security
|
||||
|
||||
HOMEPAGE= http://www.openwall.com/john/
|
||||
@ -14,16 +14,11 @@ PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= c m
|
||||
|
||||
MASTER_SITES= ${HOMEPAGE}a/
|
||||
|
||||
DISTFILES= ${DISTNAME}.tar.gz \
|
||||
john-1.6.tar.gz
|
||||
MASTER_SITES= ${HOMEPAGE}c/
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
WRKDIST= ${WRKDIR}/${DISTNAME}
|
||||
WRKSRC= ${WRKDIST}/src
|
||||
OLDJOHN= ${WRKDIR}/john-1.6
|
||||
MAKE_FLAGS= CC=${CC} AS=${CC} LD=${CC} \
|
||||
CFLAGS="${CFLAGS} -c"
|
||||
|
||||
@ -42,23 +37,31 @@ ALL_TARGET= openbsd-vax
|
||||
.elif ${MACHINE_ARCH} == "alpha"
|
||||
ALL_TARGET= linux-alpha
|
||||
.elif ${MACHINE_ARCH} == "powerpc"
|
||||
ALL_TARGET= linux-ppc
|
||||
ALL_TARGET= linux-ppc32
|
||||
.elif ${MACHINE_ARCH} == "powerpc64"
|
||||
ALL_TARGET= linux-ppc64
|
||||
.elif ${MACHINE_ARCH} == "hppa"
|
||||
ALL_TARGET= hpux-pa-risc-${CC}
|
||||
.elif ${MACHINE_ARCH} == "sparc64"
|
||||
ALL_TARGET= "openbsd-sparc64"
|
||||
.else
|
||||
ALL_TARGET= generic
|
||||
.endif
|
||||
|
||||
do-configure:
|
||||
@perl -pi -e "s,%%PREFIX%%,${PREFIX},;" \
|
||||
-e "s,%%SYSCONFDIR%%,${SYSCONFDIR},;" ${WRKSRC}/params.h
|
||||
|
||||
do-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/john
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/john
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/john
|
||||
${INSTALL_PROGRAM} ${WRKDIST}/run/john ${PREFIX}/bin
|
||||
${INSTALL_SCRIPT} ${WRKDIST}/run/mailer ${PREFIX}/bin
|
||||
@cd ${PREFIX}/bin && \
|
||||
ln -sf john unshadow && \
|
||||
ln -sf john unafs && \
|
||||
ln -sf john unique
|
||||
${INSTALL_DATA} ${OLDJOHN}/run/* ${PREFIX}/share/john
|
||||
${INSTALL_DATA} ${WRKDIST}/run/* ${PREFIX}/share/john
|
||||
${INSTALL_DATA} ${OLDJOHN}/doc/* ${PREFIX}/share/doc/john
|
||||
${INSTALL_DATA} ${WRKDIST}/run/john.conf ${PREFIX}/share/examples/john
|
||||
${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,8 +1,4 @@
|
||||
MD5 (john-1.6.37.tar.gz) = 9403233b640927295c05b0564ff1f678
|
||||
MD5 (john-1.6.tar.gz) = aae782f160041b2bdc624b0a84054e32
|
||||
RMD160 (john-1.6.37.tar.gz) = 5b46808845242a3e740469a5b9487c4637e838c2
|
||||
RMD160 (john-1.6.tar.gz) = 5a34e7f57b190313cc0773e996f6eed74f28d160
|
||||
SHA1 (john-1.6.37.tar.gz) = c85ebeb21939bfa79ec0e65cefebb42197251fb6
|
||||
SHA1 (john-1.6.tar.gz) = b49d371496b8ba5e439665b83190b1e4d4640bea
|
||||
SIZE (john-1.6.37.tar.gz) = 139372
|
||||
SIZE (john-1.6.tar.gz) = 497341
|
||||
MD5 (john-1.6.38.tar.gz) = cad2877bc4d0e54c3863f5e7d1143fc6
|
||||
RMD160 (john-1.6.38.tar.gz) = b8482d33b739c036784e70d8d7a403db15df8bf0
|
||||
SHA1 (john-1.6.38.tar.gz) = fd521c16646f2a486fadd7c6fbd1c9747a087f10
|
||||
SIZE (john-1.6.38.tar.gz) = 151331
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_Makefile,v 1.2 2004/09/23 21:52:08 fgsch Exp $
|
||||
--- src/Makefile.orig Sat Nov 29 23:02:25 2003
|
||||
+++ src/Makefile Thu Sep 23 18:08:15 2004
|
||||
@@ -16,7 +16,7 @@ NULL = /dev/null
|
||||
$OpenBSD: patch-src_Makefile,v 1.3 2005/05/31 08:08:52 sturm Exp $
|
||||
--- src/Makefile.orig Wed May 4 19:49:31 2005
|
||||
+++ src/Makefile Tue May 31 09:44:24 2005
|
||||
@@ -17,7 +17,7 @@ NULL = /dev/null
|
||||
CPPFLAGS = -E
|
||||
CFLAGS = -c -Wall -O2 -fomit-frame-pointer
|
||||
ASFLAGS = -c
|
||||
@ -10,17 +10,7 @@ $OpenBSD: patch-src_Makefile,v 1.2 2004/09/23 21:52:08 fgsch Exp $
|
||||
OPT_NORMAL = -funroll-loops
|
||||
OPT_INLINE = -finline-functions
|
||||
|
||||
@@ -204,11 +204,17 @@ openbsd-x86-any-elf:
|
||||
JOHN_OBJS="$(JOHN_OBJS) x86.o" \
|
||||
ASFLAGS="$(ASFLAGS) -DBSD"
|
||||
|
||||
+openbsd-x86-mmx-elf:
|
||||
+ $(LN) x86-mmx.h arch.h
|
||||
+ $(MAKE) $(PROJ) \
|
||||
+ JOHN_OBJS="$(JOHN_OBJS) x86.o x86-mmx.o" \
|
||||
+ ASFLAGS="$(ASFLAGS) -DBSD"
|
||||
+
|
||||
openbsd-x86-any-a.out:
|
||||
@@ -249,7 +249,7 @@ openbsd-x86-any-a.out:
|
||||
$(LN) x86-any.h arch.h
|
||||
$(MAKE) $(PROJ) \
|
||||
JOHN_OBJS="$(JOHN_OBJS) x86.o" \
|
||||
@ -29,12 +19,18 @@ $OpenBSD: patch-src_Makefile,v 1.2 2004/09/23 21:52:08 fgsch Exp $
|
||||
|
||||
openbsd-sparc:
|
||||
$(MAKE) use-openbsd-sparc HAMMER=use-openbsd-sparc NAIL=sparc.h
|
||||
@@ -219,7 +225,7 @@ use-openbsd-sparc:
|
||||
@@ -260,7 +260,13 @@ use-openbsd-sparc:
|
||||
$(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"
|
||||
+
|
||||
+openbsd-sparc64:
|
||||
+ $(LN) sparc64.h arch.h
|
||||
+ $(MAKE) $(PROJ) \
|
||||
+ CFLAGS="$(CFLAGS) -m64 -mcpu=ultrasparc" \
|
||||
+ LDFLAGS="-m64 -s"
|
||||
|
||||
openbsd-vax:
|
||||
$(LN) vax.h arch.h
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_params_h,v 1.1 2003/09/26 17:57:38 marcm Exp $
|
||||
--- src/params.h.orig 2003-06-29 06:05:05.000000000 -0700
|
||||
+++ src/params.h 2003-07-28 01:01:23.000000000 -0700
|
||||
$OpenBSD: patch-src_params_h,v 1.2 2005/05/31 08:08:52 sturm Exp $
|
||||
--- src/params.h.orig Wed May 11 05:01:34 2005
|
||||
+++ src/params.h Tue May 31 10:01:20 2005
|
||||
@@ -22,12 +22,12 @@
|
||||
* will probably want to set this to 1 for their builds of John.
|
||||
*/
|
||||
@ -12,8 +12,8 @@ $OpenBSD: patch-src_params_h,v 1.1 2003/09/26 17:57:38 marcm Exp $
|
||||
#if JOHN_SYSTEMWIDE
|
||||
-#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john"
|
||||
-#define JOHN_SYSTEMWIDE_HOME "/usr/share/john"
|
||||
+#define JOHN_SYSTEMWIDE_EXEC "/usr/local/bin/john"
|
||||
+#define JOHN_SYSTEMWIDE_HOME "/usr/local/share/john"
|
||||
+#define JOHN_SYSTEMWIDE_EXEC "%%PREFIX%%/bin/john"
|
||||
+#define JOHN_SYSTEMWIDE_HOME "%%SYSCONFDIR%%"
|
||||
#define JOHN_PRIVATE_HOME "~/.john"
|
||||
#endif
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.6 2004/09/15 18:36:00 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.7 2005/05/31 08:08:52 sturm Exp $
|
||||
bin/john
|
||||
bin/mailer
|
||||
bin/unafs
|
||||
@ -6,29 +6,11 @@ bin/unique
|
||||
bin/unshadow
|
||||
share/doc/john/
|
||||
share/doc/john/CHANGES
|
||||
share/doc/john/CONFIG
|
||||
share/doc/john/CREDITS
|
||||
share/doc/john/EXAMPLES
|
||||
share/doc/john/EXTERNAL
|
||||
share/doc/john/FAQ
|
||||
share/doc/john/INSTALL
|
||||
share/doc/john/LICENSING
|
||||
share/doc/john/MODES
|
||||
share/doc/john/NEWS
|
||||
share/doc/john/OPTIONS
|
||||
share/doc/john/README
|
||||
share/doc/john/RULES
|
||||
share/john/
|
||||
share/john/all.chr
|
||||
share/john/alpha.chr
|
||||
share/john/digits.chr
|
||||
@comment share/john/john
|
||||
share/john/john.conf
|
||||
@comment share/john/john.conf.orig
|
||||
@comment share/john/john.ini
|
||||
share/john/lanman.chr
|
||||
@comment share/john/mailer
|
||||
@comment share/john/password.lst
|
||||
@comment share/john/unafs
|
||||
@comment share/john/unique
|
||||
@comment share/john/unshadow
|
||||
share/examples/john/
|
||||
share/examples/john/john.conf
|
||||
@sample ${SYSCONFDIR}/john.conf
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user