From nobody Mon Jun 5 18:51:26 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 4QZjPV6Rvdz4Ztw9; Mon, 5 Jun 2023 18:51:26 +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 4QZjPV5zY5z3rvF; Mon, 5 Jun 2023 18:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685991086; 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=piregyEi9Qiuk/05KvT6t8gz+YFn87nd2iBOaDrnRvc=; b=FRCC21VubZ1xf6YW/t57WDpSjkPQTCT+6TOyYoRNxsqzyOWrn7lwTfMda6UtvNrqEf3tzK DOyT++iYeRFOlkaVLtliBwTNJUZkpuxMFg9xpLOn70jOXjT4EoUwVTh1T9ev5E72KYZ2r3 HAtmOdpCb7LuB0t3fX1eKZuDyg7OyIhBLsBYmjRr8lOlID0lhfWCKqm3UajHZRUQOn0H64 0OcRl3MnAApcPHsIN18d/k6ffwKiFnT8/KOctKpPXAj/UdSytHDsiQogaQCXXEzgLXGOe2 Ag8CdoGE7iyuVr6MvIdL2aAwt+E4sFesUnS+ovVRzCHgSG/sH1AQlcwcKwpU5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685991086; 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=piregyEi9Qiuk/05KvT6t8gz+YFn87nd2iBOaDrnRvc=; b=AqE2ikvBjE4GqEIDKYBwWO2nX0ckW1XI3bDSNtdX9WtzFlAu34mUcyvR+BREfi04TiiQUt GGIRiT1BZUGIOTFxVywMCytvhxcNNDFQ217whZUW8A1k9IR/BQWE//JclQ2/DEtLL1JYJz Ubh70ghHBByU+5a6q5HZrbWBs+UV+oMoIJG5OmbGZoHf5qyBMQR5kppTc4s4tfnxbaFrVj 4D8bzIHCa2x7jg0AOghlTHyD+Nn9FrC1hmCCC7VAO3Pq8clGhm9EJXacIsIbCbCJ4XpltX dyCDFezGDqvLf6wUctevEtUdOF4tcrvLM/J3gTRtQv2xY4lZxmtVdqCfxLCoXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685991086; a=rsa-sha256; cv=none; b=cyGVvNtGmFLKuj1+7dkOaHEvSGwW6CcH9qOa09mL9Mg+D13U8z5FyydeaarZPFz5DbH+Lp Zkp4dypz3aqC/oyn9Sh5RFXKxBIcA65iKFQARpxPD68JeWPPa2zMAtz/Y1o3/nqBiB1xjr +oTg+XF+bDiHgRywJRDsLub212gsGXijapJ4WGG5sMG+W+GcuOGN6Pe6E4E9n7a+e6rzEl /uAMFVDBPnmqOQAdCFCpk/4SiU3S7Et6lJ84IVkb67WUoIF2QybtPtXGqEan628c/N3Er8 yz5dcc2Fz0VgctNimjlt5c53K3c4M0NAmumkddtnlW/o3ji20t0TB/g4N6JqOQ== 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 4QZjPV53jLzyvd; Mon, 5 Jun 2023 18:51:26 +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 355IpQSl049236; Mon, 5 Jun 2023 18:51:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 355IpQS2049226; Mon, 5 Jun 2023 18:51:26 GMT (envelope-from git) Date: Mon, 5 Jun 2023 18:51:26 GMT Message-Id: <202306051851.355IpQS2049226@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: f4058dc1247c - main - security/nettle: Update to 3.9.1 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: f4058dc1247c7ffb8ff78af7c2c6431ea057ad0b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4058dc1247c7ffb8ff78af7c2c6431ea057ad0b commit f4058dc1247c7ffb8ff78af7c2c6431ea057ad0b Author: Po-Chuan Hsieh AuthorDate: 2023-06-05 18:38:36 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-05 18:46:55 +0000 security/nettle: Update to 3.9.1 - Convert REINPLACE_CMD to patch files Changes: https://git.lysator.liu.se/nettle/nettle/-/blob/nettle_3.9.1_release_20230601/NEWS --- security/nettle/Makefile | 9 +++------ security/nettle/distinfo | 6 +++--- security/nettle/files/extra-patch-Makefile.in | 11 +++++++++++ security/nettle/files/patch-configure | 11 +++++++++++ security/nettle/pkg-plist | 4 ++-- 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/security/nettle/Makefile b/security/nettle/Makefile index 351f62cddc3b..c35970d715af 100644 --- a/security/nettle/Makefile +++ b/security/nettle/Makefile @@ -1,5 +1,5 @@ PORTNAME= nettle -PORTVERSION= 3.9 +PORTVERSION= 3.9.1 CATEGORIES= security MASTER_SITES= GNU \ https://www.lysator.liu.se/~nisse/archive/ @@ -32,6 +32,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES EXAMPLES_CFLAGS= -I${OPENSSLINC} EXAMPLES_USES= ssl +EXAMPLES_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-Makefile.in .include @@ -39,15 +40,11 @@ EXAMPLES_USES= ssl CONFIGURE_ENV+= CCPIC=-fPIC .endif -post-patch: - @${REINPLACE_CMD} -e '/libdir=/ s|lib32|lib|' ${WRKSRC}/configure .if ${ARCH} == "mips64" +post-patch: @${REINPLACE_CMD} -e 's|__sgi|__unix__|' ${WRKSRC}/configure .endif -post-patch-EXAMPLES-off: - @${REINPLACE_CMD} -e '/SUBDIRS = / s| examples||' ${WRKSRC}/Makefile.in - post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so diff --git a/security/nettle/distinfo b/security/nettle/distinfo index a11068facff0..9896b862e6a8 100644 --- a/security/nettle/distinfo +++ b/security/nettle/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685162040 -SHA256 (nettle-3.9.tar.gz) = 0ee7adf5a7201610bb7fe0acbb7c9b3be83be44904dd35ebbcd965cd896bfeaa -SIZE (nettle-3.9.tar.gz) = 2393838 +TIMESTAMP = 1685792186 +SHA256 (nettle-3.9.1.tar.gz) = ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3 +SIZE (nettle-3.9.1.tar.gz) = 2396741 diff --git a/security/nettle/files/extra-patch-Makefile.in b/security/nettle/files/extra-patch-Makefile.in new file mode 100644 index 000000000000..2974b822043a --- /dev/null +++ b/security/nettle/files/extra-patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2023-06-01 18:40:35 UTC ++++ Makefile.in +@@ -19,7 +19,7 @@ OPT_NETTLE_SOURCES = @OPT_NETTLE_SOURCES@ + + FAT_TEST_LIST = @FAT_TEST_LIST@ + +-SUBDIRS = tools testsuite examples ++SUBDIRS = tools testsuite # examples + + include config.make + diff --git a/security/nettle/files/patch-configure b/security/nettle/files/patch-configure new file mode 100644 index 000000000000..1b8f460d9501 --- /dev/null +++ b/security/nettle/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2023-06-01 18:40:35 UTC ++++ configure +@@ -6638,7 +6638,7 @@ $as_echo "$as_me: WARNING: Cross compiling for linux. + # and 64-bit in lib. Don't know about "kfreebsd", does + # it follow the Linux fhs conventions? + *:freebsd*:32) +- libdir='${exec_prefix}/lib32' ++ libdir='${exec_prefix}/lib' + ;; + *:freebsd*:64) + libdir='${exec_prefix}/lib' diff --git a/security/nettle/pkg-plist b/security/nettle/pkg-plist index 2f96bfaa79a9..a55f056f8e35 100644 --- a/security/nettle/pkg-plist +++ b/security/nettle/pkg-plist @@ -78,11 +78,11 @@ include/nettle/yarrow.h lib/libhogweed.a lib/libhogweed.so lib/libhogweed.so.6 -lib/libhogweed.so.6.7 +lib/libhogweed.so.6.8 lib/libnettle.a lib/libnettle.so lib/libnettle.so.8 -lib/libnettle.so.8.7 +lib/libnettle.so.8.8 libdata/pkgconfig/hogweed.pc libdata/pkgconfig/nettle.pc %%PORTDOCS%%%%DOCSDIR%%/NEWS