From nobody Fri Jun 03 23:39:01 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 A828F1B4EAEF; Fri, 3 Jun 2022 23:39:02 +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 4LFK8k17thz3GRr; Fri, 3 Jun 2022 23:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654299542; 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=3ME99BGi1prb3jMPfusmktf1F4g2EVrk/c/nF7+iads=; b=t5RazUdCzw0Lf7PG4cwj091GS55+gUujyCSSHWRB2Ihxzfo/xlXTXf1ixJkeem+xlLZqjy +pFG9GP0Oy0c7E8Zlfry7AqwNn744gMmR2N6sgls3Ox220UX8M8KnXVGhYOXWBHkT4YFu2 +z9uWGCf4SCx6egaUA4uUx3PGUxc2ElWuuobE4Uo1ocOztYGPvFcyjG5NYpn00gTNPrckj iEk6sXbvmMAacgTigGVUErVEL0Og++VIpXE8T8fPvNRc/NGossZbtjp2AGIIq3X9mRhQ9p AogzuQNseQuNVLEXLLMq+TpfYTv++yy7wEolaoA+/H7m+BiyDLVE14ap/n0FQg== 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 D02D812E2B; Fri, 3 Jun 2022 23:39:01 +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 253Nd1lU078857; Fri, 3 Jun 2022 23:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 253Nd1JC078856; Fri, 3 Jun 2022 23:39:01 GMT (envelope-from git) Date: Fri, 3 Jun 2022 23:39:01 GMT Message-Id: <202206032339.253Nd1JC078856@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: c328d3ca8519 - main - security/nettle: Update to 3.8 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c328d3ca8519cde4d92177e1dfc812fa7f926564 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654299542; 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=3ME99BGi1prb3jMPfusmktf1F4g2EVrk/c/nF7+iads=; b=jhSUNvIjxjpIinAQzgK/B/wX9HWimiY/GXnQYz3zy4dr1xA8fKNyp7P9G0RdK7tEJ3XihZ cHafPlv9LYOFHtD6mmqFS6ajH7Iktn8BOpUGqiHmgKs87Y5WS/B9wC2QMIWOU50fQYjQat BRV4MC7Lw8ehxPmfMUcjATWgHjQaP6pfjhdFZxOf2V1/ojXv4jArxfBoiJZSt0sTeXEW9p G2Im2iVTBJ4RL/g4zZhzs5NrSIwY2219fIGpCUUSfJGGXmMrScP8DlOxyBdGj00pfss0VI bN0qnkmS+4L1o+EPE3iHG/F0qMNiA1aWvQaFGpg+jS3o9P+ToLGw1nGFLLKpWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654299542; a=rsa-sha256; cv=none; b=Gv69thIp+o0Cc9gMnBL3xx6xpOoqgv8ED77JTaPl71qmR7h41U/mi+cIIZ5ZxAyO6BGJ7R PPfuSPkhxC8nkRYl1DaH58LGcoshF3Q58K7/MfcUN28nQ3MAh8e05bHU9woM96jbiRiPh/ sxpCiXmwUo+v6P8VJAgRIRrcCYx9vxC2RTsFrDOCbi70QycSos+CzG/rbgbzx8AD3L51n8 ae+GaoV9PC0dH3x89bB7DA6giTH7YuwdgbwAhizeu60oGP41Ar4A93Ducd3cOjMHhM82kY DYRg5JxF25vZYSRTs4NSWCbAtvi4KKacMZQqPdcHXegYrBfkhiEo5nLPmok0fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=c328d3ca8519cde4d92177e1dfc812fa7f926564 commit c328d3ca8519cde4d92177e1dfc812fa7f926564 Author: Po-Chuan Hsieh AuthorDate: 2022-06-03 23:21:56 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-06-03 23:36:30 +0000 security/nettle: Update to 3.8 - Remove ELFv2 patch since upstream adds configure test for ELFV2_ABI [1] Changes: https://git.lysator.liu.se/nettle/nettle/-/blob/master/NEWS Reference: https://git.lysator.liu.se/nettle/nettle/-/commit/c7cf19390dcb0e9792fc23b0c935c1fe5e4f91e1 [1] --- security/nettle/Makefile | 9 ++---- security/nettle/distinfo | 6 ++-- .../nettle/files/extra-patch-powerpc64_machine.m4 | 32 ---------------------- .../patch-powerpc64-p8-aes-decrypt-internal.asm | 6 ++-- .../patch-powerpc64-p8-aes-encrypt-internal.asm | 6 ++-- security/nettle/pkg-plist | 6 ++-- 6 files changed, 16 insertions(+), 49 deletions(-) diff --git a/security/nettle/Makefile b/security/nettle/Makefile index 57ca439f03aa..2242322e6c36 100644 --- a/security/nettle/Makefile +++ b/security/nettle/Makefile @@ -1,7 +1,7 @@ # Created by: ijliao PORTNAME= nettle -PORTVERSION= 3.7.3 +PORTVERSION= 3.8 CATEGORIES= security MASTER_SITES= GNU \ https://www.lysator.liu.se/~nisse/archive/ @@ -24,10 +24,11 @@ CONFIGURE_ENV= M4="/usr/bin/m4 -g" GNU_CONFIGURE= yes TEST_TARGET= check USE_LDCONFIG= yes -CPE_VENDOR= nettle_project INFO= nettle +CPE_VENDOR= nettle_project + OPTIONS_DEFINE= DOCS EXAMPLES EXAMPLES_CFLAGS= -I${OPENSSLINC} @@ -39,10 +40,6 @@ EXAMPLES_USES= ssl CONFIGURE_ENV+= CCPIC=-fPIC .endif -.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-powerpc64_machine.m4 -.endif - post-patch: @${REINPLACE_CMD} -e '/libdir=/ s|lib32|lib|' ${WRKSRC}/configure .if ${ARCH} == "mips64" diff --git a/security/nettle/distinfo b/security/nettle/distinfo index e0bcb43ae699..713ec2bb06d8 100644 --- a/security/nettle/distinfo +++ b/security/nettle/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622214002 -SHA256 (nettle-3.7.3.tar.gz) = 661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0 -SIZE (nettle-3.7.3.tar.gz) = 2383985 +TIMESTAMP = 1654275835 +SHA256 (nettle-3.8.tar.gz) = 7576c68481c198f644b08c160d1a4850ba9449e308069455b5213319f234e8e6 +SIZE (nettle-3.8.tar.gz) = 2404258 diff --git a/security/nettle/files/extra-patch-powerpc64_machine.m4 b/security/nettle/files/extra-patch-powerpc64_machine.m4 deleted file mode 100644 index e0bcdbd34fd2..000000000000 --- a/security/nettle/files/extra-patch-powerpc64_machine.m4 +++ /dev/null @@ -1,32 +0,0 @@ ---- powerpc64/machine.m4.old 2021-04-18 10:51:29.072176000 -0500 -+++ powerpc64/machine.m4 2021-04-18 11:45:30.583315000 -0500 -@@ -1,26 +1,15 @@ - define(`PROLOGUE', - `.globl C_NAME($1) - DECLARE_FUNC(C_NAME($1)) --ifelse(WORDS_BIGENDIAN,no, --`ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN') -+ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN') - C_NAME($1): - addis 2,12,(.TOC.-C_NAME($1))@ha - addi 2,2,(.TOC.-C_NAME($1))@l --.localentry C_NAME($1), .-C_NAME($1)', --`.section ".opd","aw" --.align 3 --C_NAME($1): --.quad .C_NAME($1),.TOC.@tocbase,0 --.previous --ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN') --.C_NAME($1):') -+.localentry C_NAME($1), .-C_NAME($1) - undefine(`FUNC_ALIGN')') - - define(`EPILOGUE', --`ifelse(WORDS_BIGENDIAN,no, --`.size C_NAME($1), . - C_NAME($1)', --`.size .C_NAME($1), . - .C_NAME($1) --.size C_NAME($1), . - .C_NAME($1)')') -+`.size C_NAME($1), . - C_NAME($1)') - - C Get vector-scalar register from vector register - C VSR(VR) diff --git a/security/nettle/files/patch-powerpc64-p8-aes-decrypt-internal.asm b/security/nettle/files/patch-powerpc64-p8-aes-decrypt-internal.asm index 741be5db338e..6ec80f833cc9 100644 --- a/security/nettle/files/patch-powerpc64-p8-aes-decrypt-internal.asm +++ b/security/nettle/files/patch-powerpc64-p8-aes-decrypt-internal.asm @@ -1,11 +1,11 @@ ---- powerpc64/p8/aes-decrypt-internal.asm.orig 2021-06-06 20:06:30 UTC +--- powerpc64/p8/aes-decrypt-internal.asm.orig 2022-06-02 17:57:16 UTC +++ powerpc64/p8/aes-decrypt-internal.asm @@ -71,7 +71,7 @@ define(`FUNC_ALIGN', `5') PROLOGUE(_nettle_aes_decrypt) vxor ZERO,ZERO,ZERO -- DATA_LOAD_VEC(swap_mask,.swap_mask,r5) -+ DATA_LOAD_VEC(swap_mask,.swap_data,r5) +- DATA_LOAD_VEC(SWAP_MASK,.swap_mask,r5) ++ DATA_LOAD_VEC(SWAP_MASK,.swap_data,r5) subi ROUNDS,ROUNDS,1 srdi LENGTH,LENGTH,4 diff --git a/security/nettle/files/patch-powerpc64-p8-aes-encrypt-internal.asm b/security/nettle/files/patch-powerpc64-p8-aes-encrypt-internal.asm index fddeedabb748..313ba61a4f6b 100644 --- a/security/nettle/files/patch-powerpc64-p8-aes-encrypt-internal.asm +++ b/security/nettle/files/patch-powerpc64-p8-aes-encrypt-internal.asm @@ -1,11 +1,11 @@ ---- powerpc64/p8/aes-encrypt-internal.asm.orig 2021-06-06 20:06:30 UTC +--- powerpc64/p8/aes-encrypt-internal.asm.orig 2022-06-02 17:57:16 UTC +++ powerpc64/p8/aes-encrypt-internal.asm @@ -63,7 +63,7 @@ define(`S7', `v9') define(`FUNC_ALIGN', `5') PROLOGUE(_nettle_aes_encrypt) -- DATA_LOAD_VEC(swap_mask,.swap_mask,r5) -+ DATA_LOAD_VEC(swap_mask,.swap_data,r5) +- DATA_LOAD_VEC(SWAP_MASK,.swap_mask,r5) ++ DATA_LOAD_VEC(SWAP_MASK,.swap_data,r5) subi ROUNDS,ROUNDS,1 srdi LENGTH,LENGTH,4 diff --git a/security/nettle/pkg-plist b/security/nettle/pkg-plist index 7073dc2ac1ae..100c1300d537 100644 --- a/security/nettle/pkg-plist +++ b/security/nettle/pkg-plist @@ -46,6 +46,7 @@ include/nettle/memops.h include/nettle/memxor.h include/nettle/nettle-meta.h include/nettle/nettle-types.h +include/nettle/nist-keywrap.h include/nettle/pbkdf2.h include/nettle/pgp.h include/nettle/pkcs1.h @@ -63,6 +64,7 @@ include/nettle/sha1.h include/nettle/sha2.h include/nettle/sha3.h include/nettle/siv-cmac.h +include/nettle/sm3.h include/nettle/streebog.h include/nettle/twofish.h include/nettle/umac.h @@ -72,11 +74,11 @@ include/nettle/yarrow.h lib/libhogweed.a lib/libhogweed.so lib/libhogweed.so.6 -lib/libhogweed.so.6.4 +lib/libhogweed.so.6.5 lib/libnettle.a lib/libnettle.so lib/libnettle.so.8 -lib/libnettle.so.8.4 +lib/libnettle.so.8.5 libdata/pkgconfig/hogweed.pc libdata/pkgconfig/nettle.pc %%PORTDOCS%%%%DOCSDIR%%/NEWS