diff options
Diffstat (limited to 'app-crypt/johntheripper-jumbo')
8 files changed, 386 insertions, 244 deletions
diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest index cf2f85e511b8..e289b458e9e1 100644 --- a/app-crypt/johntheripper-jumbo/Manifest +++ b/app-crypt/johntheripper-jumbo/Manifest @@ -1 +1,2 @@ -DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 2fd6813e234308408d42581705ee8b25f9217a3dfb43f05483156f7bb67d0ce0d6de9c3ce8c2e4a17bb99bb377119dae2897bc08c800e7bc80bc6cf245400df6 SHA512 c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808 +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 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 deleted file mode 100644 index 2901c5bc4bd6..000000000000 --- a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-gcc11.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 <ferry.huberts@pelagic.nl> -Date: Tue, 9 Mar 2021 22:04:46 +0100 -Subject: [PATCH] Fix alignment compile errors on GCC 11 - -Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> ---- - 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/files/johntheripper-jumbo-1.9.0-opencl-fix.patch b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-opencl-fix.patch deleted file mode 100644 index 6fe7693276be..000000000000 --- a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-opencl-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/opencl_common.h 2020-08-03 15:49:20.000000000 +0100 -+++ b/src/opencl_common.h 2020-08-03 15:55:23.081101690 +0100 -@@ -81,6 +81,9 @@ - - #ifndef CL_DEVICE_TOPOLOGY_AMD - #define CL_DEVICE_TOPOLOGY_AMD 0x4037 -+#endif -+ -+#ifndef CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD - typedef union { - struct { - cl_uint type; 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 deleted file mode 100644 index 632f59d7a16f..000000000000 --- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild +++ /dev/null @@ -1,137 +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= - 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-1.9.0_p20230717.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild new file mode 100644 index 000000000000..368d59abb709 --- /dev/null +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.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/magnumripper/JohnTheRipper.git" + inherit git-r3 +else + HASH_COMMIT="c798c3f39215f6e08c67677eb9b79f65cfe08e40" + + 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. +RDEPEND="${DEPEND} + dev-perl/Compress-Raw-Lzma + 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-1.9.0_p20240102.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild new file mode 100644 index 000000000000..d4b9287e610c --- /dev/null +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild @@ -0,0 +1,155 @@ +# 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. +RDEPEND="${DEPEND} + dev-perl/Compress-Raw-Lzma + 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 826ff08b2f51..d4b9287e610c 100644 --- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild @@ -1,33 +1,29 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic toolchain-funcs pax-utils +inherit autotools flag-o-matic toolchain-funcs pax-utils -DESCRIPTION="Fast password cracker" +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" - MY_PV="${PV}-${JUMBO}" - MY_P="${MY_PN}-${MY_PV}" - SRC_URI="https://github.com/magnumripper/${MY_PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - S="${WORKDIR}/${MY_P}" + 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" -#removed rexgen and commoncrypto IUSE="custom-cflags kerberos mpi opencl openmp pcap" -DEPEND=">=dev-libs/openssl-1.0.1:0= +DEPEND=">=dev-libs/openssl-1.0.1:= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) @@ -36,19 +32,34 @@ DEPEND=">=dev-libs/openssl-1.0.1:0= dev-libs/gmp:= sys-libs/zlib app-arch/bzip2" - +# Missing (unpackaged): +# - Digest::Haval256 +# - Digest::x +# See bug #777369. RDEPEND="${DEPEND} - !app-crypt/johntheripper" + dev-perl/Compress-Raw-Lzma + 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() { - if use openmp && [[ ${MERGE_TYPE} != binary ]]; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } src_prepare() { - sed -i 's#$prefix/share/john#/etc/john#' src/configure || die default + + cd src || die + eautoreconf + + sed -i 's#$prefix/share/john#/etc/john#' configure || die } src_configure() { @@ -57,9 +68,9 @@ src_configure() { use custom-cflags || strip-flags econf \ + --enable-pkg-config \ --disable-native-march \ --disable-native-tests \ - --without-commoncrypto \ --disable-rexgen \ --with-openssl \ --with-systemwide \ @@ -70,54 +81,75 @@ src_configure() { } src_compile() { - emake -C src + # 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 - #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 + + # 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 - 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" + fi + + rm john-test.conf || die } src_install() { - # executables + # 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 + dosym john /usr/sbin/${s} done + # Scripts + exeinto /usr/share/john + doexe run/*.pl + doexe run/*.py insinto /usr/share/john - doins run/*.py + 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/kernels + doins -r run/opencl fi - # config files + # Config files insinto /etc/john doins run/*.chr run/password.lst doins run/*.conf doins -r run/rules run/ztex - # documentation - dodoc -r doc/* + # Documentation + rm -f doc/README || die + dodoc -r README.md doc/* } diff --git a/app-crypt/johntheripper-jumbo/metadata.xml b/app-crypt/johntheripper-jumbo/metadata.xml index b88d77761dbb..6e7a70aa3a13 100644 --- a/app-crypt/johntheripper-jumbo/metadata.xml +++ b/app-crypt/johntheripper-jumbo/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zerochaos@gentoo.org</email> |