commit: 18189332f06a98ab06657cfc661ab2f4c9b106cb Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Feb 16 13:12:00 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Feb 16 13:17:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18189332
app-crypt/johntheripper-jumbo: add 1.9.0_p20250216 Add a workaround for bug #729422 which isn't complete but should help with building in common configurations. Keeping the bug open so we can sort it out properly. Bug: https://bugs.gentoo.org/729422 Closes: https://bugs.gentoo.org/948330 Closes: https://bugs.gentoo.org/943973 Signed-off-by: Sam James <sam <AT> gentoo.org> app-crypt/johntheripper-jumbo/Manifest | 1 + ...999.ebuild => johntheripper-jumbo-1.9.0_p20250216.ebuild} | 12 +++++++++--- .../johntheripper-jumbo/johntheripper-jumbo-9999.ebuild | 12 +++++++++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest index d0882b25a01b..6fa975aaf750 100644 --- a/app-crypt/johntheripper-jumbo/Manifest +++ b/app-crypt/johntheripper-jumbo/Manifest @@ -1 +1,2 @@ DIST johntheripper-jumbo-1.9.0_p20240102.tar.gz 55727974 BLAKE2B 10238f549b8d1d52d7858d0a0df080ae1e92a7026b3b31f4e19d00c2bf06df5ad1fe298291d5421a0f685786fca2ad954a5ed3b2adc23d80464ec1966db9c968 SHA512 c66898d12799d88d42e6a930768e27b4110362b6384a47957ab61300b8254af051d3a2821e54f12a90ded8a20c855b8a2f044942dba1605447ae355e2f7ecbaf +DIST johntheripper-jumbo-1.9.0_p20250216.tar.gz 56239660 BLAKE2B 8d2da0b6634acc9ac78e5561e1afe4d07bc26776371d124c66d95e07164473421394c72aa6557ebd9db95c2d68754104b7dd7ba2fb36b1a193d094e13d9a4629 SHA512 27869c16977ca3c19b1f2247049dca8347b08af7bd1b626ccc549061385ed2e1617593115b6655113aa4999c3a7df5ab37c2ed9f901ed80ecd90d5e4cae9f5b5 diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216.ebuild similarity index 92% copy from app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild copy to app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216.ebuild index 1b05f5211215..3dd5924681e1 100644 --- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_BRANCH="bleeding-jumbo" inherit git-r3 else - HASH_COMMIT="9daf16b5743b2c521d23c281e13ae8cdbd37b1eb" + HASH_COMMIT="8a72b12fe6e1626ef6014e5a190b9d1f69a9edde" 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" @@ -65,7 +65,13 @@ src_prepare() { src_configure() { cd src || die - use custom-cflags || strip-flags + if ! use custom-cflags ; then + strip-flags + + # Nasty (and incomplete) workaround for bug #729422 + filter-flags '-march=native' + append-flags $(test-flags-CC '-mno-avx') + fi econf \ --enable-pkg-config \ diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild index 1b05f5211215..3dd5924681e1 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-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_BRANCH="bleeding-jumbo" inherit git-r3 else - HASH_COMMIT="9daf16b5743b2c521d23c281e13ae8cdbd37b1eb" + HASH_COMMIT="8a72b12fe6e1626ef6014e5a190b9d1f69a9edde" 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" @@ -65,7 +65,13 @@ src_prepare() { src_configure() { cd src || die - use custom-cflags || strip-flags + if ! use custom-cflags ; then + strip-flags + + # Nasty (and incomplete) workaround for bug #729422 + filter-flags '-march=native' + append-flags $(test-flags-CC '-mno-avx') + fi econf \ --enable-pkg-config \
