commit:     9af4de9760147a6d80fe072e5676ce843e1b1ba8
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 18:06:54 2024 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 18:07:34 2024 +0000
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 <zerochaos <AT> gentoo.org>

 app-crypt/johntheripper-jumbo/Manifest                   |  1 +
 ...ebuild => johntheripper-jumbo-1.9.0_p20240102.ebuild} | 16 ++++++----------
 .../johntheripper-jumbo/johntheripper-jumbo-9999.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-9999.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
similarity index 92%
copy from app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.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-9999.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} == "9999" ]] ; 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-9999.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index 3f89098a9405..6ec25a477ce0 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.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} == "9999" ]] ; 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

Reply via email to