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

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

2026-01-19 Thread Sam James

commit: bc84fea9eb1842a5f697fc9efa0e2baa95dd82de
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 19 07:30:40 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 19 09:46:48 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc84fea9

app-crypt/johntheripper: wire up verify-sig

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

 app-crypt/johntheripper/Manifest   |  1 +
 app-crypt/johntheripper/johntheripper-1.9.0.ebuild | 25 +++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 682d048011a4..dc539e19d820 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,2 +1,3 @@
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 
90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60
 SHA512 
e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
 DIST john-1.9.0.tar.xz 8944932 BLAKE2B 
57f5b83a541a7048e34d87dbee2f8f56953ef8a98bf7163b981064289d38452d11e59f1fb48a98a4f5f61d5f33866987f7c8515bf9900d742c09b7ac3e61376e
 SHA512 
26e9a245e9f050344ae8c3320e1e24dad6bc2b73e99cc041a50c2d124b2c898c93d048727451ab8a2ba1c8aa4d8d462a8c0c9fea7de39f3479a0c170a5e9ad60
+DIST john-1.9.0.tar.xz.sig 801 BLAKE2B 
9cb7a5bb0357b25c39b943063be0d3f640544b9cd51c0e071b6314c57703b9fe50363924f68fdc4d04b76707c352b4eb0bf7461168e11cc0e5b17c6ce43df9ee
 SHA512 
b8aa1b3209231bd91f8ea952d9dd4d44fd005017c4ff15e074adb1e6d1b340b8f04d4c37973aedb2693a9ef116acbfbcdef2553330317c850e753402501d7772

diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
index 3dac4bc2d91b..e38a6e5be1d5 100644
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -1,17 +1,21 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit eapi9-ver flag-o-matic toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openwall.asc
+inherit eapi9-ver flag-o-matic toolchain-funcs verify-sig
 
 MY_PN="john"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="fast password cracker"
 HOMEPAGE="https://www.openwall.com/john/";
-
-SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz";
+SRC_URI="
+   https://www.openwall.com/john/k/${MY_P}.tar.xz
+   verify-sig? ( https://www.openwall.com/john/k/${MY_P}.tar.xz.sign -> 
${MY_P}.tar.xz.sig )
+"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,10 +24,11 @@ CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 
cpu_flags_x86_avx cpu_flags_x86_
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
 DEPEND="virtual/libcrypt:="
