From nobody Wed Feb 22 20:51:45 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PMSxt0Jqmz3sBl7; Wed, 22 Feb 2023 20:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PMSxs6Gkxz3Jp9; Wed, 22 Feb 2023 20:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677099105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GBLwQarAByEkWvZoMLkvOQk/vak2UThySWzGj97r/P8=; b=uHae4NFpritrrRNGuAFSsxc0taor7kzKKUBr7r0dPo0X0DjnQVMghxPucAPQRsT+mdJRPs YOvgDN3utiZm9boa4bP9z0i6Wv9FtE5qgywq5t/Li026+Ic3+p3yHzrv2mqnQA2jOxxbck 1aJ3EeKC8YH5c3bifbnIsAfaTEESF1QaHhpwG1Yb+9Iy6xXPG7DL+CEF3XRs2/cJeG4s6f cOYAHXGHvokGeeSeq715XZAKEa9R6B4KEyw9ucvPrTAQFwq0fBucx7Wl88xUPBzFMzJXv7 so+YjjWPnNEIFDMqw2y+CuzcdgPCxdr1iWk/KX9BiYW95/LxnpuoLlziflMdAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677099105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GBLwQarAByEkWvZoMLkvOQk/vak2UThySWzGj97r/P8=; b=H+PltSFaO47ipJT3bXwAob1r7IPVWtugwCQ4rT7huuPCq1825ap7Lc9sTWNBCBrPxsDWcT zmpp6kAwRcOOT0gZoono/lxOJbpI7El9yqfJrqjI2ZUaf/43tSe+NAC9pwKMptjfELyGwI gmOzuz7TNQhPT8r6fXmHO7Sb3625lIgN3evKnMJuMx1a7NH6RQjtu2LAsHYxEPK4+TbWio 63qV4mUBAJIcxFa37P8m41vIQoEwPeJtS0jCZYRRQWvsVYF32PZv2GhG4PZWchfFzFMjab ft7n8mDUCc6km5PR+aDcP58b9ZyOD7zc8Hans8tTHuRnkRMH+aoZXRRmvQyOzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677099105; a=rsa-sha256; cv=none; b=FZV1Kg3YbwzfbMpw5H7XS1VFliOXavPf7c0wc0awPZ6X1BPN/RCmfBIWoQ+FAc7AcVMHo0 lRFUOdf9BFywZqTryQcjYVH+DAkr1/y6jvMRresDA4Ro4OPtcMs7Gy2zVx4A6r79DGw48f m5vItFawAdlxJqLkjWasF8+Rmz0yq6BfNZBksX3IsiLBMF1nttWetHYB1JJ1q1h8j2k2Fk mHln71/skO7bKu6UMnJyTf1dU74/USOy5q08nTOwMUfppUgiWDHKhdCGSGs2AMbWPTzfv8 aCiQpKq5LuJ1AE0pL37ENPSfIivL93jLURRSWK/TE6iCIHpUu3ZseIFH+4dIWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PMSxs5MYvzFj3; Wed, 22 Feb 2023 20:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31MKpjmp071531; Wed, 22 Feb 2023 20:51:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31MKpjYA071530; Wed, 22 Feb 2023 20:51:45 GMT (envelope-from git) Date: Wed, 22 Feb 2023 20:51:45 GMT Message-Id: <202302222051.31MKpjYA071530@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 2716b6672230 - main - security/john: merge upstream patch for powerpc64 build failure List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2716b6672230c578a8ebd2bb25930d5e979ea214 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=2716b6672230c578a8ebd2bb25930d5e979ea214 commit 2716b6672230c578a8ebd2bb25930d5e979ea214 Author: Piotr Kubaj AuthorDate: 2023-02-21 18:55:45 +0000 Commit: Piotr Kubaj 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 +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[];