subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-crypt\/johntheripper\-jumbo\/"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2024-01-03 Thread Rick Farina

commit: 3b19eb93f6db6a8b8020504f4ba9295d82bddec6
Author: Rick Farina  gentoo  org>
AuthorDate: Wed Jan  3 16:41:17 2024 +
Commit: Rick Farina  gentoo  org>
CommitDate: Wed Jan  3 16:41:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b19eb93

app-crypt/johntheripper-jumbo: add missing dep

Closes: https://bugs.gentoo.org/876853
Signed-off-by: Rick Farina  gentoo.org>

 .../johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild | 3 ++-
 .../johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild | 3 +--
 app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild  | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

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
index 71457dbef928..368d59abb709 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,6 +38,7 @@ DEPEND=">=dev-libs/openssl-1.0.1:=
 # - Digest::x
 # See bug #777369.
 RDEPEND="${DEPEND}
+   dev-perl/Compress-Raw-Lzma
dev-perl/Digest-MD2
virtual/perl-Digest-MD5
dev-perl/Digest-SHA3

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
index 6ec25a477ce0..d4b9287e610c 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
@@ -36,9 +36,8 @@ DEPEND=">=dev-libs/openssl-1.0.1:=
 # - Digest::Haval256
 # - Digest::x
 # See bug #777369.
-# Pending keywording https://bugs.gentoo.org/921221
-#  dev-perl/Compress-Raw-Lzma
 RDEPEND="${DEPEND}
+   dev-perl/Compress-Raw-Lzma
dev-perl/Digest-MD2
virtual/perl-Digest-MD5
dev-perl/Digest-SHA3

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 6ec25a477ce0..d4b9287e610c 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -36,9 +36,8 @@ DEPEND=">=dev-libs/openssl-1.0.1:=
 # - Digest::Haval256
 # - Digest::x
 # See bug #777369.
-# Pending keywording https://bugs.gentoo.org/921221
-#  dev-perl/Compress-Raw-Lzma
 RDEPEND="${DEPEND}
+   dev-perl/Compress-Raw-Lzma
dev-perl/Digest-MD2
virtual/perl-Digest-MD5
dev-perl/Digest-SHA3

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2024-01-03 Thread Rick Farina

commit: ec2eddc4f1bf53f02f724a1c3772b75ef992086b
Author: Rick Farina  gentoo  org>
AuthorDate: Wed Jan  3 16:41:50 2024 +
Commit: Rick Farina  gentoo  org>
CommitDate: Wed Jan  3 16:41:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec2eddc4

app-crypt/johntheripper-jumbo: drop 1.9.0_p20211129-r1

Signed-off-by: Rick Farina  gentoo.org>

 app-crypt/johntheripper-jumbo/Manifest |   1 -
 .../johntheripper-jumbo-1.9.0_p20211129-r1.ebuild  | 159 -
 2 files changed, 160 deletions(-)

diff --git a/app-crypt/johntheripper-jumbo/Manifest 
b/app-crypt/johntheripper-jumbo/Manifest
index c6b343796dfc..e289b458e9e1 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,3 +1,2 @@
-DIST johntheripper-jumbo-1.9.0_p20211129.tar.gz 47758087 BLAKE2B 
de57218151fbc3bed79322d065ef73deb99b73fb1ce55924197793a320600cc1189dabae43fe5848014c2e72dcb7e1c2a91f2aaba64bd8c7314ded37e23a34c9
 SHA512 
f8fc6bf102d900bb32c5714bd595a71f67f73a1f0a237d9f851b2f250046307bf1177f3782023cd1bbcc55f9d54fd7b4946e09c7dc1fd908ba6a6bad90b233d6
 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/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
deleted file mode 100644
index d9f48d8f15e9..
--- 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs pax-utils
-
-DESCRIPTION="Fast password cracker, community enhanced version"
-HOMEPAGE="http://www.openwall.com/john/;
-
-MY_PN="JohnTheRipper"
-
-if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git;
-   inherit git-r3
-else
-   JUMBO="jumbo-1.1"
-   MY_PV="${PV}-${JUMBO}"
-   MY_P="john-${MY_PV}"
-   HASH_COMMIT="5d0c85f16f96ca7b6dd06640e95a5801081d6e20"
-
-   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/Digest-MD2
-   virtual/perl-Digest-MD5
-   dev-perl/Digest-SHA3
-   dev-perl/Digest-GOST
-   !app-crypt/johntheripper"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-fix-bashism.patch
-)
-
-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
-
-   #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
-

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2024-01-02 Thread Rick Farina

commit: 9af4de9760147a6d80fe072e5676ce843e1b1ba8
Author: Rick Farina  gentoo  org>
AuthorDate: Tue Jan  2 18:06:54 2024 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Jan  2 18:07:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af4de97

app-crypt/johntheripper-jumbo: add 1.9.0_p20240102

sync live
minor cleanup
Signed-off-by: Rick Farina  gentoo.org>

 app-crypt/johntheripper-jumbo/Manifest   |  1 +
 ...ebuild => johntheripper-jumbo-1.9.0_p20240102.ebuild} | 16 ++--
 .../johntheripper-jumbo/johntheripper-jumbo-.ebuild  | 16 ++--
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/app-crypt/johntheripper-jumbo/Manifest 
b/app-crypt/johntheripper-jumbo/Manifest
index 6b6bd7577718..c6b343796dfc 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,2 +1,3 @@
 DIST johntheripper-jumbo-1.9.0_p20211129.tar.gz 47758087 BLAKE2B 
de57218151fbc3bed79322d065ef73deb99b73fb1ce55924197793a320600cc1189dabae43fe5848014c2e72dcb7e1c2a91f2aaba64bd8c7314ded37e23a34c9
 SHA512 
f8fc6bf102d900bb32c5714bd595a71f67f73a1f0a237d9f851b2f250046307bf1177f3782023cd1bbcc55f9d54fd7b4946e09c7dc1fd908ba6a6bad90b233d6
 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/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
similarity index 92%
copy from app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
copy to app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
index 3f89098a9405..6ec25a477ce0 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,20 +8,14 @@ inherit autotools flag-o-matic toolchain-funcs pax-utils
 DESCRIPTION="Fast password cracker, community enhanced version"
 HOMEPAGE="http://www.openwall.com/john/;
 
