Index: branches/2019Q1/net/ndisc6/Makefile =================================================================== --- branches/2019Q1/net/ndisc6/Makefile (revision 490818) +++ branches/2019Q1/net/ndisc6/Makefile (revision 490819) @@ -1,44 +1,42 @@ # Created by: rdenis@simphalempin.com # $FreeBSD$ PORTNAME= ndisc6 -PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTVERSION= 1.0.4 CATEGORIES= net ipv6 MASTER_SITES= http://www.remlab.net/files/ndisc6/ \ http://people.via.ecp.fr/~rem/www.remlab.net/files/ndisc6/ MAINTAINER= m.tsatsenko@gmail.com COMMENT= IPv6 network diagnostic tools LICENSE= GPLv2 -USES= tar:bzip2 perl5 -USE_GCC= any +USES= compiler:c11 perl5 tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-suid-install --localstatedir="${PREFIX}/var" CONFIGURE_ENV= PERL=${LOCALBASE}/bin/perl MAKE_ENV= CHOWNPROG=: LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext NLS_LDFLAGS= -lintl USE_RC_SUBR= rdnssd PORTDOCS= AUTHORS NEWS README post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor .include Index: branches/2019Q1/net/ndisc6/distinfo =================================================================== --- branches/2019Q1/net/ndisc6/distinfo (revision 490818) +++ branches/2019Q1/net/ndisc6/distinfo (revision 490819) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542928199 -SHA256 (ndisc6-1.0.3.tar.bz2) = 0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821 -SIZE (ndisc6-1.0.3.tar.bz2) = 260294 +TIMESTAMP = 1547299650 +SHA256 (ndisc6-1.0.4.tar.bz2) = abb1da4a98d94e5abe1dd7b1c975de540306b0581cbbd36aff035118b2f25c1f +SIZE (ndisc6-1.0.4.tar.bz2) = 264071 Index: branches/2019Q1/net/ndisc6/files/patch-rdnssd__rdnssd.c =================================================================== --- branches/2019Q1/net/ndisc6/files/patch-rdnssd__rdnssd.c (revision 490818) +++ branches/2019Q1/net/ndisc6/files/patch-rdnssd__rdnssd.c (nonexistent) @@ -1,10 +0,0 @@ ---- rdnssd/rdnssd.c.orig 2014-12-14 10:39:28 UTC -+++ rdnssd/rdnssd.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - #include Property changes on: branches/2019Q1/net/ndisc6/files/patch-rdnssd__rdnssd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q1/net/ndisc6/files/patch-rdnssd__rdnssd.h =================================================================== --- branches/2019Q1/net/ndisc6/files/patch-rdnssd__rdnssd.h (revision 490818) +++ branches/2019Q1/net/ndisc6/files/patch-rdnssd__rdnssd.h (nonexistent) @@ -1,27 +0,0 @@ ---- rdnssd/rdnssd.h.orig 2011-10-17 15:35:11 UTC -+++ rdnssd/rdnssd.h -@@ -32,24 +32,6 @@ extern const rdnss_src_t rdnss_netlink, - #define ND_OPT_RDNSS 25 - #define ND_OPT_DNSSL 31 - --struct nd_opt_rdnss --{ -- uint8_t nd_opt_rdnss_type; -- uint8_t nd_opt_rdnss_len; -- uint16_t nd_opt_rdnss_reserved; -- uint32_t nd_opt_rdnss_lifetime; -- /* followed by one or more IPv6 addresses */ --}; -- --struct nd_opt_dnssl --{ -- uint8_t nd_opt_dnssl_type; -- uint8_t nd_opt_dnssl_len; -- uint16_t nd_opt_dnssl_reserved; -- uint32_t nd_opt_dnssl_lifetime; -- /* followed by one or more domain names */ --}; -- - # ifdef __cplusplus - extern "C" { - # endif Property changes on: branches/2019Q1/net/ndisc6/files/patch-rdnssd__rdnssd.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q1/net/ndisc6/files/patch-rdnssd__merge-hook.in =================================================================== --- branches/2019Q1/net/ndisc6/files/patch-rdnssd__merge-hook.in (revision 490818) +++ branches/2019Q1/net/ndisc6/files/patch-rdnssd__merge-hook.in (nonexistent) @@ -1,28 +0,0 @@ ---- rdnssd/merge-hook.in.orig 2014-12-14 10:13:57 UTC -+++ rdnssd/merge-hook.in -@@ -19,7 +19,7 @@ - - set -e - --PATH=/sbin:/bin -+PATH=/sbin:/bin:/usr/bin - - # Max number of nameserver options taken into account. Should be as - # defined in -@@ -31,14 +31,14 @@ MAXNS=3 - # will limit the IPv6 entries it adds to $RDNSS_LIMIT only. - RDNSS_LIMIT=$(($MAXNS - 1)) - --sysconfdir='@SYSCONFDIR@' -+sysconfdir='/etc' - localstatedir='@LOCALSTATEDIR@' - resolvconf="$sysconfdir/resolv.conf" - myresolvconf="$localstatedir/run/rdnssd/resolv.conf" - - # These should be POSIX-compliant BREs - RE_NSV4='^nameserver *\([0-9]\{1,3\}\.\)\{3,3\}[0-9]\{1,3\} *$' --RE_NSV4OR6='^nameserver *[a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{,1\} *$' -+RE_NSV4OR6='^nameserver *[a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{0,1\} *$' - - # Count how many IPv6 nameservers we can fit - Property changes on: branches/2019Q1/net/ndisc6/files/patch-rdnssd__merge-hook.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q1/net/ndisc6/files/patch-configure =================================================================== --- branches/2019Q1/net/ndisc6/files/patch-configure (revision 490818) +++ branches/2019Q1/net/ndisc6/files/patch-configure (revision 490819) @@ -1,38 +1,38 @@ ---- configure.orig 2014-12-14 10:09:45 UTC +--- configure.orig 2019-01-06 14:36:38 UTC +++ configure -@@ -5713,7 +5713,7 @@ fi +@@ -5900,7 +5900,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 -@@ -5759,7 +5759,7 @@ fi +@@ -5946,7 +5946,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 -@@ -6597,7 +6597,7 @@ fi +@@ -6784,7 +6784,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 -@@ -6643,7 +6643,7 @@ fi +@@ -6830,7 +6830,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 Index: branches/2019Q1/net/ndisc6/files/patch-rdnss_merge-hook.in =================================================================== --- branches/2019Q1/net/ndisc6/files/patch-rdnss_merge-hook.in (nonexistent) +++ branches/2019Q1/net/ndisc6/files/patch-rdnss_merge-hook.in (revision 490819) @@ -0,0 +1,28 @@ +--- rdnss/merge-hook.in.orig 2014-12-14 10:13:57 UTC ++++ rdnss/merge-hook.in +@@ -19,7 +19,7 @@ + + set -e + +-PATH=/sbin:/bin ++PATH=/sbin:/bin:/usr/bin + + # Max number of nameserver options taken into account. Should be as + # defined in +@@ -31,14 +31,14 @@ MAXNS=3 + # will limit the IPv6 entries it adds to $RDNSS_LIMIT only. + RDNSS_LIMIT=$(($MAXNS - 1)) + +-sysconfdir='@SYSCONFDIR@' ++sysconfdir='/etc' + localstatedir='@LOCALSTATEDIR@' + resolvconf="$sysconfdir/resolv.conf" + myresolvconf="$localstatedir/run/rdnssd/resolv.conf" + + # These should be POSIX-compliant BREs + RE_NSV4='^nameserver *\([0-9]\{1,3\}\.\)\{3,3\}[0-9]\{1,3\} *$' +-RE_NSV4OR6='^nameserver *[a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{,1\} *$' ++RE_NSV4OR6='^nameserver *[a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{0,1\} *$' + + # Count how many IPv6 nameservers we can fit + Property changes on: branches/2019Q1/net/ndisc6/files/patch-rdnss_merge-hook.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.c =================================================================== --- branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.c (nonexistent) +++ branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.c (revision 490819) @@ -0,0 +1,10 @@ +--- rdnss/rdnssd.c.orig 2014-12-14 10:39:28 UTC ++++ rdnss/rdnssd.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include + #include Property changes on: branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.h =================================================================== --- branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.h (nonexistent) +++ branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.h (revision 490819) @@ -0,0 +1,27 @@ +--- rdnss/rdnssd.h.orig 2016-12-07 18:11:55 UTC ++++ rdnss/rdnssd.h +@@ -32,24 +32,6 @@ extern const rdnss_src_t rdnss_netlink, rdnss_icmp; + #define ND_OPT_RDNSS 25 + #define ND_OPT_DNSSL 31 + +-struct nd_opt_rdnss +-{ +- uint8_t nd_opt_rdnss_type; +- uint8_t nd_opt_rdnss_len; +- uint16_t nd_opt_rdnss_reserved; +- uint32_t nd_opt_rdnss_lifetime; +- /* followed by one or more IPv6 addresses */ +-}; +- +-struct nd_opt_dnssl +-{ +- uint8_t nd_opt_dnssl_type; +- uint8_t nd_opt_dnssl_len; +- uint16_t nd_opt_dnssl_reserved; +- uint32_t nd_opt_dnssl_lifetime; +- /* followed by one or more domain names */ +-}; +- + # ifdef __cplusplus + extern "C" { + # endif Property changes on: branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q1/net/ndisc6/files/patch-src-ndisc.c =================================================================== --- branches/2019Q1/net/ndisc6/files/patch-src-ndisc.c (revision 490818) +++ branches/2019Q1/net/ndisc6/files/patch-src-ndisc.c (revision 490819) @@ -1,11 +1,11 @@ ---- src/ndisc.c.orig 2014-12-14 10:39:28 UTC +--- src/ndisc.c.orig 2016-12-07 16:43:04 UTC +++ src/ndisc.c -@@ -532,7 +532,7 @@ parseadv (const uint8_t *buf, size_t len +@@ -532,7 +532,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"))); Index: branches/2019Q1/net/ndisc6/pkg-plist =================================================================== --- branches/2019Q1/net/ndisc6/pkg-plist (revision 490818) +++ branches/2019Q1/net/ndisc6/pkg-plist (revision 490819) @@ -1,30 +1,31 @@ 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%%man/man1/addr2name.1.gz %%PORTDOCS%%man/man1/dnssort.1.gz %%PORTDOCS%%man/man1/name2addr.1.gz %%PORTDOCS%%man/man1/tcpspray.1.gz %%PORTDOCS%%man/man1/tcpspray6.1.gz %%PORTDOCS%%man/man8/ndisc6.8.gz %%PORTDOCS%%man/man8/rdisc6.8.gz %%PORTDOCS%%man/man8/rdnssd.8.gz %%PORTDOCS%%man/man8/rltraceroute6.8.gz %%PORTDOCS%%man/man8/tcptraceroute6.8.gz %%PORTDOCS%%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/sv/LC_MESSAGES/ndisc6.mo @owner nobody @dir var/run/rdnssd Index: branches/2019Q1 =================================================================== --- branches/2019Q1 (revision 490818) +++ branches/2019Q1 (revision 490819) Property changes on: branches/2019Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r490814