Date: Sat, 8 Dec 2018 18:08:08 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486970 - in head/net/ndisc6: . files Message-ID: <201812081808.wB8I88qW070593@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sat Dec 8 18:08:08 2018 New Revision: 486970 URL: https://svnweb.freebsd.org/changeset/ports/486970 Log: net/ndisc6 update to 1.0.3 PR: 233854 Submitted by: m.tsatsenko@gmail.com (maintainer) Added: head/net/ndisc6/files/patch-src_tcpspray.c (contents, props changed) - copied, changed from r486969, head/net/ndisc6/files/patch-patch-src__tcpspray.c Deleted: head/net/ndisc6/files/patch-patch-src__tcpspray.c Modified: head/net/ndisc6/Makefile (contents, props changed) head/net/ndisc6/distinfo (contents, props changed) head/net/ndisc6/files/patch-configure (contents, props changed) head/net/ndisc6/files/patch-rdnssd__merge-hook.in (contents, props changed) head/net/ndisc6/files/patch-rdnssd__rdnssd.c (contents, props changed) head/net/ndisc6/files/patch-rdnssd__rdnssd.h (contents, props changed) head/net/ndisc6/files/patch-src-ndisc.c (contents, props changed) head/net/ndisc6/pkg-plist (contents, props changed) Modified: head/net/ndisc6/Makefile ============================================================================== --- head/net/ndisc6/Makefile Sat Dec 8 18:00:22 2018 (r486969) +++ head/net/ndisc6/Makefile Sat Dec 8 18:08:08 2018 (r486970) @@ -2,8 +2,7 @@ # $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/ @@ -15,6 +14,7 @@ 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 @@ -24,17 +24,11 @@ LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes -.include <bsd.port.options.mk> - -.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 Modified: head/net/ndisc6/distinfo ============================================================================== --- head/net/ndisc6/distinfo Sat Dec 8 18:00:22 2018 (r486969) +++ head/net/ndisc6/distinfo Sat Dec 8 18:08:08 2018 (r486970) @@ -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 Modified: head/net/ndisc6/files/patch-configure ============================================================================== --- head/net/ndisc6/files/patch-configure Sat Dec 8 18:00:22 2018 (r486969) +++ head/net/ndisc6/files/patch-configure Sat Dec 8 18:08:08 2018 (r486970) @@ -1,6 +1,6 @@ ---- 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 @@ -9,8 +9,8 @@ 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;; @@ -18,7 +18,7 @@ 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 @@ -27,8 +27,8 @@ 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;; @@ -36,4 +36,3 @@ esac fi fi - Modified: head/net/ndisc6/files/patch-rdnssd__merge-hook.in ============================================================================== --- head/net/ndisc6/files/patch-rdnssd__merge-hook.in Sat Dec 8 18:00:22 2018 (r486969) +++ head/net/ndisc6/files/patch-rdnssd__merge-hook.in Sat Dec 8 18:08:08 2018 (r486970) @@ -1,6 +1,6 @@ ---- 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 @@ -9,7 +9,7 @@ # Max number of nameserver options taken into account. Should be as # defined in <resolv.h> -@@ -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)) Modified: head/net/ndisc6/files/patch-rdnssd__rdnssd.c ============================================================================== --- head/net/ndisc6/files/patch-rdnssd__rdnssd.c Sat Dec 8 18:00:22 2018 (r486969) +++ head/net/ndisc6/files/patch-rdnssd__rdnssd.c Sat Dec 8 18:08:08 2018 (r486970) @@ -1,6 +1,6 @@ ---- 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 <stdbool.h> #include <locale.h> #include <signal.h> Modified: head/net/ndisc6/files/patch-rdnssd__rdnssd.h ============================================================================== --- head/net/ndisc6/files/patch-rdnssd__rdnssd.h Sat Dec 8 18:00:22 2018 (r486969) +++ head/net/ndisc6/files/patch-rdnssd__rdnssd.h Sat Dec 8 18:08:08 2018 (r486970) @@ -1,16 +1,25 @@ ---- 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 <netinet/icmp6.h> */ +--- 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 Modified: head/net/ndisc6/files/patch-src-ndisc.c ============================================================================== --- head/net/ndisc6/files/patch-src-ndisc.c Sat Dec 8 18:00:22 2018 (r486969) +++ head/net/ndisc6/files/patch-src-ndisc.c Sat Dec 8 18:08:08 2018 (r486970) @@ -1,6 +1,6 @@ ---- 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"), Copied and modified: head/net/ndisc6/files/patch-src_tcpspray.c (from r486969, head/net/ndisc6/files/patch-patch-src__tcpspray.c) ============================================================================== --- head/net/ndisc6/files/patch-patch-src__tcpspray.c Sat Dec 8 18:00:22 2018 (r486969, copy source) +++ head/net/ndisc6/files/patch-src_tcpspray.c Sat Dec 8 18:08:08 2018 (r486970) @@ -1,6 +1,6 @@ ---- 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 <stdlib.h> Modified: head/net/ndisc6/pkg-plist ============================================================================== --- head/net/ndisc6/pkg-plist Sat Dec 8 18:00:22 2018 (r486969) +++ head/net/ndisc6/pkg-plist Sat Dec 8 18:08:08 2018 (r486970) @@ -24,6 +24,7 @@ sbin/tracert6 %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812081808.wB8I88qW070593>