-RDEPEND="${DEPEND}
-   !app-crypt/johntheripper-jumbo"
-
-S="${WORKDIR}/${MY_P}"
+RDEPEND="
+   ${DEPEND}
+   !app-crypt/johntheripper-jumbo
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-openwall )"
 
 get_target() {
if use alpha; then
@@ -77,10 +82,6 @@ pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
-src_prepare() {
-   default
-}
-
 src_compile() {
local OMP

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

2025-07-15 Thread Sam James

commit: 166efc12379fac3ce3b5d3d68ad8ab621bb9c71d
Author: Sv. Lockal  gmail  com>
AuthorDate: Tue Jul 15 20:17:37 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 16 02:51:44 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=166efc12

app-crypt/johntheripper-jumbo: fix tests

Closes: https://bugs.gentoo.org/960245
Signed-off-by: Sv. Lockal  gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43016
Closes: https://github.com/gentoo/gentoo/pull/43016
Signed-off-by: Sam James  gentoo.org>

 .../johntheripper-jumbo-1.9.0_p20250703.ebuild   | 16 +---
 .../johntheripper-jumbo/johntheripper-jumbo-.ebuild  | 16 +---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
index 5d93ad04dc9e..8897a6fffd87 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
@@ -119,14 +119,24 @@ src_compile() {
 src_test() {
pax-mark -mr run/john
 
+   # Replace system (/etc/john) includes with cwd-relative for tests
+   # bug #960245.
+   mkdir test || die
+   cp -r run/*.conf run/rules test || die
+   cd test || die
+   for file in *.conf; do
+   sed -E 's/^.include <(.+)>$/.include "\1"/g' -i "$file" || die
+   done
+
if use opencl; then
# GPU tests fail in portage, so run cpu only tests
-   ./run/john --config=run/john.conf --device=cpu --test=0 
--verbosity=2 || die
+   # Reasons: kernels not in /etc/john/opencl (yet) and sandbox
+   ../run/john --config=john.conf --device=cpu --test=0 
--verbosity=2 || die
else
# Weak tests
-   ./run/john --config=run/john.conf --test=0 --verbosity=2 || die
+   ../run/john --config=john.conf --test=0 --verbosity=2 || die
# Strong tests
-   #./run/john --test=1 --verbosity=2 || die
+   #../run/john --config=john.conf --test=1 --verbosity=2 || die
fi
 }
 

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 5d93ad04dc9e..8897a6fffd87 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -119,14 +119,24 @@ src_compile() {
 src_test() {
pax-mark -mr run/john
 
+   # Replace system (/etc/john) includes with cwd-relative for tests
+   # bug #960245.
+   mkdir test || die
+   cp -r run/*.conf run/rules test || die
+   cd test || die
+   for file in *.conf; do
+   sed -E 's/^.include <(.+)>$/.include "\1"/g' -i "$file" || die
+   done
+
if use opencl; then
# GPU tests fail in portage, so run cpu only tests
-   ./run/john --config=run/john.conf --device=cpu --test=0 
--verbosity=2 || die
+   # Reasons: kernels not in /etc/john/opencl (yet) and sandbox
+   ../run/john --config=john.conf --device=cpu --test=0 
--verbosity=2 || die
else
# Weak tests
-   ./run/john --config=run/john.conf --test=0 --verbosity=2 || die
+   ../run/john --config=john.conf --test=0 --verbosity=2 || die
# Strong tests
-   #./run/john --test=1 --verbosity=2 || die
+   #../run/john --config=john.conf --test=1 --verbosity=2 || die
fi
 }

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

2025-07-15 Thread Sam James

commit: 7d5002e17fb85384685ca43b399d78e3b08ab5c0
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 16 02:52:51 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 16 02:52:51 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d5002e1

app-crypt/johntheripper-jumbo: localise 'file'

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

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

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
index 8897a6fffd87..dc32713c9182 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
@@ -124,6 +124,7 @@ src_test() {
mkdir test || die
cp -r run/*.conf run/rules test || die
cd test || die
+   local file
for file in *.conf; do
sed -E 's/^.include <(.+)>$/.include "\1"/g' -i "$file" || die
done

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 8897a6fffd87..dc32713c9182 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -124,6 +124,7 @@ src_test() {
mkdir test || die
cp -r run/*.conf run/rules test || die
cd test || die
+   local file
for file in *.conf; do
sed -E 's/^.include <(.+)>$/.include "\1"/g' -i "$file" || die
done

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

2025-07-15 Thread Sam James

commit: a45d73e783af4f6b27da0a7fa31e4e2c11564891
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 15 10:40:53 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 15 10:41:10 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a45d73e7

app-crypt/johntheripper-jumbo: drop unversioned Perl virtual deps

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

 .../johntheripper-jumbo-1.9.0_p20250703.ebuild  | 13 -
 .../johntheripper-jumbo/johntheripper-jumbo-.ebuild | 13 -
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
index e52d4d752eac..5d93ad04dc9e 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
@@ -41,7 +41,8 @@ CPU_FEATURES_MAP=(
 
 IUSE="custom-cflags kerberos mpi opencl openmp pcap test 
${CPU_FEATURES_MAP[*]%:*}"
 
-DEPEND=">=dev-libs/openssl-1.0.1:=
+DEPEND="
+   >=dev-libs/openssl-1.0.1:=
virtual/libcrypt:=
mpi? ( virtual/mpi )
opencl? ( virtual/opencl )
@@ -49,18 +50,20 @@ DEPEND=">=dev-libs/openssl-1.0.1:=
pcap? ( net-libs/libpcap )
dev-libs/gmp:=
sys-libs/zlib
-   app-arch/bzip2"
+   app-arch/bzip2
+"
 # Missing (unpackaged):
 # - Digest::Haval256
 # - Digest::x
 # See bug #777369.
-RDEPEND="${DEPEND}
+RDEPEND="
+   ${DEPEND}
dev-perl/Compress-Raw-Lzma
dev-perl/Digest-MD2
-   virtual/perl-Digest-MD5
dev-perl/Digest-SHA3
dev-perl/Digest-GOST
-   !app-crypt/johntheripper"
+   !app-crypt/johntheripper
+"
 RESTRICT="!test? ( test )"
 
 pkg_pretend() {

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index e52d4d752eac..5d93ad04dc9e 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -41,7 +41,8 @@ CPU_FEATURES_MAP=(
 
 IUSE="custom-cflags kerberos mpi opencl openmp pcap test 
${CPU_FEATURES_MAP[*]%:*}"
 
-DEPEND=">=dev-libs/openssl-1.0.1:=
+DEPEND="
+   >=dev-libs/openssl-1.0.1:=
virtual/libcrypt:=
mpi? ( virtual/mpi )
opencl? ( virtual/opencl )
@@ -49,18 +50,20 @@ DEPEND=">=dev-libs/openssl-1.0.1:=
pcap? ( net-libs/libpcap )
dev-libs/gmp:=
sys-libs/zlib
-   app-arch/bzip2"
+   app-arch/bzip2
+"
 # Missing (unpackaged):
 # - Digest::Haval256
 # - Digest::x
 # See bug #777369.
-RDEPEND="${DEPEND}
+RDEPEND="
+   ${DEPEND}
dev-perl/Compress-Raw-Lzma
dev-perl/Digest-MD2
-   virtual/perl-Digest-MD5
dev-perl/Digest-SHA3
dev-perl/Digest-GOST
-   !app-crypt/johntheripper"
+   !app-crypt/johntheripper
+"
 RESTRICT="!test? ( test )"
 
 pkg_pretend() {

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

2025-07-15 Thread Sam James

commit: ecca5cfe6554d29daa12822c85c7794a4e7df56d
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 15 10:38:09 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 15 10:38:22 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecca5cfe

app-crypt/johntheripper-jumbo: localize 'i'

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

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

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
index 5804aa6ecf70..e52d4d752eac 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
@@ -81,6 +81,7 @@ src_prepare() {
 }
 
 get_enable_simd() {
+   local i
for i in "${CPU_FEATURES_MAP[@]}" ; do
if use "${i%:*}"; then
echo "--enable-simd=${i#*:}"

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 5804aa6ecf70..e52d4d752eac 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -81,6 +81,7 @@ src_prepare() {
 }
 
 get_enable_simd() {
+   local i
for i in "${CPU_FEATURES_MAP[@]}" ; do
if use "${i%:*}"; then
echo "--enable-simd=${i#*:}"

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

2025-07-15 Thread Sam James

commit: 9f5e6867ae196a665a4af24f4f3c51ce737f10f2
Author: Sv. Lockal  gmail  com>
AuthorDate: Tue Jul 15 09:53:02 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 15 10:38:22 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f5e6867

app-crypt/johntheripper-jumbo: add 1.9.0_p20250703 with performance/completions 
fixes

Build flags were massively inoptimal (comparing to simple ./configure && make): 
removal of -march=native, then adding -mno-avx effectively downgraded 
performance to SSE2 level.
It was done as a workaround for https://bugs.gentoo.org/729422 in 2020 (before 
jumbo split), but seems to be not needed now.
custom-cflags is also not needed: it works fine with sane CFLAGS (including 
LTO, including Clang).

New ebuild adds bash/zsh completions.

The list of executable files and symlinks was recreated from scratch: old 
symlinks did not work as intended, many symlinks were replaced with standalone 
elf executables.

Bug: https://bugs.gentoo.org/729422
Closes: https://bugs.gentoo.org/954819
Signed-off-by: Sv. Lockal  gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43012
Closes: https://github.com/gentoo/gentoo/pull/43012
Signed-off-by: Sam James  gentoo.org>

 app-crypt/johntheripper-jumbo/Manifest |   1 +
 ... johntheripper-jumbo-1.9.0_p20250216-r1.ebuild} |   4 +-
 ... => johntheripper-jumbo-1.9.0_p20250703.ebuild} | 105 +
 .../johntheripper-jumbo-.ebuild| 105 +
 4 files changed, 131 insertions(+), 84 deletions(-)

diff --git a/app-crypt/johntheripper-jumbo/Manifest 
b/app-crypt/johntheripper-jumbo/Manifest
index 6fa975aaf750..b2433d7aeb94 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,2 +1,3 @@
 DIST johntheripper-jumbo-1.9.0_p20240102.tar.gz 55727974 BLAKE2B 
10238f549b8d1d52d7858d0a0df080ae1e92a7026b3b31f4e19d00c2bf06df5ad1fe298291d5421a0f685786fca2ad954a5ed3b2adc23d80464ec1966db9c968
 SHA512 
c66898d12799d88d42e6a930768e27b4110362b6384a47957ab61300b8254af051d3a2821e54f12a90ded8a20c855b8a2f044942dba1605447ae355e2f7ecbaf
 DIST johntheripper-jumbo-1.9.0_p20250216.tar.gz 56239660 BLAKE2B 
8d2da0b6634acc9ac78e5561e1afe4d07bc26776371d124c66d95e07164473421394c72aa6557ebd9db95c2d68754104b7dd7ba2fb36b1a193d094e13d9a4629
 SHA512 
27869c16977ca3c19b1f2247049dca8347b08af7bd1b626ccc549061385ed2e1617593115b6655113aa4999c3a7df5ab37c2ed9f901ed80ecd90d5e4cae9f5b5
+DIST johntheripper-jumbo-1.9.0_p20250703.tar.gz 56275211 BLAKE2B 
5caea60f269fe51a3d86f0c351739c8d348dbf05735339dac925aba9b49bd0d226ad0581e6514af1ea47ad979ee7a3ae639e1ee4bf9808a40d567ef623089964
 SHA512 
3fa3e29976d38cdec885663b943f74a089e5a1d95de5a2ee5c54d381ee28a1a9b2bbfa95a42c07d786831bfa83724f7204b7a93dfc6c74b408df57b116b18704

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216-r1.ebuild
similarity index 98%
copy from 
app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216.ebuild
copy to 
app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216-r1.ebuild
index 3dd5924681e1..a7501b5935d6 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216.ebuild
+++ 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216-r1.ebuild
@@ -156,6 +156,6 @@ src_install() {
doins -r run/rules run/ztex
 
# Documentation
-   rm -f doc/README || die
-   dodoc -r README.md doc/*
+   rm -f doc/README doc/LICENSE || die
+   dodoc -r README.md LICENSE doc/*
 }

diff --git 
a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
similarity index 58%
rename from 
app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216.ebuild
rename to 
app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
index 3dd5924681e1..5804aa6ecf70 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic toolchain-funcs pax-utils
+inherit autotools shell-completion toolchain-funcs pax-utils
 
 DESCRIPTION="Fast password cracker, community enhanced version"
 HOMEPAGE="http://www.openwall.com/john/";
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
EGIT_BRANCH="bleeding-jumbo"
inherit git-r3
 else
-   HASH_COMMIT="8a72b12fe6e1626ef6014e5a190b9d1f69a9edde"
+   HASH_COMMIT="b27f951a8e191210685c8421c90ca610cdd39dce"
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 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
@@ -21,7 +21,25 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="c

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

2025-07-13 Thread Sam James

commit: f66307331b790146e5f97b8ecaa06948d05250dd
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 13 09:34:19 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 13 09:45:34 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6630733

app-crypt/johntheripper: Stabilize 1.9.0 sparc, #945611

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

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

diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
index bca43f8eb9f7..3132c258d5b0 100644
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

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

2025-02-16 Thread Sam James

commit: 1d4c34e357e1e70b9b3f8ee17e2f631865aedebb
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 16 13:03:28 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 16 13:17:09 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d4c34e3

app-crypt/johntheripper-jumbo: drop 1.9.0_p20230717

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

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

diff --git a/app-crypt/johntheripper-jumbo/Manifest 
b/app-crypt/johntheripper-jumbo/Manifest
index e289b458e9e1..d0882b25a01b 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,2 +1 @@
-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_p20230717.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild
deleted file mode 100644
index c5012306a202..
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2024 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, community enhanced version"
-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 ~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/Compress-Raw-Lzma
-   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() {
-   # Executa

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

2025-02-16 Thread Sam James

commit: 18189332f06a98ab06657cfc661ab2f4c9b106cb
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 16 13:12:00 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 16 13:17:10 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18189332

app-crypt/johntheripper-jumbo: add 1.9.0_p20250216

Add a workaround for bug #729422 which isn't complete but should
help with building in common configurations. Keeping the bug open
so we can sort it out properly.

Bug: https://bugs.gentoo.org/729422
Closes: https://bugs.gentoo.org/948330
Closes: https://bugs.gentoo.org/943973
Signed-off-by: Sam James  gentoo.org>

 app-crypt/johntheripper-jumbo/Manifest   |  1 +
 ...999.ebuild => johntheripper-jumbo-1.9.0_p20250216.ebuild} | 12 +---
 .../johntheripper-jumbo/johntheripper-jumbo-.ebuild  | 12 +---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app-crypt/johntheripper-jumbo/Manifest 
b/app-crypt/johntheripper-jumbo/Manifest
index d0882b25a01b..6fa975aaf750 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1 +1,2 @@
 DIST johntheripper-jumbo-1.9.0_p20240102.tar.gz 55727974 BLAKE2B 
10238f549b8d1d52d7858d0a0df080ae1e92a7026b3b31f4e19d00c2bf06df5ad1fe298291d5421a0f685786fca2ad954a5ed3b2adc23d80464ec1966db9c968
 SHA512 
c66898d12799d88d42e6a930768e27b4110362b6384a47957ab61300b8254af051d3a2821e54f12a90ded8a20c855b8a2f044942dba1605447ae355e2f7ecbaf
+DIST johntheripper-jumbo-1.9.0_p20250216.tar.gz 56239660 BLAKE2B 
8d2da0b6634acc9ac78e5561e1afe4d07bc26776371d124c66d95e07164473421394c72aa6557ebd9db95c2d68754104b7dd7ba2fb36b1a193d094e13d9a4629
 SHA512 
27869c16977ca3c19b1f2247049dca8347b08af7bd1b626ccc549061385ed2e1617593115b6655113aa4999c3a7df5ab37c2ed9f901ed80ecd90d5e4cae9f5b5

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216.ebuild
similarity index 92%
copy from app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
copy to app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216.ebuild
index 1b05f5211215..3dd5924681e1 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
EGIT_BRANCH="bleeding-jumbo"
inherit git-r3
 else
-   HASH_COMMIT="9daf16b5743b2c521d23c281e13ae8cdbd37b1eb"
+   HASH_COMMIT="8a72b12fe6e1626ef6014e5a190b9d1f69a9edde"
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 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
@@ -65,7 +65,13 @@ src_prepare() {
 src_configure() {
cd src || die
 
-   use custom-cflags || strip-flags
+   if ! use custom-cflags ; then
+   strip-flags
+
+   # Nasty (and incomplete) workaround for bug #729422
+   filter-flags '-march=native'
+   append-flags $(test-flags-CC '-mno-avx')
+   fi
 
econf \
--enable-pkg-config \

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index 1b05f5211215..3dd5924681e1 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
EGIT_BRANCH="bleeding-jumbo"
inherit git-r3
 else
-   HASH_COMMIT="9daf16b5743b2c521d23c281e13ae8cdbd37b1eb"
+   HASH_COMMIT="8a72b12fe6e1626ef6014e5a190b9d1f69a9edde"
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 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
@@ -65,7 +65,13 @@ src_prepare() {
 src_configure() {
cd src || die
 
-   use custom-cflags || strip-flags
+   if ! use custom-cflags ; then
+   strip-flags
+
+   # Nasty (and incomplete) workaround for bug #729422
+   filter-flags '-march=native'
+   append-flags $(test-flags-CC '-mno-avx')
+   fi
 
econf \
--enable-pkg-config \

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

2025-02-15 Thread Ulrich Müller

commit: 6dd29a88ae4851c8725da25cdb09f16b2772f9ac
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Feb 14 16:16:32 2025 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Feb 15 09:26:41 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd29a88

app-crypt/johntheripper: Fix incorrect REPLACING_VERSIONS usage

Signed-off-by: Ulrich Müller  gentoo.org>

 app-crypt/johntheripper/johntheripper-1.9.0.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
index 158f6df061c2..bca43f8eb9f7 100644
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit flag-o-matic toolchain-funcs
+inherit eapi9-ver flag-o-matic toolchain-funcs
 
 MY_PN="john"
 MY_P="${MY_PN}-${PV}"
@@ -131,7 +131,7 @@ src_install() {
 }
 
 pkg_postinst() {
-   if [ -n "${REPLACING_VERSIONS}" ] && [ "${REPLACING_VERSIONS}" != 
"1.8.0" ]; then
+   if ver_replacing -lt 1.8.0; then
ewarn "This package no longer includes jumbo.  If you want 
jumbo please install app-crypt/johntheripper-jumbo instead."
fi
 }

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

2024-12-23 Thread Sam James

commit: 63d9c8faae78de13af2532b5063c4866bb8667d8
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 24 04:59:56 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 24 04:59:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d9c8fa

app-crypt/johntheripper: Stabilize 1.9.0 ppc64, #945611

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

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

diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
index b4c3fd20c0fe..158f6df061c2 100644
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

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

2024-12-01 Thread Jakov Smolić

commit: f5d0ecf5c5020b1fc6b55424cb0cb30c5ec32797
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Dec  1 22:36:11 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Dec  1 22:36:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d0ecf5

app-crypt/johntheripper: Stabilize 1.9.0 x86, #945611

Signed-off-by: Jakov Smolić  gentoo.org>

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

diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
index 922272164eff..7b79eb46dea0 100644
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~mips ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

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

2024-12-01 Thread Arthur Zamarin

commit: 9174aea024333bc13cd2e02009e9828a538a3b85
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec  1 19:06:52 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec  1 19:06:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9174aea0

app-crypt/johntheripper: Stabilize 1.9.0 ppc, #945611

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

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

diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
index f24bc5561041..922272164eff 100644
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~mips ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

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

2024-12-01 Thread Arthur Zamarin

commit: 4ac8bc9d8d3f85f4f9a6cc0953ce014c286ae5c6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec  1 19:03:07 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec  1 19:03:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac8bc9d

app-crypt/johntheripper: Stabilize 1.9.0 arm, #945611

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

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

diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
index fabbd858c1cf..f24bc5561041 100644
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.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
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

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

2024-08-25 Thread Andreas K. Hüttel

commit: 6523f634d012e9c1fe32ba97a859bd0c1b2616cb
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Aug 25 09:54:01 2024 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Aug 25 12:03:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6523f634

app-crypt/johntheripper-jumbo: remove ~mips

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 .../johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild  | 2 +-
 .../johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild  | 2 +-
 app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 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 368d59abb709..c5012306a202 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
@@ -17,7 +17,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 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"

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 d4b9287e610c..1b05f5211215 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
@@ -16,7 +16,7 @@ else
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"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
index d4b9287e610c..1b05f5211215 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-.ebuild
@@ -16,7 +16,7 @@ else
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"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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/

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"
SRC_URI="https://github.com/openwall/john

[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/

2023-08-21 Thread Rick Farina

commit: 606dbe9a4e28d1348975f098a34472ab8a0207b1
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Aug 21 20:54:29 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Aug 21 20:55:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=606dbe9a

app-crypt/johntheripper: destabilize 1.9.0

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

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

diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
index 354432e452ae..fabbd858c1cf 100644
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

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

2023-08-21 Thread Rick Farina

commit: bc46c1859c437b578758a64110b0e9cc2f6facba
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Aug 21 20:53:23 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Aug 21 20:55:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc46c185

app-crypt/johntheripper: add new use flags

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

 app-crypt/johntheripper/johntheripper-1.9.0.ebuild | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
index d7bd1317da50..354432e452ae 100644
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz";
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
-CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_xop"
+CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
 DEPEND="virtual/libcrypt:="
@@ -29,7 +29,11 @@ get_target() {
if use alpha; then
echo "linux-alpha"
elif use amd64; then
-   if use cpu_flags_x86_xop; then
+   if use cpu_flags_x86_avx512f; then
+   echo "linux-x86-64-avx512"
+   elif use cpu_flags_x86_avx2; then
+   echo "linux-x86-64-avx2"
+   elif use cpu_flags_x86_xop; then
echo "linux-x86-64-xop"
elif use cpu_flags_x86_avx; then
echo "linux-x86-64-avx"
@@ -43,7 +47,11 @@ get_target() {
elif use sparc; then
echo "linux-sparc"
elif use x86; then
-   if use cpu_flags_x86_xop; then
+   if use cpu_flags_x86_avx512f; then
+   echo "linux-x86-64-avx512"
+   elif use cpu_flags_x86_avx2; then
+   echo "linux-x86-64-avx2"
+   elif use cpu_flags_x86_xop; then
echo "linux-x86-xop"
elif use cpu_flags_x86_avx; then
echo "linux-x86-avx"

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

2023-08-21 Thread Rick Farina

commit: ea6340b877aa4ec6095bb4cda2fe397349dc
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Aug 21 20:42:17 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Aug 21 20:55:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea63

app-crypt/johntheripper: add 1.9.0

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

 app-crypt/johntheripper/Manifest   |   1 +
 app-crypt/johntheripper/johntheripper-1.9.0.ebuild | 129 +
 2 files changed, 130 insertions(+)

diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index b522016fa042..682d048011a4 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1 +1,2 @@
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 
90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60
 SHA512 
e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
+DIST john-1.9.0.tar.xz 8944932 BLAKE2B 
57f5b83a541a7048e34d87dbee2f8f56953ef8a98bf7163b981064289d38452d11e59f1fb48a98a4f5f61d5f33866987f7c8515bf9900d742c09b7ac3e61376e
 SHA512 
26e9a245e9f050344ae8c3320e1e24dad6bc2b73e99cc041a50c2d124b2c898c93d048727451ab8a2ba1c8aa4d8d462a8c0c9fea7de39f3479a0c170a5e9ad60

diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
new file mode 100644
index ..d7bd1317da50
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="https://www.openwall.com/john/";
+
+SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_xop"
+IUSE="custom-cflags openmp ${CPU_FLAGS}"
+
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}
+   !app-crypt/johntheripper-jumbo"
+
+S="${WORKDIR}/${MY_P}"
+
+get_target() {
+   if use alpha; then
+   echo "linux-alpha"
+   elif use amd64; then
+   if use cpu_flags_x86_xop; then
+   echo "linux-x86-64-xop"
+   elif use cpu_flags_x86_avx; then
+   echo "linux-x86-64-avx"
+   else
+   echo "linux-x86-64"
+   fi
+   elif use ppc; then
+   echo "linux-ppc32"
+   elif use ppc64; then
+   echo "linux-ppc64"
+   elif use sparc; then
+   echo "linux-sparc"
+   elif use x86; then
+   if use cpu_flags_x86_xop; then
+   echo "linux-x86-xop"
+   elif use cpu_flags_x86_avx; then
+   echo "linux-x86-avx"
+   elif use cpu_flags_x86_sse2; then
+   echo "linux-x86-sse2"
+   elif use cpu_flags_x86_mmx; then
+   echo "linux-x86-mmx"
+   else
+   echo "linux-x86-any"
+   fi
+   elif use ppc-macos; then
+   echo "macosx-ppc32-altivec"
+   elif use x64-macos; then
+   echo "macosx-x86-64"
+   else
+   echo "generic"
+   fi
+}
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+   default
+}
+
+src_compile() {
+   local OMP
+
+   use custom-cflags || strip-flags
+   cat <<- EOF >> config.gentoo || die
+   #define JOHN_SYSTEMWIDE 1
+   #define JOHN_SYSTEMWIDE_HOME "${EPREFIX}/etc/john"
+   #define JOHN_SYSTEMWIDE_EXEC "${EPREFIX}/usr/libexec/john"
+EOF
+
+   append-flags -fPIC -fPIE
+   #gcc-specs-pie && append-ldflags -nopie
+   use openmp && OMP="-fopenmp"
+
+   CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
+
+   emake -C src/ \
+   CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
+   CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP}" \
+   LDFLAGS="${LDFLAGS} ${OMP}" \
+   OPT_NORMAL="" \
+   OMPFLAGS="${OMP}" \
+   $(get_target)
+}
+
+src_test() {
+   emake -C src/ check
+}
+
+src_install() {
+   # executables
+   dosbin run/john
+   newsbin run/mailer john-mailer
+
+   dosym john /usr/sbin/unafs
+   dosym john /usr/sbin/unique
+   dosym john /usr/sbin/unshadow
+
+   # config files
+   insinto /etc/john
+   doins run/*.chr run/password.lst
+

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

2023-08-19 Thread Rick Farina

commit: cc9c531cd3971202190d53065f781887cd748a47
Author: Rick Farina  gentoo  org>
AuthorDate: Sat Aug 19 22:25:38 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Sat Aug 19 22:40:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc9c531c

app-crypt/johntheripper: revbump dep changes

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

 .../{johntheripper-1.8.0-r1.ebuild => johntheripper-1.8.0-r2.ebuild}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0-r2.ebuild
similarity index 100%
rename from app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
rename to app-crypt/johntheripper/johntheripper-1.8.0-r2.ebuild

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

2023-08-19 Thread Rick Farina

commit: ff099bbf517fb5ed6aff6331740587c6f33e4096
Author: Rick Farina  gentoo  org>
AuthorDate: Sat Aug 19 22:20:42 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Sat Aug 19 22:40:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff099bbf

app-crypt/johntheripper: move deps around

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

 app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
index 6a6fca918868..c9ec0d145876 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cuda flag-o-matic toolchain-funcs
 
@@ -19,9 +19,9 @@ KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 
~amd64-linux ~x86-lin
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
-RDEPEND="sys-libs/zlib
+DEPEND="sys-libs/zlib
virtual/libcrypt:="
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
!app-crypt/johntheripper-jumbo"
 
 S="${WORKDIR}/${MY_P}"

[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/

2022-05-14 Thread David Seifert

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

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

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

 app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
index 700c4d5a8787..1d4e84fe706c 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
@@ -66,10 +66,12 @@ get_target() {
fi
 }
 
+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/

2022-01-05 Thread David Seifert

commit: 1d882ca6dd9af72446614decd0d572109e941dea
Author: David Seifert  gentoo  org>
AuthorDate: Wed Jan  5 10:01:18 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Jan  5 10:01:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d882ca6

app-crypt/johntheripper: remove amd64-fbsd

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

 app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild | 12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
index 5b712e92fe3a..700c4d5a8787 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0-r1.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
@@ -61,16 +61,6 @@ get_target() {
echo "macosx-x86-64"
elif use x86-solaris; then
echo "solaris-x86-any"
-   elif use x86-fbsd; then
-   if use cpu_flags_x86_sse2; then
-   echo "freebsd-x86-sse2"
-   elif use cpu_flags_x86_mmx; then
-   echo "freebsd-x86-mmx"
-   else
-   echo "freebsd-x86-any"
-   fi
-   elif use amd64-fbsd; then
-   echo "freebsd-x86-64"
else
echo "generic"
fi

[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
+   AC

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

2021-11-19 Thread Sam James

commit: 239efd8867d84f16504655a5c09da419fe32d8cb
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 19 11:16:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 19 11:32:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=239efd88

app-crypt/johntheripper: use 'emake'

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

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

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
index 48bf0ae95f66..5b712e92fe3a 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
@@ -112,7 +112,7 @@ EOF
 }
 
 src_test() {
-   make -C src/ check
+   emake -C src/ check
 }
 
 src_install() {

[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/

2021-04-03 Thread Sam James

commit: a4c7bfb337eae28f7245395e8f620629449e0bba
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr  3 22:59:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  3 22:59:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c7bfb3

app-crypt/johntheripper: eutils--, multilib--

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

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

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index cd23cb4e246..048b15c1c8d 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cuda eutils flag-o-matic toolchain-funcs multilib
+inherit cuda flag-o-matic toolchain-funcs
 
 MY_PN="john"
 MY_P="${MY_PN}-${PV}"

[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 keych

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

2021-01-07 Thread Fabian Groffen

commit: f75d11e7b907039f5e3391e162f2ea1f714b8992
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Jan  7 08:11:12 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Jan  7 08:11:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75d11e7

app-crypt/johntheripper: drop handling for x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index aa12fcaa1a5..cd23cb4e246 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.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
@@ -56,12 +56,8 @@ get_target() {
fi
elif use ppc-macos; then
echo "macosx-ppc32-altivec"
-   elif use x86-macos; then
-   if use cpu_flags_x86_sse2; then
-   echo "macosx-x86-sse2"
-   else
-   echo "macosx-x86"
-   fi
+   elif use x64-macos; then
+   echo "macosx-x86-64"
elif use x86-solaris; then
echo "solaris-x86-any"
elif use x86-fbsd; then

[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
+
+   in

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

2019-06-06 Thread Andreas Sturmlechner

commit: 2c95e38ec54cc00b694db04bf87329c2517dd91d
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Jun  6 18:11:00 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  6 20:33:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c95e38e

app-crypt/johntheripper: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12209
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../johntheripper-1.7.3.1-mkdir-sandbox.patch  | 12 
 .../files/johntheripper-1.7.6-cflags.patch | 83 --
 .../files/johntheripper-1.7.9-clang.patch  | 15 
 .../johntheripper-1.7.9-ppc-compile-fix.patch  | 17 -
 4 files changed, 127 deletions(-)

diff --git 
a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch 
b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch
deleted file mode 100644
index 5600f3cc17e..000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp john-1.7.3.1.org/src/path.c john-1.7.3.1/src/path.c
 john-1.7.3.1.org/src/path.c2003-10-01 04:26:25.0 +0300
-+++ john-1.7.3.1/src/path.c2007-11-10 15:53:23.0 +0200
-@@ -55,7 +55,7 @@ void path_init(char **argv)
- #ifdef JOHN_PRIVATE_HOME
-   private = path_expand(JOHN_PRIVATE_HOME);
-   if (mkdir(private, S_IRUSR | S_IWUSR | S_IXUSR)) {
--  if (errno != EEXIST) pexit("mkdir: %s", private);
-+  if (errno != EEXIST && errno != EACCES) pexit("mkdir: %s", 
private);
-   } else
-   fprintf(stderr, "Created directory: %s\n", private);
- #endif

diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch 
b/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch
deleted file mode 100644
index 4b6637a29d8..000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch
+++ /dev/null
@@ -1,83 +0,0 @@
 Makefile   2010-07-18 15:27:51.0 -0400
-+++ Makefile.mine  2010-07-18 15:30:09.0 -0400
-@@ -629,7 +629,7 @@
- macosx-ppc32-altivec:
-   $(LN) ppc32alt.h arch.h
-   $(MAKE) $(PROJ) \
--  CFLAGS="-c -Wall -fomit-frame-pointer" \
-+  CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer" \
-   OPT_NORMAL="-fast -mcpu=7450" \
-   OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec 
-maltivec"
- 
-@@ -638,7 +638,7 @@
-   $(LN) ppc32alt.h arch.h
-   $(MAKE) $(PROJ) \
-   ASFLAGS="$(ASFLAGS) -arch ppc" \
--  CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
-+  CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
-   LDFLAGS="$(LDFLAGS) -arch ppc" \
-   OPT_NORMAL="-fast -mcpu=7450" \
-   OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec 
-maltivec"
-@@ -650,7 +650,7 @@
-   $(LN) ppc32.h arch.h
-   $(MAKE) $(PROJ) \
-   CC=cc \
--  CFLAGS="-c -traditional-cpp" \
-+  CFLAGS="$(CFLAGS) -c -traditional-cpp" \
-   OPT_NORMAL="-O2" \
-   OPT_INLINE="-O3"
- 
-@@ -658,7 +658,7 @@
-   $(LN) ppc32.h arch.h
-   $(MAKE) $(PROJ) \
-   ASFLAGS="$(ASFLAGS) -arch ppc" \
--  CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
-+  CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
-   LDFLAGS="$(LDFLAGS) -arch ppc" \
-   OPT_NORMAL="-O2" \
-   OPT_INLINE="-O3 -finline-limit=4000"
-@@ -667,7 +667,7 @@
- macosx-ppc64-altivec:
-   $(LN) ppc64alt.h arch.h
-   $(MAKE) $(PROJ) \
--  CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
-+  CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \
-   LDFLAGS="$(LDFLAGS) -m64" \
-   OPT_NORMAL="-fast" \
-   OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec"
-@@ -676,7 +676,7 @@
-   $(LN) ppc64alt.h arch.h
-   $(MAKE) $(PROJ) \
-   ASFLAGS="$(ASFLAGS) -arch ppc" \
--  CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \
-+  CFLAGS="$(CFLAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" 
\
-   LDFLAGS="$(LDFLAGS) -arch ppc -m64" \
-   OPT_NORMAL="-fast" \
-   OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec"
-@@ -684,7 +684,7 @@
- macosx-ppc64:
-   $(LN) ppc64.h arch.h
-   $(MAKE) $(PROJ) \
--  CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
-+  CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \
-   LDFLAGS="$(LDFLAGS) -m64" \
-   OPT_NORMAL="-fast" \
-   OPT_INLINE="-fast -finline-limit=4000"
-@@ -693,7 +693,7 @@
-   $(LN) ppc64.h arch.h
-   $(MAKE) $(PROJ) \
-   ASFLAGS="$(A

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

2019-06-05 Thread Andreas Sturmlechner

commit: 7cbaa258c6e1668bf08558fcfc894d5c97270acf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 15 15:28:34 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun  5 21:17:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cbaa258

app-crypt/johntheripper: Drop 1.7.9*

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-crypt/johntheripper/Manifest   |   2 -
 .../johntheripper/johntheripper-1.7.9-r11.ebuild   | 274 -
 .../johntheripper/johntheripper-1.7.9-r6.ebuild| 251 ---
 app-crypt/johntheripper/metadata.xml   |   5 -
 4 files changed, 532 deletions(-)

diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 6be3684eb5f..b522016fa04 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,3 +1 @@
-DIST john-1.7.9-jumbo-7.diff.gz 1074044 BLAKE2B 
beb2b3777bccd68ba510b75575cc12678f38bcebd08a8c6d91a291d14b2a3e404013ade5d68610bc9d4a2e26a6a00db8c8757bd4fbcb64bd20cde28a6abde9f4
 SHA512 
07a461df199fc776e8f62e969a95762fc1c99b72cdbd4a83d06f05ed236eaac9a918356ec9b8f8d060d1a9b2b8aa5c4021dfe53382761a5a76269ec66a5bd28a
-DIST john-1.7.9.tar.bz2 717505 BLAKE2B 
ea720451b4544a975d5baca75242f22d8b306ad4101f5774dd80b0855410efae7d7e09d6c43bd6e89aac7346ea686ccc5a1bfedc8c89888a39a49941774759a9
 SHA512 
121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 
90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60
 SHA512 
e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild 
b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
deleted file mode 100644
index 49d18cec623..000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-7"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="https://www.openwall.com/john/";
-
-SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
-   !minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi 
opencl openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-   mpi? ( !minimal )
-   cuda? ( !minimal )
-   opencl? ( !minimal )
-   mozilla? ( !minimal )"
-
-RDEPEND="!app-crypt/johntheripper-jumbo
-   sys-libs/zlib
-   !minimal? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )
-   mpi? ( virtual/mpi )
-   cuda? ( x11-drivers/nvidia-drivers
-   dev-util/nvidia-cuda-toolkit:= )
-   opencl? ( virtual/opencl )
-   mozilla? ( dev-libs/nss dev-libs/nspr )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-   echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-   echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-   if use alpha; then
-   echo "linux-alpha"
-   elif use amd64; then
-   if has_xop; then
-   echo "linux-x86-64-xop"
-   elif has_avx; then
-   echo "linux-x86-64-avx"
-   else
-   echo "linux-x86-64"
-   fi
-   elif use ppc; then
-   #if use altivec; then
-   #   echo "linux-ppc32-altivec"
-   #else
-   echo "linux-ppc32"
-   #fi
-   elif use ppc64; then
-   #if use altivec; then
-   #   echo "linux-ppc32-altivec"
-   #else
-   echo "linux-ppc64"
-   #fi
-   # linux-ppc64-altivec is slightly slower than 
linux-ppc32-altivec for most hash types.
-   # as per the Makefile comments
-   elif use sparc; then
-   echo "linux-sparc"
-   elif use x86; then
-   if has_xop; then
-   echo "linux-x86-xop"
-   elif has_avx; then
-   echo "linux-x86-avx"
-   elif use cpu_flags_x86_sse2; then
-   echo "linux-x86-sse2"

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

2019-05-15 Thread Mikle Kolyada

commit: 8c5c30e0024a9408dc07180fe27e691bd15a6b5f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed May 15 15:17:21 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed May 15 15:17:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c5c30e0

app-crypt/johntheripper: arm stable wrt bug #684632

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

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

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 31ecee30655..78b619fda5a 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

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

2019-05-15 Thread Mikle Kolyada

commit: d9f865f37a26e41352d736abbd0a74079ef915fa
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed May 15 15:16:51 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed May 15 15:16:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9f865f3

app-crypt/johntheripper: x86 stable wrt bug #684632

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

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

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 1593f7f20f0..31ecee30655 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

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

2019-05-13 Thread Mikle Kolyada

commit: c61d370a575fb50fe4fc2c045e7a37307c23f5cd
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May 13 17:01:56 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May 13 17:01:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61d370a

app-crypt/johntheripper: amd64 stable wrt bug #684632

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

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

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 8b94cc7e2a6..1593f7f20f0 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ~mips ppc ppc64 sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

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

2019-05-12 Thread Sergei Trofimovich

commit: 0ab62c2044190a85f19184ded86f722b500839b7
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 12 21:59:40 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 12 21:59:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ab62c20

app-crypt/johntheripper: stable 1.8.0 for ppc64, bug #684632

Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 8f4eb2530f3..8b94cc7e2a6 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ~mips ppc ~ppc64 sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm hppa ~mips ppc ppc64 sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

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

2019-05-12 Thread Sergei Trofimovich

commit: 7905c9d4089d73cfdc9b04f61c17edecafa85551
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 12 21:55:10 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 12 21:55:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7905c9d4

app-crypt/johntheripper: stable 1.8.0 for ppc, bug #684632

Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 113d8b20589..8f4eb2530f3 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm hppa ~mips ppc ~ppc64 sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

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

2019-05-08 Thread Tobias Klausmann

commit: 2f8b2e772ec5685607392f1aa98daac67bc3fef9
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Wed May  8 14:37:33 2019 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Wed May  8 14:37:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f8b2e77

app-crypt/johntheripper-1.8.0-r0: alpha stable

Bug: http://bugs.gentoo.org/684632
Signed-off-by: Tobias Klausmann  gentoo.org>

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

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index be659715e6c..113d8b20589 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

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

2019-05-07 Thread Sergei Trofimovich

commit: e9caf875c70e809f4141bb05afc8545234d89053
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed May  8 06:02:53 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed May  8 06:25:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9caf875

app-crypt/johntheripper: stable 1.8.0 for hppa, bug #684632

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 95f542e6070..be659715e6c 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

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

2019-05-06 Thread Sergei Trofimovich

commit: cb255c22fff480da57f72c438b7bd175df96ed58
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue May  7 05:37:59 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue May  7 06:26:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb255c22

app-crypt/johntheripper: stable 1.8.0 for sparc, bug #684632

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 8cd2dafa182..95f542e6070 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx 
cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

[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/

2018-12-18 Thread Rick Farina

commit: 5c709711434c65390363fd1689cb0ffb33d0f698
Author: Rick Farina  gentoo  org>
AuthorDate: Tue Dec 18 21:34:31 2018 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Dec 18 21:40:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c709711

app-crypt/johntheripper: blocker jtr-jumbo

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

 app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild | 3 ++-
 app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild  | 3 ++-
 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild 
b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
index 8cc549fa4bf..49d18cec623 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
@@ -27,7 +27,8 @@ REQUIRED_USE="openmp? ( !minimal )
opencl? ( !minimal )
mozilla? ( !minimal )"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="!app-crypt/johntheripper-jumbo
+   sys-libs/zlib
!minimal? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild 
b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
index e3e30d7db42..48f23d519a6 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
@@ -26,7 +26,8 @@ REQUIRED_USE="openmp? ( !minimal )
cuda? ( !minimal )
opencl? ( !minimal )"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="!app-crypt/johntheripper-jumbo
+   sys-libs/zlib
!minimal? ( >=dev-libs/openssl-0.9.7:0 )
mpi? ( virtual/mpi )
cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild 
b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index d3365af2702..8cd2dafa182 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -20,7 +20,8 @@ CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 
cpu_flags_x86_avx cpu_flags_x86_
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
 RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   !app-crypt/johntheripper-jumbo"
 
 S="${WORKDIR}/${MY_P}"

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

2018-12-18 Thread Rick Farina

commit: a3208a3d2c8e955b4b65c64099b0e8af3c95fa8d
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Dec 17 19:01:16 2018 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Dec 18 21:40:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3208a3d

app-crypt/johntheripper: 1.8.0

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

 app-crypt/johntheripper/Manifest   |   1 +
 .../johntheripper/johntheripper-1.7.9-r10.ebuild   | 268 -
 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 142 +++
 3 files changed, 143 insertions(+), 268 deletions(-)

diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index c8ee3743082..6be3684eb5f 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,2 +1,3 @@
 DIST john-1.7.9-jumbo-7.diff.gz 1074044 BLAKE2B 
beb2b3777bccd68ba510b75575cc12678f38bcebd08a8c6d91a291d14b2a3e404013ade5d68610bc9d4a2e26a6a00db8c8757bd4fbcb64bd20cde28a6abde9f4
 SHA512 
07a461df199fc776e8f62e969a95762fc1c99b72cdbd4a83d06f05ed236eaac9a918356ec9b8f8d060d1a9b2b8aa5c4021dfe53382761a5a76269ec66a5bd28a
 DIST john-1.7.9.tar.bz2 717505 BLAKE2B 
ea720451b4544a975d5baca75242f22d8b306ad4101f5774dd80b0855410efae7d7e09d6c43bd6e89aac7346ea686ccc5a1bfedc8c89888a39a49941774759a9
 SHA512 
121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b
+DIST john-1.8.0.tar.xz 4468704 BLAKE2B 
90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60
 SHA512 
e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild 
b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
deleted file mode 100644
index 09066589c34..000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-7"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="https://www.openwall.com/john/";
-
-SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
-   !minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi 
opencl openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-   mpi? ( !minimal )
-   cuda? ( !minimal )
-   opencl? ( !minimal )
-   mozilla? ( !minimal )"
-
-DEPEND="sys-libs/zlib
-   !minimal? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )
-   mpi? ( virtual/mpi )
-   cuda? ( x11-drivers/nvidia-drivers
-   dev-util/nvidia-cuda-toolkit:= )
-   opencl? ( virtual/opencl )
-   mozilla? ( dev-libs/nss dev-libs/nspr )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-   echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-   echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-   if use alpha; then
-   echo "linux-alpha"
-   elif use amd64; then
-   if has_xop; then
-   echo "linux-x86-64-xop"
-   elif has_avx; then
-   echo "linux-x86-64-avx"
-   else
-   echo "linux-x86-64"
-   fi
-   elif use ppc; then
-   #if use altivec; then
-   #   echo "linux-ppc32-altivec"
-   #else
-   echo "linux-ppc32"
-   #fi
-   elif use ppc64; then
-   #if use altivec; then
-   #   echo "linux-ppc32-altivec"
-   #else
-   echo "linux-ppc64"
-   #fi
-   # linux-ppc64-altivec is slightly slower than 
linux-ppc32-altivec for most hash types.
-   # as per the Makefile comments
-   elif use sparc; then
-   echo "linux-sparc"
-   elif use x86; then
-   if has_xop; then
-   echo "linux-x86-xop"
-   elif has_avx; then
-   echo "linux-x86-avx"
-   elif use cpu_flags_x86_sse2; then
-   echo "linux-x86-sse2"
-   elif use cpu_flags_x86_mmx; then
-   echo "linux-x86-mmx"
-   else
-

[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/

2018-12-13 Thread Rick Farina

commit: 1043886cdc560fa69bb9b9b33b154825c3f46d30
Author: Rick Farina  gentoo  org>
AuthorDate: Thu Dec 13 15:34:08 2018 +
Commit: Rick Farina  gentoo  org>
CommitDate: Thu Dec 13 15:34:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1043886c

app-crypt/johntheripper: bug #672188

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

 app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild 
b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
index 142838097ae..8cc549fa4bf 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
@@ -234,7 +234,6 @@ src_install() {
dosbin run/john
newsbin run/mailer john-mailer
 
-   die
pax-mark -mr "${ED}/usr/sbin/john" || die
 
dosym john /usr/sbin/unafs

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

2018-11-27 Thread Rick Farina

commit: 398e2f24d09ff76b0a27a5f7e28726a82140f914
Author: Zero_Chaos  gentoo  org>
AuthorDate: Tue Nov 27 17:52:34 2018 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Nov 27 17:52:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=398e2f24

app-crypt/johntheripper: fix for bug #664050

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

 app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild 
b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
index 916f7b51ca6..142838097ae 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
@@ -234,7 +234,8 @@ src_install() {
dosbin run/john
newsbin run/mailer john-mailer
 
-   pax-mark -mr "${ED}usr/sbin/john" || die
+   die
+   pax-mark -mr "${ED}/usr/sbin/john" || die
 
dosym john /usr/sbin/unafs
dosym john /usr/sbin/unique

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

2018-11-02 Thread Craig Andrews

commit: 4e6a1b34a384121bdc50113abc0ab6fd67b19596
Author: Craig Andrews  gentoo  org>
AuthorDate: Fri Nov  2 20:08:07 2018 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Fri Nov  2 20:08:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e6a1b34

app-crypt/johntheripper: Use https urls

Signed-off-by: Craig Andrews  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild | 8 
 app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild | 8 
 app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild  | 8 
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild 
b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
index fc6fab5d528..09066589c34 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,10 +11,10 @@ MY_P="${MY_PN}-${PV}"
 JUMBO="jumbo-7"
 
 DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/";
+HOMEPAGE="https://www.openwall.com/john/";
 
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
-   !minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
+SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
+   !minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild 
b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
index b8eed231b1b..916f7b51ca6 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,10 +11,10 @@ MY_P="${MY_PN}-${PV}"
 JUMBO="jumbo-7"
 
 DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/";
+HOMEPAGE="https://www.openwall.com/john/";
 
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
-   !minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
+SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
+   !minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild 
b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
index 81c08300e9a..e3e30d7db42 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -11,10 +11,10 @@ MY_P="${MY_PN}-${PV}"
 JUMBO="jumbo-7"
 
 DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/";
+HOMEPAGE="https://www.openwall.com/john/";
 
-SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
-   !minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
+SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
+   !minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"

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

2018-11-02 Thread Craig Andrews

commit: c996083d50cfa494da3796d5a444cfd60f559319
Author: Craig Andrews  gentoo  org>
AuthorDate: Fri Nov  2 20:09:51 2018 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Fri Nov  2 20:09:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c996083d

app-crypt/johntheripper: add github remote-id to metadata.xml

Signed-off-by: Craig Andrews  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-crypt/johntheripper/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-crypt/johntheripper/metadata.xml 
b/app-crypt/johntheripper/metadata.xml
index ea96d4b1927..e03a2537ac5 100644
--- a/app-crypt/johntheripper/metadata.xml
+++ b/app-crypt/johntheripper/metadata.xml
@@ -10,6 +10,9 @@
 [email protected]
 Crypto
   
+  
+magnumripper/JohnTheRipper
+  
   
 Use nvidia cuda toolkit for speeding up cracking on 
capable devices
  Support mozilla password cracking

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

2016-07-07 Thread Patrice Clement

commit: 7c886e1756e0e6031f839dcd8ec5c727853fc85d
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sun Jul  3 17:14:00 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Jul  7 07:18:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c886e17

app-crypt/johntheripper: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/1826

Signed-off-by: Patrice Clement  gentoo.org>

 ...theripper-1.7.9-jumbo-5-NT-performance-02.patch | 31 --
 1 file changed, 31 deletions(-)

diff --git 
a/app-crypt/johntheripper/files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch
 
b/app-crypt/johntheripper/files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch
deleted file mode 100644
index 6066cb8..000
--- 
a/app-crypt/johntheripper/files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/NT_fmt_plug.c b/src/NT_fmt_plug.c
-index eb52e3d..411a45b 100644
 a/src/NT_fmt_plug.c
-+++ b/src/NT_fmt_plug.c
-@@ -652,7 +652,7 @@ static inline void set_key_helper(unsigned int * keybuffer,
-   for(; key[md4_size]; i += xBuf, md4_size++)
-   {
-   unsigned int temp;
--  if ((temp = key[++md4_size]))
-+  if ((temp = key[++md4_size]) && md4_size < PLAINTEXT_LENGTH)
-   {
-   keybuffer[i] = key[md4_size-1] | (temp << 16);
-   }
-@@ -704,7 +704,7 @@ static inline void set_key_helper_utf8(unsigned int * 
keybuffer, unsigned int xB
- const UTF8 * source, unsigned int lenStoreOffset, unsigned int *lastlen)
- {
-   unsigned int *target = keybuffer;
--  unsigned int *targetEnd = &keybuffer[xBuf * ((PLAINTEXT_LENGTH + 1) >> 
1)];
-+  unsigned int *targetEnd = &keybuffer[xBuf * (PLAINTEXT_LENGTH >> 1)];
-   UTF32 chl, chh = 0x80;
-   unsigned int outlen = 0;
- 
-@@ -844,7 +844,7 @@ static inline void set_key_helper_encoding(unsigned int * 
keybuffer,
-   i = 0;
-   for(md4_size = 0; key[md4_size]; i += xBuf, md4_size++)
-   {
--  if ((temp = CP_to_Unicode[key[++md4_size]]))
-+  if ((temp = CP_to_Unicode[key[++md4_size]]) && 
md4_size < PLAINTEXT_LENGTH)
-   keybuffer[i] = 
CP_to_Unicode[key[md4_size-1]] | (temp << 16);
-   else {
-   keybuffer[i] = 
CP_to_Unicode[key[md4_size-1]] | 0x80;

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

2016-06-14 Thread Austin English

commit: f44215bc85605856c871874d5dd3837be93838cf
Author: Austin English  gentoo  org>
AuthorDate: Thu Jun  2 07:45:28 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Wed Jun 15 03:42:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44215bc

app-crypt/johntheripper: fix building with clang

Gentoo-Bug: https://bugs.gentoo.org/554392

 .../files/johntheripper-1.7.9-clang.patch  |  15 ++
 .../johntheripper/johntheripper-1.7.9-r11.ebuild   | 274 +
 2 files changed, 289 insertions(+)

diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch 
b/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch
new file mode 100644
index 000..1b85914
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch
@@ -0,0 +1,15 @@
+Fix for building johntheripper with clang.
+
+https://bugs.gentoo.org/show_bug.cgi?id=554392 
+
+--- john-1.7.9-jumbo-7/src/rawSHA1_ng_fmt.c
 john-1.7.9-jumbo-7/src/rawSHA1_ng_fmt.c
+@@ -530,7 +530,7 @@
+ 
+ #if defined(__SSE4_1__)
+ 
+-# if !defined(__INTEL_COMPILER)
++# if !defined(__INTEL_COMPILER) && !defined(__clang__)
+ // This intrinsic is not always available in GCC, so define it here.
+ static inline int _mm_testz_si128 (__m128i __M, __m128i __V)
+ {

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild 
b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
new file mode 100644
index 000..2ebce22
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-7"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/";
+
+SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
+   !minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+#Remove AltiVec USE flag. Appears to be an upstream issue.
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi 
opencl openmp cpu_flags_x86_sse2"
+REQUIRED_USE="openmp? ( !minimal )
+   mpi? ( !minimal )
+   cuda? ( !minimal )
+   opencl? ( !minimal )
+   mozilla? ( !minimal )"
+
+DEPEND="sys-libs/zlib
+   !minimal? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )
+   mpi? ( virtual/mpi )
+   cuda? ( x11-drivers/nvidia-drivers
+   dev-util/nvidia-cuda-toolkit:= )
+   opencl? ( virtual/opencl )
+   mozilla? ( dev-libs/nss dev-libs/nspr )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+has_xop() {
+   echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
+}
+
+has_avx() {
+   echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
+}
+
+get_target() {
+   if use alpha; then
+   echo "linux-alpha"
+   elif use amd64; then
+   if has_xop; then
+   echo "linux-x86-64-xop"
+   elif has_avx; then
+   echo "linux-x86-64-avx"
+   else
+   echo "linux-x86-64"
+   fi
+   elif use ppc; then
+   #if use altivec; then
+   #   echo "linux-ppc32-altivec"
+   #else
+   echo "linux-ppc32"
+   #fi
+   elif use ppc64; then
+   #if use altivec; then
+   #   echo "linux-ppc32-altivec"
+   #else
+   echo "linux-ppc64"
+   #fi
+   # linux-ppc64-altivec is slightly slower than 
linux-ppc32-altivec for most hash types.
+   # as per the Makefile comments
+   elif use sparc; then
+   echo "linux-sparc"
+   elif use x86; then
+   if has_xop; then
+   echo "linux-x86-xop"
+   elif has_avx; then
+   echo "linux-x86-avx"
+   elif use cpu_flags_x86_sse2; then
+   echo "linux-x86-sse2"
+   elif use cpu_flags_x86_mmx; then
+   echo "linux-x86-mmx"
+   else
+   echo "linux-x86-any"
+   fi
+   elif use ppc-macos; then
+   # force AltiVec, the non-altivec profile contains ancient compiler cruft
+   #   if use altivec; then
+   echo "macosx-ppc32-altivec"
+   #   else
+   #   echo "macosx-ppc32"
+   #   fi
+   # for Tiger this can be macosx-ppc64
+   elif use x86-macos; then
+   if use cpu_flags_x86_sse2; then
+

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

2016-06-03 Thread Anthony G. Basile

commit: f96e8a6179b60e178a285748cf8b116c0285d26e
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Jun  3 11:05:21 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Jun  3 11:05:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96e8a61

app-crypt/johntheripper: add libressl support

Package-Manager: portage-2.2.28

 app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild 
b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
index b455023..071fe1a 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 #Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mozilla mpi opencl openmp 
cpu_flags_x86_sse2"
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi 
opencl openmp cpu_flags_x86_sse2"
 REQUIRED_USE="openmp? ( !minimal )
mpi? ( !minimal )
cuda? ( !minimal )
@@ -29,7 +29,10 @@ REQUIRED_USE="openmp? ( !minimal )
mozilla? ( !minimal )"
 
 DEPEND="sys-libs/zlib
-   !minimal? ( >=dev-libs/openssl-0.9.7:0 )
+   !minimal? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )
mpi? ( virtual/mpi )
cuda? ( x11-drivers/nvidia-drivers
dev-util/nvidia-cuda-toolkit:= )

74 matches

Mail list logo