Attachment #201058 for bug #233187

Lines 2-9 Link Here

(-)Makefile (-3 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ndisc6	4	PORTNAME= ndisc6
5	PORTVERSION= 1.0.3	5	PORTVERSION= 1.0.4
6	PORTREVISION= 1
7	CATEGORIES= net ipv6	6	CATEGORIES= net ipv6
8	MASTER_SITES= http://www.remlab.net/files/ndisc6/ \	7	MASTER_SITES= http://www.remlab.net/files/ndisc6/ \
9	http://people.via.ecp.fr/~rem/www.remlab.net/files/ndisc6/	8	http://people.via.ecp.fr/~rem/www.remlab.net/files/ndisc6/
Lines 14-20 Link Here
14	LICENSE= GPLv2	13	LICENSE= GPLv2
15		14
16	USES= tar:bzip2 perl5	15	USES= tar:bzip2 perl5
17	USE_GCC= any
18		16
19	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
20	CONFIGURE_ARGS= --disable-suid-install --localstatedir="${PREFIX}/var"	18	CONFIGURE_ARGS= --disable-suid-install --localstatedir="${PREFIX}/var"

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1542928199	1	TIMESTAMP = 1547299650
2	SHA256 (ndisc6-1.0.3.tar.bz2) = 0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821	2	SHA256 (ndisc6-1.0.4.tar.bz2) = abb1da4a98d94e5abe1dd7b1c975de540306b0581cbbd36aff035118b2f25c1f
3	SIZE (ndisc6-1.0.3.tar.bz2) = 260294	3	SIZE (ndisc6-1.0.4.tar.bz2) = 264071




--- configure.orig	2019-01-06 14:36:38 UTC
+++ configure
@@ -5900,7 +5900,7 @@ fi
                 if test "X$additional_includedir" = "X/usr/local/include"; then
                   if test -n "$GCC"; then
                     case $host_os in

                     esac
                   fi
                 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

                           esac
                         fi
                       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

                     esac
                   fi
                 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




--- 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 <resolv.h>
@@ -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
 

Line 0 Link Here

(-)files/patch-rdnss_rdnssd.c (+10 lines)
	1	--- rdnss/rdnssd.c.orig 2014-12-14 10:39:28 UTC
	2	+++ rdnss/rdnssd.c
	3	@@ -28,6 +28,7 @@
	4	#include <stdbool.h>
	5	#include <locale.h>
	6	#include <signal.h>
	7	+#include <stdint.h>
	8
	9	#include <sys/types.h>
	10	#include <sys/stat.h>




--- 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




--- 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 <resolv.h>
@@ -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
 

Lines 1-10 Link Here

(-)files/patch-rdnssd__rdnssd.c (-10 lines)
1	--- rdnssd/rdnssd.c.orig 2014-12-14 10:39:28 UTC
2	+++ rdnssd/rdnssd.c
3	@@ -28,6 +28,7 @@
4	#include <stdbool.h>
5	#include <locale.h>
6	#include <signal.h>
7	+#include <stdint.h>
8
9	#include <sys/types.h>
10	#include <sys/stat.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_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

Lines 1-6 Link Here

(-)files/patch-src-ndisc.c (-2 / +2 lines)
1	--- src/ndisc.c.orig 2014-12-14 10:39:28 UTC	1	--- src/ndisc.c.orig 2016-12-07 16:43:04 UTC
2	+++ src/ndisc.c	2	+++ src/ndisc.c
3	@@ -532,7 +532,7 @@ parseadv (const uint8_t *buf, size_t len	3	@@ -532,7 +532,7 @@ parseadv (const uint8_t *buf, size_t len, const struct
4	printf (_("Stateful other conf. : %3s\n"),	4	printf (_("Stateful other conf. : %3s\n"),
5	gettext ((v & ND_RA_FLAG_OTHER) ? N_ ("Yes") : N_("No")));	5	gettext ((v & ND_RA_FLAG_OTHER) ? N_ ("Yes") : N_("No")));
6	printf (_("Mobile home agent : %3s\n"),	6	printf (_("Mobile home agent : %3s\n"),

Lines 26-30 Link Here

(-)pkg-plist (+1 lines)
26	%%NLS%%share/locale/en/LC_MESSAGES/ndisc6.mo	26	%%NLS%%share/locale/en/LC_MESSAGES/ndisc6.mo
27	%%NLS%%share/locale/en_GB/LC_MESSAGES/ndisc6.mo	27	%%NLS%%share/locale/en_GB/LC_MESSAGES/ndisc6.mo
28	%%NLS%%share/locale/fr/LC_MESSAGES/ndisc6.mo	28	%%NLS%%share/locale/fr/LC_MESSAGES/ndisc6.mo
		29	%%NLS%%share/locale/sv/LC_MESSAGES/ndisc6.mo
29	@owner nobody	30	@owner nobody
30	@dir var/run/rdnssd	31	@dir var/run/rdnssd

Return to bug 233187

Lines 1-6 Link Here

(-)files/patch-configure (-5 / +5 lines)
1	--- configure.orig 2014-12-14 10:09:45 UTC	1	--- configure.orig 2019-01-06 14:36:38 UTC
2	+++ configure	2	+++ configure
3	@@ -5713,7 +5713,7 @@ fi	3	@@ -5900,7 +5900,7 @@ fi
4	if test "X$additional_includedir" = "X/usr/local/include"; then	4	if test "X$additional_includedir" = "X/usr/local/include"; then
5	if test -n "$GCC"; then	5	if test -n "$GCC"; then
6	case $host_os in	6	case $host_os in
Lines 9-15 Link Here
9	esac	9	esac
10	fi	10	fi
11	fi	11	fi
12	@@ -5759,7 +5759,7 @@ fi	12	@@ -5946,7 +5946,7 @@ fi
13	\|\| test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then	13	\|\| test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
14	if test -n "$GCC"; then	14	if test -n "$GCC"; then
15	case $host_os in	15	case $host_os in
Lines 18-24 Link Here
18	esac	18	esac
19	fi	19	fi
20	fi	20	fi
21	@@ -6597,7 +6597,7 @@ fi	21	@@ -6784,7 +6784,7 @@ fi
22	if test "X$additional_includedir" = "X/usr/local/include"; then	22	if test "X$additional_includedir" = "X/usr/local/include"; then
23	if test -n "$GCC"; then	23	if test -n "$GCC"; then
24	case $host_os in	24	case $host_os in
Lines 27-33 Link Here
27	esac	27	esac
28	fi	28	fi
29	fi	29	fi
30	@@ -6643,7 +6643,7 @@ fi	30	@@ -6830,7 +6830,7 @@ fi
31	\|\| test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then	31	\|\| test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
32	if test -n "$GCC"; then	32	if test -n "$GCC"; then
33	case $host_os in	33	case $host_os in

Line 0 Link Here

(-)files/patch-rdnss_merge-hook.in (+28 lines)
	1	--- rdnss/merge-hook.in.orig 2014-12-14 10:13:57 UTC
	2	+++ rdnss/merge-hook.in
	3	@@ -19,7 +19,7 @@
	4
	5	set -e
	6
	7	-PATH=/sbin:/bin
	8	+PATH=/sbin:/bin:/usr/bin
	9
	10	# Max number of nameserver options taken into account. Should be as
	11	# defined in <resolv.h>
	12	@@ -31,14 +31,14 @@ MAXNS=3
	13	# will limit the IPv6 entries it adds to $RDNSS_LIMIT only.
	14	RDNSS_LIMIT=$(($MAXNS - 1))
	15
	16	-sysconfdir='@SYSCONFDIR@'
	17	+sysconfdir='/etc'
	18	localstatedir='@LOCALSTATEDIR@'
	19	resolvconf="$sysconfdir/resolv.conf"
	20	myresolvconf="$localstatedir/run/rdnssd/resolv.conf"
	21
	22	# These should be POSIX-compliant BREs
	23	RE_NSV4='^nameserver \([0-9]\{1,3\}\.\)\{3,3\}[0-9]\{1,3\} $'
	24	-RE_NSV4OR6='^nameserver [a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{,1\} $'
	25	+RE_NSV4OR6='^nameserver [a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{0,1\} $'
	26
	27	# Count how many IPv6 nameservers we can fit
	28

Line 0 Link Here

(-)files/patch-rdnss_rdnssd.h (+27 lines)
	1	--- rdnss/rdnssd.h.orig 2016-12-07 18:11:55 UTC
	2	+++ rdnss/rdnssd.h
	3	@@ -32,24 +32,6 @@ extern const rdnss_src_t rdnss_netlink, rdnss_icmp;
	4	#define ND_OPT_RDNSS 25
	5	#define ND_OPT_DNSSL 31
	6
	7	-struct nd_opt_rdnss
	8	-{
	9	- uint8_t nd_opt_rdnss_type;
	10	- uint8_t nd_opt_rdnss_len;
	11	- uint16_t nd_opt_rdnss_reserved;
	12	- uint32_t nd_opt_rdnss_lifetime;
	13	- /* followed by one or more IPv6 addresses */
	14	-};
	15	-
	16	-struct nd_opt_dnssl
	17	-{
	18	- uint8_t nd_opt_dnssl_type;
	19	- uint8_t nd_opt_dnssl_len;
	20	- uint16_t nd_opt_dnssl_reserved;
	21	- uint32_t nd_opt_dnssl_lifetime;
	22	- /* followed by one or more domain names */
	23	-};
	24	-
	25	# ifdef __cplusplus
	26	extern "C" {
	27	# endif

Lines 1-28 Link Here

(-)files/patch-rdnssd__merge-hook.in (-28 lines)
1	--- rdnssd/merge-hook.in.orig 2014-12-14 10:13:57 UTC
2	+++ rdnssd/merge-hook.in
3	@@ -19,7 +19,7 @@
4
5	set -e
6
7	-PATH=/sbin:/bin
8	+PATH=/sbin:/bin:/usr/bin
9
10	# Max number of nameserver options taken into account. Should be as
11	# defined in <resolv.h>
12	@@ -31,14 +31,14 @@ MAXNS=3
13	# will limit the IPv6 entries it adds to $RDNSS_LIMIT only.
14	RDNSS_LIMIT=$(($MAXNS - 1))
15
16	-sysconfdir='@SYSCONFDIR@'
17	+sysconfdir='/etc'
18	localstatedir='@LOCALSTATEDIR@'
19	resolvconf="$sysconfdir/resolv.conf"
20	myresolvconf="$localstatedir/run/rdnssd/resolv.conf"
21
22	# These should be POSIX-compliant BREs
23	RE_NSV4='^nameserver \([0-9]\{1,3\}\.\)\{3,3\}[0-9]\{1,3\} $'
24	-RE_NSV4OR6='^nameserver [a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{,1\} $'
25	+RE_NSV4OR6='^nameserver [a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{0,1\} $'
26
27	# Count how many IPv6 nameservers we can fit
28

Lines 1-27 Link Here

(-)files/patch-rdnssd__rdnssd.h (-27 lines)
1	--- rdnssd/rdnssd.h.orig 2011-10-17 15:35:11 UTC
2	+++ rdnssd/rdnssd.h
3	@@ -32,24 +32,6 @@ extern const rdnss_src_t rdnss_netlink,
4	#define ND_OPT_RDNSS 25
5	#define ND_OPT_DNSSL 31
6
7	-struct nd_opt_rdnss
8	-{
9	- uint8_t nd_opt_rdnss_type;
10	- uint8_t nd_opt_rdnss_len;
11	- uint16_t nd_opt_rdnss_reserved;
12	- uint32_t nd_opt_rdnss_lifetime;
13	- /* followed by one or more IPv6 addresses */
14	-};
15	-
16	-struct nd_opt_dnssl
17	-{
18	- uint8_t nd_opt_dnssl_type;
19	- uint8_t nd_opt_dnssl_len;
20	- uint16_t nd_opt_dnssl_reserved;
21	- uint32_t nd_opt_dnssl_lifetime;
22	- /* followed by one or more domain names */
23	-};
24	-
25	# ifdef __cplusplus
26	extern "C" {
27	# endif