Date: Mon, 5 Jun 2023 18:51:26 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f4058dc1247c - main - security/nettle: Update to 3.9.1 Message-ID: <202306051851.355IpQS2049226@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4058dc1247c7ffb8ff78af7c2c6431ea057ad0b commit f4058dc1247c7ffb8ff78af7c2c6431ea057ad0b Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-06-05 18:38:36 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> 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 <bsd.port.options.mk> @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306051851.355IpQS2049226>