mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-19 00:13:33 +00:00
security/john: merge upstream patch for powerpc64 build failure
Allows to drop -mvsx.
This commit is contained in:
parent
29c28cb14a
commit
2716b66722
@ -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\
|
||||
|
31
security/john/files/patch-git-2e74ecd
Normal file
31
security/john/files/patch-git-2e74ecd
Normal file
@ -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[];
|
Loading…
Reference in New Issue
Block a user