-MY_PN="JohnTheRipper"
-
 if [[ ${PV} == "" ]] ; 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.1"
-   MY_PV="${PV}-${JUMBO}"
-   MY_P="john-${MY_PV}"
-   HASH_COMMIT="5d0c85f16f96ca7b6dd06640e95a5801081d6e20"
-
+   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
 
@@ -42,6 +36,8 @@ DEPEND=">=dev-libs/openssl-1.0.1:=
 # - Digest::Haval256
 # - Digest::x
 # See bug #777369.
+# Pending keywording https://bugs.gentoo.org/921221
+#  dev-perl/Compress-Raw-Lzma
 RDEPEND="${DEPEND}
dev-perl/Digest-MD2
virtual/perl-Digest-MD5

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 3f89098a9405..6ec25a477ce0 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,20 +8,14 @@ inherit autotools flag-o-matic toolchain-funcs pax-utils
 DESCRIPTION="Fast password cracker, community enhanced version"
 HOMEPAGE="http://www.openwall.com/john/;
 
-MY_PN="JohnTheRipper"
-
 if [[ ${PV} == "" ]] ; 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.1"
-   MY_PV="${PV}-${JUMBO}"
-   MY_P="john-${MY_PV}"
-   HASH_COMMIT="5d0c85f16f96ca7b6dd06640e95a5801081d6e20"
-
+   HASH_COMMIT="9daf16b5743b2c521d23c281e13ae8cdbd37b1eb"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2023-08-23 Thread Rick Farina

commit: dca4f0d26bd533d3499e73def925d21045c64c9f
Author: Rick Farina  gentoo  org>
AuthorDate: Thu Aug 24 01:40:08 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Thu Aug 24 01:40:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dca4f0d2

app-crypt/johntheripper-jumbo: update DESCRIPTION

Closes: https://bugs.gentoo.org/876859
Signed-off-by: Rick Farina  gentoo.org>

 .../johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild | 4 ++--
 .../johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild| 2 +-
 app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
index eb2beb0f704b..d9f48d8f15e9 100644
--- 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
+++ 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 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"

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
index bae1c377306f..71457dbef928 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 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/;
 
 if [[ ${PV} == "" ]] ; then

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 28bc5b8cf5fa..3f89098a9405 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 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"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2023-08-21 Thread Rick Farina

commit: c909fa25c0bb9233afbb49727077ce474be18dae
Author: Rick Farina  gentoo  org>
AuthorDate: Tue Aug 22 00:28:30 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Aug 22 00:36:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c909fa25

app-crypt/johntheripper-jumbo: add 1.9.0_p20230717

Signed-off-by: Rick Farina  gentoo.org>

 app-crypt/johntheripper-jumbo/Manifest |   1 +
 .../johntheripper-jumbo-1.9.0_p20230717.ebuild | 155 +
 2 files changed, 156 insertions(+)

diff --git a/app-crypt/johntheripper-jumbo/Manifest 
b/app-crypt/johntheripper-jumbo/Manifest
index ea505c2084b2..6b6bd7577718 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1 +1,2 @@
 DIST johntheripper-jumbo-1.9.0_p20211129.tar.gz 47758087 BLAKE2B 
de57218151fbc3bed79322d065ef73deb99b73fb1ce55924197793a320600cc1189dabae43fe5848014c2e72dcb7e1c2a91f2aaba64bd8c7314ded37e23a34c9
 SHA512 
f8fc6bf102d900bb32c5714bd595a71f67f73a1f0a237d9f851b2f250046307bf1177f3782023cd1bbcc55f9d54fd7b4946e09c7dc1fd908ba6a6bad90b233d6
+DIST johntheripper-jumbo-1.9.0_p20230717.tar.gz 56772470 BLAKE2B 
33295dc28d32852a6284adaadbbf9d9c852fb78e1dc673df5e67c31befb6921dbd6d29310ca7b3406e4b1259cca6e8d643292d73f4324262b038a1c6bc7ff51b
 SHA512 
fd48a6bccf3f2be0d495aa8a635af73bc386c5815fdaa62259f2920724afa89e0e9743585c412e595486a0d2677f1ec43c43606471078ec0611d5c05b01853de

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 ..bae1c377306f
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 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"
+HOMEPAGE="http://www.openwall.com/john/;
+
+if [[ ${PV} == "" ]] ; 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/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

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2023-08-21 Thread Rick Farina

commit: be945243684e65d5c97a4996024c51468b434350
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Aug 21 23:34:36 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Aug 22 00:36:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be945243

app-crypt/johntheripper-jumbo: update EAPI 7 -> 8

Sync live
Attempt to make tests work, failure
Signed-off-by: Rick Farina  gentoo.org>

 .../johntheripper-jumbo-.ebuild| 31 +-
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 65429e87891e..28bc5b8cf5fa 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools flag-o-matic toolchain-funcs pax-utils
 
@@ -22,7 +22,7 @@ else
SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz 
-> ${P}.tar.gz"
S="${WORKDIR}/john-${HASH_COMMIT}"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"
@@ -48,6 +48,7 @@ RDEPEND="${DEPEND}
dev-perl/Digest-SHA3
dev-perl/Digest-GOST
!app-crypt/johntheripper"
+RESTRICT="test"
 
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -90,22 +91,26 @@ src_compile() {
emake LD="$(tc-getCC)" -C src
 }
 
