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

[Sam James]

commit:     f7e2367203f61eb544373ea641a70b68aea579a0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 25 02:08:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 25 19:31:50 2021 +0000
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 <soap <AT> gentoo.org>
Reported-by: John Helmert III <ajak <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/johntheripper-jumbo-1.9.0-gcc11.patch    | 53 ++++++++++++++++++++++
 ....ebuild => johntheripper-jumbo-1.9.0-r3.ebuild} | 10 ++--
 .../johntheripper-jumbo-9999.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 00000000000..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 <ferry.huberts@×××××××.nl>
+Date: Tue, 9 Mar 2021 22:04:46 +0100
+Subject: [PATCH] Fix alignment compile errors on GCC 11
+
+Signed-off-by: Ferry Huberts <ferry.huberts@×××××××.nl>
+---
+ 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-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index 40bb28803b1..826ff08b2f5 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.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 )
 	kerberos? ( virtual/krb5 )
 	pcap? ( net-libs/libpcap )
-	dev-libs/gmp:*
+	dev-libs/gmp:=
 	sys-libs/zlib
 	app-arch/bzip2"