From nobody Wed Oct 19 07:49:36 2022 X-Original-To: dev-commits-ports-main@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 4MsjYX34Kkz4gCCT; Wed, 19 Oct 2022 07:49:36 +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 4MsjYX2cPPz3wmb; Wed, 19 Oct 2022 07:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666165776; 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=S7dwV7oBXWYoTB2zkDiLJ0fvGj1CMXNLwmVapfZV6Fo=; b=C9kkJpyfx/4DZSjPfd70G+qmbqct9Lr3V0MuQh//6RXmM0S1wHKTFggBDeQHgqZ/3vQIBW uWTy+vGP3fm9JLYNn0Wbs9BQAc8mGJPFmb7PiV4KZz1oVYOxSWXm4ajK0WK0lXoqbTHZ7L bkw+acc7IBei+mNOjySCmt03xPhQ9x0iE8ohkk4MTTrs/i9kNJOsEtsjAhevHNoR+VldZN Jw849nV8+uj/8oYloODHkvD44qdafxU6Oq39Hifq5/mczFilcqBoWNiuBrULufan4M2Tzn Hes1jOckZDkvZKp8AGRClc0te+gU31aM3Ic7w+w1ZPIf2vIlg2TcGMBFIAdBLA== 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 4MsjYX1X5DzRkX; Wed, 19 Oct 2022 07:49:36 +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 29J7naom036740; Wed, 19 Oct 2022 07:49:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29J7na2V036739; Wed, 19 Oct 2022 07:49:36 GMT (envelope-from git) Date: Wed, 19 Oct 2022 07:49:36 GMT Message-Id: <202210190749.29J7na2V036739@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 809fe307f02e - main - security/john: try to fix the port's build on AArch64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 809fe307f02ed333ae4e3ce3325df958e19c3ab1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666165776; 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=S7dwV7oBXWYoTB2zkDiLJ0fvGj1CMXNLwmVapfZV6Fo=; b=mHgAUjuOxdw8PeTtc1CDFujI5nnia0axclY/yUXTfYDkTI1jOw2AVAyaoILpJbRAR1uo02 jLVEE26+m46znD8HA8YZH82BQeCRsvqRjsKtEiNL0by18PJT4O1Of0VuHDLRvfCCRNh6TL vzN22Ghtl9jfQ8LlyZ2yh9CAXG8h8IfhXMvN6pyiTCUaxHNV9khSrVyYm4uHwsGCBZj2sE c3sADmwbY933xro6FE9TMXF5TJuEOypw9i5DWqAk8+doRXv1AKOTl7NIT+F7k9et3N1cxo Fffr7YaCohtQxRTWT15Lc2RJlRBXkYFktPGqgBdxdxqm+0DYyyZxPvsvFow2Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666165776; a=rsa-sha256; cv=none; b=BudFPoOnwvg4BNR0wR2RnMC4oYX81mf0YDylkEDz1cLJLHKHXZ3vtxE4VklSrdGMlPrBmf 0qEnB213KhBsMBv4T6axbkbAN7y++3kZH21mDRpcNst/ggC0NVmVtDi6+dC//6dy5Eef5N WE6fyspVoLQkOG4gxvYmpv6iB3rhN2W+1Fn6XbWaj9OIgb3R7d8FRHKJIg/oYqbDsvAkKt Qb8hEyNOfzdjJD8sr1AuSsf3iCCxAdytGmbgdP5DXr9Fwe+Sa8j4nc0mmm1UYXcnjCrW0r 3yQrJC1VVfFsYKTQZT31jCZMDrjaxGLLYPR2t3kp7CdUgkgni1myskXJUoFQTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=809fe307f02ed333ae4e3ce3325df958e19c3ab1 commit 809fe307f02ed333ae4e3ce3325df958e19c3ab1 Author: Alexey Dokuchaev AuthorDate: 2022-10-19 07:48:36 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-10-19 07:48:36 +0000 security/john: try to fix the port's build on AArch64 In commit 1e6670382fbb, the observed failure on PowerPC had been mended in a way that broke AArch64 build. Robert's investigation had shown that should've been included elsewhere, and it actually is, but guarded by `#ifdef __linux__' for some reason. Alexander explained that at the time the AltiVec support was just for two platforms: macOS (first) and Linux (added later). If the guard of `#include ' was needed, then we could probably replace the `#ifdef __linux__' with `#ifndef __APPLE__' for the same effect on old macOS versions which do not need the #include. PR: 266732 Submitted by: Robert Clausecker Discussed with: Solar Designer --- security/john/Makefile | 2 ++ security/john/files/patch-src_sboxes-s.c | 10 ---------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/security/john/Makefile b/security/john/Makefile index 1358642f6165..8822f293079c 100644 --- a/security/john/Makefile +++ b/security/john/Makefile @@ -51,6 +51,8 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/params.h @${REINPLACE_CMD} -e '/^host_cpu=/s|$$| ; case $$host_cpu in\ amd64) host_cpu=x86_64 ;; esac|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,^#ifdef __linux,#ifndef __APPLE,' \ + ${WRKSRC}/DES_bs_b.c do-install: .for b in ${BINARIES} diff --git a/security/john/files/patch-src_sboxes-s.c b/security/john/files/patch-src_sboxes-s.c deleted file mode 100644 index b6caba0d866d..000000000000 --- a/security/john/files/patch-src_sboxes-s.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/sboxes-s.c.orig 2021-12-13 00:08:30.419393000 +0100 -+++ src/sboxes-s.c 2021-12-13 00:08:41.847880000 +0100 -@@ -32,6 +32,7 @@ - #define regs 8 - #else - /* PowerPC with AltiVec, etc. */ -+#include - #define regs 32 - #endif -