From cdd8982b5fde70da005cb979a78519b01297d578 Mon Sep 17 00:00:00 2001 From: Hank Leininger Date: Fri, 20 Nov 2020 19:47:28 -0700 Subject: app-crypt/johntheripper-jumbo: fixes and cleanups Fixed opencl compilation issue, installation of .pl helpers, a broken documentation symlink, and removed ~amd64-linux KEYWORD because its dependencies lack it, to keep `repoman full` happy. Signed-off-by: Hank Leininger Closes: https://bugs.gentoo.org/732456 Closes: https://bugs.gentoo.org/713462 CLoses: https://bugs.gentoo.org/726432 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Rick Farina --- .../johntheripper-jumbo-1.9.0-opencl-fix.patch | 12 ++ .../johntheripper-jumbo-1.9.0-r1.ebuild | 133 +++++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-opencl-fix.patch create mode 100644 app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild (limited to 'app-crypt/johntheripper-jumbo') 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 new file mode 100644 index 000000000000..6fe7693276be --- /dev/null +++ b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-opencl-fix.patch @@ -0,0 +1,12 @@ +--- 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-r1.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild new file mode 100644 index 000000000000..260f0956a160 --- /dev/null +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2020 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 + KEYWORDS="" +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 ~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 + + 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/* +} -- cgit v1.2.3-65-gdbad