diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
commit | 7218e1b46bceac05841e90472501742d905fb3fc (patch) | |
tree | 56fae051db521b8fce8014cbc8b11484885b14b3 /app-crypt/johntheripper-jumbo | |
parent | 6d691ad5b6239929063441bbd14c489e92e7396e (diff) |
gentoo resync : 12.03.2021
Diffstat (limited to 'app-crypt/johntheripper-jumbo')
-rw-r--r-- | app-crypt/johntheripper-jumbo/Manifest | 6 | ||||
-rw-r--r-- | app-crypt/johntheripper-jumbo/files/1.8.0-gcc5.patch | 63 | ||||
-rw-r--r-- | app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-opencl-fix.patch | 12 | ||||
-rw-r--r-- | app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild | 124 | ||||
-rw-r--r-- | app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild (renamed from app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0.ebuild) | 17 |
5 files changed, 28 insertions, 194 deletions
diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest index 865a7e8f97e3..96c40e5cd654 100644 --- a/app-crypt/johntheripper-jumbo/Manifest +++ b/app-crypt/johntheripper-jumbo/Manifest @@ -1,7 +1,5 @@ -AUX 1.8.0-gcc5.patch 1793 BLAKE2B b25b356e68c5e210557373a3cf8e5543e8851f2d375fb72af82189bfb7c491826bc4fe092484e28031683d30a37863c20b6c36b19ca73ed133e77988dc4df188 SHA512 941a8fbe435d24287be158648d3083062806de639ce822645d949a171b2e662249bb13d9f5903017792cc979c7ff89615681adaed2afbf0d9c6ca5fe825e135a -DIST JohnTheRipper-1.8.0-jumbo-1.tar.gz 32533148 BLAKE2B 15929fa25314438619899582b209bee6902b1e53dc2df39ed6a686820665fd4d8e56d26b3f0082d05dc6be2f54add3526570d936c0a929641e33e6dcfb7a13b5 SHA512 8b7fad7a6330b5ff1afc306218ba698aaa27776b566f82c2e76102d5ceb10aeafa69d71fa6fff67c81996ea2c6a04384bab4696ed192306c6d074873562e7089 +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.8.0.ebuild 2883 BLAKE2B a28ba75fff72f5e71ef689aaea7382d2a5851330a87a3de3ba03c5f19f3f7c82840f12ae3737f7d807c9b2859e3fb4336a3a0705b792c59501ecf6f486ba3000 SHA512 3429b072e7ea94d6f9cefd3690cb8c467a9716d89b6327b4c9cd228700c1bb11a44eb6a05d2ee0d77d222f5a07ae1836375d41c7a6df26de62d36948dbe5dd34 -EBUILD johntheripper-jumbo-1.9.0.ebuild 2781 BLAKE2B 2aee32ba44099634b4ceca82f2e17d169046847385c3f293cb58d4171c995b98f9f37c0349de02e87a2f566d2a093e0b350fffb482a7a54f435e7d24e3fb3a5b SHA512 449b1ba4946ebb7eac226443ee6883da89954f715ec1d4e64191cb74b22feb8721702d288525306c9a960b87c39dc1382dcd961ca0d9bf1a81a3750be51f37bb +EBUILD johntheripper-jumbo-1.9.0-r1.ebuild 2992 BLAKE2B 97ac3dcc43bb11e8c1fdb7a777f4723b4df7096bc3a5f9670f802c22b1d848c9d8990b486791eaacf10716ed65c3ae7e3c78eaea8b5e572712967f9008ccacd4 SHA512 6a43dfc10ed75a4db108e19720a01156a2aa83d403b07041144c3676c0733571e9caeb4a964f832b69886edac61a63a350232decea3d2501c2f1726d5f510a01 EBUILD johntheripper-jumbo-9999.ebuild 2821 BLAKE2B 1b54c4bfe05f92540dced1ad6078890477c678c3d699a6ee6be530deabfb99dffde0d639bf39b9c45072c57bdbe2fe056316c60ec259730166398213bd9cad00 SHA512 ee155f58191bc6e678b8601b36627550deb6f3be7f454dfa412c303a03bd528a41581d58bd8f63fedd2e0ba7c6abc4f5cdf045a9ac835fff39453581aac24eec MISC metadata.xml 472 BLAKE2B 82b4e6bd8682bd19ffc1140a8225e1766333af7a10331e4ce5a0b1306959b267a23df2429b593bd74f0bc61e73bd7df6a756cc2820438335c3a565b6208d9219 SHA512 63bf68deac15fd3e96d6ccf7d4ca4c52192c79bf1d075305d1e9757b3ce20dd5f868ef4c908dbe020d2fe6884756b236281ec8902cc4294a3eac96aa05571abf diff --git a/app-crypt/johntheripper-jumbo/files/1.8.0-gcc5.patch b/app-crypt/johntheripper-jumbo/files/1.8.0-gcc5.patch deleted file mode 100644 index f2a7984955ab..000000000000 --- a/app-crypt/johntheripper-jumbo/files/1.8.0-gcc5.patch +++ /dev/null @@ -1,63 +0,0 @@ -From e2e868db3e153b3f959e119a51703d4afb99c624 Mon Sep 17 00:00:00 2001 -From: magnum <john.magnum@hushmail.com> -Date: Wed, 13 May 2015 12:05:00 +0200 -Subject: [PATCH] Add another solution to #1093. This make it possible to build - using gcc 5 without --std=gnu89 (although I kept the latter for now). See - also #1250. - ---- - src/DES_bs_b.c | 3 +++ - src/MD5_std.c | 12 ++++++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/src/DES_bs_b.c b/src/DES_bs_b.c -index 306b4e4..18c9235 100644 ---- a/src/DES_bs_b.c -+++ b/src/DES_bs_b.c -@@ -1272,6 +1272,9 @@ static MAYBE_INLINE void DES_bs_finalize_keys(void) - #endif - - #if DES_bs_mt -+#if __GNUC__ >= 5 -+extern -+#endif - MAYBE_INLINE void DES_bs_set_salt_for_thread(int t, unsigned int salt) - #else - void DES_bs_set_salt(ARCH_WORD salt) -diff --git a/src/MD5_std.c b/src/MD5_std.c -index 6bdcd35..1eec9b4 100644 ---- a/src/MD5_std.c -+++ b/src/MD5_std.c -@@ -496,9 +496,15 @@ extern void MD5_body(MD5_word x[15], MD5_word out[4]); - #if MD5_std_mt - #define MD5_body(x, out) \ - MD5_body_for_thread(t, x, out) -+#if __GNUC__ >= 5 -+extern -+#endif - MAYBE_INLINE_BODY void MD5_body_for_thread(int t, - MD5_word x[15], MD5_word out[4]) - #else -+#if __GNUC__ >= 5 -+extern -+#endif - MAYBE_INLINE_BODY void MD5_body(MD5_word x[15], MD5_word out[4]) - #endif - { -@@ -595,10 +601,16 @@ MAYBE_INLINE_BODY void MD5_body(MD5_word x[15], MD5_word out[4]) - #if MD5_std_mt - #define MD5_body(x0, x1, out0, out1) \ - MD5_body_for_thread(t, x0, x1, out0, out1) -+#if __GNUC__ >= 5 -+extern -+#endif - MAYBE_INLINE_BODY void MD5_body_for_thread(int t, - MD5_word x0[15], MD5_word x1[15], - MD5_word out0[4], MD5_word out1[4]) - #else -+#if __GNUC__ >= 5 -+extern -+#endif - MAYBE_INLINE_BODY void MD5_body(MD5_word x0[15], MD5_word x1[15], - MD5_word out0[4], MD5_word out1[4]) - #endif 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.8.0.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild deleted file mode 100644 index e770d857725a..000000000000 --- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild +++ /dev/null @@ -1,124 +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="${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}" -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" - -pkg_setup() { - if use openmp && [[ ${MERGE_TYPE} != binary ]]; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -src_prepare() { - eapply "${FILESDIR}/${PV}-gcc5.patch" - sed -i 's#/usr/share/john#/etc/john#' src/params.h || die - default -} - -src_configure() { - cd src || die - - use custom-cflags || strip-flags - - # John ignores CPPFLAGS, use CFLAGS instead - append-cflags -DJOHN_SYSTEMWIDE=1 - - econf \ - --disable-native-macro \ - --disable-native-tests \ - --without-commoncrypto \ - --disable-rexgen \ - --with-openssl \ - $(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 - - insinto /usr/share/john - doins run/*.py - - 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 - - # documentation - dodoc doc/* -} diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild index 26cf0d9fe4d7..5538df15678d 100644 --- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0.ebuild +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild @@ -39,6 +39,8 @@ DEPEND=">=dev-libs/openssl-1.0.1:0 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" @@ -54,6 +56,7 @@ src_configure() { cd src || die use custom-cflags || strip-flags + append-cflags -fcommon econf \ --disable-native-march \ @@ -103,8 +106,15 @@ src_install() { dosym john /usr/sbin/$s done - insinto /usr/share/john - doins run/*.py + # 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 @@ -118,5 +128,6 @@ src_install() { doins -r run/rules run/ztex # documentation - dodoc -r doc/* + rm -f doc/README + dodoc -r README.md doc/* } |