From f1dc5590a2dd40d1eb922340af0b628b559eaeda Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 2 Jul 2017 10:12:23 +1000 Subject: [PATCH] john: fix missing footprint files, various fixes --- john/.footprint | 35 +++++++++++++++++++++++++++ john/.md5sum | 1 + john/.signature | 5 ++-- john/Pkgfile | 26 ++++++++++++-------- john/gcc5.patch | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 12 deletions(-) create mode 100644 john/gcc5.patch diff --git a/john/.footprint b/john/.footprint index b228b8efe..aa1169790 100644 --- a/john/.footprint +++ b/john/.footprint @@ -4,42 +4,56 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/john/ -rwxr-xr-x root/root usr/lib/john/1password2john.py +-rw-r--r-- root/root usr/lib/john/1password2john.pyc -rwxr-xr-x root/root usr/lib/john/7z2john.py +-rw-r--r-- root/root usr/lib/john/7z2john.pyc -rwxr-xr-x root/root usr/lib/john/SIPdump -rwxr-xr-x root/root usr/lib/john/aix2john.pl -rwxr-xr-x root/root usr/lib/john/aix2john.py +-rw-r--r-- root/root usr/lib/john/aix2john.pyc -rwxr-xr-x root/root usr/lib/john/alnum.chr -rwxr-xr-x root/root usr/lib/john/alnumspace.chr -rwxr-xr-x root/root usr/lib/john/alpha.chr -rwxr-xr-x root/root usr/lib/john/androidfde2john.py +-rw-r--r-- root/root usr/lib/john/androidfde2john.pyc -rwxr-xr-x root/root usr/lib/john/apex2john.py +-rw-r--r-- root/root usr/lib/john/apex2john.pyc -rwxr-xr-x root/root usr/lib/john/ascii.chr -rwxr-xr-x root/root usr/lib/john/base64conv -rwxr-xr-x root/root usr/lib/john/benchmark-unify -rwxr-xr-x root/root usr/lib/john/bitcoin2john.py +-rw-r--r-- root/root usr/lib/john/bitcoin2john.pyc -rwxr-xr-x root/root usr/lib/john/blockchain2john.py +-rw-r--r-- root/root usr/lib/john/blockchain2john.pyc -rwxr-xr-x root/root usr/lib/john/calc_stat -rwxr-xr-x root/root usr/lib/john/cisco2john.pl -rwxr-xr-x root/root usr/lib/john/cprepair -rwxr-xr-x root/root usr/lib/john/cracf2john.py +-rw-r--r-- root/root usr/lib/john/cracf2john.pyc -rwxr-xr-x root/root usr/lib/john/dictionary.rfc2865 -rwxr-xr-x root/root usr/lib/john/digits.chr -rwxr-xr-x root/root usr/lib/john/dmg2john -rwxr-xr-x root/root usr/lib/john/dmg2john.py +-rw-r--r-- root/root usr/lib/john/dmg2john.pyc -rwxr-xr-x root/root usr/lib/john/dumb16.conf -rwxr-xr-x root/root usr/lib/john/dumb32.conf -rwxr-xr-x root/root usr/lib/john/dynamic.conf -rwxr-xr-x root/root usr/lib/john/dynamic_flat_sse_formats.conf -rwxr-xr-x root/root usr/lib/john/ecryptfs2john.py +-rw-r--r-- root/root usr/lib/john/ecryptfs2john.pyc -rwxr-xr-x root/root usr/lib/john/efs2john.py +-rw-r--r-- root/root usr/lib/john/efs2john.pyc -rwxr-xr-x root/root usr/lib/john/encfs2john.py +-rw-r--r-- root/root usr/lib/john/encfs2john.pyc -rwxr-xr-x root/root usr/lib/john/genincstats.rb -rwxr-xr-x root/root usr/lib/john/genmkvpwd -rwxr-xr-x root/root usr/lib/john/gpg2john -rwxr-xr-x root/root usr/lib/john/hccap2john -rwxr-xr-x root/root usr/lib/john/hextoraw.pl -rwxr-xr-x root/root usr/lib/john/htdigest2john.py +-rw-r--r-- root/root usr/lib/john/htdigest2john.pyc -rwxr-xr-x root/root usr/lib/john/ikescan2john.py +-rw-r--r-- root/root usr/lib/john/ikescan2john.pyc -rwxr-xr-x root/root usr/lib/john/ios7tojohn.pl -rwxr-xr-x root/root usr/lib/john/john -rwxr-xr-x root/root usr/lib/john/john.bash_completion @@ -47,16 +61,21 @@ drwxr-xr-x root/root usr/lib/john/ -rwxr-xr-x root/root usr/lib/john/john.local.conf -rwxr-xr-x root/root usr/lib/john/john.zsh_completion -rwxr-xr-x root/root usr/lib/john/kdcdump2john.py +-rw-r--r-- root/root usr/lib/john/kdcdump2john.pyc -rwxr-xr-x root/root usr/lib/john/keepass2john -rwxr-xr-x root/root usr/lib/john/keychain2john -rwxr-xr-x root/root usr/lib/john/keychain2john.py +-rw-r--r-- root/root usr/lib/john/keychain2john.pyc -rwxr-xr-x root/root usr/lib/john/keyring2john -rwxr-xr-x root/root usr/lib/john/keystore2john -rwxr-xr-x root/root usr/lib/john/keystore2john.py +-rw-r--r-- root/root usr/lib/john/keystore2john.pyc -rwxr-xr-x root/root usr/lib/john/known_hosts2john.py +-rw-r--r-- root/root usr/lib/john/known_hosts2john.pyc -rwxr-xr-x root/root usr/lib/john/korelogic.conf -rwxr-xr-x root/root usr/lib/john/kwallet2john -rwxr-xr-x root/root usr/lib/john/kwallet2john.py +-rw-r--r-- root/root usr/lib/john/kwallet2john.pyc -rwxr-xr-x root/root usr/lib/john/lanman.chr -rwxr-xr-x root/root usr/lib/john/latin1.chr -rwxr-xr-x root/root usr/lib/john/ldif2john.pl @@ -65,6 +84,7 @@ drwxr-xr-x root/root usr/lib/john/ -rwxr-xr-x root/root usr/lib/john/lion2john.pl -rwxr-xr-x root/root usr/lib/john/lm_ascii.chr -rwxr-xr-x root/root usr/lib/john/lotus2john.py +-rw-r--r-- root/root usr/lib/john/lotus2john.pyc -rwxr-xr-x root/root usr/lib/john/lower.chr -rwxr-xr-x root/root usr/lib/john/lowernum.chr -rwxr-xr-x root/root usr/lib/john/lowerspace.chr @@ -72,19 +92,29 @@ drwxr-xr-x root/root usr/lib/john/ -rwxr-xr-x root/root usr/lib/john/mailer -rwxr-xr-x root/root usr/lib/john/makechr -rwxr-xr-x root/root usr/lib/john/mcafee_epo2john.py +-rw-r--r-- root/root usr/lib/john/mcafee_epo2john.pyc -rwxr-xr-x root/root usr/lib/john/mkvcalcproba -rwxr-xr-x root/root usr/lib/john/ml2john.py +-rw-r--r-- root/root usr/lib/john/ml2john.pyc -rwxr-xr-x root/root usr/lib/john/mozilla2john.py +-rw-r--r-- root/root usr/lib/john/mozilla2john.pyc -rwxr-xr-x root/root usr/lib/john/netntlm.pl -rwxr-xr-x root/root usr/lib/john/netscreen.py +-rw-r--r-- root/root usr/lib/john/netscreen.pyc -rwxr-xr-x root/root usr/lib/john/odf2john.py +-rw-r--r-- root/root usr/lib/john/odf2john.pyc -rwxr-xr-x root/root usr/lib/john/office2john.py +-rw-r--r-- root/root usr/lib/john/office2john.pyc -rwxr-xr-x root/root usr/lib/john/openbsd_softraid2john.py +-rw-r--r-- root/root usr/lib/john/openbsd_softraid2john.pyc -rwxr-xr-x root/root usr/lib/john/openssl2john.py +-rw-r--r-- root/root usr/lib/john/openssl2john.pyc -rwxr-xr-x root/root usr/lib/john/pass_gen.pl -rwxr-xr-x root/root usr/lib/john/password.lst -rwxr-xr-x root/root usr/lib/john/pcap2john.py +-rw-r--r-- root/root usr/lib/john/pcap2john.pyc -rwxr-xr-x root/root usr/lib/john/pdf2john.py +-rw-r--r-- root/root usr/lib/john/pdf2john.pyc -rwxr-xr-x root/root usr/lib/john/pfx2john -rwxr-xr-x root/root usr/lib/john/putty2john -rwxr-xr-x root/root usr/lib/john/pwsafe2john @@ -101,12 +131,17 @@ drwxr-xr-x root/root usr/lib/john/ -rwxr-xr-x root/root usr/lib/john/sha-dump.pl -rwxr-xr-x root/root usr/lib/john/sha-test.pl -rwxr-xr-x root/root usr/lib/john/sipdump2john.py +-rw-r--r-- root/root usr/lib/john/sipdump2john.pyc -rwxr-xr-x root/root usr/lib/john/ssh2john -rwxr-xr-x root/root usr/lib/john/ssh2sshng.py +-rw-r--r-- root/root usr/lib/john/ssh2sshng.pyc -rwxr-xr-x root/root usr/lib/john/sshng2john.py +-rw-r--r-- root/root usr/lib/john/sshng2john.pyc -rwxr-xr-x root/root usr/lib/john/stats -rwxr-xr-x root/root usr/lib/john/strip2john.py +-rw-r--r-- root/root usr/lib/john/strip2john.pyc -rwxr-xr-x root/root usr/lib/john/sxc2john.py +-rw-r--r-- root/root usr/lib/john/sxc2john.pyc -rwxr-xr-x root/root usr/lib/john/tgtsnarf -rwxr-xr-x root/root usr/lib/john/truecrypt_volume2john -rwxr-xr-x root/root usr/lib/john/uaf2john diff --git a/john/.md5sum b/john/.md5sum index 1e05ef1cc..af8a38f61 100644 --- a/john/.md5sum +++ b/john/.md5sum @@ -1 +1,2 @@ +9cb1275e086164252aa1da5347367dfa gcc5.patch 1d6b22ec41a12cdcd62ad6eae3e77345 john-1.8.0-jumbo-1.tar.xz diff --git a/john/.signature b/john/.signature index 74db75198..60b125bd4 100644 --- a/john/.signature +++ b/john/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZJLwY+cYxWnhikhkBlL3PghE5LPQ4ikesE87jbD8tkb2v9VhEI7cuXDq1wUii+Tw5ChweT9kJj5BWC+p7ZT6g0= -SHA256 (Pkgfile) = 06b2ac354f4f4a717db5bc5cb64869b317da7cad0a485f3055111dd25304b796 +RWSE3ohX2g5d/X7IBjQTuPcKnPnF3fbImbWlS3ygz3akspopevD6aoUtv0oDR7+oR1N41GAdJNuBmnsfMSX4zZ3hSWTGcJP2aA0= +SHA256 (Pkgfile) = b18543936363c00a54c77576deae3dcae62b224df84988003ccc6dcad6a978e8 SHA256 (.footprint) = d1a92e410390b405463562d7928acd54122eb9b1a76033e2ec18d3e27dda471c SHA256 (john-1.8.0-jumbo-1.tar.xz) = bac93d025995a051f055adbd7ce2f1975676cac6c74a6c7a3ee4cfdd9c160923 +SHA256 (gcc5.patch) = c84d53f4e2b5c15c9ab83aea05d72a7e1492e4f0cb547e0047aa91458851aee5 diff --git a/john/Pkgfile b/john/Pkgfile index 1f3c2bfdd..d3361c553 100644 --- a/john/Pkgfile +++ b/john/Pkgfile @@ -1,27 +1,33 @@ # Description: John the Ripper is a fast password cracker # URL: http://www.openwall.com/john/ # Maintainer: Thomas Penteker, tek at serverop dot de -# Packager: Jose V Beneyto, sepen at crux dot nu +# Depends on: libpcap python name=john version=1.8.0-jumbo-1 -release=1 -source=(http://www.openwall.com/$name/j/$name-$version.tar.xz) +release=2 +source=(https://www.openwall.com/$name/j/$name-$version.tar.xz + gcc5.patch) build() { - - sed -i 's|/usr/libexec|/usr/lib|g' $name-$version/src/params.h - cd $name-$version/src + + sed -i 's|/usr/libexec|/usr/lib|g' params.h # fix compilation with gcc 5.x - ./configure CFLAGS=-std=gnu89 + patch -p2 -i $SRC/gcc5.patch + + CONFIG_SHELL=/bin/bash \ + ./configure --prefix=/usr CFLAGS="${CFLAGS}" make - install -d $PKG/usr/bin install -d $PKG/usr/lib/$name - install -m 755 ../run/* $PKG/usr/lib/$name + install -m 0755 -t $PKG/usr/lib/$name ../run/* + + install -d $PKG/usr/bin echo -e '#!/bin/sh\n/usr/lib/john/john "$@"\n' > $PKG/usr/bin/john - chmod 755 $PKG/usr/bin/john + chmod 0755 $PKG/usr/bin/john + + /usr/bin/python -mcompileall $PKG } diff --git a/john/gcc5.patch b/john/gcc5.patch new file mode 100644 index 000000000..f2a798495 --- /dev/null +++ b/john/gcc5.patch @@ -0,0 +1,63 @@ +From e2e868db3e153b3f959e119a51703d4afb99c624 Mon Sep 17 00:00:00 2001 +From: magnum +Date: Wed, 13 May 2015 12:05:00 +0200 +Subject: [PATCH] Add another solution to #1093. This make it possible to build + using gcc 5 without --std=gnu89 (although I kept the latter for now). See + also #1250. + +--- + src/DES_bs_b.c | 3 +++ + src/MD5_std.c | 12 ++++++++++++ + 2 files changed, 15 insertions(+) + +diff --git a/src/DES_bs_b.c b/src/DES_bs_b.c +index 306b4e4..18c9235 100644 +--- a/src/DES_bs_b.c ++++ b/src/DES_bs_b.c +@@ -1272,6 +1272,9 @@ static MAYBE_INLINE void DES_bs_finalize_keys(void) + #endif + + #if DES_bs_mt ++#if __GNUC__ >= 5 ++extern ++#endif + MAYBE_INLINE void DES_bs_set_salt_for_thread(int t, unsigned int salt) + #else + void DES_bs_set_salt(ARCH_WORD salt) +diff --git a/src/MD5_std.c b/src/MD5_std.c +index 6bdcd35..1eec9b4 100644 +--- a/src/MD5_std.c ++++ b/src/MD5_std.c +@@ -496,9 +496,15 @@ extern void MD5_body(MD5_word x[15], MD5_word out[4]); + #if MD5_std_mt + #define MD5_body(x, out) \ + MD5_body_for_thread(t, x, out) ++#if __GNUC__ >= 5 ++extern ++#endif + MAYBE_INLINE_BODY void MD5_body_for_thread(int t, + MD5_word x[15], MD5_word out[4]) + #else ++#if __GNUC__ >= 5 ++extern ++#endif + MAYBE_INLINE_BODY void MD5_body(MD5_word x[15], MD5_word out[4]) + #endif + { +@@ -595,10 +601,16 @@ MAYBE_INLINE_BODY void MD5_body(MD5_word x[15], MD5_word out[4]) + #if MD5_std_mt + #define MD5_body(x0, x1, out0, out1) \ + MD5_body_for_thread(t, x0, x1, out0, out1) ++#if __GNUC__ >= 5 ++extern ++#endif + MAYBE_INLINE_BODY void MD5_body_for_thread(int t, + MD5_word x0[15], MD5_word x1[15], + MD5_word out0[4], MD5_word out1[4]) + #else ++#if __GNUC__ >= 5 ++extern ++#endif + MAYBE_INLINE_BODY void MD5_body(MD5_word x0[15], MD5_word x1[15], + MD5_word out0[4], MD5_word out1[4]) + #endif