Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4c61b612f6d8670fd268ae0d62942ff13f292bdb
commit 4c61b612f6d8670fd268ae0d62942ff13f292bdb Author: crazy <[email protected]> Date: Mon Dec 12 20:34:57 2016 +0100 john-1.8.0_jumbo_1-2-x86_64 * rebuild * added an patch to fix the build * FB fixes diff --git a/source/apps-extra/john/FrugalBuild b/source/apps-extra/john/FrugalBuild index ea9b046..2a9dd20 100644 --- a/source/apps-extra/john/FrugalBuild +++ b/source/apps-extra/john/FrugalBuild @@ -5,29 +5,31 @@ pkgname=john _jumbover=1 pkgver=1.8.0_jumbo_${_jumbover} -pkgrel=1 +pkgrel=2 pkgdesc="John the Ripper is a fast password cracker." url="http://www.openwall.com/john/"; depends=() groups=('apps-extra') -archs=('i686' 'x86_64') +archs=('x86_64') up2date="lynx -dump http://openwall.com/john |Flasttar" -source=(http://www.openwall.com/$pkgname/j/$pkgname-${pkgver//_/-}.tar.xz - john) -signatures=("${source[0]}.sign" '') +source=(http://www.openwall.com/$pkgname/j/$pkgname-${pkgver//_/-}.tar.xz john gcc5++.patch) +sha1sums=('38196f21d2c9c4b539529d0820eb242d5373241f' \ + '6ac620306d267b5002f6fa16137ddc8c04dd4e66' \ + '503d57e21d779f7b6448fce4ac17034662598f0d') -_F_cd_path=$pkgname-${pkgver//_/-}/src +_F_cd_path=$pkgname-${pkgver//_/-} -[ "$CARCH" == "x86_64" ] && _F_make_opts="${MAKEFLAGS} linux-x86-64" -[ "$CARCH" == "i686" ] && _F_make_opts="${MAKEFLAGS} linux-x86-mmx" +_F_make_opts="${MAKEFLAGS} linux-x86-64" build() { + Fcd + Fpatchall + Fexec cd src || Fdie Fconf - - make clean || Fdie - make -s || Fdie - + Fexec make clean || Fdie + Fexec make -s || Fdie + # Move and install files Ffilerel ../run/john.conf /etc/john/john.conf Fexerel ../run/* usr/lib/john @@ -37,9 +39,8 @@ build() Fln /usr/lib/john/john usr/bin/unique Fln /usr/lib/john/john usr/bin/unshadow Frm usr/lib/john/un{afs,ique,shadow} - #clean up the conf file - sed -i 's/^\.include ["<].*//g' $Fdestdir/etc/john/john.conf + Fexec sed -i 's/^\.include ["<].*//g' $Fdestdir/etc/john/john.conf } diff --git a/source/apps-extra/john/gcc5++.patch b/source/apps-extra/john/gcc5++.patch new file mode 100644 index 0000000..c758438 --- /dev/null +++ b/source/apps-extra/john/gcc5++.patch @@ -0,0 +1,49 @@ +diff -Naur john-1.8.0-jumbo-1/src/DES_bs_b.c john-1.8.0-jumbo-1-p/src/DES_bs_b.c +--- john-1.8.0-jumbo-1/src/DES_bs_b.c 2014-05-16 15:40:40.000000000 +0200 ++++ john-1.8.0-jumbo-1-p/src/DES_bs_b.c 2016-12-12 20:22:03.273436555 +0100 +@@ -1247,6 +1247,9 @@ + #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 -Naur john-1.8.0-jumbo-1/src/MD5_std.c john-1.8.0-jumbo-1-p/src/MD5_std.c +--- john-1.8.0-jumbo-1/src/MD5_std.c 2014-05-16 15:40:40.000000000 +0200 ++++ john-1.8.0-jumbo-1-p/src/MD5_std.c 2016-12-12 20:22:03.274436555 +0100 +@@ -490,9 +490,15 @@ + #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 + { +@@ -589,10 +595,16 @@ + #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 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
