Date: Mon, 27 Apr 2026 00:13:00 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Cc: Takefu <takefu@airport.fm> Subject: git: 1de377e8f2b7 - 2026Q2 - net/ndisc6: Fix build failure for 13.x-RELEASE and Add ja_JP locale Message-ID: <69eeaa0c.1e86f.57caba7d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2026Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=1de377e8f2b7dea6787d4b59722bce3f4e5e6428 commit 1de377e8f2b7dea6787d4b59722bce3f4e5e6428 Author: Takefu <takefu@airport.fm> AuthorDate: 2026-04-24 16:01:38 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-04-27 00:11:57 +0000 net/ndisc6: Fix build failure for 13.x-RELEASE and Add ja_JP locale Fixed build failures in 13.x-RELEASE. Changed MASTER_SITES to https. PR: 288977 MFH: 2026Q2 Event: Wiesbaden Hackathon 202604 (cherry picked from commit 24b17c7630e551584636340addbc156a199aa532) --- net/ndisc6/Makefile | 12 ++++++++++-- net/ndisc6/distinfo | 4 +++- net/ndisc6/files/patch-configure | 2 +- net/ndisc6/files/patch-po_LINGUAS | 8 ++++++++ net/ndisc6/files/patch-rdnss_rdnssd.c | 2 +- net/ndisc6/files/patch-src_ndisc.c | 11 ++++++++++- net/ndisc6/files/patch-src_tcpspray.c | 2 +- net/ndisc6/pkg-plist | 1 + 8 files changed, 35 insertions(+), 7 deletions(-) diff --git a/net/ndisc6/Makefile b/net/ndisc6/Makefile index c6dc7f1f3b88..49bc3d456dd0 100644 --- a/net/ndisc6/Makefile +++ b/net/ndisc6/Makefile @@ -1,7 +1,11 @@ PORTNAME= ndisc6 DISTVERSION= 1.0.8 +PORTREVISION= 1 CATEGORIES= net -MASTER_SITES= http://www.remlab.net/files/ndisc6/ +MASTER_SITES= https://www.remlab.net/files/ndisc6/ \ + LOCAL/je3kmz:gmo +DISTFILES= ${DISTNAME}.tar.bz2 \ + ${DISTNAME}_ja.tar.xz:gmo MAINTAINER= takefu@airport.fm COMMENT= IPv6 network diagnostic tools @@ -9,7 +13,7 @@ WWW= https://www.remlab.net/ndisc6/ LICENSE= GPLv2 -USES= compiler:c11 localbase perl5 tar:bzip2 +USES= compiler:c11 localbase perl5 tar:bzip2 tar:xz USE_RC_SUBR= rdnssd GNU_CONFIGURE= yes @@ -26,6 +30,10 @@ NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls NLS_LDFLAGS= -lintl +pre-patch-NLS-on: + ${CP} ${WRKDIR}/${DISTNAME}_ja.gmo ${WRKSRC}/po/ja.gmo + ${CP} ${WRKDIR}/${DISTNAME}_ja.po ${WRKSRC}/po/ja.po + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:M*:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} diff --git a/net/ndisc6/distinfo b/net/ndisc6/distinfo index a652f106a0fb..06b8f4c41e31 100644 --- a/net/ndisc6/distinfo +++ b/net/ndisc6/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1755061334 +TIMESTAMP = 1766111626 SHA256 (ndisc6-1.0.8.tar.bz2) = 1f2fb2dc1172770aa5a09d39738a44d8b753cc5e2e25e306ca78682f9fea0b4f SIZE (ndisc6-1.0.8.tar.bz2) = 262355 +SHA256 (ndisc6-1.0.8_ja.tar.xz) = f86f18d1bb1ff8970205d4a12851a7dd41a0a16314331361b9be2f1e6378a930 +SIZE (ndisc6-1.0.8_ja.tar.xz) = 8684 diff --git a/net/ndisc6/files/patch-configure b/net/ndisc6/files/patch-configure index 3d764dc4d201..ab357b87a25b 100644 --- a/net/ndisc6/files/patch-configure +++ b/net/ndisc6/files/patch-configure @@ -1,4 +1,4 @@ ---- configure.orig 2022-07-11 16:50:06 UTC +--- configure.orig 2024-01-27 12:55:04 UTC +++ configure @@ -6355,7 +6355,7 @@ fi if test "X$additional_includedir" = "X/usr/local/include"; then diff --git a/net/ndisc6/files/patch-po_LINGUAS b/net/ndisc6/files/patch-po_LINGUAS new file mode 100644 index 000000000000..0168bf6b20dd --- /dev/null +++ b/net/ndisc6/files/patch-po_LINGUAS @@ -0,0 +1,8 @@ +--- po/LINGUAS.orig 2015-08-28 17:13:44 UTC ++++ po/LINGUAS +@@ -3,4 +3,5 @@ fr + en + en_GB + fr ++ja + sv diff --git a/net/ndisc6/files/patch-rdnss_rdnssd.c b/net/ndisc6/files/patch-rdnss_rdnssd.c index 54ed9b80a918..ef3a2987d957 100644 --- a/net/ndisc6/files/patch-rdnss_rdnssd.c +++ b/net/ndisc6/files/patch-rdnss_rdnssd.c @@ -1,4 +1,4 @@ ---- rdnss/rdnssd.c.orig 2014-12-14 10:39:28 UTC +--- rdnss/rdnssd.c.orig 2022-05-11 18:30:50 UTC +++ rdnss/rdnssd.c @@ -28,6 +28,7 @@ #include <stdbool.h> diff --git a/net/ndisc6/files/patch-src_ndisc.c b/net/ndisc6/files/patch-src_ndisc.c index 053a8e8380de..77e63681c0a1 100644 --- a/net/ndisc6/files/patch-src_ndisc.c +++ b/net/ndisc6/files/patch-src_ndisc.c @@ -1,6 +1,6 @@ --- src/ndisc.c.orig 2023-11-10 15:28:07 UTC +++ src/ndisc.c -@@ -451,7 +451,7 @@ parsednssl (const uint8_t *opt) +@@ -451,7 +451,7 @@ static int parsednssl (const uint8_t *opt) { const uint8_t *base; @@ -9,6 +9,15 @@ if (optlen < 2) return -1; +@@ -511,7 +511,7 @@ parsepref64 (const uint8_t *opt) + return -1; + + memcpy(&pref64, opt + 4, 12); +- pref64.s6_addr32[3] = 0; ++ memset(&pref64.s6_addr[12], 0, 4); + if (inet_ntop (AF_INET6, &pref64, str, sizeof (str)) == NULL) + return -1; + @@ -559,7 +559,7 @@ parseadv (const uint8_t *buf, size_t len, const struct printf (_("Stateful other conf. : %3s\n"), gettext ((v & ND_RA_FLAG_OTHER) ? N_ ("Yes") : N_("No"))); diff --git a/net/ndisc6/files/patch-src_tcpspray.c b/net/ndisc6/files/patch-src_tcpspray.c index dd18a150b0d4..e784e02d3ada 100644 --- a/net/ndisc6/files/patch-src_tcpspray.c +++ b/net/ndisc6/files/patch-src_tcpspray.c @@ -1,4 +1,4 @@ ---- src/tcpspray.c.orig 2011-09-22 16:00:30 UTC +--- src/tcpspray.c.orig 2016-12-07 16:43:04 UTC +++ src/tcpspray.c @@ -33,6 +33,7 @@ # define SIZE_MAX SIZE_T_MAX // FreeBSD 4.x workaround diff --git a/net/ndisc6/pkg-plist b/net/ndisc6/pkg-plist index cc1f3de597f0..aab6c9cb0d05 100644 --- a/net/ndisc6/pkg-plist +++ b/net/ndisc6/pkg-plist @@ -26,6 +26,7 @@ sbin/tracert6 %%NLS%%share/locale/en/LC_MESSAGES/ndisc6.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/ndisc6.mo %%NLS%%share/locale/fr/LC_MESSAGES/ndisc6.mo +%%NLS%%share/locale/ja/LC_MESSAGES/ndisc6.mo %%NLS%%share/locale/sv/LC_MESSAGES/ndisc6.mo @owner nobody @dir var/run/rdnssdhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69eeaa0c.1e86f.57caba7d>