gentoo auto-resync : 02:01:2024 - 20:57:46

3 files changed, 165 insertions, 11 deletions

diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
index 150a37fae9cb..e2745633960d 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,7 +1,9 @@
 AUX johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch 3933 BLAKE2B cd5d773615f4b239e857b430c35a905be7e0c8bfd83b037f43fe14799340aa6d3a02bf9f3f69c1e69a2b07a4038474c1fc57a8ab056db26fde5aa14b1842df18 SHA512 505cf695a001f22a74998a83eb79ce7b88882eb51a0864833e06bd9344dae36df629ffb6cdcdfaa019b3dfcfdedc8314a30b169d0d5b1f6976408adbaee49023
 DIST johntheripper-jumbo-1.9.0_p20211129.tar.gz 47758087 BLAKE2B de57218151fbc3bed79322d065ef73deb99b73fb1ce55924197793a320600cc1189dabae43fe5848014c2e72dcb7e1c2a91f2aaba64bd8c7314ded37e23a34c9 SHA512 f8fc6bf102d900bb32c5714bd595a71f67f73a1f0a237d9f851b2f250046307bf1177f3782023cd1bbcc55f9d54fd7b4946e09c7dc1fd908ba6a6bad90b233d6
 DIST johntheripper-jumbo-1.9.0_p20230717.tar.gz 56772470 BLAKE2B 33295dc28d32852a6284adaadbbf9d9c852fb78e1dc673df5e67c31befb6921dbd6d29310ca7b3406e4b1259cca6e8d643292d73f4324262b038a1c6bc7ff51b SHA512 fd48a6bccf3f2be0d495aa8a635af73bc386c5815fdaa62259f2920724afa89e0e9743585c412e595486a0d2677f1ec43c43606471078ec0611d5c05b01853de
+DIST johntheripper-jumbo-1.9.0_p20240102.tar.gz 55727974 BLAKE2B 10238f549b8d1d52d7858d0a0df080ae1e92a7026b3b31f4e19d00c2bf06df5ad1fe298291d5421a0f685786fca2ad954a5ed3b2adc23d80464ec1966db9c968 SHA512 c66898d12799d88d42e6a930768e27b4110362b6384a47957ab61300b8254af051d3a2821e54f12a90ded8a20c855b8a2f044942dba1605447ae355e2f7ecbaf
 EBUILD johntheripper-jumbo-1.9.0_p20211129-r1.ebuild 3506 BLAKE2B bf4b1332f6b670afdd8eb8143d34aa50167cc0b43e590a15635349f9abbabca4c8ef306bcd02be2e327c808300b805da0545b74d0ec5fd3894b654bbf734d37a SHA512 5d4330da8526c26ec68fa003e9d3c9f1de60385936551cce68992a307ea1a756f134b05f9ff3d8c112f68974764d1a5dd7d842b0375d1a363fd30f616271baf0
 EBUILD johntheripper-jumbo-1.9.0_p20230717.ebuild 3548 BLAKE2B 5fc51b022900c61fef31cfca90b5230a3acd4b6b899cb84971b435667075fc249ac0a9935f03a35eb018772cab83c4ec6f927a1fc0fb5504025ab77a26d5ecc5 SHA512 e6c81d46b3d4bb125d0447506b21dc9cb6acaace7875a243dc4ebb78fc16b5846e001e6ea3f36410e73891571fa4289e1b2cbe619c9310ef9dae1ffbb9ad99f9
