gentoo resync : 24.12.2018

5 files changed, 152 insertions, 274 deletions

diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 80cf2d22984c..ae08fb6eaf73 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -4,7 +4,8 @@ AUX johntheripper-1.7.9-clang.patch 454 BLAKE2B 96a7ffadcb23ba7979e05a796fafb8f2
 AUX johntheripper-1.7.9-ppc-compile-fix.patch 444 BLAKE2B 0bbbe937851272ba3a06c7c521c4cf24d092d66816f65eabd9800bb0c968e0a191fa7ccd2ccb2a87c0b540e8910a5f4c8978d7692cfba775b1f64471078ec013 SHA512 4af86bb0c5bfc4d88914f195744a596a71236fa49340b47748974a242fde82266fb6bfb41cb266980a3367b1c1a3797960f057a42c5ece3cdc09229c5a4a1513
 DIST john-1.7.9-jumbo-7.diff.gz 1074044 BLAKE2B beb2b3777bccd68ba510b75575cc12678f38bcebd08a8c6d91a291d14b2a3e404013ade5d68610bc9d4a2e26a6a00db8c8757bd4fbcb64bd20cde28a6abde9f4 SHA512 07a461df199fc776e8f62e969a95762fc1c99b72cdbd4a83d06f05ed236eaac9a918356ec9b8f8d060d1a9b2b8aa5c4021dfe53382761a5a76269ec66a5bd28a
 DIST john-1.7.9.tar.bz2 717505 BLAKE2B ea720451b4544a975d5baca75242f22d8b306ad4101f5774dd80b0855410efae7d7e09d6c43bd6e89aac7346ea686ccc5a1bfedc8c89888a39a49941774759a9 SHA512 121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b
