View | Details | Raw Unified | Return to bug 254922 | Differences between
and this patch

Collapse All | Expand All

(-)john/Makefile (-26 / +20 lines)
Lines 4-10 Link Here
4
PORTNAME=	john
4
PORTNAME=	john
5
# NB: starting from the next version, community-enhanced (jumbo) patch
5
# NB: starting from the next version, community-enhanced (jumbo) patch
6
# should be offered as an option (suggested by Solar Designer himself).
6
# should be offered as an option (suggested by Solar Designer himself).
7
DISTVERSION=	1.8.0-jumbo-1
7
DISTVERSION=	1.9.0-jumbo-1
8
PORTREVISION=	6
8
PORTREVISION=	6
9
CATEGORIES=	security
9
CATEGORIES=	security
10
MASTER_SITES=	http://www.openwall.com/john/j/ \
10
MASTER_SITES=	http://www.openwall.com/john/j/ \
Lines 30-36 Link Here
30
30
31
ALL_TARGET=	default
31
ALL_TARGET=	default
32
32
33
BINARIES=	calc_stat cprepair genmkvpwd john luks2john mkvcalcproba \
33
BINARIES=	calc_stat cprepair genmkvpwd john mkvcalcproba \
34
		raw2dyna SIPdump tgtsnarf uaf2john vncpcap2john wpapcap2john
34
		raw2dyna SIPdump tgtsnarf uaf2john vncpcap2john wpapcap2john
35
35
36
BINLINKS=	base64conv dmg2john gpg2john hccap2john keepass2john \
36
BINLINKS=	base64conv dmg2john gpg2john hccap2john keepass2john \
Lines 50-76 Link Here
50
OPENCL_CONFIGURE_ENABLE= opencl
50
OPENCL_CONFIGURE_ENABLE= opencl
51
OPENCL_DESC=    Build with OpenCL support
51
OPENCL_DESC=    Build with OpenCL support
52
52
53
post-extract:
54
	@${RM} ${WRKSRC}/pfx_fmt_plug.c ${WRKSRC}/rawSHA0_fmt_plug.c \
55
		${WRKSRC}/ssh_fmt_plug.c \
56
57
post-patch:
58
	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/params.h
59
# Replace methods and types that were marked deprecated by OpenSSL 0.9.7
60
# and removed in OpenSSL 1.1.0 and LibreSSL
61
	@${REINPLACE_CMD} -e 's|des_string_to_key|DES_string_to_key|' \
62
		${WRKSRC}/KRB4_fmt_plug.c
63
	@${REINPLACE_CMD} -e 's|des_set_odd_parity|DES_set_odd_parity|' \
64
		${WRKSRC}/KRB4_std_plug.c
65
	@${REINPLACE_CMD} -e 's|C_Block|DES_cblock|' \
66
		${WRKSRC}/efs_fmt_plug.c \
67
		${WRKSRC}/gpg_fmt_plug.c \
68
		${WRKSRC}/keychain_fmt_plug.c \
69
		${WRKSRC}/mozilla_ng_fmt_plug.c \
70
		${WRKSRC}/opencl_gpg_fmt_plug.c \
71
		${WRKSRC}/opencl_keychain_fmt_plug.c \
72
		${WRKSRC}/ssh_ng_fmt_plug.c
73
74
do-install:
53
do-install:
75
.for b in ${BINARIES}
54
.for b in ${BINARIES}
76
	${INSTALL_PROGRAM} ${WRKSRC}/../run/${b} ${STAGEDIR}${PREFIX}/bin
55
	${INSTALL_PROGRAM} ${WRKSRC}/../run/${b} ${STAGEDIR}${PREFIX}/bin
Lines 79-93 Link Here
79
	${LN} -sf john ${STAGEDIR}${PREFIX}/bin/${l}
58
	${LN} -sf john ${STAGEDIR}${PREFIX}/bin/${l}
80
.endfor
59
.endfor
81
	@${MKDIR} ${STAGEDIR}${DATADIR}/extra
