diff --git a/net/ndisc6/Makefile b/net/ndisc6/Makefile index 836761a5667c..bf73a88bb586 100644 --- a/net/ndisc6/Makefile +++ b/net/ndisc6/Makefile @@ -1,49 +1,43 @@ # Created by: rdenis@simphalempin.com # $FreeBSD$ PORTNAME= ndisc6 -PORTVERSION= 1.0.2 -PORTREVISION= 6 +PORTVERSION= 1.0.3 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 + 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 -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -LDFLAGS+= -lintl -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +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 diff --git a/net/ndisc6/distinfo b/net/ndisc6/distinfo index 3d96d8af12d9..88b6fb81c1c3 100644 --- a/net/ndisc6/distinfo +++ b/net/ndisc6/distinfo @@ -1,2 +1,3 @@ -SHA256 (ndisc6-1.0.2.tar.bz2) = 6acec8a0cb9efa3ac98456f46c3016aeec0598b0c7557c95242b5228ad62ca7a -SIZE (ndisc6-1.0.2.tar.bz2) = 239249 +TIMESTAMP = 1542928199 +SHA256 (ndisc6-1.0.3.tar.bz2) = 0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821 +SIZE (ndisc6-1.0.3.tar.bz2) = 260294 diff --git a/net/ndisc6/files/patch-configure b/net/ndisc6/files/patch-configure index b88e977db173..ea65a254b630 100644 --- a/net/ndisc6/files/patch-configure +++ b/net/ndisc6/files/patch-configure @@ -1,39 +1,38 @@ ---- configure.orig 2011-04-24 02:27:27.000000000 +0400 -+++ configure 2011-04-24 02:29:19.000000000 +0400 -@@ -5483,7 +5483,7 @@ +--- configure.orig 2014-12-14 10:09:45 UTC ++++ configure +@@ -5713,7 +5713,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 -@@ -5527,7 +5527,7 @@ - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then +@@ -5759,7 +5759,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 -@@ -6288,7 +6288,7 @@ +@@ -6597,7 +6597,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 -@@ -6332,7 +6332,7 @@ - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then +@@ -6643,7 +6643,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-rdnssd__merge-hook.in b/net/ndisc6/files/patch-rdnssd__merge-hook.in index a40c66df2cad..fb53c52ff6ff 100644 --- a/net/ndisc6/files/patch-rdnssd__merge-hook.in +++ b/net/ndisc6/files/patch-rdnssd__merge-hook.in @@ -1,28 +1,28 @@ ---- rdnssd/merge-hook.in.orig 2011-09-30 17:29:15.000000000 +0200 -+++ rdnssd/merge-hook.in 2011-09-30 17:29:53.000000000 +0200 -@@ -21,7 +21,7 @@ +--- 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 -@@ -33,14 +33,14 @@ +@@ -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 diff --git a/net/ndisc6/files/patch-rdnssd__rdnssd.c b/net/ndisc6/files/patch-rdnssd__rdnssd.c index df730bbdd30c..c8cbe857156a 100644 --- a/net/ndisc6/files/patch-rdnssd__rdnssd.c +++ b/net/ndisc6/files/patch-rdnssd__rdnssd.c @@ -1,10 +1,10 @@ ---- rdnssd/rdnssd.c.orig 2011-09-10 14:20:44.451134584 +0400 -+++ rdnssd/rdnssd.c 2011-09-10 14:21:09.758658207 +0400 -@@ -29,6 +29,7 @@ +--- rdnssd/rdnssd.c.orig 2014-12-14 10:39:28 UTC ++++ rdnssd/rdnssd.c +@@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/net/ndisc6/files/patch-rdnssd__rdnssd.h b/net/ndisc6/files/patch-rdnssd__rdnssd.h index 1aa03c3104b9..b942a24307cf 100644 --- a/net/ndisc6/files/patch-rdnssd__rdnssd.h +++ b/net/ndisc6/files/patch-rdnssd__rdnssd.h @@ -1,18 +1,27 @@ ---- rdnssd/rdnssd.h.orig 2011-07-23 01:03:38.000000000 +0400 -+++ rdnssd/rdnssd.h 2011-07-23 01:03:56.000000000 +0400 -@@ -32,15 +32,6 @@ - /* Belongs in */ +--- 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_resserved1; +- 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 diff --git a/net/ndisc6/files/patch-src-ndisc.c b/net/ndisc6/files/patch-src-ndisc.c index 0b1fa047e1c9..4e7adddbb490 100644 --- a/net/ndisc6/files/patch-src-ndisc.c +++ b/net/ndisc6/files/patch-src-ndisc.c @@ -1,11 +1,11 @@ ---- src/ndisc.c.orig 2011-09-10 14:17:49.714181834 +0400 -+++ src/ndisc.c 2011-09-10 14:17:51.893973268 +0400 -@@ -441,7 +441,7 @@ +--- src/ndisc.c.orig 2014-12-14 10:39:28 UTC ++++ src/ndisc.c +@@ -532,7 +532,7 @@ parseadv (const uint8_t *buf, size_t len 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-patch-src__tcpspray.c b/net/ndisc6/files/patch-src_tcpspray.c similarity index 53% rename from net/ndisc6/files/patch-patch-src__tcpspray.c rename to net/ndisc6/files/patch-src_tcpspray.c index def72fc23bd7..dd18a150b0d4 100644 --- a/net/ndisc6/files/patch-patch-src__tcpspray.c +++ b/net/ndisc6/files/patch-src_tcpspray.c @@ -1,10 +1,10 @@ ---- src/tcpspray.c.orig 2010-05-01 01:08:34.000000000 -0700 -+++ src/tcpspray.c 2015-02-15 15:56:55.904785304 -0800 -@@ -34,6 +34,7 @@ +--- src/tcpspray.c.orig 2011-09-22 16:00:30 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 cf573438d63a..8da6da23c4ce 100644 --- a/net/ndisc6/pkg-plist +++ b/net/ndisc6/pkg-plist @@ -1,29 +1,30 @@ 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 @owner nobody @dir var/run/rdnssd