From 9aa80713372911cec499b3adb2cd746790920916 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 Jun 2021 10:15:54 +0100 Subject: gentoo resync : 29.06.2021 --- app-crypt/johntheripper-jumbo/Manifest | 5 +- .../files/johntheripper-jumbo-1.9.0-gcc11.patch | 53 ++++++++ .../johntheripper-jumbo-1.9.0-r2.ebuild | 133 -------------------- .../johntheripper-jumbo-1.9.0-r3.ebuild | 137 +++++++++++++++++++++ .../johntheripper-jumbo-9999.ebuild | 5 +- 5 files changed, 196 insertions(+), 137 deletions(-) create mode 100644 app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-gcc11.patch delete mode 100644 app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r2.ebuild create mode 100644 app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild (limited to 'app-crypt/johntheripper-jumbo') diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest index c56185ffae21..bc9de79b8b6c 100644 --- a/app-crypt/johntheripper-jumbo/Manifest +++ b/app-crypt/johntheripper-jumbo/Manifest @@ -1,5 +1,6 @@ +AUX johntheripper-jumbo-1.9.0-gcc11.patch 1713 BLAKE2B b1f3aaf0c76f1c0fc6ad0d498dce4722994ed11a6f0547bb4ff7683083b9c9d59ce817133189853380378121515aa12db1cf08699c40b39e2fdec667045da88d SHA512 d341eeb291b5bf5721b781272ac66aa56e7d38db305f0272e65a0b77bad05ffc631cfe5fe8093f94a8545cc09020d639dfebb1b903585248bd57933661571b4f AUX johntheripper-jumbo-1.9.0-opencl-fix.patch 333 BLAKE2B 248ad5ecba48908a982c27c9d8162c22031cfc29f0becb05209f56c837bb850f6032c847a60d8cd05ba88a0f73ad35f27a08fefb734c6bd87f458b22f77db0ab SHA512 81f9dabc6d8ad54944be7eb9b3c7204ce426db842325c31662038e213775c0a86288c860712e6d3c24f7a9d0b7a0fd8962126a25242f45e5f242307691a97d38 DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 2fd6813e234308408d42581705ee8b25f9217a3dfb43f05483156f7bb67d0ce0d6de9c3ce8c2e4a17bb99bb377119dae2897bc08c800e7bc80bc6cf245400df6 SHA512 c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808 -EBUILD johntheripper-jumbo-1.9.0-r2.ebuild 2993 BLAKE2B 512cba94b73d135f68d8b121ab97bde126ce124596648398d85f3b3295952b752d8c9ee56e1a56c276cdacc751e2c676274db7739a4d70d2082b7c3340c9c828 SHA512 0ace9fb01ddc9f422ce82e73d7195406b80c684308e9d7e1cd2f73434428ee0e69b612e34c8c34c00b978c46f26b3cb33892baf51c53232a27994ab39aec441c -EBUILD johntheripper-jumbo-9999.ebuild 2822 BLAKE2B 8518dc8995437dcb38ffdba9cde0283a8f0d3fe7c4d66eea4969f327a2f7da10c54008c132d480be689f67cbf1e7065f9a944a245482543990910253d9124976 SHA512 cb20d6b7d5a70eb5ee7a8a237dd52b2a41ea7a9ae09c6e0c07ef0ad0429edf8ac89b73105b91714acbea3fb70d0be31f227903c8e5f548bc0102fe10b3a63c54 +EBUILD johntheripper-jumbo-1.9.0-r3.ebuild 3046 BLAKE2B 2573edffdbd3fd90ea3cff11197767acd593d24a99ae8a1c3f60c1b4f14b9e2e6ffb134b03a6f2e86ce850c379d4d8ce5fdeddf872e045126142a3592fd0b9c6 SHA512 5714243ca54db6aeeeb083070a419d0d93c67d24c272ecba833b4e813c605f56b5909fb663ec85f3142462113e716b1817a67e3dc8bfba511e89e30a8d37bfcc +EBUILD johntheripper-jumbo-9999.ebuild 2842 BLAKE2B f3a248bb7713f41e9d87f0b8d751e2edd3136266c50da26419d9aeb01f0e884f52a3bf78e8c012efa26a3192552e77eee69c4bdc832817b9907c255a52403682 SHA512 b5d8625f3c3c62e0a9a7b859c8b65be7655ec4fbab5b38cb3264f444770dd23b2770dfd8dc478de2693c8b4e9dd168a4fe5edc7adca6ede5c2e4951d52fd643d MISC metadata.xml 472 BLAKE2B 82b4e6bd8682bd19ffc1140a8225e1766333af7a10331e4ce5a0b1306959b267a23df2429b593bd74f0bc61e73bd7df6a756cc2820438335c3a565b6208d9219 SHA512 63bf68deac15fd3e96d6ccf7d4ca4c52192c79bf1d075305d1e9757b3ce20dd5f868ef4c908dbe020d2fe6884756b236281ec8902cc4294a3eac96aa05571abf diff --git a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-gcc11.patch b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-gcc11.patch new file mode 100644 index 000000000000..2901c5bc4bd6 --- /dev/null +++ b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-gcc11.patch @@ -0,0 +1,53 @@ +https://bugs.gentoo.org/786651 +https://github.com/openwall/john/commit/8152ac071bce1ebc98fac6bed962e90e9b92d8cf.patch + +From 8152ac071bce1ebc98fac6bed962e90e9b92d8cf Mon Sep 17 00:00:00 2001 +From: Ferry Huberts +Date: Tue, 9 Mar 2021 22:04:46 +0100 +Subject: [PATCH] Fix alignment compile errors on GCC 11 + +Signed-off-by: Ferry Huberts +--- + src/blake2.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/blake2.h b/src/blake2.h +index b05208117e..b4398f9e13 100644 +--- a/src/blake2.h ++++ b/src/blake2.h +@@ -57,7 +57,7 @@ extern "C" { + uint8_t personal[BLAKE2S_PERSONALBYTES]; // 32 + } blake2s_param; + +- JTR_ALIGN( 64 ) typedef struct __blake2s_state ++ typedef struct JTR_ALIGN( 64 ) __blake2s_state + { + uint32_t h[8]; + uint32_t t[2]; +@@ -82,7 +82,7 @@ extern "C" { + uint8_t personal[BLAKE2B_PERSONALBYTES]; // 64 + } blake2b_param; + +- JTR_ALIGN( 64 ) typedef struct __blake2b_state ++ typedef struct JTR_ALIGN( 64 ) __blake2b_state + { + uint64_t h[8]; + uint64_t t[2]; +@@ -94,7 +94,7 @@ extern "C" { + #if defined(JOHN_NO_SIMD) || (!defined(__SSE2__) && !defined(__SSE4_1__) && !defined(__XOP__)) + typedef struct __blake2sp_state + #else +- JTR_ALIGN( 64 ) typedef struct __blake2sp_state ++ typedef struct JTR_ALIGN( 64 ) __blake2sp_state + #endif + { + blake2s_state S[8][1]; +@@ -106,7 +106,7 @@ extern "C" { + #if defined(JOHN_NO_SIMD) || (!defined(__SSE2__) && !defined(__SSE4_1__) && !defined(__XOP__)) + typedef struct __blake2bp_state + #else +- JTR_ALIGN( 64 ) typedef struct __blake2bp_state ++ typedef struct JTR_ALIGN( 64 ) __blake2bp_state + #endif + { + blake2b_state S[4][1]; diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r2.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r2.ebuild deleted file mode 100644 index 12b9fbef4708..000000000000 --- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r2.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs pax-utils - -DESCRIPTION="fast password cracker" -HOMEPAGE="http://www.openwall.com/john/" - -MY_PN="JohnTheRipper" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git" - inherit git-r3 -else - JUMBO="jumbo-1" - MY_PV="${PV}-${JUMBO}" - MY_P="john-${MY_PV}" - SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -#removed rexgen and commoncrypto -IUSE="custom-cflags kerberos mpi opencl openmp pcap" - -DEPEND=">=dev-libs/openssl-1.0.1:0= - mpi? ( virtual/mpi ) - opencl? ( virtual/opencl ) - kerberos? ( virtual/krb5 ) - pcap? ( net-libs/libpcap ) - dev-libs/gmp:* - sys-libs/zlib - app-arch/bzip2" - -RDEPEND="${DEPEND} - !app-crypt/johntheripper" - -PATCHES=( "${FILESDIR}/${P}-opencl-fix.patch" ) - -pkg_setup() { - if use openmp && [[ ${MERGE_TYPE} != binary ]]; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -src_prepare() { - sed -i 's#$prefix/share/john#/etc/john#' src/configure || die - default -} - -src_configure() { - cd src || die - - use custom-cflags || strip-flags - append-cflags -fcommon - - econf \ - --disable-native-march \ - --disable-native-tests \ - --without-commoncrypto \ - --disable-rexgen \ - --with-openssl \ - --with-systemwide \ - $(use_enable mpi) \ - $(use_enable opencl) \ - $(use_enable openmp) \ - $(use_enable pcap) -} - -src_compile() { - emake -C src -} - -src_test() { - pax-mark -mr run/john - #if use opencl; then - #gpu tests fail in portage, so run cpu only tests - # ./run/john --device=cpu --test=0 --verbosity=2 || die - #else - #weak tests - # ./run/john --test=0 --verbosity=2 || die - #strong tests - #./run/john --test=1 --verbosity=2 || die - #fi - ewarn "When built systemwide, john can't run tests without reading files in /etc." - ewarn "Don't bother opening a bug for this unless you include a patch to fix it" -} - -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 - 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 - cd run - for s in *.pl *.py ; do - dosym ../share/john/$s /usr/bin/$s - done - cd .. - - if use opencl; then - insinto /etc/john - doins -r run/kernels - 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 - dodoc -r README.md doc/* -} diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild new file mode 100644 index 000000000000..632f59d7a16f --- /dev/null +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs pax-utils + +DESCRIPTION="Fast password cracker" +HOMEPAGE="http://www.openwall.com/john/" + +MY_PN="JohnTheRipper" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git" + inherit git-r3 +else + JUMBO="jumbo-1" + MY_PV="${PV}-${JUMBO}" + MY_P="john-${MY_PV}" + SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2" +SLOT="0" +#removed rexgen and commoncrypto +IUSE="custom-cflags kerberos mpi opencl openmp pcap" + +DEPEND=">=dev-libs/openssl-1.0.1:0= + virtual/libcrypt:= + mpi? ( virtual/mpi ) + opencl? ( virtual/opencl ) + kerberos? ( virtual/krb5 ) + pcap? ( net-libs/libpcap ) + dev-libs/gmp:= + sys-libs/zlib + app-arch/bzip2" + +RDEPEND="${DEPEND} + !app-crypt/johntheripper" + +PATCHES=( + "${FILESDIR}/${P}-opencl-fix.patch" + "${FILESDIR}/${P}-gcc11.patch" +) + +pkg_setup() { + if use openmp && [[ ${MERGE_TYPE} != binary ]]; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi +} + +src_prepare() { + sed -i 's#$prefix/share/john#/etc/john#' src/configure || die + default +} + +src_configure() { + cd src || die + + use custom-cflags || strip-flags + append-cflags -fcommon + + econf \ + --disable-native-march \ + --disable-native-tests \ + --without-commoncrypto \ + --disable-rexgen \ + --with-openssl \ + --with-systemwide \ + $(use_enable mpi) \ + $(use_enable opencl) \ + $(use_enable openmp) \ + $(use_enable pcap) +} + +src_compile() { + emake -C src +} + +src_test() { + pax-mark -mr run/john + #if use opencl; then + #gpu tests fail in portage, so run cpu only tests + # ./run/john --device=cpu --test=0 --verbosity=2 || die + #else + #weak tests + # ./run/john --test=0 --verbosity=2 || die + #strong tests + #./run/john --test=1 --verbosity=2 || die + #fi + ewarn "When built systemwide, john can't run tests without reading files in /etc." + ewarn "Don't bother opening a bug for this unless you include a patch to fix it" +} + +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 + 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 + cd run + for s in *.pl *.py ; do + dosym ../share/john/$s /usr/bin/$s + done + cd .. + + if use opencl; then + insinto /etc/john + doins -r run/kernels + 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 + 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 40bb28803b18..826ff08b2f51 100644 --- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit flag-o-matic toolchain-funcs pax-utils -DESCRIPTION="fast password cracker" +DESCRIPTION="Fast password cracker" HOMEPAGE="http://www.openwall.com/john/" MY_PN="JohnTheRipper" @@ -28,11 +28,12 @@ SLOT="0" IUSE="custom-cflags kerberos mpi opencl openmp pcap" DEPEND=">=dev-libs/openssl-1.0.1:0= + virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) - dev-libs/gmp:* + dev-libs/gmp:= sys-libs/zlib app-arch/bzip2" -- cgit v1.2.3