From nobody Fri Jun 30 10:27:47 2023 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 4Qss2r14dhz4lD9s; Fri, 30 Jun 2023 10:27:48 +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 4Qss2r0fLJz3h2S; Fri, 30 Jun 2023 10:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688120868; 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=78pg1j4EER/lwl5DAG1b+FIh6+IOUjDUlCIpIH1XJkM=; b=BDPOYl168gDJa1bStXTeGAVv6heZHpcIyVGMzlyBwhuo65lFYdx1Ztt+aRukFYJa95PkhZ mbTOt70SORTnj5gdXiy8NTd+8dmXbmnlNRIzkwBLdAZ7Ou6SGpwnszU6zGEngAyziplwX5 XKOzJanw7qPW3fG3wNFErjyPe18j36tsZ0Rxe8wRiblkewI3NSRlyqDL3n2z3TIjhIVDvx 2HiIm9wdMz8hoijh9NdlqVgwO9ye6lN9LEul/SlGVttQZIC5v6alwz0nd1TaaLkm7zcI10 UdyID1lniis2FRKEIcme+EuY74ic03D8zjSHiKMVQ0ojMCgZ5qJfap2TXAakVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688120868; 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=78pg1j4EER/lwl5DAG1b+FIh6+IOUjDUlCIpIH1XJkM=; b=FJx7oCl3UhgW54ZtbqUTmxJG8n3F3kuxl8Mxj4IbLgQDfdATDBEvrabe3a4GuxrQGvjyB9 7m5AEWChw0E9ffcwfKoCBkVxhEXhSDxJz5+VRXjFCLu5lU5z+H53roq9WhZqXNxIh6DX5z /nbByAhl72gsZiDbDDFEDsUBnuCTMZCGxKXIbGyHIe7p8QvXhHhJ8ms5uSYvhrD+nj2MLB 1m7zSRKsVrHOciCyYd6ZkxzSEMN16+1YfxDiHquXIlkuUOT5kATibxko4mnowiJl5F7AqN inJQjgjW7zR1MtYK7dnDWrxzMac9iSYcncoRgVNcWWaarsRWyu+JrMLzJS+PLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688120868; a=rsa-sha256; cv=none; b=h9yYwee9A8M8eofvigk6HVtBDi/6yAV8qsLYOJeivgh4d6XmHrtEGDkUC1Q8lBtRosdVDa h32xBaQBywvTCkqdtGz/khAJPMq/vUFJWOXtQv5WsWyFO8Y5xdx48NC2D6+CfGiOnbzy88 aSx0aSLSBnTbrUtrqXOoocNjQGAzgk2clhgcPSufeeIN25bdzg4NE7zW4eBFsAYVmDF0sW XIKso5q+pmcNc6vIqKkgXdaXS8Gy719qXnLVDN8qD+6HC7FSO9ErLQSnB9OaglHZEVCV8s YO/ovh+WIp8r/9mZdQ0jP/5ygHybQuQ5N+2AeaTo2HpHWXKUNll6AXHOEdxE5Q== 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 4Qss2q6kl0zvhZ; Fri, 30 Jun 2023 10:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35UARlRU084899; Fri, 30 Jun 2023 10:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35UARlgb084897; Fri, 30 Jun 2023 10:27:47 GMT (envelope-from git) Date: Fri, 30 Jun 2023 10:27:47 GMT Message-Id: <202306301027.35UARlgb084897@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: 5b40b4feb582 - main - security/john: backport upstream patch to fix the build against Clang 16 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: 5b40b4feb582db1831ac4e6a3aac31c7acef2dea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b40b4feb582db1831ac4e6a3aac31c7acef2dea commit 5b40b4feb582db1831ac4e6a3aac31c7acef2dea Author: Alexey Dokuchaev AuthorDate: 2023-06-30 10:26:42 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-06-30 10:26:42 +0000 security/john: backport upstream patch to fix the build against Clang 16 Reported by: pkg-fallout --- security/john/files/patch-git-8152ac0 | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/security/john/files/patch-git-8152ac0 b/security/john/files/patch-git-8152ac0 new file mode 100644 index 000000000000..8cfaefc1e598 --- /dev/null +++ b/security/john/files/patch-git-8152ac0 @@ -0,0 +1,50 @@ +From 8152ac071bce1ebc98fac6bed962e90e9b92d8cf Mon Sep 17 00:00:00 2001 +From: Ferry Huberts +Date: Tue, 9 Mar 2021 22:04:46 +0100 +Subject: [PATCH] Fix alignment compile errors on GCC 11 + +Signed-off-by: Ferry Huberts +--- + 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];