diff --git a/net/ndisc6/Makefile b/net/ndisc6/Makefile index c6dc7f1f3b88..49bc3d456dd0 100644 --- a/net/ndisc6/Makefile +++ b/net/ndisc6/Makefile @@ -1,33 +1,41 @@ 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 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 CONFIGURE_ARGS= --disable-suid-install \ --localstatedir="${PREFIX}/var" CONFIGURE_ENV= PERL=${LOCALBASE}/bin/perl MAKE_ENV= CHOWNPROG=: PORTDOCS= AUTHORS NEWS README OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes 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} .include 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,38 +1,38 @@ ---- 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 if test -n "$GCC"; then case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; + linux* | gnu* | k*bsd*-gnu | freebsd* ) haveit=yes;; esac fi fi @@ -6401,7 +6401,7 @@ fi || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; + linux* | gnu* | k*bsd*-gnu | freebsd* ) haveit=yes;; esac fi fi @@ -7252,7 +7252,7 @@ fi if test "X$additional_includedir" = "X/usr/local/include"; then if test -n "$GCC"; then case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; + linux* | gnu* | k*bsd*-gnu | freebsd* ) haveit=yes;; esac fi fi @@ -7298,7 +7298,7 @@ fi || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; + linux* | gnu* | k*bsd*-gnu | freebsd* ) haveit=yes;; esac fi fi 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,10 +1,10 @@ ---- 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 #include #include +#include #include #include 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,20 +1,29 @@ --- 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; - uint8_t optlen = opt[1]; + uint16_t optlen = opt[1]; 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"))); printf (_("Mobile home agent : %3s\n"), - gettext ((v & ND_RA_FLAG_HOME_AGENT) ? N_ ("Yes") : N_("No"))); + gettext ((v & ND_RA_FLAG_HA) ? N_ ("Yes") : N_("No"))); printf (_("Router preference : %6s\n"), pref_i2n (v)); printf (_("Neighbor discovery proxy : %3s\n"), gettext ((v & 0x04) ? 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,10 +1,10 @@ ---- 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 #endif #include +#include #include #include 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 @@ -1,31 +1,32 @@ bin/addr2name bin/dnssort bin/name2addr bin/tcpspray bin/tcpspray6 etc/rdnssd/merge-hook sbin/ndisc6 sbin/rdisc6 sbin/rdnssd sbin/tcptraceroute6 sbin/rltraceroute6 sbin/tracert6 %%PORTDOCS%%share/man/man1/addr2name.1.gz %%PORTDOCS%%share/man/man1/dnssort.1.gz %%PORTDOCS%%share/man/man1/name2addr.1.gz %%PORTDOCS%%share/man/man1/tcpspray.1.gz %%PORTDOCS%%share/man/man1/tcpspray6.1.gz %%PORTDOCS%%share/man/man8/ndisc6.8.gz %%PORTDOCS%%share/man/man8/rdisc6.8.gz %%PORTDOCS%%share/man/man8/rdnssd.8.gz %%PORTDOCS%%share/man/man8/rltraceroute6.8.gz %%PORTDOCS%%share/man/man8/tcptraceroute6.8.gz %%PORTDOCS%%share/man/man8/tracert6.8.gz %%NLS%%share/locale/cs/LC_MESSAGES/ndisc6.mo %%NLS%%share/locale/de/LC_MESSAGES/ndisc6.mo %%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/rdnssd