john: update to 1.9.0.

srcpkgs/john/patches/gcc5.patch

@@ -1,13 +0,0 @@
---- src/common.h.orig
-+++ src/common.h
-@@ -31,7 +31,9 @@ typedef unsigned long long ARCH_WORD_64;
- #define is_aligned(PTR, CNT) ((((ARCH_WORD)(const void *)(PTR))&(CNT-1))==0)
- 
- #ifdef __GNUC__
--#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER)
-+#if __GNUC__ >= 5
-+#define MAYBE_INLINE __attribute__((gnu_inline)) inline
-+#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER)
- #define MAYBE_INLINE __attribute__((always_inline)) inline
- #elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
- #define MAYBE_INLINE __attribute__((always_inline))

srcpkgs/john/patches/libressl.patch

@@ -1,9 +0,0 @@
---- src/common.h	2015-02-02 15:49:37.819305586 +0100
-+++ src/common.h	2015-02-02 15:47:25.449554007 +0100
-@@ -75,4 +75,6 @@
-  */
- extern void common_init(void);
- 
-+#define C_Block DES_cblock
-+
- #endif

srcpkgs/john/patches/truecrypt.patch

@@ -1,20 +0,0 @@
-Upstream patch:
-commit 480e95b0e449863be3e1a5b0bc634a67df28b618
-Author: Solar <solar@openwall.com>
-Date:   Thu Dec 18 21:24:01 2014 +0100
-
-    Fix a bug in truecrypt for non-x86 archs. Closes #912.
-
---- src/truecrypt_fmt_plug.c
-+++ src/truecrypt_fmt_plug.c
-@@ -310,8 +310,8 @@ static int crypt_all(int *pcount, struct db_salt *salt)
- 			pbkdf2_sha512_sse((const unsigned char **)pin, lens, psalt->salt, 64, psalt->num_iterations, &(x.poutc), sizeof(key), 0);
- 		}
- #else
--		if (is_sha512)
--			pbkdf2_sha512((const unsigned char*)key_buffer[i], strlen(key_buffer[i]), psalt->salt, 64, num_iterations, key, sizeof(key), 0);
-+		if (psalt->hash_type == IS_SHA512)
-+			pbkdf2_sha512((const unsigned char*)key_buffer[i], strlen((char*)key_buffer[i]), psalt->salt, 64, psalt->num_iterations, key, sizeof(key), 0);
- #endif
- 		else if (psalt->hash_type == IS_RIPEMD160)
- 			pbkdf2_ripemd160(key_buffer[i], strlen((char*)(key_buffer[i])), psalt->salt, 64, psalt->num_iterations, key, sizeof(key), 0);

srcpkgs/john/template

@@ -1,60 +1,96 @@
 # Template file for 'john'
 pkgname=john
-version=1.8.0
+version=1.9.0
-revision=13
+revision=1
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
-configure_args="--disable-native-tests --disable-native-macro"
+configure_args="--with-systemwide"
-hostmakedepends="libgomp-devel pkg-config"
+makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
-makedepends="zlib-devel libgomp-devel libressl-devel libpcap-devel gmp-devel"
-conf_files="/etc/john/john.conf"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piraty <piraty1@inbox.ru>"
-license="GPL-2"
+license="GPL-2.0-or-later with OpenSSL-exception"
-homepage="http://www.openwall.com/john/"
+homepage="https://www.openwall.com/john/"
-distfiles="$homepage/j/$pkgname-${version}-jumbo-${_jumbover}.tar.xz"
+distfiles="$homepage/k/$pkgname-${version}-jumbo-${_jumbover}.tar.xz"
-checksum=bac93d025995a051f055adbd7ce2f1975676cac6c74a6c7a3ee4cfdd9c160923
+checksum=f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b
 
 pre_configure() {
-	rm rawSHA0_fmt_plug.c # SHA no longer available in libressl
+	unset CPP AS LD
-	sed -i 's|des_|DES_|g' KRB4*.c
+}
-	sed -i -e 's|^$CPP|$CC -E|' configure
+
-	export AS= LD=
+# Tests cannot be run because include statements for rules in john.conf search
-	export OPENSSL_LIBS="-lssl -lcrypto"
+# in /usr/share/john, even if $JOHN is replaced and points to
-	CFLAGS+=" -DJOHN_SYSTEMWIDE=1"
+# `/builddir/john-.../run`.
+do_check() {
+	:
 }
 
 do_install() {
-	cd ..
+	# doc and license
+	cd ../
+	cp -r doc doc.tmp ; cd doc.tmp
+	for f in *LICENSE* COPYING; do
+		vlicense $f
+		rm $f
+	done
+	rm INSTALL*
+	rm -r extras
+	for f in * ; do
+		vdoc $f
+	done
+	cd .. ; rm -r doc.tmp
 
-	# config file
+	cd run
-	sed -i 's|$JOHN|/usr/share/john|g' run/john.conf
+
-	install -Dm644 run/john.conf ${DESTDIR}/etc/john/john.conf
+	# binaries
-	# docs
+	vbin john
-	vmkdir usr/share/doc/john
+	for f in SIPdump bitlocker2john calc_stat cprepair dmg2john eapmd5tojohn \
-	vmkdir usr/share/licenses/john
+		genmkvpwd hccap2john keepass2john mkvcalcproba putty2john racf2john \
-	install -m644 doc/* ${DESTDIR}/usr/share/doc/john
+		raw2dyna tgtsnarf uaf2john vncpcap2john wpapcap2john ; do
+			vbin $f
+	done
+
+	# scripts
+	for ext in lua pl rb py; do
+		for f in *.$ext ; do
+			vbin $f ${f/.$ext}
+		done
+	done
+	vbin mailer john-mailer
+
+	# data
 	vmkdir usr/share/john
-	mv ${DESTDIR}/usr/share/doc/$pkgname/LICENSE ${DESTDIR}/usr/share/licenses/$pkgname
+	vcopy john.conf usr/share/john
-	# install password list and charset files
+	vcopy rules usr/share/john
-	install -m644 run/*.chr run/*.lst ${DESTDIR}/usr/share/john
+	vcopy "*.chr" usr/share/john
-	install -m644 run/*.conf ${DESTDIR}/usr/share/john
+	vcopy "*.lst" usr/share/john
-	# install binaries
+	vcopy "*.conf" usr/share/john
-	vbin run/john
+	vcopy "*.js" usr/share/john
-	vbin run/mailer john-mailer
-	vbin run/vncpcap2john
-	vbin run/luks2john
 
-	cd ${DESTDIR}/usr/bin
+	vmkdir usr/share/applications
+	vcopy "../src/packaging/*.desktop" usr/share/applications/john.desktop
+
+	vmkdir usr/share/bash-completion/completions
+	vinstall john.bash_completion 644 usr/share/bash-completion/completions/ john
+	vmkdir usr/share/zsh/site-functions
+	vinstall john.zsh_completion 644 usr/share/zsh/site-functions/ _john
+}
+
+post_install() {
+	cd $DESTDIR
+	vsed -i ${DESTDIR}/usr/share/john/john.conf \
+		-e 's|$JOHN|/usr/share/john|g'
+
+	# fix some perms
+	chmod 644 $(find ${DESTDIR}/usr/share/ -type f)
+
+	cd usr/bin
 	ln -s john unafs
 	ln -s john unique
 	ln -s john unshadow
 	ln -s john undrop
 	ln -s john gpg2john
-	ln -s john pdf2john
 	ln -s john rar2john
-	ln -s john ssh2john
 	ln -s john zip2john
 }