git: 2716b6672230 - main - security/john: merge upstream patch for powerpc64 build failure

From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Wed, 22 Feb 2023 20:51:45 UTC
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2716b6672230c578a8ebd2bb25930d5e979ea214

commit 2716b6672230c578a8ebd2bb25930d5e979ea214
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-02-21 18:55:45 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-02-22 20:51:40 +0000

    security/john: merge upstream patch for powerpc64 build failure
    
    Allows to drop -mvsx.
---
 security/john/Makefile                |  3 +--
 security/john/files/patch-git-2e74ecd | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/security/john/Makefile b/security/john/Makefile
index d8f42867e842..124e5cda60c3 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -2,6 +2,7 @@ PORTNAME=	john
 # NB: starting from the next version, community-enhanced (jumbo) patch
 # should be offered as an option (suggested by Solar Designer himself).
 DISTVERSION=	1.9.0-jumbo-1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.openwall.com/john/j/ \
 		http://mirrors.kernel.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \
@@ -52,8 +53,6 @@ OPENMPI_CONFIGURE_ON=	--enable-mpi
 OPENMPI_CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/mpi/openmpi/include" \
 			LDFLAGS="-L${LOCALBASE}/mpi/openmpi/lib"
 
-CFLAGS_powerpc64=	-mvsx
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/params.h
 	@${REINPLACE_CMD} -e '/^host_cpu=/s|$$| ; case $$host_cpu in\
diff --git a/security/john/files/patch-git-2e74ecd b/security/john/files/patch-git-2e74ecd
new file mode 100644
index 000000000000..800592419556
--- /dev/null
+++ b/security/john/files/patch-git-2e74ecd
@@ -0,0 +1,31 @@
+From 2e74ecd4da1624b78d07eddaaa1074fc584928d0 Mon Sep 17 00:00:00 2001
+From: pkubaj <pkubaj@FreeBSD.org>
+Date: Tue, 21 Feb 2023 16:44:44 +0000
+Subject: [PATCH] Fix build on powerpc64 by not including dynamic.h
+
+Fixes https://github.com/openwall/john/issues/5231
+---
+ src/john.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/john.c b/src/john.c
+index 75463966ea..70ef8b4ceb 100644
+--- a/src/john.c
++++ b/src/john.c
+@@ -106,7 +106,6 @@ static int john_omp_threads_new;
+ #include "subsets.h"
+ #include "external.h"
+ #include "batch.h"
+-#include "dynamic.h"
+ #include "dynamic_compiler.h"
+ #include "fake_salts.h"
+ #include "listconf.h"
+@@ -141,6 +140,8 @@ static int john_omp_threads_new;
+ #endif
+ #include "omp_autotune.h"
+ 
++extern int dynamic_Register_formats(struct fmt_main **ptr);
++	
+ #if CPU_DETECT
+ extern int CPU_detect(void);
+ extern char CPU_req_name[];