From 7cbaa258c6e1668bf08558fcfc894d5c97270acf Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 15 May 2019 17:28:34 +0200 Subject: app-crypt/johntheripper: Drop 1.7.9* Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner --- app-crypt/johntheripper/Manifest | 2 - .../johntheripper/johntheripper-1.7.9-r11.ebuild | 274 --------------------- .../johntheripper/johntheripper-1.7.9-r6.ebuild | 251 ------------------- app-crypt/johntheripper/metadata.xml | 5 - 4 files changed, 532 deletions(-) delete mode 100644 app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild delete mode 100644 app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild (limited to 'app-crypt') diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest index 6be3684eb5f2..b522016fa042 100644 --- a/app-crypt/johntheripper/Manifest +++ b/app-crypt/johntheripper/Manifest @@ -1,3 +1 @@ -DIST john-1.7.9-jumbo-7.diff.gz 1074044 BLAKE2B beb2b3777bccd68ba510b75575cc12678f38bcebd08a8c6d91a291d14b2a3e404013ade5d68610bc9d4a2e26a6a00db8c8757bd4fbcb64bd20cde28a6abde9f4 SHA512 07a461df199fc776e8f62e969a95762fc1c99b72cdbd4a83d06f05ed236eaac9a918356ec9b8f8d060d1a9b2b8aa5c4021dfe53382761a5a76269ec66a5bd28a -DIST john-1.7.9.tar.bz2 717505 BLAKE2B ea720451b4544a975d5baca75242f22d8b306ad4101f5774dd80b0855410efae7d7e09d6c43bd6e89aac7346ea686ccc5a1bfedc8c89888a39a49941774759a9 SHA512 121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543 diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild deleted file mode 100644 index 49d18cec6232..000000000000 --- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib - -MY_PN="john" -MY_P="${MY_PN}-${PV}" - -JUMBO="jumbo-7" - -DESCRIPTION="fast password cracker" -HOMEPAGE="https://www.openwall.com/john/" - -SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2 - !minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -#Remove AltiVec USE flag. Appears to be an upstream issue. -IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi opencl openmp cpu_flags_x86_sse2" -REQUIRED_USE="openmp? ( !minimal ) - mpi? ( !minimal ) - cuda? ( !minimal ) - opencl? ( !minimal ) - mozilla? ( !minimal )" - -RDEPEND="!app-crypt/johntheripper-jumbo - sys-libs/zlib - !minimal? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - mpi? ( virtual/mpi ) - cuda? ( x11-drivers/nvidia-drivers - dev-util/nvidia-cuda-toolkit:= ) - opencl? ( virtual/opencl ) - mozilla? ( dev-libs/nss dev-libs/nspr )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -has_xop() { - echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1" -} - -has_avx() { - echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1" -} - -get_target() { - if use alpha; then - echo "linux-alpha" - elif use amd64; then - if has_xop; then - echo "linux-x86-64-xop" - elif has_avx; then - echo "linux-x86-64-avx" - else - echo "linux-x86-64" - fi - elif use ppc; then - #if use altivec; then - # echo "linux-ppc32-altivec" - #else - echo "linux-ppc32" - #fi - elif use ppc64; then - #if use altivec; then - # echo "linux-ppc32-altivec" - #else - echo "linux-ppc64" - #fi - # linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types. - # as per the Makefile comments - elif use sparc; then - echo "linux-sparc" - elif use x86; then - if has_xop; then - echo "linux-x86-xop" - elif has_avx; then - echo "linux-x86-avx" - elif use cpu_flags_x86_sse2; then - echo "linux-x86-sse2" - elif use cpu_flags_x86_mmx; then - echo "linux-x86-mmx" - else - echo "linux-x86-any" - fi - elif use ppc-macos; then - # force AltiVec, the non-altivec profile contains ancient compiler cruft - # if use altivec; then - echo "macosx-ppc32-altivec" - # else - # echo "macosx-ppc32" - # fi - # for Tiger this can be macosx-ppc64 - elif use x86-macos; then - if use cpu_flags_x86_sse2; then - echo "macosx-x86-sse2" - else - echo "macosx-x86" - fi - elif use x86-solaris; then - echo "solaris-x86-any" - elif use x86-fbsd; then - if use cpu_flags_x86_sse2; then - echo "freebsd-x86-sse2" - elif use cpu_flags_x86_mmx; then - echo "freebsd-x86-mmx" - else - echo "freebsd-x86-any" - fi - elif use amd64-fbsd; then - echo "freebsd-x86-64" - else - echo "generic" - fi -} - -get_john_objs() { - echo -n '${JOHN_COMMON_OBJS} ' - if use opencl; then - echo -n '${OCL_OBJS} ' - fi - if use cuda; then - echo -n '${CUDA_OBJS}' - fi -} - -pkg_setup() { - if use openmp && [[ ${MERGE_TYPE} != binary ]]; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -src_prepare() { - if ! use minimal; then - eapply "${WORKDIR}/${MY_P}-${JUMBO}.diff" - - if use mpi ; then - sed -e "s/^#CC = mpicc/CC = mpicc/" \ - -e "s/^#MPIOBJ =/MPIOBJ =/" \ - -i src/Makefile || die - fi - - # fix typo in jumbo patch - sed -i 's:All15:All5:' run/john.conf || die - # fix compile on ppc (only needed for jumbo-7) - eapply "${FILESDIR}/${P}-ppc-compile-fix.patch" - fi - - cd src || die - eapply -p0 "${FILESDIR}/${PN}-1.7.6-cflags.patch" - eapply -p2 "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch" - eapply -p2 "${FILESDIR}/${PN}-1.7.9-clang.patch" - eapply_user - - if ! use minimal; then - sed -e "s/LDFLAGS *= */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \ - -e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \ - -i Makefile || die "sed Makefile failed" - sed -i 's#/usr/local#/opt#g' Makefile || die - fi - sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die - - if use cuda; then - cuda_src_prepare - sed \ - -e "/^NVCC_FLAGS/s:-arch sm_10:${NVCCFLAGS}:g" \ - -i Makefile || die - fi - - if use mozilla; then - sed -i -e '/HAVE_NSS =/s/^#*//' -e 's/NSS_override//' Makefile || die - fi -} - -src_compile() { - local OMP - - use custom-cflags || strip-flags - cat <<- EOF >> config.gentoo || die - #define JOHN_SYSTEMWIDE 1 - #define JOHN_SYSTEMWIDE_HOME "${EPREFIX}/etc/john" - #define JOHN_SYSTEMWIDE_EXEC "${EPREFIX}/usr/libexec/john" -EOF - - append-flags -fPIC -fPIE - gcc-specs-pie && append-ldflags -nopie - use openmp && OMP="-fopenmp" - - CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)" - if use mpi; then - CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc - fi - - #this stuff was all stolen from the Makefile, if build breaks, check this first - if use opencl; then - GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0" - GPULDFLAGS="${GPULDFLAGS} -lOpenCL" - fi - if use cuda; then - GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA" - GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart" - fi - - emake -C src/ \ - CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \ - CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \ - LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \ - OPT_NORMAL="" \ - OMPFLAGS="${OMP}" \ - JOHN_OBJS="$(get_john_objs)" \ - $(get_target) -} - -src_test() { - if use opencl; then - cp src/opencl/*.cl run/ - cp src/opencl_*.h run/ - fi - pax-mark -mr run/john - if use opencl || use cuda; then - ewarn "GPU tests fail, skipping all tests..." - else - make -C src/ check - fi -} - -src_install() { - # executables - dosbin run/john - newsbin run/mailer john-mailer - - pax-mark -mr "${ED}/usr/sbin/john" || die - - dosym john /usr/sbin/unafs - dosym john /usr/sbin/unique - dosym john /usr/sbin/unshadow - - # jumbo-patch additions - if ! use minimal; then - for s in \ - keychain2john keepass2john pwsafe2john hccap2john \ - racf2john zip2john rar2john pdf2john ssh2john undrop \ - ; do - dosym john /usr/sbin/$s - done - use mozilla && dosym john /usr/sbin/mozilla2john - dosbin run/calc_stat - dosbin run/genmkvpwd - dosbin run/mkvcalcproba - dosbin run/raw2dyna - dosbin run/tgtsnarf - insinto /etc/john - doins run/genincstats.rb run/stats - doins run/netscreen.py run/sap2john.pl - if use opencl; then - doins src/opencl/*.cl - doins src/opencl_*.h - fi - fi - - # config files - insinto /etc/john - doins run/*.chr run/password.lst - doins run/*.conf - - # documentation - dodoc doc/* -} diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild deleted file mode 100644 index 48f23d519a62..000000000000 --- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild +++ /dev/null @@ -1,251 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs pax-utils multilib - -MY_PN="john" -MY_P="${MY_PN}-${PV}" - -JUMBO="jumbo-7" - -DESCRIPTION="fast password cracker" -HOMEPAGE="https://www.openwall.com/john/" - -SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2 - !minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -#Remove AltiVec USE flag. Appears to be an upstream issue. -IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2" -REQUIRED_USE="openmp? ( !minimal ) - mpi? ( !minimal ) - cuda? ( !minimal ) - opencl? ( !minimal )" - -RDEPEND="!app-crypt/johntheripper-jumbo - sys-libs/zlib - !minimal? ( >=dev-libs/openssl-0.9.7:0 ) - mpi? ( virtual/mpi ) - cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) - opencl? ( virtual/opencl )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -has_xop() { - echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1" -} - -has_avx() { - echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1" -} - -get_target() { - if use alpha; then - echo "linux-alpha" - elif use amd64; then - if has_xop; then - echo "linux-x86-64-xop" - elif has_avx; then - echo "linux-x86-64-avx" - else - echo "linux-x86-64" - fi - elif use ppc; then - #if use altivec; then - # echo "linux-ppc32-altivec" - #else - echo "linux-ppc32" - #fi - elif use ppc64; then - #if use altivec; then - # echo "linux-ppc32-altivec" - #else - echo "linux-ppc64" - #fi - # linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types. - # as per the Makefile comments - elif use sparc; then - echo "linux-sparc" - elif use x86; then - if has_xop; then - echo "linux-x86-xop" - elif has_avx; then - echo "linux-x86-avx" - elif use cpu_flags_x86_sse2; then - echo "linux-x86-sse2" - elif use cpu_flags_x86_mmx; then - echo "linux-x86-mmx" - else - echo "linux-x86-any" - fi - elif use ppc-macos; then - # force AltiVec, the non-altivec profile contains ancient compiler cruft - # if use altivec; then - echo "macosx-ppc32-altivec" - # else - # echo "macosx-ppc32" - # fi - # for Tiger this can be macosx-ppc64 - elif use x86-macos; then - if use cpu_flags_x86_sse2; then - echo "macosx-x86-sse2" - else - echo "macosx-x86" - fi - elif use x86-solaris; then - echo "solaris-x86-any" - elif use x86-fbsd; then - if use cpu_flags_x86_sse2; then - echo "freebsd-x86-sse2" - elif use cpu_flags_x86_mmx; then - echo "freebsd-x86-mmx" - else - echo "freebsd-x86-any" - fi - elif use amd64-fbsd; then - echo "freebsd-x86-64" - else - echo "generic" - fi -} - -get_john_objs() { - echo -n '${JOHN_COMMON_OBJS} ' - if use opencl; then - echo -n '${OCL_OBJS} ' - fi - if use cuda; then - echo -n '${CUDA_OBJS}' - fi -} - -pkg_setup() { - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -src_prepare() { - if ! use minimal; then - epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff" - - if use mpi ; then - sed -e "s/^#CC = mpicc/CC = mpicc/" \ - -e "s/^#MPIOBJ =/MPIOBJ =/" \ - -i src/Makefile || die - fi - - # fix typo in jumbo patch - sed -i 's:All15:All5:' run/john.conf || die - # fix compile on ppc (only needed for jumbo-7) - epatch "${FILESDIR}/${P}-ppc-compile-fix.patch" - fi - - cd src - epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch" - epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch" - - if ! use minimal; then - sed -e "s/LDFLAGS *= */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \ - -e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \ - -i Makefile || die "sed Makefile failed" - sed -i 's#/usr/local#/opt#g' Makefile || die - fi - sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die -} - -src_compile() { - local OMP - - use custom-cflags || strip-flags - echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo - echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo - echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo - append-flags -fPIC -fPIE - gcc-specs-pie && append-ldflags -nopie - use openmp && OMP="-fopenmp" - - CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)" - if use mpi; then - CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc - fi - - #this stuff was all stolen from the Makefile, if build breaks, check this first - if use opencl; then - GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0" - GPULDFLAGS="${GPULDFLAGS} -lOpenCL" - fi - if use cuda; then - GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA" - GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart" - fi - - emake -C src/ \ - CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \ - CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \ - LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \ - OPT_NORMAL="" \ - OMPFLAGS="${OMP}" \ - JOHN_OBJS="$(get_john_objs)" \ - $(get_target) -} - -src_test() { - if use opencl; then - cp src/opencl/*.cl run/ - cp src/opencl_*.h run/ - fi - pax-mark -mr run/john - if use opencl || use cuda; then - ewarn "GPU tests fail, skipping all tests..." - else - make -C src/ check - fi -} - -src_install() { - # executables - dosbin run/john - newsbin run/mailer john-mailer - - pax-mark -mr "${ED}usr/sbin/john" || die - - dosym john /usr/sbin/unafs - dosym john /usr/sbin/unique - dosym john /usr/sbin/unshadow - - # jumbo-patch additions - if ! use minimal; then - for s in \ - keychain2john keepass2john pwsafe2john hccap2john \ - racf2john zip2john rar2john pdf2john ssh2john undrop \ - ; do - dosym john /usr/sbin/$s - done - dosbin run/calc_stat - dosbin run/genmkvpwd - dosbin run/mkvcalcproba - dosbin run/raw2dyna - dosbin run/tgtsnarf - insinto /etc/john - doins run/genincstats.rb run/stats - doins run/netscreen.py run/sap2john.pl - if use opencl; then - doins src/opencl/*.cl - doins src/opencl_*.h - fi - fi - - # config files - insinto /etc/john - doins run/*.chr run/password.lst - doins run/*.conf - - # documentation - dodoc doc/* -} diff --git a/app-crypt/johntheripper/metadata.xml b/app-crypt/johntheripper/metadata.xml index e03a2537ac54..40069f63efa1 100644 --- a/app-crypt/johntheripper/metadata.xml +++ b/app-crypt/johntheripper/metadata.xml @@ -13,9 +13,4 @@ magnumripper/JohnTheRipper - - Use nvidia cuda toolkit for speeding up cracking on capable devices - Support mozilla password cracking - Enable opencl support for speeding up cracking on capable devices - -- cgit v1.2.3-65-gdbad