-EBUILD johntheripper-1.7.9-r10.ebuild 6458 BLAKE2B 8896245230bec6d2bf2add2ba42175fc7980c5c7cea201a5f587dd78089f06af8d2eb92cec63a617f7f9538c6ad332a34abbeffc0af70e4b686e4fcd6a457e8b SHA512 6eecf3ad51c49b0dca5f71a226ae56a552373fa9b730a2c8f9bc3ab1d1eb7a1cd2a53e57b0d6938b1832f008d8f329480fe643a10eb8acf90e66defb962f18c9
-EBUILD johntheripper-1.7.9-r11.ebuild 6501 BLAKE2B 81818fe5ea3b11c007cde12586b520920aff1cce07aa5c327eb5ca75601adb1d57830c123d7d093c7fa429516ef8124acd4364eca003ab7b5ec3ad9f59f504ee SHA512 89223290ed69c57c7901398b97585124046ebf12f9bff027cafc4e58186df8906af7f320fcff0428ece1dc29e313fca1965869cc57b4008f704e5869e531c328
-EBUILD johntheripper-1.7.9-r6.ebuild 6006 BLAKE2B aaa7d9a64623ff5f9749b9920c04dffff5ac1f9f39e14966ef124c81deb038023709cc3681d9108ec4bfb926a2c770d4e0a89bbafb5ac6721f0f6e636bba6a92 SHA512 2dba19dfe3cb407cc123d70b3e45fd48013eb47a336186392e1276d5aa0936956958d632b2b41c5e9218b86477d6a135ade507c35d81e3b3558fac279fd8ddf5
+DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
+EBUILD johntheripper-1.7.9-r11.ebuild 6534 BLAKE2B 008ae23a7c0f34613cdbbde75db6c4b488ce5dca2ef57a7726c55663eef563a7bd7a133424aa359e0c8dca659678a4fa62179f57b5a333316c545a71b99e30b9 SHA512 3b8fa826d67f349c8eafbb96c509def97e21bd1688fe762c211214a4def243c6db02d3afae0b23dcc7dae62a717d25cef302de2b782edc4a1d468424063066f7
+EBUILD johntheripper-1.7.9-r6.ebuild 6038 BLAKE2B b1f1791dd6bb0990b894aa04808f7593be46e44dc10760c2099152dca60fac9903f0af9466b83c17a380e3a2b281c1abc964d677c8d32dd5df734d97dc0cabbd SHA512 212da5ebef507b1a37d2c3a8ef4da5e9dd3072c30dbe86012bb304e364eb02f2a1d131eae50f7d66b5b5aea60e23b4b0c58cc76cbd0fca093194cc26ad645fdb
+EBUILD johntheripper-1.8.0.ebuild 3223 BLAKE2B d3b8685091a2635645e674abfd3d56013d250622ca89b6e96d56d23c0bf07d45cb37a57dc59c544553fcc65d4ac0b6e313c6c0245d94db72fe15139bd751c951 SHA512 dfe72d8d3513eeed262d5dd755f36000ea50140633e8e1d0d3789bc326498715b7759b475007b1a20c7f371ad014561a9a803f6986a0db0117feecdbc1a5d5e6
 MISC metadata.xml 793 BLAKE2B 8650fe215af0de8946b72ebbd2c2979c437e90634fc48d9d1ac20350b23922a418093301641589a9d524de2908e2c715dc1e0419a2206a34ff20bb7eb0b2a3aa SHA512 29234712e9b5631919aa400e207b36cefa84819cf2609547f5244745d81559d10e79b50e296681b65d14fcf813eea69acbb97fd8f8f487bb4240e4087f4b098e
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
deleted file mode 100644
index 09066589c34b..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-7"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="https://www.openwall.com/john/"
-
-SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi opencl openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-	mpi? ( !minimal )
-	cuda? ( !minimal )
-	opencl? ( !minimal )
-	mozilla? ( !minimal )"
-
-DEPEND="sys-libs/zlib
-	!minimal? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	mpi? ( virtual/mpi )
-	cuda? ( x11-drivers/nvidia-drivers
-		dev-util/nvidia-cuda-toolkit:= )
-	opencl? ( virtual/opencl )
-	mozilla? ( dev-libs/nss dev-libs/nspr )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		if has_xop; then
-			echo "linux-x86-64-xop"
-		elif has_avx; then
-			echo "linux-x86-64-avx"
-		else
-			echo "linux-x86-64"
-		fi
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if has_xop; then
-			echo "linux-x86-xop"
-		elif has_avx; then
-			echo "linux-x86-avx"
-		elif use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-get_john_objs() {
-	echo -n '${JOHN_COMMON_OBJS} '
-	if use opencl; then
-		echo -n '${OCL_OBJS} '
-	fi
-	if use cuda; then
-		echo -n '${CUDA_OBJS}'
-	fi
-}
-
-pkg_setup() {
-	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-
-		if use mpi ; then
-			sed -e "s/^#CC = mpicc/CC = mpicc/" \
-				-e "s/^#MPIOBJ =/MPIOBJ =/" \
-				-i src/Makefile || die
-		fi
-
-		# fix typo in jumbo patch
-		sed -i 's:All15:All5:' run/john.conf || die
-		# fix compile on ppc (only needed for jumbo-7)
-		epatch "${FILESDIR}/${P}-ppc-compile-fix.patch"
-	fi
-
-	cd src
-	epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
-	epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-		sed -i 's#/usr/local#/opt#g' Makefile || die
-	fi
-	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
-
-	if use cuda; then
-		cuda_src_prepare
-		sed \
-			-e "/^NVCC_FLAGS/s:-arch sm_10:${NVCCFLAGS}:g" \
-			-i Makefile || die
-	fi
-
-	if use mozilla; then
-		sed -i -e '/HAVE_NSS =/s/^#*//' -e 's/NSS_override//' Makefile || die
-	fi
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
-	if use mpi; then
-		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	fi
-
-	#this stuff was all stolen from the Makefile, if build breaks, check this first
-	if use opencl; then
-		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
-		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
-	fi
-	if use cuda; then
-		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
-		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
-	fi
-
-	emake -C src/ \
-		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
-		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		JOHN_OBJS="$(get_john_objs)" \
-		$(get_target)
-}
-
-src_test() {
-	if use opencl; then
-		cp src/opencl/*.cl run/
-		cp src/opencl_*.h run/
-	fi
-	pax-mark -mr run/john
-	if use opencl || use cuda; then
-		ewarn "GPU tests fail, skipping all tests..."
-	else
-		make -C src/ check
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -mr "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		for s in \
-			keychain2john keepass2john pwsafe2john hccap2john \
-			racf2john zip2john rar2john pdf2john ssh2john undrop \
-			; do
-			dosym john /usr/sbin/$s
-		done
-		use mozilla && dosym john /usr/sbin/mozilla2john
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		dosbin run/raw2dyna
-		dosbin run/tgtsnarf
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap2john.pl
-		if use opencl; then
-			doins src/opencl/*.cl
-			doins src/opencl_*.h
-		fi
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
index 916f7b51ca6e..49d18cec6232 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
@@ -27,7 +27,8 @@ REQUIRED_USE="openmp? ( !minimal )
 	opencl? ( !minimal )
 	mozilla? ( !minimal )"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="!app-crypt/johntheripper-jumbo
+	sys-libs/zlib
 	!minimal? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
@@ -234,7 +235,7 @@ src_install() {
 	dosbin run/john
 	newsbin run/mailer john-mailer
 
-	pax-mark -mr "${ED}usr/sbin/john" || die
+	pax-mark -mr "${ED}/usr/sbin/john" || die
 
 	dosym john /usr/sbin/unafs
 	dosym john /usr/sbin/unique
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
index e3e30d7db420..48f23d519a62 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
@@ -26,7 +26,8 @@ REQUIRED_USE="openmp? ( !minimal )
 	cuda? ( !minimal )
 	opencl? ( !minimal )"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="!app-crypt/johntheripper-jumbo
+	sys-libs/zlib
 	!minimal? ( >=dev-libs/openssl-0.9.7:0 )
 	mpi? ( virtual/mpi )
 	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
new file mode 100644
index 000000000000..8cd2dafa1828
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cuda eutils flag-o-matic toolchain-funcs multilib
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="https://www.openwall.com/john/"
+
+SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
+IUSE="custom-cflags openmp ${CPU_FLAGS}"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	!app-crypt/johntheripper-jumbo"
+
+S="${WORKDIR}/${MY_P}"
+
+get_target() {
+	if use alpha; then
+		echo "linux-alpha"
+	elif use amd64; then
+		if use cpu_flags_x86_xop; then
+			echo "linux-x86-64-xop"
+		elif use cpu_flags_x86_avx; then
+			echo "linux-x86-64-avx"
+		else
+			echo "linux-x86-64"
+		fi
+	elif use ppc; then
+		echo "linux-ppc32"
+	elif use ppc64; then
+		echo "linux-ppc64"
+	elif use sparc; then
+		echo "linux-sparc"
+	elif use x86; then
+		if use cpu_flags_x86_xop; then
+			echo "linux-x86-xop"
+		elif use cpu_flags_x86_avx; then
+			echo "linux-x86-avx"
+		elif use cpu_flags_x86_sse2; then
+			echo "linux-x86-sse2"
+		elif use cpu_flags_x86_mmx; then
+			echo "linux-x86-mmx"
+		else
+			echo "linux-x86-any"
+		fi
+	elif use ppc-macos; then
+		echo "macosx-ppc32-altivec"
+	elif use x86-macos; then
+		if use cpu_flags_x86_sse2; then
+			echo "macosx-x86-sse2"
+		else
+			echo "macosx-x86"
+		fi
+	elif use x86-solaris; then
+		echo "solaris-x86-any"
+	elif use x86-fbsd; then
+		if use cpu_flags_x86_sse2; then
+			echo "freebsd-x86-sse2"
+		elif use cpu_flags_x86_mmx; then
+			echo "freebsd-x86-mmx"
+		else
+			echo "freebsd-x86-any"
+		fi
+	elif use amd64-fbsd; then
+		echo "freebsd-x86-64"
+	else
+		echo "generic"
+	fi
+}
+
+pkg_setup() {
+	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local OMP
+
+	use custom-cflags || strip-flags
+	cat <<- EOF >> config.gentoo || die
+	#define JOHN_SYSTEMWIDE 1
+	#define JOHN_SYSTEMWIDE_HOME "${EPREFIX}/etc/john"
+	#define JOHN_SYSTEMWIDE_EXEC "${EPREFIX}/usr/libexec/john"
+EOF
+
+	append-flags -fPIC -fPIE
+	#gcc-specs-pie && append-ldflags -nopie
+	use openmp && OMP="-fopenmp"
+
+	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
+
+	emake -C src/ \
+		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
+		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP}" \
+		LDFLAGS="${LDFLAGS} ${OMP}" \
+		OPT_NORMAL="" \
+		OMPFLAGS="${OMP}" \
+		$(get_target)
+}
+
+src_test() {
+	make -C src/ check
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	dosym john /usr/sbin/unafs
+	dosym john /usr/sbin/unique
+	dosym john /usr/sbin/unshadow
+
+	# config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+
+	# documentation
+	dodoc doc/*
+}
+
+pkg_postinst() {
+	if [ -n "${REPLACING_VERSIONS}" ] && [ "${REPLACING_VERSIONS}" != "1.8.0" ]; then
+		ewarn "This package no longer includes jumbo.  If you want jumbo please install app-crypt/johntheripper-jumbo instead."
+	fi
+}