Re: UPDATE: security/john-jumbo
Hi,
Am Dienstag, März 05, 2019 14:44 CET, "Sebastian Reitenbach"
schrieb:
> Hi,
>
> I was in need to crack some hashes that our john-jumbo doesn't have yet.
> Since there is no new release since it was imported, I updated it to a more
> recent git checkout. It's from beginning of February, since then, it works
> for me. Of the >400 tests, ran on amd64 and i386, one fails sometimes, other
> than that, it works quite well for me. While here, take MAINTAINER.
>
> any comments, rants, suggestions, or tests, or even OKs welcome.
>
anyone? Updated patch now with a newer checkout.
cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/security/john-jumbo/Makefile,v
retrieving revision 1.20
diff -u -p -u -r1.20 Makefile
--- Makefile18 Nov 2018 21:09:47 - 1.20
+++ Makefile22 Mar 2019 09:22:44 -
@@ -5,27 +5,27 @@ BROKEN-alpha =DES_bs.c:173: internal co
FIX_EXTRACT_PERMISSIONS=Yes
V =1.8.0
-JV = 1
-REVISION = 3
-EXTRACT_SUFX = .tar.xz
+JV = 1.20190321
DISTNAME = john-$V-jumbo-${JV}
PKGNAME = john-jumbo-$V.${JV}
+GH_ACCOUNT = magnumripper
+GH_PROJECT = JohnTheRipper
+GH_COMMIT =6e8096ccdb4d2dbf00aa85da370f9e8524f306a2
CATEGORIES = security
-HOMEPAGE = http://www.openwall.com/john/
+HOMEPAGE = https://www.openwall.com/john/
+MAINTAINER = Sebastian Reitenbach
# files from various authors; see license review txt file
PERMIT_PACKAGE_CDROM = see doc/john-1.7.9-jumbo-7-licensing.txt
PERMIT_PACKAGE_FTP = Yes
-WANTLIB += c crypto m nspr4 nss3 pcap plc4 plds4 pthread smime3
-WANTLIB += nssutil3 sqlite3 ssl ssl3 z
+WANTLIB += c crypto m nspr4 nss3 pcap plc4 plds4 smime3
+WANTLIB += nssutil3 ssl ssl3 z
-MASTER_SITES = http://www.openwall.com/john/j/
-LIB_DEPENDS = databases/sqlite3 \
- security/nss
+LIB_DEPENDS = security/nss
USE_GMAKE =Yes
MAKE_FILE =Makefile.legacy
@@ -69,17 +69,18 @@ ALL_TARGET= openbsd-sparc64
ALL_TARGET=generic
.endif
-BINS += SIPdump calc_stat cprepair genmkvpwd luks2john makechr
-BINS += mkvcalcproba raw2dyna tgtsnarf uaf2john vncpcap2john wpapcap2john
+BINS += SIPdump calc_stat cprepair genmkvpwd hccap2john makechr mkvcalcproba
+BINS += racf2john raw2dyna relbench stats tgtsnarf uaf2john vncpcap2john
wpapcap2john
do-configure:
perl -pi -e 's,\$$JOHN/john.conf,${SYSCONFDIR}/john.conf,'
${WRKSRC}/params.h
rm ${WRKSRC}/KRB4_*_plug.c # no old DES API support in LibreSSL
- rm ${WRKSRC}/rawSHA0_fmt_plug.c # no SHA-0 support in LibreSSL
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/john
+ ${INSTALL_DATA_DIR} ${PREFIX}/libdata/perl5/site_perl
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/john
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/john/rules
${INSTALL_PROGRAM} ${WRKDIST}/run/john ${PREFIX}/bin
cd ${WRKDIST}/run; ${INSTALL_PROGRAM} ${BINS} ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKDIST}/run/mailer \
@@ -88,6 +89,10 @@ do-install:
ln -sf john ${PREFIX}/bin/`basename $$i`; done
${INSTALL_DATA} ${WRKDIST}/run/*.{chr,conf,lst} \
${PREFIX}/share/examples/john
+ ${INSTALL_DATA} ${WRKDIST}/run/rules/*.rule \
+ ${PREFIX}/share/examples/john/rules/
+ ${INSTALL_DATA} ${WRKDIST}/run/lib/*.pm \
+ ${PREFIX}/libdata/perl5/site_perl/
${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
# not using TEST_TARGET as it gets confused by the quotes in CFLAGS
Index: distinfo
===
RCS file: /cvs/ports/security/john-jumbo/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo16 Jan 2015 15:40:01 - 1.3
+++ distinfo22 Mar 2019 09:22:44 -
@@ -1,2 +1,2 @@
-SHA256 (john-1.8.0-jumbo-1.tar.xz) =
usk9AlmVoFHwVa29fOLxl1Z2ysbHSmx6PuTP3ZwWCSM=
-SIZE (john-1.8.0-jumbo-1.tar.xz) = 23232492
+SHA256 (john-1.8.0-jumbo-1.20190321-6e8096cc.tar.gz) =
jiZPuEunkAui6+Yyk3VrtZY1LsmrGi4YfLQTvoTcoOY=
+SIZE (john-1.8.0-jumbo-1.20190321-6e8096cc.tar.gz) = 47181582
Index: patches/patch-src_Makefile_legacy
===
RCS file: /cvs/ports/security/john-jumbo/patches/patch-src_Makefile_legacy,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-src_Makefile_legacy
--- patches/patch-src_Makefile_legacy 24 Apr 2018 18:10:55 - 1.2
+++ patches/patch-src_Makefile_legacy 22 Mar 2019 09:22:44 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_Makefile_legacy,v 1.
Index: src/Makefile.legacy
--- src/Makefile.legacy.orig
+++ src/Makefile.legacy
-@@ -1073,11 +1073,9 @@ openbsd-alpha:
+@@ -916,11 +916,9 @@ openbsd-alpha:
openbsd-sparc64:
$(LN) sparc64.h arch.h
@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
@@ -16,7 +16,7 @@ Index:
UPDATE: security/john-jumbo
Hi,
I was in need to crack some hashes that our john-jumbo doesn't have yet. Since
there is no new release since it was imported, I updated it to a more recent
git checkout. It's from beginning of February, since then, it works for me. Of
the >400 tests, ran on amd64 and i386, one fails sometimes, other than that, it
works quite well for me. While here, take MAINTAINER.
any comments, rants, suggestions, or tests, or even OKs welcome.
cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/security/john-jumbo/Makefile,v
retrieving revision 1.20
diff -u -p -u -r1.20 Makefile
--- Makefile18 Nov 2018 21:09:47 - 1.20
+++ Makefile5 Mar 2019 09:23:00 -
@@ -5,27 +5,27 @@ BROKEN-alpha =DES_bs.c:173: internal co
FIX_EXTRACT_PERMISSIONS=Yes
V =1.8.0
-JV = 1
-REVISION = 3
-EXTRACT_SUFX = .tar.xz
+JV = 1.20190201
DISTNAME = john-$V-jumbo-${JV}
PKGNAME = john-jumbo-$V.${JV}
+GH_ACCOUNT = magnumripper
+GH_PROJECT = JohnTheRipper
+GH_COMMIT =1f1a862e852a07d71d364f045a7fb2525b48a8b7
CATEGORIES = security
-HOMEPAGE = http://www.openwall.com/john/
+HOMEPAGE = https://www.openwall.com/john/
+MAINTAINER = Sebastian Reitenbach
# files from various authors; see license review txt file
PERMIT_PACKAGE_CDROM = see doc/john-1.7.9-jumbo-7-licensing.txt
PERMIT_PACKAGE_FTP = Yes
-WANTLIB += c crypto m nspr4 nss3 pcap plc4 plds4 pthread smime3
-WANTLIB += nssutil3 sqlite3 ssl ssl3 z
+WANTLIB += c crypto m nspr4 nss3 pcap plc4 plds4 smime3
+WANTLIB += nssutil3 ssl ssl3 z
-MASTER_SITES = http://www.openwall.com/john/j/
-LIB_DEPENDS = databases/sqlite3 \
- security/nss
+LIB_DEPENDS = security/nss
USE_GMAKE =Yes
MAKE_FILE =Makefile.legacy
@@ -69,17 +69,18 @@ ALL_TARGET= openbsd-sparc64
ALL_TARGET=generic
.endif
-BINS += SIPdump calc_stat cprepair genmkvpwd luks2john makechr
-BINS += mkvcalcproba raw2dyna tgtsnarf uaf2john vncpcap2john wpapcap2john
+BINS += SIPdump calc_stat cprepair genmkvpwd hccap2john makechr mkvcalcproba
+BINS += racf2john raw2dyna relbench stats tgtsnarf uaf2john vncpcap2john
wpapcap2john
do-configure:
perl -pi -e 's,\$$JOHN/john.conf,${SYSCONFDIR}/john.conf,'
${WRKSRC}/params.h
rm ${WRKSRC}/KRB4_*_plug.c # no old DES API support in LibreSSL
- rm ${WRKSRC}/rawSHA0_fmt_plug.c # no SHA-0 support in LibreSSL
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/john
+ ${INSTALL_DATA_DIR} ${PREFIX}/libdata/perl5/site_perl
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/john
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/john/rules
${INSTALL_PROGRAM} ${WRKDIST}/run/john ${PREFIX}/bin
cd ${WRKDIST}/run; ${INSTALL_PROGRAM} ${BINS} ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKDIST}/run/mailer \
@@ -88,6 +89,10 @@ do-install:
ln -sf john ${PREFIX}/bin/`basename $$i`; done
${INSTALL_DATA} ${WRKDIST}/run/*.{chr,conf,lst} \
${PREFIX}/share/examples/john
+ ${INSTALL_DATA} ${WRKDIST}/run/rules/*.rule \
+ ${PREFIX}/share/examples/john/rules/
+ ${INSTALL_DATA} ${WRKDIST}/run/lib/*.pm \
+ ${PREFIX}/libdata/perl5/site_perl/
${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
# not using TEST_TARGET as it gets confused by the quotes in CFLAGS
Index: distinfo
===
RCS file: /cvs/ports/security/john-jumbo/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo16 Jan 2015 15:40:01 - 1.3
+++ distinfo5 Mar 2019 09:23:00 -
@@ -1,2 +1,2 @@
-SHA256 (john-1.8.0-jumbo-1.tar.xz) =
usk9AlmVoFHwVa29fOLxl1Z2ysbHSmx6PuTP3ZwWCSM=
-SIZE (john-1.8.0-jumbo-1.tar.xz) = 23232492
+SHA256 (john-1.8.0-jumbo-1.20190201-1f1a862e.tar.gz) =
WE5iCKJYfjBzIUUOoRT+Xi8OoCeYAmG/xP0IA3GEF48=
+SIZE (john-1.8.0-jumbo-1.20190201-1f1a862e.tar.gz) = 47113844
Index: patches/patch-src_Makefile_legacy
===
RCS file: /cvs/ports/security/john-jumbo/patches/patch-src_Makefile_legacy,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-src_Makefile_legacy
--- patches/patch-src_Makefile_legacy 24 Apr 2018 18:10:55 - 1.2
+++ patches/patch-src_Makefile_legacy 5 Mar 2019 09:23:00 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_Makefile_legacy,v 1.
Index: src/Makefile.legacy
--- src/Makefile.legacy.orig
+++ src/Makefile.legacy
-@@ -1073,11 +1073,9 @@ openbsd-alpha:
+@@ -916,11 +916,9 @@ openbsd-alpha:
openbsd-sparc64:
$(LN) sparc64.h arch.h
@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
@@ -16,7 +16,7 @@ Index: src/Makefile.legacy
@echo "All done"
openbsd-sparc:
-@@ -1922,7 +1920,7 @@ generic: generic.h
+@@ -1658,7 +1656,7 @@ generic: generic.h
