Attachment 223950 Details for Bug 254922 – Non-recursive diff

[patch] Non-recursive diff

john19.diff (text/plain), 9.43 KB, created by Thierry Dussuet on 2021-04-09 16:27:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Dussuet

Created: 2021-04-09 16:27:23 UTC

Size: 9.43 KB

patch

obsolete

>diff -uN john.orig/Makefile john/Makefile
>--- john.orig/Makefile	2021-04-09 16:55:04.889319000 +0200
>+++ john/Makefile	2021-04-09 18:25:35.316147000 +0200
>@@ -4,7 +4,7 @@
> PORTNAME=	john
> # NB: starting from the next version, community-enhanced (jumbo) patch
> # should be offered as an option (suggested by Solar Designer himself).
>-DISTVERSION=	1.8.0-jumbo-1
>+DISTVERSION=	1.9.0-jumbo-1
> PORTREVISION=	6
> CATEGORIES=	security
> MASTER_SITES=	http://www.openwall.com/john/j/ \
>@@ -30,7 +30,7 @@
> 
> ALL_TARGET=	default
> 
>-BINARIES=	calc_stat cprepair genmkvpwd john luks2john mkvcalcproba \
>+BINARIES=	calc_stat cprepair genmkvpwd john mkvcalcproba \
> 		raw2dyna SIPdump tgtsnarf uaf2john vncpcap2john wpapcap2john
> 
> BINLINKS=	base64conv dmg2john gpg2john hccap2john keepass2john \
>@@ -50,27 +50,6 @@
> OPENCL_CONFIGURE_ENABLE= opencl
> OPENCL_DESC=    Build with OpenCL support
> 
>-post-extract:
>-	@${RM} ${WRKSRC}/pfx_fmt_plug.c ${WRKSRC}/rawSHA0_fmt_plug.c \
>-		${WRKSRC}/ssh_fmt_plug.c \
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/params.h
>-# 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
>@@ -79,15 +58,30 @@
> 	${LN} -sf john ${STAGEDIR}${PREFIX}/bin/${l}
> .endfor
> 	@${MKDIR} ${STAGEDIR}${DATADIR}/extra
>+	@${MKDIR} ${STAGEDIR}${DATADIR}/rules
>+	@${MKDIR} ${STAGEDIR}${DATADIR}/extra/lib
>+	@${MKDIR} ${STAGEDIR}${DATADIR}/extra/dns
>+	@${MKDIR} ${STAGEDIR}${DATADIR}/extra/ztex
> 	cd ${WRKSRC}/../run && ${INSTALL_DATA} *.chr *.conf *.lst \
> 		${STAGEDIR}${DATADIR}
>-	cd ${WRKSRC}/../run && ${INSTALL_DATA} *.?? benchmark-unify \
>+	cd ${WRKSRC}/../run && ${INSTALL_DATA} *.?? *.lua benchmark-unify \
> 		dictionary.rfc2865 john.*sh_completion mailer makechr \
>-		relbench stats ${STAGEDIR}${DATADIR}/extra
>+		bitlocker2john eapmd5tojohn relbench stats \
>+		${STAGEDIR}${DATADIR}/extra
>+	cd ${WRKSRC}/../run/rules && ${INSTALL_DATA} *.rule ${STAGEDIR}${DATADIR}/rules
>+	cd ${WRKSRC}/../run/lib && ${INSTALL_DATA} *.pm ${STAGEDIR}${DATADIR}/extra/lib
>+	cd ${WRKSRC}/../run/dns && ${INSTALL_DATA} README.txt __init__.py \
>+		_compat.py exception.py flags.py hash.py message.py name.py \
>+		opcode.py rdata.py rdataclass.py rdataset.py rdatatype.py \
>+		rrset.py set.py tokenizer.py tsig.py tsigkeyring.py wiredata.py \
>+		${STAGEDIR}${DATADIR}/extra/dns
>+	cd ${WRKSRC}/../run/ztex && ${INSTALL_DATA} *.??? ${STAGEDIR}${DATADIR}/extra/ztex
> 
> do-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/extras
> 	@${RM} ${WRKSRC}/../doc/COPYING
>-	${INSTALL_DATA} ${WRKSRC}/../doc/* ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/../doc/[A-Zdp]* ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/../doc/extras/* ${STAGEDIR}${DOCSDIR}/extras
> 
> .include <bsd.port.mk>
>diff -uN john.orig/distinfo john/distinfo
>--- john.orig/distinfo	2016-11-12 16:16:56.000000000 +0100
>+++ john/distinfo	2021-04-09 16:23:54.048227000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1418916028
>-SHA256 (john-1.8.0-jumbo-1.tar.xz) = bac93d025995a051f055adbd7ce2f1975676cac6c74a6c7a3ee4cfdd9c160923
>-SIZE (john-1.8.0-jumbo-1.tar.xz) = 23232492
>+TIMESTAMP = 1617813899
>+SHA256 (john-1.9.0-jumbo-1.tar.xz) = f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b
>+SIZE (john-1.9.0-jumbo-1.tar.xz) = 33638768
>Common subdirectories: john.orig/files and john/files
>diff -uN john.orig/pkg-plist john/pkg-plist
>--- john.orig/pkg-plist	2019-03-08 13:12:57.000000000 +0100
>+++ john/pkg-plist	2021-04-09 18:27:53.462090000 +0200
>@@ -12,7 +12,6 @@
> bin/keyring2john
> bin/keystore2john
> bin/kwallet2john
>-bin/luks2john
> bin/mkvcalcproba
> bin/putty2john
> bin/pwsafe2john
>@@ -30,7 +29,6 @@
> bin/wpapcap2john
> bin/zip2john
> %%DATADIR%%/extra/1password2john.py
>-%%DATADIR%%/extra/7z2john.py
> %%DATADIR%%/extra/aix2john.pl
> %%DATADIR%%/extra/aix2john.py
> %%DATADIR%%/extra/androidfde2john.py
>@@ -43,7 +41,6 @@
> %%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
>@@ -65,17 +62,15 @@
> %%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/pdf2john.pl
> %%DATADIR%%/extra/radius2john.pl
> %%DATADIR%%/extra/relbench
> %%DATADIR%%/extra/rexgen2rules.pl
>@@ -83,11 +78,114 @@
> %%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%%/extra/7z2john.pl
>+%%DATADIR%%/extra/DPAPImk2john.py
>+%%DATADIR%%/extra/adxcsouf2john.py
>+%%DATADIR%%/extra/aem2john.py
>+%%DATADIR%%/extra/andotp2john.py
>+%%DATADIR%%/extra/androidbackup2john.py
>+%%DATADIR%%/extra/ansible2john.py
>+%%DATADIR%%/extra/applenotes2john.py
>+%%DATADIR%%/extra/aruba2john.py
>+%%DATADIR%%/extra/axcrypt2john.py
>+%%DATADIR%%/extra/bestcrypt2john.py
>+%%DATADIR%%/extra/bitlocker2john
>+%%DATADIR%%/extra/bitshares2john.py
>+%%DATADIR%%/extra/bitwarden2john.py
>+%%DATADIR%%/extra/bks2john.py
>+%%DATADIR%%/extra/ccache2john.py
>+%%DATADIR%%/extra/codepage.pl
>+%%DATADIR%%/extra/dashlane2john.py
>+%%DATADIR%%/extra/deepsound2john.py
>+%%DATADIR%%/extra/dns/README.txt
>+%%DATADIR%%/extra/dns/__init__.py
>+%%DATADIR%%/extra/dns/_compat.py
>+%%DATADIR%%/extra/dns/exception.py
>+%%DATADIR%%/extra/dns/flags.py
>+%%DATADIR%%/extra/dns/hash.py
>+%%DATADIR%%/extra/dns/message.py
>+%%DATADIR%%/extra/dns/name.py
>+%%DATADIR%%/extra/dns/opcode.py
>+%%DATADIR%%/extra/dns/rdata.py
>+%%DATADIR%%/extra/dns/rdataclass.py
>+%%DATADIR%%/extra/dns/rdataset.py
>+%%DATADIR%%/extra/dns/rdatatype.py
>+%%DATADIR%%/extra/dns/rrset.py
>+%%DATADIR%%/extra/dns/set.py
>+%%DATADIR%%/extra/dns/tokenizer.py
>+%%DATADIR%%/extra/dns/tsig.py
>+%%DATADIR%%/extra/dns/tsigkeyring.py
>+%%DATADIR%%/extra/dns/wiredata.py
>+%%DATADIR%%/extra/eapmd5tojohn
>+%%DATADIR%%/extra/ejabberd2john.py
>+%%DATADIR%%/extra/electrum2john.py
>+%%DATADIR%%/extra/enpass2john.py
>+%%DATADIR%%/extra/ethereum2john.py
>+%%DATADIR%%/extra/filezilla2john.py
>+%%DATADIR%%/extra/fuzz_option.pl
>+%%DATADIR%%/extra/geli2john.py
>+%%DATADIR%%/extra/hccapx2john.py
>+%%DATADIR%%/extra/ibmiscanner2john.py
>+%%DATADIR%%/extra/itunes_backup2john.pl
>+%%DATADIR%%/extra/iwork2john.py
>+%%DATADIR%%/extra/keyring2john.py
>+%%DATADIR%%/extra/kirbi2john.py
>+%%DATADIR%%/extra/krb2john.py
>+%%DATADIR%%/extra/lastpass2john.py
>+%%DATADIR%%/extra/lib/ExifTool.pm
>+%%DATADIR%%/extra/lib/PDF.pm
>+%%DATADIR%%/extra/lib/RandomAccess.pm
>+%%DATADIR%%/extra/libreoffice2john.py
>+%%DATADIR%%/extra/luks2john.py
>+%%DATADIR%%/extra/mac2john-alt.py
>+%%DATADIR%%/extra/mac2john.py
>+%%DATADIR%%/extra/monero2john.py
>+%%DATADIR%%/extra/money2john.py
>+%%DATADIR%%/extra/multibit2john.py
>+%%DATADIR%%/extra/neo2john.py
>+%%DATADIR%%/extra/network2john.lua
>+%%DATADIR%%/extra/padlock2john.py
>+%%DATADIR%%/extra/pem2john.py
>+%%DATADIR%%/extra/pfx2john.py
>+%%DATADIR%%/extra/pgpdisk2john.py
>+%%DATADIR%%/extra/pgpsda2john.py
>+%%DATADIR%%/extra/pgpwde2john.py
>+%%DATADIR%%/extra/potcheck.pl
>+%%DATADIR%%/extra/prosody2john.py
>+%%DATADIR%%/extra/ps_token2john.py
>+%%DATADIR%%/extra/pse2john.py
>+%%DATADIR%%/extra/pwsafe2john.py
>+%%DATADIR%%/extra/radius2john.py
>+%%DATADIR%%/extra/rulestack.pl
>+%%DATADIR%%/extra/signal2john.py
>+%%DATADIR%%/extra/ssh2john.py
>+%%DATADIR%%/extra/sspr2john.py
>+%%DATADIR%%/extra/staroffice2john.py
>+%%DATADIR%%/extra/telegram2john.py
>+%%DATADIR%%/extra/tezos2john.py
>+%%DATADIR%%/extra/truecrypt2john.py
>+%%DATADIR%%/extra/unrule.pl
>+%%DATADIR%%/extra/vdi2john.pl
>+%%DATADIR%%/extra/vmx2john.py
>+%%DATADIR%%/extra/ztex/inouttraffic.ihx
>+%%DATADIR%%/extra/ztex/ztex115y_bcrypt.bit
>+%%DATADIR%%/extra/ztex/ztex115y_descrypt.bit
>+%%DATADIR%%/extra/ztex/ztex115y_md5crypt.bit
>+%%DATADIR%%/extra/ztex/ztex115y_sha256crypt.bit
>+%%DATADIR%%/extra/ztex/ztex115y_sha512crypt.bit
>+%%DATADIR%%/rules/InsidePro-PasswordsPro.rule
>+%%DATADIR%%/rules/T0XlC-insert_top_100_passwords_1_G.rule
>+%%DATADIR%%/rules/T0XlC.rule
>+%%DATADIR%%/rules/T0XlCv1.rule
>+%%DATADIR%%/rules/best64.rule
>+%%DATADIR%%/rules/d3ad0ne.rule
>+%%DATADIR%%/rules/dive.rule
>+%%DATADIR%%/rules/passphrase-rule1.rule
>+%%DATADIR%%/rules/passphrase-rule2.rule
>+%%DATADIR%%/rules/rockyou-30000.rule
>+%%DATADIR%%/rules/specific.rule
> %%DATADIR%%/alnum.chr
> %%DATADIR%%/alnumspace.chr
> %%DATADIR%%/alpha.chr
>@@ -97,8 +195,8 @@
> %%DATADIR%%/dumb32.conf
> %%DATADIR%%/dynamic.conf
> %%DATADIR%%/dynamic_flat_sse_formats.conf
>+%%DATADIR%%/hybrid.conf
> %%DATADIR%%/john.conf
>-%%DATADIR%%/john.local.conf
> %%DATADIR%%/korelogic.conf
> %%DATADIR%%/lanman.chr
> %%DATADIR%%/latin1.chr

Actions: View | Diff

Attachments on bug 254922: 223949 | 223950 | 224054