60
	@${MKDIR} ${STAGEDIR}${DATADIR}/extra
61
	@${MKDIR} ${STAGEDIR}${DATADIR}/rules
62
	@${MKDIR} ${STAGEDIR}${DATADIR}/extra/lib
63
	@${MKDIR} ${STAGEDIR}${DATADIR}/extra/dns
64
	@${MKDIR} ${STAGEDIR}${DATADIR}/extra/ztex
82
	cd ${WRKSRC}/../run && ${INSTALL_DATA} *.chr *.conf *.lst \
65
	cd ${WRKSRC}/../run && ${INSTALL_DATA} *.chr *.conf *.lst \
83
		${STAGEDIR}${DATADIR}
66
		${STAGEDIR}${DATADIR}
84
	cd ${WRKSRC}/../run && ${INSTALL_DATA} *.?? benchmark-unify \
67
	cd ${WRKSRC}/../run && ${INSTALL_DATA} *.?? *.lua benchmark-unify \
85
		dictionary.rfc2865 john.*sh_completion mailer makechr \
68
		dictionary.rfc2865 john.*sh_completion mailer makechr \
86
		relbench stats ${STAGEDIR}${DATADIR}/extra
69
		bitlocker2john eapmd5tojohn relbench stats \
70
		${STAGEDIR}${DATADIR}/extra
71
	cd ${WRKSRC}/../run/rules && ${INSTALL_DATA} *.rule ${STAGEDIR}${DATADIR}/rules
72
	cd ${WRKSRC}/../run/lib && ${INSTALL_DATA} *.pm ${STAGEDIR}${DATADIR}/extra/lib
73
	cd ${WRKSRC}/../run/dns && ${INSTALL_DATA} README.txt __init__.py \
74
		_compat.py exception.py flags.py hash.py message.py name.py \
75
		opcode.py rdata.py rdataclass.py rdataset.py rdatatype.py \
76
		rrset.py set.py tokenizer.py tsig.py tsigkeyring.py wiredata.py \
77
		${STAGEDIR}${DATADIR}/extra/dns
78
	cd ${WRKSRC}/../run/ztex && ${INSTALL_DATA} *.??? ${STAGEDIR}${DATADIR}/extra/ztex
87
79
88
do-install-DOCS-on:
80
do-install-DOCS-on:
89
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
81
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
82
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/extras
90
	@${RM} ${WRKSRC}/../doc/COPYING
83
	@${RM} ${WRKSRC}/../doc/COPYING
