Index: head/net/ndisc6/Makefile =================================================================== --- head/net/ndisc6/Makefile (revision 379055) +++ head/net/ndisc6/Makefile (revision 379056) @@ -1,51 +1,53 @@ # Created by: rdenis@simphalempin.com # $FreeBSD$ PORTNAME= ndisc6 PORTVERSION= 1.0.2 PORTREVISION= 1 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 +USES= tar:bzip2 perl5 USE_GCC= any GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-suid-install +CONFIGURE_ENV= PERL=${LOCALBASE}/bin/perl +MAKE_ENV= CHOWNPROG=: LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include OPTIONS_DEFINE= DOCS NLS .include .if ${OSVERSION} >= 803000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rdnssd-rdnssd.h +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rdnssd__rdnssd.h .endif .if ${PORT_OPTIONS:MNLS} USES+= gettext LDFLAGS+= -lintl PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif 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: head/net/ndisc6/files/extra-patch-rdnssd-rdnssd.h =================================================================== --- head/net/ndisc6/files/extra-patch-rdnssd-rdnssd.h (revision 379055) +++ head/net/ndisc6/files/extra-patch-rdnssd-rdnssd.h (nonexistent) @@ -1,18 +0,0 @@ ---- 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 */ - #define ND_OPT_RDNSS 25 - --struct nd_opt_rdnss --{ -- uint8_t nd_opt_rdnss_type; -- uint8_t nd_opt_rdnss_len; -- uint16_t nd_opt_rdnss_resserved1; -- uint32_t nd_opt_rdnss_lifetime; -- /* followed by one or more IPv6 addresses */ --}; -- - # ifdef __cplusplus - extern "C" { - # endif Property changes on: head/net/ndisc6/files/extra-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: head/net/ndisc6/files/patch-rdnssd-merge-hook.in =================================================================== --- head/net/ndisc6/files/patch-rdnssd-merge-hook.in (revision 379055) +++ head/net/ndisc6/files/patch-rdnssd-merge-hook.in (nonexistent) @@ -1,28 +0,0 @@ ---- 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 @@ - - 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 @@ - # 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: head/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: head/net/ndisc6/files/patch-rdnssd-rdnssd.c =================================================================== --- head/net/ndisc6/files/patch-rdnssd-rdnssd.c (revision 379055) +++ head/net/ndisc6/files/patch-rdnssd-rdnssd.c (nonexistent) @@ -1,10 +0,0 @@ ---- 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 @@ - #include - #include - #include -+#include - - #include - #include Property changes on: head/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: head/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h =================================================================== --- head/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h (nonexistent) +++ head/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h (revision 379056) @@ -0,0 +1,18 @@ +--- 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 */ + #define ND_OPT_RDNSS 25 + +-struct nd_opt_rdnss +-{ +- uint8_t nd_opt_rdnss_type; +- uint8_t nd_opt_rdnss_len; +- uint16_t nd_opt_rdnss_resserved1; +- uint32_t nd_opt_rdnss_lifetime; +- /* followed by one or more IPv6 addresses */ +-}; +- + # ifdef __cplusplus + extern "C" { + # endif Property changes on: head/net/ndisc6/files/extra-patch-rdnssd__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: head/net/ndisc6/files/patch-patch-src__tcpspray.c =================================================================== --- head/net/ndisc6/files/patch-patch-src__tcpspray.c (nonexistent) +++ head/net/ndisc6/files/patch-patch-src__tcpspray.c (revision 379056) @@ -0,0 +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 @@ + # define SIZE_MAX SIZE_T_MAX // FreeBSD 4.x workaround + #endif + #include ++#include + + #include + #include Property changes on: head/net/ndisc6/files/patch-patch-src__tcpspray.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: head/net/ndisc6/files/patch-rdnssd__merge-hook.in =================================================================== --- head/net/ndisc6/files/patch-rdnssd__merge-hook.in (nonexistent) +++ head/net/ndisc6/files/patch-rdnssd__merge-hook.in (revision 379056) @@ -0,0 +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 @@ + + 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 @@ + # 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: head/net/ndisc6/files/patch-rdnssd__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: head/net/ndisc6/files/patch-rdnssd__rdnssd.c =================================================================== --- head/net/ndisc6/files/patch-rdnssd__rdnssd.c (nonexistent) +++ head/net/ndisc6/files/patch-rdnssd__rdnssd.c (revision 379056) @@ -0,0 +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 @@ + #include + #include + #include ++#include + + #include + #include Property changes on: head/net/ndisc6/files/patch-rdnssd__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: head/net/ndisc6/pkg-plist =================================================================== --- head/net/ndisc6/pkg-plist (revision 379055) +++ head/net/ndisc6/pkg-plist (revision 379056) @@ -1,27 +1,29 @@ 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/fr/LC_MESSAGES/ndisc6.mo +@owner nobody +@dir var/run/rdnssd