Index: head/security/john/Makefile =================================================================== --- head/security/john/Makefile (revision 494695) +++ head/security/john/Makefile (revision 494696) @@ -1,93 +1,96 @@ # Created by: David O'Brien # $FreeBSD$ PORTNAME= john DISTVERSION= 1.8.0-jumbo-1 PORTREVISION= 5 CATEGORIES= security MASTER_SITES= http://www.openwall.com/john/j/ \ http://mirrors.kernel.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \ http://distro.ibiblio.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \ http://gd.tuwien.ac.at/opsys/linux/openwall/projects/john/${DISTVERSION:C/-.*//}/ MAINTAINER= danfe@FreeBSD.org COMMENT= Featureful Unix password cracker LICENSE= GPLv2 BROKEN_SSL= openssl111 LIB_DEPENDS= libgmp.so:math/gmp BROKEN_aarch64= Fails to build: Cannot detect CPU architechture BROKEN_mips64= Fails to build: Cannot detect CPU architechture USES= gmake shebangfix ssl tar:xz GNU_CONFIGURE= yes CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" SHEBANG_FILES= ../run/*.pl ../run/*.rb ../run/benchmark-unify ../run/relbench WRKSRC_SUBDIR= src ALL_TARGET= default CFLAGS+= -DJOHN_SYSTEMWIDE=1 \ -DJOHN_SYSTEMWIDE_HOME=\\\"${DATADIR}\\\" \ -DJOHN_SYSTEMWIDE_EXEC=\\\"${LOCALBASE}/libexec/${PORTNAME}\\\" # We prefer -jumbo (community-enhanced) versions instead of vanilla releases # due to the sad fact that `-jumbo-???' suffixed versions *precede* official # ones per pkg_version(1) -t check. So, when Alexander rolls out new "plain" # release, just hold the horses and wait for corresponding -jumbo one, which # usually does not take too long to appear. # +# Starting from the next version, community-enhanced (jumbo) should be added +# as an optional feature, as suggested by Alexander himself. +# PORTSCOUT= limit:.*-jumbo BINARIES= calc_stat cprepair genmkvpwd john luks2john mkvcalcproba \ raw2dyna SIPdump tgtsnarf uaf2john vncpcap2john wpapcap2john BINLINKS= base64conv dmg2john gpg2john hccap2john keepass2john \ keychain2john keyring2john keystore2john kwallet2john \ - pfx2john putty2john pwsafe2john racf2john rar2john ssh2john \ + pfx2john putty2john pwsafe2john racf2john rar2john \ truecrypt_volume2john unafs undrop unique unshadow zip2john PORTDOCS= * OPTIONS_DEFINE= DOCS #OPENMP #OPENMP_USES= compiler:openmp post-patch: # Replace methods and types that were marked deprecated by OpenSSL 0.9.7 # and removed in OpenSSL 1.1.0 and LibreSSL @${REINPLACE_CMD} -e 's|des_string_to_key|DES_string_to_key|' \ ${WRKSRC}/KRB4_fmt_plug.c @${REINPLACE_CMD} -e 's|des_set_odd_parity|DES_set_odd_parity|' \ ${WRKSRC}/KRB4_std_plug.c @${REINPLACE_CMD} -e 's|C_Block|DES_cblock|' \ ${WRKSRC}/efs_fmt_plug.c \ ${WRKSRC}/gpg_fmt_plug.c \ ${WRKSRC}/keychain_fmt_plug.c \ ${WRKSRC}/mozilla_ng_fmt_plug.c \ ${WRKSRC}/opencl_gpg_fmt_plug.c \ ${WRKSRC}/opencl_keychain_fmt_plug.c \ ${WRKSRC}/ssh_ng_fmt_plug.c do-install: .for b in ${BINARIES} ${INSTALL_PROGRAM} ${WRKSRC}/../run/${b} ${STAGEDIR}${PREFIX}/bin .endfor .for l in ${BINLINKS} ${LN} -sf john ${STAGEDIR}${PREFIX}/bin/${l} .endfor @${MKDIR} ${STAGEDIR}${DATADIR}/extra cd ${WRKSRC}/../run && ${INSTALL_DATA} *.chr *.conf *.lst \ ${STAGEDIR}${DATADIR} cd ${WRKSRC}/../run && ${INSTALL_DATA} *.?? benchmark-unify \ dictionary.rfc2865 john.*sh_completion mailer makechr \ relbench stats ${STAGEDIR}${DATADIR}/extra do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @${RM} ${WRKSRC}/../doc/COPYING ${INSTALL_DATA} ${WRKSRC}/../doc/* ${STAGEDIR}${DOCSDIR} .include Index: head/security/john/files/patch-Makefile.in =================================================================== --- head/security/john/files/patch-Makefile.in (nonexistent) +++ head/security/john/files/patch-Makefile.in (revision 494696) @@ -0,0 +1,41 @@ +--- Makefile.in.orig 2014-12-18 13:53:53 UTC ++++ Makefile.in +@@ -84,7 +84,6 @@ JOHN_OBJS = \ + base64.o base64_convert.o \ + md4.o sha2.o \ + dynamic_fmt.o dynamic_parser.o dynamic_preloads.o dynamic_utils.o dynamic_big_crypt.o \ +- ssh2john.o \ + pfx2john.o \ + unrarcmd.o unrarfilter.o unrarhlp.o unrar.o unrarppm.o unrarvm.o \ + rar2john.o \ +@@ -132,7 +131,7 @@ GENMKVPWD_OBJS = \ + genmkvpwd.o mkvlib.o memory.o miscnl.o path.o memdbg.o + + PROJ = ../run/john@EXE_EXT@ ../run/unshadow@EXE_EXT@ ../run/unafs@EXE_EXT@ ../run/unique@EXE_EXT@ ../run/undrop@EXE_EXT@ \ +- ../run/ssh2john@EXE_EXT@ ../run/rar2john@EXE_EXT@ ../run/zip2john@EXE_EXT@ \ ++ ../run/rar2john@EXE_EXT@ ../run/zip2john@EXE_EXT@ \ + ../run/genmkvpwd@EXE_EXT@ ../run/mkvcalcproba@EXE_EXT@ ../run/calc_stat@EXE_EXT@ \ + ../run/tgtsnarf@EXE_EXT@ ../run/racf2john@EXE_EXT@ ../run/hccap2john@EXE_EXT@ \ + ../run/pwsafe2john@EXE_EXT@ ../run/raw2dyna@EXE_EXT@ ../run/keepass2john@EXE_EXT@ ../run/pfx2john@EXE_EXT@ \ +@@ -305,10 +304,6 @@ miscnl.o: misc.c + $(RM) ../run/undrop + $(LN) john ../run/undrop + +-../run/ssh2john: ../run/john +- $(RM) ../run/ssh2john +- $(LN) john ../run/ssh2john +- + ../run/putty2john: ../run/john + $(RM) ../run/putty2john + $(LN) john ../run/putty2john +@@ -396,10 +391,6 @@ miscnl.o: misc.c + ../run/undrop.exe: symlink.c + $(CC) symlink.c -o ../run/undrop.exe + $(STRIP) ../run/undrop.exe +- +-../run/ssh2john.exe: symlink.c +- $(CC) symlink.c -o ../run/ssh2john.exe +- $(STRIP) ../run/ssh2john.exe + + ../run/putty2john.exe: symlink.c + $(CC) symlink.c -o ../run/putty2john.exe Property changes on: head/security/john/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/john/files/patch-Makefile.legacy =================================================================== --- head/security/john/files/patch-Makefile.legacy (nonexistent) +++ head/security/john/files/patch-Makefile.legacy (revision 494696) @@ -0,0 +1,78 @@ +--- Makefile.legacy.orig 2014-12-18 07:59:02 UTC ++++ Makefile.legacy +@@ -127,7 +127,6 @@ JOHN_OBJS = \ + base64.o base64_convert.o \ + md4.o sha2.o \ + dynamic_fmt.o dynamic_parser.o dynamic_preloads.o dynamic_utils.o dynamic_big_crypt.o \ +- ssh2john.o \ + pfx2john.o \ + unrarcmd.o unrarfilter.o unrarhlp.o unrar.o unrarppm.o unrarvm.o \ + rar2john.o \ +@@ -209,7 +208,7 @@ GENMKVPWD_OBJS = \ + genmkvpwd.o mkvlib.o memory.o miscnl.o path.o memdbg.o + + PROJ = ../run/john ../run/unshadow ../run/unafs ../run/unique ../run/undrop \ +- ../run/ssh2john ../run/rar2john ../run/zip2john \ ++ ../run/rar2john ../run/zip2john \ + ../run/genmkvpwd ../run/mkvcalcproba ../run/calc_stat \ + ../run/tgtsnarf ../run/racf2john ../run/hccap2john \ + ../run/pwsafe2john ../run/raw2dyna ../run/keepass2john ../run/pfx2john \ +@@ -220,7 +219,7 @@ PROJ = ../run/john ../run/unshadow ../run/unafs ../run + PROJ_DOS = ../run/john.bin ../run/john.com \ + ../run/unshadow.com ../run/unafs.com ../run/unique.com \ + ../run/undrop.com \ +- ../run/ssh2john.com ../run/rar2john.com ../run/zip2john \ ++ ../run/rar2john.com ../run/zip2john \ + ../run/racf2john.com ../run/hccap2john.com \ + ../run/pwsafe2john.com ../run/keepass2john.com ../run/pfx2john.com \ + ../run/keychain2john.com ../run/keyring2john.com ../run/kwallet2john.com \ +@@ -229,7 +228,7 @@ PROJ_DOS = ../run/john.bin ../run/john.com \ + PROJ_WIN32 = ../run/john.exe \ + ../run/unshadow.exe ../run/unafs.exe ../run/unique.exe \ + ../run/undrop.exe \ +- ../run/ssh2john.exe ../run/rar2john.exe ../run/zip2john.exe \ ++ ../run/rar2john.exe ../run/zip2john.exe \ + ../run/genmkvpwd.exe ../run/mkvcalcproba.exe ../run/calc_stat.exe \ + ../run/racf2john.exe ../run/hccap2john.exe \ + ../run/pwsafe2john.exe ../run/raw2dyna.exe ../run/keepass2john.exe \ +@@ -239,7 +238,7 @@ PROJ_WIN32 = ../run/john.exe \ + PROJ_WIN32_MINGW = ../run/john-mingw.exe \ + ../run/unshadow.exe ../run/unafs.exe ../run/unique.exe \ + ../run/undrop.exe \ +- ../run/ssh2john.exe ../run/rar2john.exe ../run/zip2john.exe \ ++ ../run/rar2john.exe ../run/zip2john.exe \ + ../run/genmkvpwd.exe ../run/mkvcalcproba.exe ../run/calc_stat.exe \ + ../run/racf2john.exe ../run/hccap2john.exe \ + ../run/pwsafe2john.exe ../run/raw2dyna.exe ../run/keepass2john.exe \ +@@ -2029,10 +2028,6 @@ $(SUBDIRS): + $(RM) ../run/undrop + ln -s john ../run/undrop + +-../run/ssh2john: ../run/john +- $(RM) ../run/ssh2john +- ln -s john ../run/ssh2john +- + ../run/putty2john: ../run/john + $(RM) ../run/putty2john + ln -s john ../run/putty2john +@@ -2114,9 +2109,6 @@ $(SUBDIRS): + ../run/undrop.com: john.com + copy john.com ..\run\undrop.com + +-../run/ssh2john.com: john.com +- copy john.com ..\run\ssh2john.com +- + ../run/putty2john.com: john.com + copy john.com ..\run\putty2john.com + +@@ -2197,10 +2189,6 @@ john.com: john.asm + ../run/undrop.exe: symlink.c + $(CC) symlink.c -o ../run/undrop.exe + $(STRIP) ../run/undrop.exe +- +-../run/ssh2john.exe: symlink.c +- $(CC) symlink.c -o ../run/ssh2john.exe +- $(STRIP) ../run/ssh2john.exe + + ../run/putty2john.exe: symlink.c + $(CC) symlink.c -o ../run/putty2john.exe Property changes on: head/security/john/files/patch-Makefile.legacy ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/john/files/patch-john.c =================================================================== --- head/security/john/files/patch-john.c (nonexistent) +++ head/security/john/files/patch-john.c (revision 494696) @@ -0,0 +1,22 @@ +--- john.c.orig 2014-12-18 07:59:02 UTC ++++ john.c +@@ -153,7 +153,6 @@ extern int base64conv(int argc, char **argv); + extern int hccap2john(int argc, char **argv); + extern int zip2john(int argc, char **argv); + extern int gpg2john(int argc, char **argv); +-extern int ssh2john(int argc, char **argv); + extern int pfx2john(int argc, char **argv); + extern int keychain2john(int argc, char **argv); + extern int kwallet2john(int argc, char **argv); +@@ -1540,11 +1539,6 @@ int main(int argc, char **argv) + if (!strcmp(name, "unique")) { + CPU_detect_or_fallback(argv, 0); + return unique(argc, argv); +- } +- +- if (!strcmp(name, "ssh2john")) { +- CPU_detect_or_fallback(argv, 0); +- return ssh2john(argc, argv); + } + + if (!strcmp(name, "putty2john")) { Property changes on: head/security/john/files/patch-john.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/john/pkg-plist =================================================================== --- head/security/john/pkg-plist (revision 494695) +++ head/security/john/pkg-plist (revision 494696) @@ -1,117 +1,116 @@ bin/SIPdump bin/base64conv bin/calc_stat bin/cprepair bin/dmg2john bin/genmkvpwd bin/gpg2john bin/hccap2john bin/john bin/keepass2john bin/keychain2john bin/keyring2john bin/keystore2john bin/kwallet2john bin/luks2john bin/mkvcalcproba bin/pfx2john bin/putty2john bin/pwsafe2john bin/racf2john bin/rar2john bin/raw2dyna -bin/ssh2john bin/tgtsnarf bin/truecrypt_volume2john bin/uaf2john bin/unafs bin/undrop bin/unique bin/unshadow bin/vncpcap2john bin/wpapcap2john bin/zip2john %%DATADIR%%/extra/1password2john.py %%DATADIR%%/extra/7z2john.py %%DATADIR%%/extra/aix2john.pl %%DATADIR%%/extra/aix2john.py %%DATADIR%%/extra/androidfde2john.py %%DATADIR%%/extra/apex2john.py %%DATADIR%%/extra/benchmark-unify %%DATADIR%%/extra/bitcoin2john.py %%DATADIR%%/extra/blockchain2john.py %%DATADIR%%/extra/cisco2john.pl %%DATADIR%%/extra/cracf2john.py %%DATADIR%%/extra/dictionary.rfc2865 %%DATADIR%%/extra/dmg2john.py %%DATADIR%%/extra/ecryptfs2john.py %%DATADIR%%/extra/efs2john.py %%DATADIR%%/extra/encfs2john.py %%DATADIR%%/extra/genincstats.rb %%DATADIR%%/extra/hextoraw.pl %%DATADIR%%/extra/htdigest2john.py %%DATADIR%%/extra/ikescan2john.py %%DATADIR%%/extra/ios7tojohn.pl %%DATADIR%%/extra/john.bash_completion %%DATADIR%%/extra/john.zsh_completion %%DATADIR%%/extra/kdcdump2john.py %%DATADIR%%/extra/keychain2john.py %%DATADIR%%/extra/keystore2john.py %%DATADIR%%/extra/known_hosts2john.py %%DATADIR%%/extra/kwallet2john.py %%DATADIR%%/extra/ldif2john.pl %%DATADIR%%/extra/leet.pl %%DATADIR%%/extra/lion2john-alt.pl %%DATADIR%%/extra/lion2john.pl %%DATADIR%%/extra/lotus2john.py %%DATADIR%%/extra/mailer %%DATADIR%%/extra/makechr %%DATADIR%%/extra/mcafee_epo2john.py %%DATADIR%%/extra/ml2john.py %%DATADIR%%/extra/mozilla2john.py %%DATADIR%%/extra/netntlm.pl %%DATADIR%%/extra/netscreen.py %%DATADIR%%/extra/odf2john.py %%DATADIR%%/extra/office2john.py %%DATADIR%%/extra/openbsd_softraid2john.py %%DATADIR%%/extra/openssl2john.py %%DATADIR%%/extra/pass_gen.pl %%DATADIR%%/extra/pcap2john.py %%DATADIR%%/extra/pdf2john.py %%DATADIR%%/extra/radius2john.pl %%DATADIR%%/extra/relbench %%DATADIR%%/extra/rexgen2rules.pl %%DATADIR%%/extra/sap2john.pl %%DATADIR%%/extra/sha-dump.pl %%DATADIR%%/extra/sha-test.pl %%DATADIR%%/extra/sipdump2john.py %%DATADIR%%/extra/ssh2sshng.py %%DATADIR%%/extra/sshng2john.py %%DATADIR%%/extra/stats %%DATADIR%%/extra/strip2john.py %%DATADIR%%/extra/sxc2john.py %%DATADIR%%/alnum.chr %%DATADIR%%/alnumspace.chr %%DATADIR%%/alpha.chr %%DATADIR%%/ascii.chr %%DATADIR%%/digits.chr %%DATADIR%%/dumb16.conf %%DATADIR%%/dumb32.conf %%DATADIR%%/dynamic.conf %%DATADIR%%/dynamic_flat_sse_formats.conf %%DATADIR%%/john.conf %%DATADIR%%/john.local.conf %%DATADIR%%/korelogic.conf %%DATADIR%%/lanman.chr %%DATADIR%%/latin1.chr %%DATADIR%%/lm_ascii.chr %%DATADIR%%/lower.chr %%DATADIR%%/lowernum.chr %%DATADIR%%/lowerspace.chr %%DATADIR%%/password.lst %%DATADIR%%/regex_alphabets.conf %%DATADIR%%/repeats16.conf %%DATADIR%%/repeats32.conf %%DATADIR%%/upper.chr %%DATADIR%%/uppernum.chr %%DATADIR%%/utf8.chr