-#src_test() {
-#  pax-mark -mr run/john
+src_test() {
+   pax-mark -mr run/john
 
-   #if use opencl; then
+   # 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 --device=cpu --test=0 --verbosity=2 || die
-   #else
+   ./run/john --config=run/john-test.conf --device=cpu --test=0 
--verbosity=2 || die
+   else
# Weak tests
-   #./run/john --test=0 --verbosity=2 || die
+   ./run/john --config=run/john-test.conf --test=0 --verbosity=2 
|| die
# Strong tests
#./run/john --test=1 --verbosity=2 || die
-   #fi
+   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"
-#}
+   rm john-test.conf || die
+}
 
 src_install() {
# Executables

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/files/

2022-10-15 Thread Conrad Kostecki

commit: 5e6b596b5f6793a380d94b684932444b04850dfb
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Oct  4 10:37:40 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Oct 15 19:33:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e6b596b

app-crypt/johntheripper-jumbo: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27611
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../johntheripper-jumbo-1.9.0-fix-bashism.patch| 24 --
 .../files/johntheripper-jumbo-1.9.0-gcc11.patch| 53 --
 .../johntheripper-jumbo-1.9.0-opencl-fix.patch | 12 -
 3 files changed, 89 deletions(-)

diff --git 
a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch
 
b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch
deleted file mode 100644
index a0a18158ce7e..
--- 
a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://patch-diff.githubusercontent.com/raw/openwall/john/pull/4822.patch
-
-From dd9501341808fe19b9c5cd4f8f04edfc5f377077 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Wed, 22 Sep 2021 19:34:38 +0100
-Subject: [PATCH] configure.ac: avoid bashism in pkg-config check
-
-== is a Bashism and configure scripts need to work
-with a POSIX shell, so let's change to = (like in
-the other condition).
-
-Signed-off-by: Sam James 
 a/src/configure.ac
-+++ b/src/configure.ac
-@@ -347,7 +347,7 @@ AS_IF([test -z "$STRIP"], [AC_CHECK_TOOL([STRIP], 
[strip])])
- dnl Check if we have this at all
- PKG_PROG_PKG_CONFIG
- AC_MSG_CHECKING([if pkg-config will be used])
--if test "x$PKG_CONFIG" = x || test "x$enable_pkg_config" == xno ; then
-+if test "x$PKG_CONFIG" = x || test "x$enable_pkg_config" = xno ; then
-   JTR_MSG_RESULT_FAILIF_FORCED([xno], [x$enable_pkg_config], [pkg-config is 
NOT available])
-   PKG_CONFIG=no
- else
-

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..
--- 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 
-Date: Tue, 9 Mar 2021 22:04:46 +0100
-Subject: [PATCH] Fix alignment compile errors on GCC 11
-
-Signed-off-by: Ferry Huberts 

- 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..
--- 
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.0 +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;

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2022-10-04 Thread Arthur Zamarin

commit: 6df5dd3a2e326f232cd0421bdd1e965e07159610
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Oct  4 07:32:24 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Oct  4 07:32:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df5dd3a

app-crypt/johntheripper-jumbo: Keyword 1.9.0_p20211129-r1 arm64, #832452

Signed-off-by: Arthur Zamarin  gentoo.org>

 .../johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
index 37c73b4c41d9..eb2beb0f704b 100644
--- 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
+++ 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz 
-> ${P}.tar.gz"
S="${WORKDIR}/john-${HASH_COMMIT}"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2022-10-01 Thread Rick Farina

commit: 9a748d6ffb8ba21af6b50ddc2a4a166551cc87d7
Author: Rick Farina  gentoo  org>
AuthorDate: Sun Oct  2 02:23:43 2022 +
Commit: Rick Farina  gentoo  org>
CommitDate: Sun Oct  2 02:23:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a748d6f

app-crypt/johntheripper-jumbo: drop 1.9.0-r3, 1.9.0_p20210920, 1.9.0_p20211129

Signed-off-by: Rick Farina  gentoo.org>

 app-crypt/johntheripper-jumbo/Manifest |   2 -
 .../johntheripper-jumbo-1.9.0-r3.ebuild| 139 --
 .../johntheripper-jumbo-1.9.0_p20210920.ebuild | 145 ---
 .../johntheripper-jumbo-1.9.0_p20211129.ebuild | 157 -
 4 files changed, 443 deletions(-)

diff --git a/app-crypt/johntheripper-jumbo/Manifest 
b/app-crypt/johntheripper-jumbo/Manifest
index 6012316eb241..ea505c2084b2 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,3 +1 @@
-DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 
2fd6813e234308408d42581705ee8b25f9217a3dfb43f05483156f7bb67d0ce0d6de9c3ce8c2e4a17bb99bb377119dae2897bc08c800e7bc80bc6cf245400df6
 SHA512 
c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808
-DIST johntheripper-jumbo-1.9.0_p20210920.tar.gz 47758128 BLAKE2B 
e85255dc218c43e6358f76eac1e79af01d437a7a1fcddd608a390734fdc4070cbf949b8abc080b82decf4a1f5e32d2baa6d2a09d385a31913d8e988c8732e85e
 SHA512 
5121434ad275921fe6288c51fd9dfd36ed3162387e70e8089bbc266d4a17ea461b72ce26b2004acfb62d95a9ee2d570ef3b3f00c1d031abd8cff2f20c3ab480a
 DIST johntheripper-jumbo-1.9.0_p20211129.tar.gz 47758087 BLAKE2B 
de57218151fbc3bed79322d065ef73deb99b73fb1ce55924197793a320600cc1189dabae43fe5848014c2e72dcb7e1c2a91f2aaba64bd8c7314ded37e23a34c9
 SHA512 
