Date: Mon, 16 Feb 2015 00:39:43 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379056 - in head/net/ndisc6: . files Message-ID: <201502160039.t1G0dh2W056710@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Mon Feb 16 00:39:42 2015 New Revision: 379056 URL: https://svnweb.freebsd.org/changeset/ports/379056 QAT: https://qat.redports.org/buildarchive/r379056/ Log: Fix build and stage brokenness. Comply to patch naming conventions. Added: head/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h - copied unchanged from r378755, head/net/ndisc6/files/extra-patch-rdnssd-rdnssd.h head/net/ndisc6/files/patch-patch-src__tcpspray.c (contents, props changed) head/net/ndisc6/files/patch-rdnssd__merge-hook.in - copied unchanged from r378755, head/net/ndisc6/files/patch-rdnssd-merge-hook.in head/net/ndisc6/files/patch-rdnssd__rdnssd.c - copied unchanged from r378755, head/net/ndisc6/files/patch-rdnssd-rdnssd.c Deleted: head/net/ndisc6/files/extra-patch-rdnssd-rdnssd.h head/net/ndisc6/files/patch-rdnssd-merge-hook.in head/net/ndisc6/files/patch-rdnssd-rdnssd.c Modified: head/net/ndisc6/Makefile head/net/ndisc6/pkg-plist Modified: head/net/ndisc6/Makefile ============================================================================== --- head/net/ndisc6/Makefile Sun Feb 15 22:30:45 2015 (r379055) +++ head/net/ndisc6/Makefile Mon Feb 16 00:39:42 2015 (r379056) @@ -13,10 +13,12 @@ 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 @@ -26,7 +28,7 @@ OPTIONS_DEFINE= DOCS NLS .include <bsd.port.options.mk> .if ${OSVERSION} >= 803000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rdnssd-rdnssd.h +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rdnssd__rdnssd.h .endif .if ${PORT_OPTIONS:MNLS} Copied: head/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h (from r378755, head/net/ndisc6/files/extra-patch-rdnssd-rdnssd.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h Mon Feb 16 00:39:42 2015 (r379056, copy of r378755, head/net/ndisc6/files/extra-patch-rdnssd-rdnssd.h) @@ -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 <netinet/icmp6.h> */ + #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 Added: head/net/ndisc6/files/patch-patch-src__tcpspray.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ndisc6/files/patch-patch-src__tcpspray.c Mon Feb 16 00:39:42 2015 (r379056) @@ -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 <stdlib.h> ++#include <signal.h> + + #include <sys/types.h> + #include <unistd.h> Copied: head/net/ndisc6/files/patch-rdnssd__merge-hook.in (from r378755, head/net/ndisc6/files/patch-rdnssd-merge-hook.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ndisc6/files/patch-rdnssd__merge-hook.in Mon Feb 16 00:39:42 2015 (r379056, copy of r378755, head/net/ndisc6/files/patch-rdnssd-merge-hook.in) @@ -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 <resolv.h> +@@ -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 + Copied: head/net/ndisc6/files/patch-rdnssd__rdnssd.c (from r378755, head/net/ndisc6/files/patch-rdnssd-rdnssd.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ndisc6/files/patch-rdnssd__rdnssd.c Mon Feb 16 00:39:42 2015 (r379056, copy of r378755, head/net/ndisc6/files/patch-rdnssd-rdnssd.c) @@ -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 <stdbool.h> + #include <locale.h> + #include <signal.h> ++#include <stdint.h> + + #include <sys/types.h> + #include <sys/stat.h> Modified: head/net/ndisc6/pkg-plist ============================================================================== --- head/net/ndisc6/pkg-plist Sun Feb 15 22:30:45 2015 (r379055) +++ head/net/ndisc6/pkg-plist Mon Feb 16 00:39:42 2015 (r379056) @@ -25,3 +25,5 @@ sbin/tracert6 %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502160039.t1G0dh2W056710>