91
	${INSTALL_DATA} ${WRKSRC}/../doc/* ${STAGEDIR}${DOCSDIR}
84
	${INSTALL_DATA} ${WRKSRC}/../doc/[A-Zdp]* ${STAGEDIR}${DOCSDIR}
85
	${INSTALL_DATA} ${WRKSRC}/../doc/extras/* ${STAGEDIR}${DOCSDIR}/extras
92
86
93
.include <bsd.port.mk>
87
.include <bsd.port.mk>
(-)john/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1418916028
1
TIMESTAMP = 1617813899
2
SHA256 (john-1.8.0-jumbo-1.tar.xz) = bac93d025995a051f055adbd7ce2f1975676cac6c74a6c7a3ee4cfdd9c160923
2
SHA256 (john-1.9.0-jumbo-1.tar.xz) = f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b
3
SIZE (john-1.8.0-jumbo-1.tar.xz) = 23232492
3
SIZE (john-1.9.0-jumbo-1.tar.xz) = 33638768
(-)john/pkg-plist (-10 / +108 lines)
Lines 12-18 Link Here
12
bin/keyring2john
12
bin/keyring2john
13
bin/keystore2john
13
bin/keystore2john
14
bin/kwallet2john
14
bin/kwallet2john
15
bin/luks2john
16
bin/mkvcalcproba
15
bin/mkvcalcproba
17
bin/putty2john
16
bin/putty2john
18
bin/pwsafe2john
17
bin/pwsafe2john
Lines 30-36 Link Here
30
bin/wpapcap2john
29
bin/wpapcap2john
31
bin/zip2john
30
bin/zip2john
32
%%DATADIR%%/extra/1password2john.py
31
%%DATADIR%%/extra/1password2john.py
33
%%DATADIR%%/extra/7z2john.py
34
%%DATADIR%%/extra/aix2john.pl
32
%%DATADIR%%/extra/aix2john.pl
35
%%DATADIR%%/extra/aix2john.py
33
%%DATADIR%%/extra/aix2john.py
36
%%DATADIR%%/extra/androidfde2john.py
34
%%DATADIR%%/extra/androidfde2john.py
Lines 43-49 Link Here
43
%%DATADIR%%/extra/dictionary.rfc2865
41
%%DATADIR%%/extra/dictionary.rfc2865
44
%%DATADIR%%/extra/dmg2john.py
42
%%DATADIR%%/extra/dmg2john.py
45
%%DATADIR%%/extra/ecryptfs2john.py
43
%%DATADIR%%/extra/ecryptfs2john.py
46
%%DATADIR%%/extra/efs2john.py
47
%%DATADIR%%/extra/encfs2john.py
44
%%DATADIR%%/extra/encfs2john.py
48
%%DATADIR%%/extra/genincstats.rb
45
%%DATADIR%%/extra/genincstats.rb
49
%%DATADIR%%/extra/hextoraw.pl
46
%%DATADIR%%/extra/hextoraw.pl
Lines 65-81 Link Here
65
%%DATADIR%%/extra/mailer
62
%%DATADIR%%/extra/mailer
66
%%DATADIR%%/extra/makechr
63
%%DATADIR%%/extra/makechr
67
%%DATADIR%%/extra/mcafee_epo2john.py
64
%%DATADIR%%/extra/mcafee_epo2john.py
68
%%DATADIR%%/extra/ml2john.py
69
%%DATADIR%%/extra/mozilla2john.py
65
%%DATADIR%%/extra/mozilla2john.py
70
%%DATADIR%%/extra/netntlm.pl
66
%%DATADIR%%/extra/netntlm.pl
71
%%DATADIR%%/extra/netscreen.py
67
%%DATADIR%%/extra/netscreen.py
72
%%DATADIR%%/extra/odf2john.py
73
%%DATADIR%%/extra/office2john.py
68
%%DATADIR%%/extra/office2john.py
74
%%DATADIR%%/extra/openbsd_softraid2john.py
69
%%DATADIR%%/extra/openbsd_softraid2john.py
75
%%DATADIR%%/extra/openssl2john.py
70
%%DATADIR%%/extra/openssl2john.py
76
%%DATADIR%%/extra/pass_gen.pl
71
%%DATADIR%%/extra/pass_gen.pl
77
%%DATADIR%%/extra/pcap2john.py
72
%%DATADIR%%/extra/pcap2john.py
78
%%DATADIR%%/extra/pdf2john.py
73
%%DATADIR%%/extra/pdf2john.pl
79
%%DATADIR%%/extra/radius2john.pl
74
%%DATADIR%%/extra/radius2john.pl
80
%%DATADIR%%/extra/relbench
75
%%DATADIR%%/extra/relbench
81
%%DATADIR%%/extra/rexgen2rules.pl
76
%%DATADIR%%/extra/rexgen2rules.pl
Lines 83-93 Link Here
83
%%DATADIR%%/extra/sha-dump.pl
78
%%DATADIR%%/extra/sha-dump.pl
84
%%DATADIR%%/extra/sha-test.pl
79
%%DATADIR%%/extra/sha-test.pl
85
%%DATADIR%%/extra/sipdump2john.py
80
%%DATADIR%%/extra/sipdump2john.py
86
%%DATADIR%%/extra/ssh2sshng.py
87
%%DATADIR%%/extra/sshng2john.py
88
%%DATADIR%%/extra/stats
81
%%DATADIR%%/extra/stats
89
%%DATADIR%%/extra/strip2john.py
82
%%DATADIR%%/extra/strip2john.py
90
%%DATADIR%%/extra/sxc2john.py
83
%%DATADIR%%/extra/7z2john.pl
84
%%DATADIR%%/extra/DPAPImk2john.py
85
%%DATADIR%%/extra/adxcsouf2john.py
86
%%DATADIR%%/extra/aem2john.py
87
%%DATADIR%%/extra/andotp2john.py
88
%%DATADIR%%/extra/androidbackup2john.py
89
%%DATADIR%%/extra/ansible2john.py
90
%%DATADIR%%/extra/applenotes2john.py
91
%%DATADIR%%/extra/aruba2john.py
92
%%DATADIR%%/extra/axcrypt2john.py
93
%%DATADIR%%/extra/bestcrypt2john.py
94
%%DATADIR%%/extra/bitlocker2john
95
%%DATADIR%%/extra/bitshares2john.py
96
%%DATADIR%%/extra/bitwarden2john.py
97
%%DATADIR%%/extra/bks2john.py
98
%%DATADIR%%/extra/ccache2john.py
99
%%DATADIR%%/extra/codepage.pl
100
%%DATADIR%%/extra/dashlane2john.py
101
%%DATADIR%%/extra/deepsound2john.py
102
%%DATADIR%%/extra/dns/README.txt
103
%%DATADIR%%/extra/dns/__init__.py
104
%%DATADIR%%/extra/dns/_compat.py
105
%%DATADIR%%/extra/dns/exception.py
106
%%DATADIR%%/extra/dns/flags.py
107
%%DATADIR%%/extra/dns/hash.py
108
%%DATADIR%%/extra/dns/message.py
109
%%DATADIR%%/extra/dns/name.py
110
%%DATADIR%%/extra/dns/opcode.py
111
%%DATADIR%%/extra/dns/rdata.py
112
%%DATADIR%%/extra/dns/rdataclass.py
113
%%DATADIR%%/extra/dns/rdataset.py
114
%%DATADIR%%/extra/dns/rdatatype.py
115
%%DATADIR%%/extra/dns/rrset.py
116
%%DATADIR%%/extra/dns/set.py
117
%%DATADIR%%/extra/dns/tokenizer.py
118
%%DATADIR%%/extra/dns/tsig.py
119
%%DATADIR%%/extra/dns/tsigkeyring.py
120
%%DATADIR%%/extra/dns/wiredata.py
121
%%DATADIR%%/extra/eapmd5tojohn
122
%%DATADIR%%/extra/ejabberd2john.py
123
%%DATADIR%%/extra/electrum2john.py
124
%%DATADIR%%/extra/enpass2john.py
125
%%DATADIR%%/extra/ethereum2john.py
126
%%DATADIR%%/extra/filezilla2john.py
127
%%DATADIR%%/extra/fuzz_option.pl
128
%%DATADIR%%/extra/geli2john.py
129
%%DATADIR%%/extra/hccapx2john.py
130
%%DATADIR%%/extra/ibmiscanner2john.py
131
%%DATADIR%%/extra/itunes_backup2john.pl
132
%%DATADIR%%/extra/iwork2john.py
133
%%DATADIR%%/extra/keyring2john.py
134
%%DATADIR%%/extra/kirbi2john.py
135
%%DATADIR%%/extra/krb2john.py
136
%%DATADIR%%/extra/lastpass2john.py
137
%%DATADIR%%/extra/lib/ExifTool.pm
138
%%DATADIR%%/extra/lib/PDF.pm
139
%%DATADIR%%/extra/lib/RandomAccess.pm
140
%%DATADIR%%/extra/libreoffice2john.py
141
%%DATADIR%%/extra/luks2john.py
142
%%DATADIR%%/extra/mac2john-alt.py
143
%%DATADIR%%/extra/mac2john.py
144
%%DATADIR%%/extra/monero2john.py
145
%%DATADIR%%/extra/money2john.py
146
%%DATADIR%%/extra/multibit2john.py
147
%%DATADIR%%/extra/neo2john.py
148
%%DATADIR%%/extra/network2john.lua
149
%%DATADIR%%/extra/padlock2john.py
150
%%DATADIR%%/extra/pem2john.py
151
%%DATADIR%%/extra/pfx2john.py
152
%%DATADIR%%/extra/pgpdisk2john.py
153
%%DATADIR%%/extra/pgpsda2john.py
154
%%DATADIR%%/extra/pgpwde2john.py
155
%%DATADIR%%/extra/potcheck.pl
156
%%DATADIR%%/extra/prosody2john.py
157
%%DATADIR%%/extra/ps_token2john.py
158
%%DATADIR%%/extra/pse2john.py
159
%%DATADIR%%/extra/pwsafe2john.py
160
%%DATADIR%%/extra/radius2john.py
161
%%DATADIR%%/extra/rulestack.pl
162
%%DATADIR%%/extra/signal2john.py
163
%%DATADIR%%/extra/ssh2john.py
164
%%DATADIR%%/extra/sspr2john.py
165
%%DATADIR%%/extra/staroffice2john.py
166
%%DATADIR%%/extra/telegram2john.py
167
%%DATADIR%%/extra/tezos2john.py
168
%%DATADIR%%/extra/truecrypt2john.py
169
%%DATADIR%%/extra/unrule.pl
170
%%DATADIR%%/extra/vdi2john.pl
171
%%DATADIR%%/extra/vmx2john.py
172
%%DATADIR%%/extra/ztex/inouttraffic.ihx
173
%%DATADIR%%/extra/ztex/ztex115y_bcrypt.bit
174
%%DATADIR%%/extra/ztex/ztex115y_descrypt.bit
175
%%DATADIR%%/extra/ztex/ztex115y_md5crypt.bit
176
%%DATADIR%%/extra/ztex/ztex115y_sha256crypt.bit
177
%%DATADIR%%/extra/ztex/ztex115y_sha512crypt.bit
178
%%DATADIR%%/rules/InsidePro-PasswordsPro.rule
179
%%DATADIR%%/rules/T0XlC-insert_top_100_passwords_1_G.rule
180
%%DATADIR%%/rules/T0XlC.rule
181
%%DATADIR%%/rules/T0XlCv1.rule
182
%%DATADIR%%/rules/best64.rule
183
%%DATADIR%%/rules/d3ad0ne.rule
184
%%DATADIR%%/rules/dive.rule
185
%%DATADIR%%/rules/passphrase-rule1.rule
186
%%DATADIR%%/rules/passphrase-rule2.rule
187
%%DATADIR%%/rules/rockyou-30000.rule
188
%%DATADIR%%/rules/specific.rule
91
%%DATADIR%%/alnum.chr
189
%%DATADIR%%/alnum.chr
92
%%DATADIR%%/alnumspace.chr
190
%%DATADIR%%/alnumspace.chr
93
%%DATADIR%%/alpha.chr
191
%%DATADIR%%/alpha.chr
Lines 97-104 Link Here
97
%%DATADIR%%/dumb32.conf
195
%%DATADIR%%/dumb32.conf
98
%%DATADIR%%/dynamic.conf
196
%%DATADIR%%/dynamic.conf
99
%%DATADIR%%/dynamic_flat_sse_formats.conf
197
%%DATADIR%%/dynamic_flat_sse_formats.conf
198
%%DATADIR%%/hybrid.conf
100
%%DATADIR%%/john.conf
199
%%DATADIR%%/john.conf
101
%%DATADIR%%/john.local.conf
102
%%DATADIR%%/korelogic.conf
200
%%DATADIR%%/korelogic.conf
103
%%DATADIR%%/lanman.chr
201
%%DATADIR%%/lanman.chr
104
%%DATADIR%%/latin1.chr
202
%%DATADIR%%/latin1.chr

Return to bug 254922