f8fc6bf102d900bb32c5714bd595a71f67f73a1f0a237d9f851b2f250046307bf1177f3782023cd1bbcc55f9d54fd7b4946e09c7dc1fd908ba6a6bad90b233d6

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 f17408ea8cf3..
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2022 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} == "" ]] ; 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_pretend() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-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() {
-   #

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2022-10-01 Thread Rick Farina

commit: e4c073b5c5a565bd027e1b54318d84b26bd5bee7
Author: Rick Farina  gentoo  org>
AuthorDate: Sun Oct  2 02:20:10 2022 +
Commit: Rick Farina  gentoo  org>
CommitDate: Sun Oct  2 02:20:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c073b5

app-crypt/johntheripper-jumbo: remove vestigial test

The actual tests are all commented out, and I'm leaving them in case I
have time to fix them later, but it doesn't make sense to have ewarns
about the tests that were already commented out.

Signed-off-by: Rick Farina  gentoo.org>

 .../johntheripper-jumbo-1.9.0_p20211129-r1.ebuild  | 10 +-
 app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild  | 10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
index 9abb2540073e..37c73b4c41d9 100644
--- 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
+++ 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
@@ -94,8 +94,8 @@ src_compile() {
emake LD="$(tc-getCC)" -C src
 }
 
-src_test() {
-   pax-mark -mr run/john
+#src_test() {
+#  pax-mark -mr run/john
 
#if use opencl; then
# GPU tests fail in portage, so run cpu only tests
@@ -107,9 +107,9 @@ src_test() {
#./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"
-}
+#  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

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 5f3764905ef0..65429e87891e 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -90,8 +90,8 @@ src_compile() {
emake LD="$(tc-getCC)" -C src
 }
 
-src_test() {
-   pax-mark -mr run/john
+#src_test() {
+#  pax-mark -mr run/john
 
#if use opencl; then
# GPU tests fail in portage, so run cpu only tests
@@ -103,9 +103,9 @@ src_test() {
#./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"
-}
+#  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

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2022-10-01 Thread Rick Farina

commit: 000432917e31a8f0dbbacde06951ac9a70342be7
Author: matoro  users  noreply  github  com>
AuthorDate: Sun Sep 18 03:29:25 2022 +
Commit: Rick Farina  gentoo  org>
CommitDate: Sun Oct  2 02:10:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00043291

app-crypt/johntheripper-jumbo: install bundled perl deps

Several perl scripts e.g. pdf2john.pl need these local bundled perl deps
installed.  They are pretty heavily forked from the original upstream
versions, and locally contained to this package.

Closes: https://bugs.gentoo.org/830660
Signed-off-by: Rick Farina  gentoo.org>

 .../johntheripper-jumbo-1.9.0_p20211129-r1.ebuild  | 159 +
 1 file changed, 159 insertions(+)

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
new file mode 100644
index ..9abb2540073e
--- /dev/null
+++ 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs pax-utils
+
+DESCRIPTION="Fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/;
+
+MY_PN="JohnTheRipper"
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git;
+   inherit git-r3
+else
+   JUMBO="jumbo-1.1"
+   MY_PV="${PV}-${JUMBO}"
+   MY_P="john-${MY_PV}"
+   HASH_COMMIT="5d0c85f16f96ca7b6dd06640e95a5801081d6e20"
+
+   SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/john-${HASH_COMMIT}"
+
+   KEYWORDS="~alpha ~amd64 ~arm ~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/Digest-MD2
+   virtual/perl-Digest-MD5
+   dev-perl/Digest-SHA3
+   dev-perl/Digest-GOST
+   !app-crypt/johntheripper"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-fix-bashism.patch
+)
+
+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
+
+   #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
+   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
+

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2022-10-01 Thread Rick Farina

commit: 3c94fcc4bac8910a4344506f3ae71b2bf7032e11
Author: Rick Farina  gentoo  org>
AuthorDate: Sun Oct  2 02:13:03 2022 +
Commit: Rick Farina  gentoo  org>
CommitDate: Sun Oct  2 02:13:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c94fcc4

app-crypt/johntheripper-jumbo: sync live ebuild

Signed-off-by: Rick Farina  gentoo.org>

 app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 0b2c68d044c4..5f3764905ef0 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -128,6 +128,8 @@ src_install() {
exeinto /usr/share/john
doexe run/*.pl
doexe run/*.py
+   insinto /usr/share/john
+   doins -r run/lib
cd run || die
 
local s

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2022-05-14 Thread David Seifert

commit: f7ef3949041a92d4d9aadd8f26c33ac8f6d23198
Author: David Seifert  gentoo  org>
AuthorDate: Sat May 14 21:30:04 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat May 14 21:30:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ef3949

app-crypt/johntheripper-jumbo: [QA] tc-has-openmp → tc-check-openmp

Signed-off-by: David Seifert  gentoo.org>

 .../johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild| 10 ++
 .../johntheripper-jumbo-1.9.0_p20210920.ebuild | 10 ++
 .../johntheripper-jumbo-1.9.0_p20211129.ebuild |  8 +---
 app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild  |  8 +---
 4 files changed, 22 insertions(+), 14 deletions(-)

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
index 632f59d7a16f..f17408ea8cf3 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,10 +45,12 @@ PATCHES=(
"${FILESDIR}/${P}-gcc11.patch"
 )
 
+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() {

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
index df228200cfd7..a77f1fbf4199 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,10 +45,12 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.9.0-fix-bashism.patch
 )
 
+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() {

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
index 6f4a38509974..5143d68af9a3 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
@@ -53,10 +53,12 @@ PATCHES=(
"${FILESDIR}"/${P}-fix-bashism.patch
 )
 
+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() {

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 90eb1c9135c3..0b2c68d044c4 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -49,10 +49,12 @@ RDEPEND="${DEPEND}
dev-perl/Digest-GOST
!app-crypt/johntheripper"
 
+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() {

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2021-12-04 Thread Arthur Zamarin

commit: c1d693abda6d47b1abf7a12f553a742a9cb852a9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec  4 10:07:01 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec  4 10:07:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d693ab

app-crypt/johntheripper-jumbo: Keyword 1.9.0_p20211129 ppc64, #828048

Signed-off-by: Arthur Zamarin  gentoo.org>

 .../johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
index f69c927dea7d..684a202323cb 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz 
-> ${P}.tar.gz"
S="${WORKDIR}/john-${HASH_COMMIT}"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2021-12-04 Thread Arthur Zamarin

commit: ce533063f88d579e6ed86f6b3a022838bb94ae3c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec  4 10:06:58 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec  4 10:07:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce533063

app-crypt/johntheripper-jumbo: Keyword 1.9.0_p20211129 ppc, #828048

Signed-off-by: Arthur Zamarin  gentoo.org>

 .../johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
index 3416c8e253f9..f69c927dea7d 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz 
-> ${P}.tar.gz"
S="${WORKDIR}/john-${HASH_COMMIT}"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2021-12-03 Thread Arthur Zamarin

commit: 9a11006fd8406785c6b1e47f911e4d67a4d4a766
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  3 19:25:03 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  3 19:25:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a11006f

app-crypt/johntheripper-jumbo: Keyword 1.9.0_p20211129 arm, #828048

Signed-off-by: Arthur Zamarin  gentoo.org>

 .../johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
index 412dadaecd40..3416c8e253f9 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz 
-> ${P}.tar.gz"
S="${WORKDIR}/john-${HASH_COMMIT}"
 
-   KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos"
+   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2021-12-02 Thread Arthur Zamarin

commit: 0a07b31c64ca0b6cc03545c58aa110489c7b3fae
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  3 07:40:47 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  3 07:41:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a07b31c

app-crypt/johntheripper-jumbo: Keyword 1.9.0_p20211129 x86, #828048

Signed-off-by: Arthur Zamarin  gentoo.org>

 .../johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
index f6903d38ff10..412dadaecd40 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz 
-> ${P}.tar.gz"
S="${WORKDIR}/john-${HASH_COMMIT}"
 
-   KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~amd64-linux ~x86-linux 
~ppc-macos"
+   KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/, app-crypt/johntheripper-jumbo/files/

2021-12-02 Thread Sam James

commit: 4b20afa3bda32ad2d4350472ebc7c1e3891abd98
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  3 06:18:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  3 06:21:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b20afa3

app-crypt/johntheripper-jumbo: add 1.9.0_p20211129; sync live

- Respect $STRINGS
- Avoid Bashisms
- Modernise ebuild a bit
- Add missing runtime dependencies for Perl scripts
- Sync live

Closes: https://bugs.gentoo.org/763828
Closes: https://bugs.gentoo.org/729432
Closes: https://bugs.gentoo.org/777369
Signed-off-by: Sam James  gentoo.org>

 app-crypt/johntheripper-jumbo/Manifest |   1 +
 ...eripper-jumbo-1.9.0_p20211129-fix-bashism.patch | 111 +
 ... => johntheripper-jumbo-1.9.0_p20211129.ebuild} |  84 +++-
 .../johntheripper-jumbo-.ebuild|  78 ++-
 4 files changed, 223 insertions(+), 51 deletions(-)

diff --git a/app-crypt/johntheripper-jumbo/Manifest 
b/app-crypt/johntheripper-jumbo/Manifest
index 40c0211c6790..6012316eb241 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,2 +1,3 @@
 DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 
2fd6813e234308408d42581705ee8b25f9217a3dfb43f05483156f7bb67d0ce0d6de9c3ce8c2e4a17bb99bb377119dae2897bc08c800e7bc80bc6cf245400df6
 SHA512 
c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808
 DIST johntheripper-jumbo-1.9.0_p20210920.tar.gz 47758128 BLAKE2B 
e85255dc218c43e6358f76eac1e79af01d437a7a1fcddd608a390734fdc4070cbf949b8abc080b82decf4a1f5e32d2baa6d2a09d385a31913d8e988c8732e85e
 SHA512 
5121434ad275921fe6288c51fd9dfd36ed3162387e70e8089bbc266d4a17ea461b72ce26b2004acfb62d95a9ee2d570ef3b3f00c1d031abd8cff2f20c3ab480a
+DIST johntheripper-jumbo-1.9.0_p20211129.tar.gz 47758087 BLAKE2B 
de57218151fbc3bed79322d065ef73deb99b73fb1ce55924197793a320600cc1189dabae43fe5848014c2e72dcb7e1c2a91f2aaba64bd8c7314ded37e23a34c9
 SHA512 
f8fc6bf102d900bb32c5714bd595a71f67f73a1f0a237d9f851b2f250046307bf1177f3782023cd1bbcc55f9d54fd7b4946e09c7dc1fd908ba6a6bad90b233d6

diff --git 
a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch
 
b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch
new file mode 100644
index ..2306bb018f36
--- /dev/null
+++ 
b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch
@@ -0,0 +1,111 @@
+https://github.com/openwall/john/pull/4908
+https://bugs.gentoo.org/763828
+
+From 7a843229dff28cf0851fe3130c74b38dfaf38411 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Fri, 3 Dec 2021 03:40:00 +
+Subject: [PATCH 1/2] configure: check for 'strings' and respect $STRINGS
+ variable
+
+It's possible to want a ${CHOST}-prefixed copy of strings,
+so add a check for 'strings' in configure.ac and respect
+$STRINGS within jtr_asm_magic.
+
+Signed-off-by: Sam James 
+---
+ src/configure.ac|  1 +
+ src/m4/jtr_asm_magic.m4 |  2 +-
+ 3 files changed, 98 insertions(+), 2 deletions(-)
+
+diff --git a/src/configure.ac b/src/configure.ac
+index 53b6a62592..98b28be202 100644
+--- a/src/configure.ac
 b/src/configure.ac
+@@ -346,6 +346,7 @@ AS_IF([test -z "$AS"], [AS="$CC"])
+ AS_IF([test -z "$LD"], [LD="$CC"])
+ AS_IF([test -z "$AR"], [AC_CHECK_TOOL([AR], [ar])])
+ AS_IF([test -z "$STRIP"], [AC_CHECK_TOOL([STRIP], [strip])])
++AS_IF([test -z "$STRINGS"], [AC_CHECK_TOOL([STRINGS], [strings])])
+ 
+ dnl Check if we have this at all
+ PKG_PROG_PKG_CONFIG
+diff --git a/src/m4/jtr_asm_magic.m4 b/src/m4/jtr_asm_magic.m4
+index 469a944589..162736d855 100644
+--- a/src/m4/jtr_asm_magic.m4
 b/src/m4/jtr_asm_magic.m4
+@@ -19,7 +19,7 @@ EXTRA_AS_FLAGS=
+ AC_MSG_CHECKING([for extra ASFLAGS])
+ CC="$CC_BACKUP"
+ CFLAGS="$CFLAGS -O0"
+-AS_IF([echo "int long_ident;" > conftest.c && ${CC} -c conftest.c && strings 
- conftest.${OBJEXT} | ${GREP} _long_ident > conftest.out],
++AS_IF([echo "int long_ident;" > conftest.c && ${CC} -c conftest.c && 
${STRINGS} - conftest.${OBJEXT} | ${GREP} _long_ident > conftest.out],
+   [JTR_LIST_ADD(EXTRA_AS_FLAGS, [-DUNDERSCORES])])
+ 
+ AC_LINK_IFELSE([AC_LANG_SOURCE(
+
+From 8c43ed0c2f7fdb793978d90306d6f6a118122e39 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Fri, 3 Dec 2021 03:46:44 +
+Subject: [PATCH 2/2] configure: fix bashisms
+
+'==' isn't recognised by POSIX-compliant shells, so let's use = too.
+
+No functional change.
+
+Signed-off-by: Sam James 
+---
+ src/configure.ac |  8 
+ src/m4/jtr_utility_macros.m4 |  4 ++--
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+--- a/src/configure.ac
 b/src/configure.ac
+@@ -339,7 +339,7 @@ AC_CACHE_SAVE
+ AC_PATH_PROG([SORT], [sort])
+ AC_PATH_PROG([FIND], [find])
+ AC_PATH_PROG([PERL], [perl])
+-if test "x$PERL" == x ; then
++if test "x$PERL" = x ; then
+

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/, app-crypt/johntheripper-jumbo/files/

2021-09-22 Thread Sam James

commit: 3f0a0993461657039f3a44f37f6e67490e09d4c6
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 22 22:22:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 22 22:24:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f0a0993

app-crypt/johntheripper-jumbo: add 1.9.0_p20210920-r1

Signed-off-by: Sam James  gentoo.org>

 app-crypt/johntheripper-jumbo/Manifest |   1 +
 .../johntheripper-jumbo-1.9.0-fix-bashism.patch|  24 
 .../johntheripper-jumbo-1.9.0_p20210920.ebuild | 143 +
 3 files changed, 168 insertions(+)

diff --git a/app-crypt/johntheripper-jumbo/Manifest 
b/app-crypt/johntheripper-jumbo/Manifest
index cf2f85e511b..40c0211c679 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_p20210920.tar.gz 47758128 BLAKE2B 
e85255dc218c43e6358f76eac1e79af01d437a7a1fcddd608a390734fdc4070cbf949b8abc080b82decf4a1f5e32d2baa6d2a09d385a31913d8e988c8732e85e
 SHA512 
5121434ad275921fe6288c51fd9dfd36ed3162387e70e8089bbc266d4a17ea461b72ce26b2004acfb62d95a9ee2d570ef3b3f00c1d031abd8cff2f20c3ab480a

diff --git 
a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch
 
b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch
new file mode 100644
index 000..a0a18158ce7
--- /dev/null
+++ 
b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch
@@ -0,0 +1,24 @@
+https://patch-diff.githubusercontent.com/raw/openwall/john/pull/4822.patch
+
+From dd9501341808fe19b9c5cd4f8f04edfc5f377077 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Wed, 22 Sep 2021 19:34:38 +0100
+Subject: [PATCH] configure.ac: avoid bashism in pkg-config check
+
+== is a Bashism and configure scripts need to work
+with a POSIX shell, so let's change to = (like in
+the other condition).
+
+Signed-off-by: Sam James 
+--- a/src/configure.ac
 b/src/configure.ac
+@@ -347,7 +347,7 @@ AS_IF([test -z "$STRIP"], [AC_CHECK_TOOL([STRIP], 
[strip])])
+ dnl Check if we have this at all
+ PKG_PROG_PKG_CONFIG
+ AC_MSG_CHECKING([if pkg-config will be used])
+-if test "x$PKG_CONFIG" = x || test "x$enable_pkg_config" == xno ; then
++if test "x$PKG_CONFIG" = x || test "x$enable_pkg_config" = xno ; then
+   JTR_MSG_RESULT_FAILIF_FORCED([xno], [x$enable_pkg_config], [pkg-config is 
NOT available])
+   PKG_CONFIG=no
+ else
+

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
new file mode 100644
index 000..df228200cfd
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs pax-utils
+
+DESCRIPTION="Fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/;
+
+MY_PN="JohnTheRipper"
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git;
+   inherit git-r3
+else
+   JUMBO="jumbo-1.1"
+   MY_PV="${PV}-${JUMBO}"
+   MY_P="john-${MY_PV}"
+   HASH_COMMIT="43c7f8850736d4ec68bf0a022ae9fb34c274a01d"
+
+   SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/john-${HASH_COMMIT}"
+
+   KEYWORDS="~alpha ~amd64 ~arm ~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"
+RDEPEND="${DEPEND}
+   !app-crypt/johntheripper"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.9.0-fix-bashism.patch
+)
+
+pkg_setup() {
+   if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
+   tc-has-openmp || die "Please switch to an OpenMP compatible 
compiler"
+   fi
+}
+
+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 \

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/files/, app-crypt/johntheripper-jumbo/

2021-06-25 Thread Sam James

commit: f7e2367203f61eb544373ea641a70b68aea579a0
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 25 02:08:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 25 19:31:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e23672

app-crypt/johntheripper-jumbo: add virtual/libcrypt dependency, fix gcc 11

Needed for upcoming libxcrypt migration.

Closes: https://bugs.gentoo.org/786651
Acked-by: David Seifert  gentoo.org>
Reported-by: John Helmert III  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 .../files/johntheripper-jumbo-1.9.0-gcc11.patch| 53 ++
 ebuild => johntheripper-jumbo-1.9.0-r3.ebuild} | 10 ++--
 .../johntheripper-jumbo-.ebuild|  5 +-
 3 files changed, 63 insertions(+), 5 deletions(-)

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
new file mode 100644
index 000..2901c5bc4bd
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-gcc11.patch
@@ -0,0 +1,53 @@
+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 
+Date: Tue, 9 Mar 2021 22:04:46 +0100
+Subject: [PATCH] Fix alignment compile errors on GCC 11
+
+Signed-off-by: Ferry Huberts 
+---
+ 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/johntheripper-jumbo-1.9.0-r2.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
similarity index 94%
rename from app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r2.ebuild
rename to app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
index 12b9fbef470..632f59d7a16 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r2.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs pax-utils
 
-DESCRIPTION="fast password cracker"
+DESCRIPTION="Fast password cracker"
 HOMEPAGE="http://www.openwall.com/john/;
 
 MY_PN="JohnTheRipper"
@@ -28,18 +28,22 @@ SLOT="0"
 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:*
+   dev-libs/gmp:=
sys-libs/zlib
app-arch/bzip2"
 
 RDEPEND="${DEPEND}
!app-crypt/johntheripper"
 
-PATCHES=( "${FILESDIR}/${P}-opencl-fix.patch" )
+PATCHES=(
+   "${FILESDIR}/${P}-opencl-fix.patch"
+   "${FILESDIR}/${P}-gcc11.patch"
+)
 
 pkg_setup() {
if use openmp && [[ ${MERGE_TYPE} != binary ]]; then

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 40bb28803b1..826ff08b2f5 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs pax-utils
 
-DESCRIPTION="fast password cracker"
+DESCRIPTION="Fast password cracker"
 HOMEPAGE="http://www.openwall.com/john/;
 
 MY_PN="JohnTheRipper"
@@ -28,11 +28,12 @@ SLOT="0"
 IUSE="custom-cflags kerberos mpi opencl openmp pcap"
 
 DEPEND=">=dev-libs/openssl-1.0.1:0=
+   virtual/libcrypt:=
mpi? ( virtual/mpi )
opencl? ( virtual/opencl )

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/files/

2021-03-10 Thread Conrad Kostecki

commit: a21fbc15b909b99fa33dfa3b5af36c243d837cf0
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Mar 10 14:03:16 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Mar 10 22:04:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a21fbc15

app-crypt/johntheripper-jumbo: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/19868
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../johntheripper-jumbo/files/1.8.0-gcc5.patch | 63 --
 1 file changed, 63 deletions(-)

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 f2a7984955a..000
--- 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 
-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

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2021-03-10 Thread Rick Farina

commit: 820b6513e1e7655a1e9001a2598d0b3a2d7da07d
Author: Rick Farina  gentoo  org>
AuthorDate: Wed Mar 10 17:05:09 2021 +
Commit: Rick Farina  gentoo  org>
CommitDate: Wed Mar 10 17:05:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=820b6513

app-crypt/johntheripper-jumbo: add gcc-10 hack

maybe someday upstream will make a release

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Rick Farina  gentoo.org>

 app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

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
index c0fcb46c4e3..5538df15678 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild
@@ -56,6 +56,7 @@ src_configure() {
cd src || die
 
use custom-cflags || strip-flags
+   append-cflags -fcommon
 
econf \
--disable-native-march \

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2021-03-09 Thread Rick Farina

commit: 4ed0c7ea31218312797665524ee1fc080f4828d6
Author: Rick Farina  gentoo  org>
AuthorDate: Tue Mar  9 21:42:49 2021 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Mar  9 21:43:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ed0c7ea

app-crypt/johntheripper-jumbo: drop old

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Rick Farina  gentoo.org>

 app-crypt/johntheripper-jumbo/Manifest |   1 -
 .../johntheripper-jumbo-1.8.0.ebuild   | 124 -
 .../johntheripper-jumbo-1.9.0.ebuild   | 122 
 3 files changed, 247 deletions(-)

diff --git a/app-crypt/johntheripper-jumbo/Manifest 
b/app-crypt/johntheripper-jumbo/Manifest
index 0afa7b836b3..cf2f85e511b 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,2 +1 @@
-DIST JohnTheRipper-1.8.0-jumbo-1.tar.gz 32533148 BLAKE2B 
15929fa25314438619899582b209bee6902b1e53dc2df39ed6a686820665fd4d8e56d26b3f0082d05dc6be2f54add3526570d936c0a929641e33e6dcfb7a13b5
 SHA512 
8b7fad7a6330b5ff1afc306218ba698aaa27776b566f82c2e76102d5ceb10aeafa69d71fa6fff67c81996ea2c6a04384bab4696ed192306c6d074873562e7089
 DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 
2fd6813e234308408d42581705ee8b25f9217a3dfb43f05483156f7bb67d0ce0d6de9c3ce8c2e4a17bb99bb377119dae2897bc08c800e7bc80bc6cf245400df6
 SHA512 
c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808

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 e770d857725..000
--- 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} == "" ]] ; 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 \
-

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2021-03-09 Thread Rick Farina

commit: b9de2a9ecd1543b73bd37604b30179efcdfac081
Author: Rick Farina  gentoo  org>
AuthorDate: Tue Mar  9 21:40:09 2021 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Mar  9 21:43:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9de2a9e

app-crypt/johntheripper-jumbo: remove stray keywords=

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Rick Farina  gentoo.org>

 app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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
index 260f0956a16..9177f8d4624 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,6 @@ MY_PN="JohnTheRipper"
 if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git;
inherit git-r3
-   KEYWORDS=""
 else
JUMBO="jumbo-1"
MY_PV="${PV}-${JUMBO}"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2021-03-09 Thread Rick Farina

commit: 590633ed64a50e822bf3b904e70c91d10e678473
Author: Rick Farina  gentoo  org>
AuthorDate: Tue Mar  9 21:41:37 2021 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Mar  9 21:43:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=590633ed

app-crypt/johntheripper-jumbo: restored dropped keyword

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Rick Farina  gentoo.org>

 app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 9177f8d4624..c0fcb46c4e3 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r1.ebuild
@@ -18,7 +18,7 @@ else
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"
+   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
S="${WORKDIR}/${MY_P}"
 fi

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/files/, app-crypt/johntheripper-jumbo/

2021-03-09 Thread Rick Farina

commit: cdd8982b5fde70da005cb979a78519b01297d578
Author: Hank Leininger  korelogic  com>
AuthorDate: Sat Nov 21 02:47:28 2020 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Mar  9 21:43:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd8982b

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  korelogic.com>
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  gentoo.org>

 .../johntheripper-jumbo-1.9.0-opencl-fix.patch |  12 ++
 .../johntheripper-jumbo-1.9.0-r1.ebuild| 133 +
 2 files changed, 145 insertions(+)

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 000..6fe7693276b
--- /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.0 +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 000..260f0956a16
--- /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} == "" ]] ; 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

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2021-01-05 Thread Miroslav Šulc

commit: 9735b799384ae3df0e340098b06dc0fd9ba7a0ad
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Jan  5 10:46:59 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Jan  5 10:46:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9735b799

app-crypt/johntheripper-jumbo: fixed installation of docs in live

Closes: https://bugs.gentoo.org/746833
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 721d298e771..c2ab18f15f1 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -119,5 +119,5 @@ src_install() {
doins -r run/rules run/ztex
 
# documentation
-   dodoc doc/*
+   dodoc -r doc/*
 }

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2019-07-14 Thread Hans de Graaff

commit: d586f4d8e6d487365bb24fb0befe464af810997b
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Jul 14 08:57:55 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Jul 14 08:58:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d586f4d8

app-crypt/johntheripper-jumbo: add 1.9.0

Fixes: https://bugs.gentoo.org/674656
Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 app-crypt/johntheripper-jumbo/Manifest |   1 +
 .../johntheripper-jumbo-1.9.0.ebuild   | 123 +
 2 files changed, 124 insertions(+)

diff --git a/app-crypt/johntheripper-jumbo/Manifest 
b/app-crypt/johntheripper-jumbo/Manifest
index 1cbbf2f69a9..0afa7b836b3 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1 +1,2 @@
 DIST JohnTheRipper-1.8.0-jumbo-1.tar.gz 32533148 BLAKE2B 
15929fa25314438619899582b209bee6902b1e53dc2df39ed6a686820665fd4d8e56d26b3f0082d05dc6be2f54add3526570d936c0a929641e33e6dcfb7a13b5
 SHA512 
8b7fad7a6330b5ff1afc306218ba698aaa27776b566f82c2e76102d5ceb10aeafa69d71fa6fff67c81996ea2c6a04384bab4696ed192306c6d074873562e7089
+DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 
2fd6813e234308408d42581705ee8b25f9217a3dfb43f05483156f7bb67d0ce0d6de9c3ce8c2e4a17bb99bb377119dae2897bc08c800e7bc80bc6cf245400df6
 SHA512 
c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0.ebuild
new file mode 100644
index 000..40128aaaf43
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 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} == "" ]] ; 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-fbsd ~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() {
+   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
+
+

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

2018-12-19 Thread Rick Farina

commit: 358201d61352b1b840c4721cf02efef7048f8513
Author: Rick Farina  gentoo  org>
AuthorDate: Thu Dec 20 04:08:37 2018 +
Commit: Rick Farina  gentoo  org>
CommitDate: Thu Dec 20 04:08:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358201d6

app-crypt/johntheripper-jumbo: fix bug #673414

also don't install opencl kernels in a dir john doesn't read them in

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina  gentoo.org>

 app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild | 7 +++
 app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild  | 8 
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
index 6e8d04dc6d4..a70e6a1c4ca 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
@@ -96,7 +96,7 @@ src_install() {
dosbin run/john
newsbin run/mailer john-mailer
 
-   pax-mark -mr "${ED}usr/sbin/john"
+   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 \
@@ -111,15 +111,14 @@ src_install() {
doins run/*.py
 
if use opencl; then
-   insinto /usr/share/john/kernels
-   doins run/kernels/*
+   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/kernels
 
# documentation
dodoc doc/*

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 1e72fa5104c..a05e2f9da35 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -93,7 +93,7 @@ src_install() {
dosbin run/john
newsbin run/mailer john-mailer
 
-   pax-mark -mr "${ED}usr/sbin/john"
+   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 \
@@ -108,15 +108,15 @@ src_install() {
doins run/*.py
 
if use opencl; then
-   insinto /usr/share/john/kernels
-   doins run/kernels/*
+   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/kernels run/ztex
+   doins -r run/rules run/ztex
 
# documentation
dodoc doc/*

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/, app-crypt/johntheripper-jumbo/files/

2018-12-18 Thread Rick Farina

commit: 1abd827624bea952700371febd5442ce2c8ebdd1
Author: Rick Farina  gentoo  org>
AuthorDate: Tue Dec 18 21:32:27 2018 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Dec 18 21:40:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1abd8276

app-crypt/johntheripper-jumbo: split jtr and jumbo

jumbo "patch" has taken on a life of it's own and is now vastly too
different than  jtr to keep a sane unified ebuild

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina  gentoo.org>

 app-crypt/johntheripper-jumbo/Manifest |   1 +
 .../johntheripper-jumbo/files/1.8.0-gcc5.patch |  63 +++
 .../johntheripper-jumbo-1.8.0.ebuild   | 126 +
 .../johntheripper-jumbo-.ebuild| 123 
 app-crypt/johntheripper-jumbo/metadata.xml |  19 
 5 files changed, 332 insertions(+)

diff --git a/app-crypt/johntheripper-jumbo/Manifest 
b/app-crypt/johntheripper-jumbo/Manifest
new file mode 100644
index 000..1cbbf2f69a9
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -0,0 +1 @@
+DIST JohnTheRipper-1.8.0-jumbo-1.tar.gz 32533148 BLAKE2B 
15929fa25314438619899582b209bee6902b1e53dc2df39ed6a686820665fd4d8e56d26b3f0082d05dc6be2f54add3526570d936c0a929641e33e6dcfb7a13b5
 SHA512 
8b7fad7a6330b5ff1afc306218ba698aaa27776b566f82c2e76102d5ceb10aeafa69d71fa6fff67c81996ea2c6a04384bab4696ed192306c6d074873562e7089

diff --git a/app-crypt/johntheripper-jumbo/files/1.8.0-gcc5.patch 
b/app-crypt/johntheripper-jumbo/files/1.8.0-gcc5.patch
new file mode 100644
index 000..f2a7984955a
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/files/1.8.0-gcc5.patch
@@ -0,0 +1,63 @@
+From e2e868db3e153b3f959e119a51703d4afb99c624 Mon Sep 17 00:00:00 2001
+From: magnum 
+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/johntheripper-jumbo-1.8.0.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
new file mode 100644
index 000..6e8d04dc6d4
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 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} == "" ]] ; 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="${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 
~x86-fbsd ~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:*
+

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/files/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/, app-crypt/johntheripper-jumbo/files/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/, app-crypt/johntheripper-jumbo/files/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/files/, app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/files/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/files/, app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/, app-crypt/johntheripper-jumbo/files/

30 matches

Site Navigation

Mail list logo

Footer information