From nobody Tue Apr 11 23:04:21 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 4Px1ck60nGz44lS0; Tue, 11 Apr 2023 23:04:22 +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 4Px1ck0Wz7z4HkY; Tue, 11 Apr 2023 23:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681254262; 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=7FviAmWIUBVuh0YxSt5FMGgSTPF8f1Y6oOVw7MvBRSw=; b=AK8nFgyWgM8hxXK3D7B2YvC9Qb3a531ATpmlKoz4NxlwQ76pVu6chn+BQno07oy0DfJwwM eSvZg2XxWH14Kri0bgfBnBkbbH0baTp2jBs4H6WGfV+CDwneWsR6vK19By3mz1dOppabM/ /X6/jQLtKb+C6Dvs1f0Uj8QWs0y7dba2XRnZS/q435yKTSXJ2La6p8FrDC27Om2yWeJypA USelT1hK8VKwOTH2ED/aZr+O/DG68OxyhMDDIU2IZY0hWXwQdKb+rC49cBZnR5cW7M3UJL E1j6Kj66cfvL6rkKxZFX3lf1bYHSmqvWf109j3/r2Wte6Z2uM2rC/jY2UcH6fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681254262; 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=7FviAmWIUBVuh0YxSt5FMGgSTPF8f1Y6oOVw7MvBRSw=; b=FhVTv9qpTwz7UlxiIB0UCmdEIj0Gt8PURPUu+DSE0EzL2qzddG9RkVcxr2fEfjOcHHgpqI Ac2c4ZMX6Q8p7gLzx7A7Y9dZiJQB1fgfmHPZqkrffM6IMlDXUo5zM4BhW5Dvlo7H9y9tT/ QPxpP9wsIixbQSvyEh+Iq4tij98luei61ZfBi5culYZ39xSDp633aH3qCeSY3EPq2nlwAM BLcuGjXd4t/AsfnqPFy7OZIV5/wn57jZw0hr47D/i8iBds96dtjX6SARhAJXEc/oaykI/f PaHV5tmTQVHBOo3Keqj7qCLy3RjZ2+i39dx9l+j+25hEdcgmjQ2I8J4cRKhe3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681254262; a=rsa-sha256; cv=none; b=oA4QFa7cHIuY425olCrW3enPDe3IqskD+siCHz075P6AimSCWqva4Dle0C48sjZ45vFiLJ 82NU/8cIK9NsLHSPlSDggrjdwqVw/G6Qnt3e/E4cushFT4j7VPEdTMMzfIudaqacAUSVrb 6rvcrHrD28dG7vOVctMne5TMWGQS9IqyOFhlbPdBBy0z4V18nn5qpoNqZJ5kFxW8DSG8f6 f78lItL/EaPCD0xQRUh6lqi6wy8cx2TIKrmsLCt/+uG/YzeoSXeRt8W5C0KSXJwFx34Gvx PT4bQCs9tbGkiEx5uy66IgLnAuTk7h1Wts/lBSds7CDxmpcgvuAw46EddD31Ug== 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 4Px1cj6kMgzbwV; Tue, 11 Apr 2023 23:04:21 +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 33BN4LQv071917; Tue, 11 Apr 2023 23:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BN4Lfc071916; Tue, 11 Apr 2023 23:04:21 GMT (envelope-from git) Date: Tue, 11 Apr 2023 23:04:21 GMT Message-Id: <202304112304.33BN4Lfc071916@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 47f2932ebad0 - main - security/ncrypt: fix build with -fno-common 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47f2932ebad004446c08db2dc98ceac1822a27e2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=47f2932ebad004446c08db2dc98ceac1822a27e2 commit 47f2932ebad004446c08db2dc98ceac1822a27e2 Author: Robert Clausecker AuthorDate: 2023-04-11 00:22:30 +0000 Commit: Robert Clausecker CommitDate: 2023-04-11 23:02:43 +0000 security/ncrypt: fix build with -fno-common Move definition of ROUNDS from header to source file. This fixes the port on FreeBSD 13 and later. --- security/ncrypt/Makefile | 4 +--- security/ncrypt/files/patch-rijndael-alg-fst.c | 11 +++++++++++ security/ncrypt/files/patch-rijndael-alg-fst.h | 11 +++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/security/ncrypt/Makefile b/security/ncrypt/Makefile index b9a6f57238f2..8c9a222d0021 100644 --- a/security/ncrypt/Makefile +++ b/security/ncrypt/Makefile @@ -1,5 +1,6 @@ PORTNAME= ncrypt PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION:R}.0 @@ -10,9 +11,6 @@ WWW= http://ncrypt.sourceforge.net/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_13= ld: error: duplicate symbol: ROUNDS -BROKEN_FreeBSD_14= ld: error: duplicate symbol: ROUNDS - USES= tar:tgz GNU_CONFIGURE= yes diff --git a/security/ncrypt/files/patch-rijndael-alg-fst.c b/security/ncrypt/files/patch-rijndael-alg-fst.c new file mode 100644 index 000000000000..f4aaec08628a --- /dev/null +++ b/security/ncrypt/files/patch-rijndael-alg-fst.c @@ -0,0 +1,11 @@ +--- rijndael-alg-fst.c.orig 2023-04-11 00:20:28 UTC ++++ rijndael-alg-fst.c +@@ -9,6 +9,8 @@ + + #include "rijndael-alg-fst.h" + ++int ROUNDS; ++ + #define SC ((BC - 4) >> 1) + + #include "boxes-fst.dat" diff --git a/security/ncrypt/files/patch-rijndael-alg-fst.h b/security/ncrypt/files/patch-rijndael-alg-fst.h new file mode 100644 index 000000000000..7d46cb2c9728 --- /dev/null +++ b/security/ncrypt/files/patch-rijndael-alg-fst.h @@ -0,0 +1,11 @@ +--- rijndael-alg-fst.h.orig 2023-04-11 00:20:14 UTC ++++ rijndael-alg-fst.h +@@ -11,7 +11,7 @@ typedef unsigned char word8; + typedef unsigned short word16; + typedef unsigned int word32; + +-int ROUNDS; ++extern int ROUNDS; + + int rijndaelKeySched (word8 k[MAXKC][4], int keyBits, + word8 rk[MAXROUNDS+1][4][4]);