-EBUILD johntheripper-jumbo-9999.ebuild 3631 BLAKE2B 06eb76d8a5a1d9ad7c61c686f8001128f872093f82ffe2708befe171c3516e85e10caaf3699452d3eff2054efa38436d025bf386b19a373a80a4a1149a8f49e6 SHA512 76a66bec247347242dffaadc78e3712cd4d920c4192b0e9280cb7c8ffd094a97b1f4fad168e9d1ecaf5ef86883c4696fa27d74179cd6da3f673e216e56bcc9e2
+EBUILD johntheripper-jumbo-1.9.0_p20240102.ebuild 3644 BLAKE2B fa28622ef6c8cd3f934c2764267b963a67d45aa941064320051af34399c94f1f18cc7f2f5a2dfc06dc693f458e4718117701a71eab8511c82c6d922ef23044e9 SHA512 eff3e72d3947ed1057504bbc2c7b33d7fddfcf59d74d63d6994456e00260fda43188a807c727dde5c0a1515012745227b570a47e9424ca78003c52797ded1276
+EBUILD johntheripper-jumbo-9999.ebuild 3644 BLAKE2B fa28622ef6c8cd3f934c2764267b963a67d45aa941064320051af34399c94f1f18cc7f2f5a2dfc06dc693f458e4718117701a71eab8511c82c6d922ef23044e9 SHA512 eff3e72d3947ed1057504bbc2c7b33d7fddfcf59d74d63d6994456e00260fda43188a807c727dde5c0a1515012745227b570a47e9424ca78003c52797ded1276
 MISC metadata.xml 473 BLAKE2B ed1c424492ff052e83ce899d8ea4a805ce5d4a5604da336ad16929594d14307c2e264c4eb6e6ee985d3167b8917e8c80c38ed9f97ba5293a0b8f84f472fd9786 SHA512 f124050eecf17e3c2fa01b6140881349e089840c75cb30bf054286a049026bb372cc70e1ce7be3054fffbe5836be7dc1f7fc9e3918f874443644ea99c5b441ab
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
new file mode 100644
index 000000000000..6ec25a477ce0
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs pax-utils
+
+DESCRIPTION="Fast password cracker, community enhanced version"
+HOMEPAGE="http://www.openwall.com/john/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/openwall/john.git"
+	EGIT_BRANCH="bleeding-jumbo"
+	inherit git-r3
+else
+	HASH_COMMIT="9daf16b5743b2c521d23c281e13ae8cdbd37b1eb"
+	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/john-${HASH_COMMIT}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags kerberos mpi opencl openmp pcap"
+
+DEPEND=">=dev-libs/openssl-1.0.1:=
+	virtual/libcrypt:=
+	mpi? ( virtual/mpi )
+	opencl? ( virtual/opencl )
+	kerberos? ( virtual/krb5 )
+	pcap? ( net-libs/libpcap )
+	dev-libs/gmp:=
+	sys-libs/zlib
+	app-arch/bzip2"
+# Missing (unpackaged):
+# - Digest::Haval256
+# - Digest::x
+# See bug #777369.
+# Pending keywording https://bugs.gentoo.org/921221
+#	dev-perl/Compress-Raw-Lzma
+RDEPEND="${DEPEND}
+	dev-perl/Digest-MD2
+	virtual/perl-Digest-MD5
+	dev-perl/Digest-SHA3
+	dev-perl/Digest-GOST
+	!app-crypt/johntheripper"
+RESTRICT="test"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	cd src || die
+	eautoreconf
+
+	sed -i 's#$prefix/share/john#/etc/john#' configure || die
+}
+
+src_configure() {
+	cd src || die
+
+	use custom-cflags || strip-flags
+
+	econf \
+		--enable-pkg-config \
+		--disable-native-march \
+		--disable-native-tests \
+		--disable-rexgen \
+		--with-openssl \
+		--with-systemwide \
+		$(use_enable mpi) \
+		$(use_enable opencl) \
+		$(use_enable openmp) \
+		$(use_enable pcap)
+}
+
+src_compile() {
+	# Uses default LD=$(CC) but if the user's set LD, it'll call it
+	# bug #729432.
+	emake LD="$(tc-getCC)" -C src
+}
+
+src_test() {
+	pax-mark -mr run/john
+
+	# this probably causes the following failure:
+	# Testing: as400-des, AS/400 DES [DES 32/64]... PASS
+	# Error, Invalid signature line trying to link to dynamic format.
+	# Original format=as400-ssha1
+	sed '/.include /d' run/john.conf > run/john-test.conf
+	if use opencl; then
+		# GPU tests fail in portage, so run cpu only tests
+		./run/john --config=run/john-test.conf --device=cpu --test=0 --verbosity=2 || die
+	else
+		# Weak tests
+		./run/john --config=run/john-test.conf --test=0 --verbosity=2 || die
+		# Strong tests
+		#./run/john --test=1 --verbosity=2 || die
+	fi
+
+	rm john-test.conf || die
+}
+
+src_install() {
+	# Executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -mr "${ED}/usr/sbin/john"
+
+	# grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3
+	local s
+	for s in \
+		unshadow unafs undrop unique ssh2john putty2john pfx2john keepass2john keyring2john \
+		zip2john gpg2john rar2john racf2john keychain2john kwallet2john pwsafe2john dmg2john \
+		hccap2john base64conv truecrypt_volume2john keystore2john
+	do
+		dosym john /usr/sbin/${s}
+	done
+
+	# Scripts
+	exeinto /usr/share/john
+	doexe run/*.pl
+	doexe run/*.py
+	insinto /usr/share/john
+	doins -r run/lib
+	cd run || die
+
+	local s
+	for s in *.pl *.py; do
+		dosym ../share/john/${s} /usr/bin/${s}
+	done
+	cd .. || die
+
+	if use opencl; then
+		insinto /etc/john
+		doins -r run/opencl
+	fi
+
+	# Config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+	doins -r run/rules run/ztex
+
+	# Documentation
+	rm -f doc/README || die
+	dodoc -r README.md doc/*
+}
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index 3f89098a9405..6ec25a477ce0 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,20 +8,14 @@ inherit autotools flag-o-matic toolchain-funcs pax-utils
 DESCRIPTION="Fast password cracker, community enhanced version"
 HOMEPAGE="http://www.openwall.com/john/"
 
-MY_PN="JohnTheRipper"
-
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git"
+	EGIT_REPO_URI="https://github.com/openwall/john.git"
+	EGIT_BRANCH="bleeding-jumbo"
 	inherit git-r3
 else
-	JUMBO="jumbo-1.1"
-	MY_PV="${PV}-${JUMBO}"
-	MY_P="john-${MY_PV}"
-	HASH_COMMIT="5d0c85f16f96ca7b6dd06640e95a5801081d6e20"
-
+	HASH_COMMIT="9daf16b5743b2c521d23c281e13ae8cdbd37b1eb"
 	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/john-${HASH_COMMIT}"
-
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
@@ -42,6 +36,8 @@ DEPEND=">=dev-libs/openssl-1.0.1:=
 # - Digest::Haval256
 # - Digest::x
 # See bug #777369.
+# Pending keywording https://bugs.gentoo.org/921221
+#	dev-perl/Compress-Raw-Lzma
 RDEPEND="${DEPEND}
 	dev-perl/Digest-MD2
 	virtual/perl-Digest-MD5