From 73c318acdaf6f8309d68bd266051e6dd1f1bd787 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Jun 2019 09:04:53 +0100 Subject: gentoo resync : 08.06.2019 --- app-crypt/johntheripper/Manifest | 10 +- .../johntheripper-1.7.3.1-mkdir-sandbox.patch | 12 - .../files/johntheripper-1.7.6-cflags.patch | 83 ------- .../files/johntheripper-1.7.9-clang.patch | 15 -- .../johntheripper-1.7.9-ppc-compile-fix.patch | 17 -- .../johntheripper/johntheripper-1.7.9-r11.ebuild | 274 --------------------- .../johntheripper/johntheripper-1.7.9-r6.ebuild | 251 ------------------- app-crypt/johntheripper/metadata.xml | 5 - 8 files changed, 1 insertion(+), 666 deletions(-) delete mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch delete mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch delete mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch delete mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch 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/johntheripper') diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest index e017c6bbe911..23f3736dd41b 100644 --- a/app-crypt/johntheripper/Manifest +++ b/app-crypt/johntheripper/Manifest @@ -1,11 +1,3 @@ -AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 BLAKE2B b682dff0bb3675c5d59a93e927cd47ee0d1ed3d2a31cffd855f2db6924dda70b243bbd6d575d22e8e9aa9588f4b377547feecbaf0db8d6ed25006e269dde8bd9 SHA512 7aac967890dd57a67b6248722cefe9764e6ddfb280cb06f511e3f71e16527689098d39a80c32316f343030e3e5161e0e0003b83f95707b6a89dbf590fa5256a4 -AUX johntheripper-1.7.6-cflags.patch 2927 BLAKE2B e013afb4e669b5185b8020e6d65014809b2df8c9e2cbcb6c8508dddc7012468dc13e050720afe4925453ca0fed068d664184fbf70c94ab750f59895bfb0aab2f SHA512 47d9f074c9a639caf2366c425220f03c4daf882cbac3d86fa2649a5b12de3784713800be0f719a37b0b92c0c4b0a36ded247c351f894514cfa8fe67a0e23c732 -AUX johntheripper-1.7.9-clang.patch 454 BLAKE2B 96a7ffadcb23ba7979e05a796fafb8f22c1189a3f99de4145f0dc5ce95d492cc69b4cefa881ee8fc66573b069b69a408937faa6ecb2b5462390080302157252c SHA512 8fe7579f9ff27e43d1d42287823a8c885b8095600a076cb5807c4fb9f94798e730b817a56f8e3120a762959d06a09e9a4e312656bea4cee858198ae4cff0b5e7 -AUX johntheripper-1.7.9-ppc-compile-fix.patch 444 BLAKE2B 0bbbe937851272ba3a06c7c521c4cf24d092d66816f65eabd9800bb0c968e0a191fa7ccd2ccb2a87c0b540e8910a5f4c8978d7692cfba775b1f64471078ec013 SHA512 4af86bb0c5bfc4d88914f195744a596a71236fa49340b47748974a242fde82266fb6bfb41cb266980a3367b1c1a3797960f057a42c5ece3cdc09229c5a4a1513 -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 -EBUILD johntheripper-1.7.9-r11.ebuild 6534 BLAKE2B 008ae23a7c0f34613cdbbde75db6c4b488ce5dca2ef57a7726c55663eef563a7bd7a133424aa359e0c8dca659678a4fa62179f57b5a333316c545a71b99e30b9 SHA512 3b8fa826d67f349c8eafbb96c509def97e21bd1688fe762c211214a4def243c6db02d3afae0b23dcc7dae62a717d25cef302de2b782edc4a1d468424063066f7 -EBUILD johntheripper-1.7.9-r6.ebuild 6038 BLAKE2B b1f1791dd6bb0990b894aa04808f7593be46e44dc10760c2099152dca60fac9903f0af9466b83c17a380e3a2b281c1abc964d677c8d32dd5df734d97dc0cabbd SHA512 212da5ebef507b1a37d2c3a8ef4da5e9dd3072c30dbe86012bb304e364eb02f2a1d131eae50f7d66b5b5aea60e23b4b0c58cc76cbd0fca093194cc26ad645fdb EBUILD johntheripper-1.8.0.ebuild 3215 BLAKE2B f9a9b61c415871fc60d49df4f6b14fca0b5253617a973c7c5a6b6b7a99b9569d1b56ee22768e013727775eea1569773ef319302a671d91d1f2bcbaffe459d44d SHA512 c53429f8cbba8ea6e06511f2f389acc1a29ec3b663dbf96b0162ddaf9327078cfd4066175ef41b639f269dfe4ac791c2d40738833defe19f7e00e85e805d1853 -MISC metadata.xml 793 BLAKE2B 8650fe215af0de8946b72ebbd2c2979c437e90634fc48d9d1ac20350b23922a418093301641589a9d524de2908e2c715dc1e0419a2206a34ff20bb7eb0b2a3aa SHA512 29234712e9b5631919aa400e207b36cefa84819cf2609547f5244745d81559d10e79b50e296681b65d14fcf813eea69acbb97fd8f8f487bb4240e4087f4b098e +MISC metadata.xml 515 BLAKE2B 498289b766df94a5c7e5f770804658821c5c2a3428725c53141c784a5ecf2e9229277175f941c46923009c43df6a16ac8ba27bb8b7e16b852409a558548b6c47 SHA512 f5893e1cb42c3f71c07968a099b2ce67f27aac202fec65860b8f67ae006691821efba255108436c8a5e752674cb76c7d43c8bbbf97b864b1067dfd8d66c5a474 diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch deleted file mode 100644 index 5600f3cc17ec..000000000000 --- a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp john-1.7.3.1.org/src/path.c john-1.7.3.1/src/path.c ---- john-1.7.3.1.org/src/path.c 2003-10-01 04:26:25.000000000 +0300 -+++ john-1.7.3.1/src/path.c 2007-11-10 15:53:23.000000000 +0200 -@@ -55,7 +55,7 @@ void path_init(char **argv) - #ifdef JOHN_PRIVATE_HOME - private = path_expand(JOHN_PRIVATE_HOME); - if (mkdir(private, S_IRUSR | S_IWUSR | S_IXUSR)) { -- if (errno != EEXIST) pexit("mkdir: %s", private); -+ if (errno != EEXIST && errno != EACCES) pexit("mkdir: %s", private); - } else - fprintf(stderr, "Created directory: %s\n", private); - #endif diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch b/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch deleted file mode 100644 index 4b6637a29d8f..000000000000 --- a/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- Makefile 2010-07-18 15:27:51.000000000 -0400 -+++ Makefile.mine 2010-07-18 15:30:09.000000000 -0400 -@@ -629,7 +629,7 @@ - macosx-ppc32-altivec: - $(LN) ppc32alt.h arch.h - $(MAKE) $(PROJ) \ -- CFLAGS="-c -Wall -fomit-frame-pointer" \ -+ CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer" \ - OPT_NORMAL="-fast -mcpu=7450" \ - OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec" - -@@ -638,7 +638,7 @@ - $(LN) ppc32alt.h arch.h - $(MAKE) $(PROJ) \ - ASFLAGS="$(ASFLAGS) -arch ppc" \ -- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \ -+ CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \ - LDFLAGS="$(LDFLAGS) -arch ppc" \ - OPT_NORMAL="-fast -mcpu=7450" \ - OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec" -@@ -650,7 +650,7 @@ - $(LN) ppc32.h arch.h - $(MAKE) $(PROJ) \ - CC=cc \ -- CFLAGS="-c -traditional-cpp" \ -+ CFLAGS="$(CFLAGS) -c -traditional-cpp" \ - OPT_NORMAL="-O2" \ - OPT_INLINE="-O3" - -@@ -658,7 +658,7 @@ - $(LN) ppc32.h arch.h - $(MAKE) $(PROJ) \ - ASFLAGS="$(ASFLAGS) -arch ppc" \ -- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \ -+ CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \ - LDFLAGS="$(LDFLAGS) -arch ppc" \ - OPT_NORMAL="-O2" \ - OPT_INLINE="-O3 -finline-limit=4000" -@@ -667,7 +667,7 @@ - macosx-ppc64-altivec: - $(LN) ppc64alt.h arch.h - $(MAKE) $(PROJ) \ -- CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \ -+ CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \ - LDFLAGS="$(LDFLAGS) -m64" \ - OPT_NORMAL="-fast" \ - OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec" -@@ -676,7 +676,7 @@ - $(LN) ppc64alt.h arch.h - $(MAKE) $(PROJ) \ - ASFLAGS="$(ASFLAGS) -arch ppc" \ -- CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \ -+ CFLAGS="$(CFLAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \ - LDFLAGS="$(LDFLAGS) -arch ppc -m64" \ - OPT_NORMAL="-fast" \ - OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec" -@@ -684,7 +684,7 @@ - macosx-ppc64: - $(LN) ppc64.h arch.h - $(MAKE) $(PROJ) \ -- CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \ -+ CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \ - LDFLAGS="$(LDFLAGS) -m64" \ - OPT_NORMAL="-fast" \ - OPT_INLINE="-fast -finline-limit=4000" -@@ -693,7 +693,7 @@ - $(LN) ppc64.h arch.h - $(MAKE) $(PROJ) \ - ASFLAGS="$(ASFLAGS) -arch ppc" \ -- CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \ -+ CFLAGS="$(CFLAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \ - LDFLAGS="$(LDFLAGS) -arch ppc -m64" \ - OPT_NORMAL="-fast" \ - OPT_INLINE="-fast -finline-limit=4000" -@@ -723,7 +723,7 @@ - $(LN) ppc32alt.h arch.h - $(MAKE) $(PROJ) \ - ASFLAGS="$(ASFLAGS) -arch ppc" \ -- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \ -+ CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \ - LDFLAGS="$(LDFLAGS) -arch ppc" \ - OPT_NORMAL="-fast -mcpu=7450" \ - OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec" diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch b/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch deleted file mode 100644 index 1b85914ed4ff..000000000000 --- a/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix for building johntheripper with clang. - -https://bugs.gentoo.org/show_bug.cgi?id=554392 - ---- john-1.7.9-jumbo-7/src/rawSHA1_ng_fmt.c -+++ john-1.7.9-jumbo-7/src/rawSHA1_ng_fmt.c -@@ -530,7 +530,7 @@ - - #if defined(__SSE4_1__) - --# if !defined(__INTEL_COMPILER) -+# if !defined(__INTEL_COMPILER) && !defined(__clang__) - // This intrinsic is not always available in GCC, so define it here. - static inline int _mm_testz_si128 (__m128i __M, __m128i __V) - { diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch b/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch deleted file mode 100644 index c28ec21a0ae8..000000000000 --- a/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ru john-1.7.9.orig/src/gost_plug.c john-1.7.9/src/gost_plug.c ---- john-1.7.9.orig/src/gost_plug.c 2013-01-20 16:15:45.464000001 +0000 -+++ john-1.7.9/src/gost_plug.c 2013-01-20 16:16:06.104000001 +0000 -@@ -531,7 +531,6 @@ - } - #endif - --#ifndef __GLIBC__ - void rhash_u32_swap_copy(void* to, int index, const void* from, size_t length) { - size_t i; - unsigned int *pO, *pI; -@@ -542,4 +541,3 @@ - *pO++ = bswap_32(*pI++); - } - } --#endif - 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