Attachment 201057 Details for Bug 233187 – ndisc6.diff

[patch] ndisc6.diff

ndisc6.diff (text/plain), 9.92 KB, created by Tobias Kortkamp on 2019-01-12 13:36:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2019-01-12 13:36:42 UTC

Size: 9.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 490017)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ndisc6
>-PORTVERSION=	1.0.3
>-PORTREVISION=	1
>+PORTVERSION=	1.0.4
> CATEGORIES=	net ipv6
> MASTER_SITES=	http://www.remlab.net/files/ndisc6/ \
> 		http://people.via.ecp.fr/~rem/www.remlab.net/files/ndisc6/
>@@ -14,7 +13,6 @@
> LICENSE=	GPLv2
> 
> USES=		tar:bzip2 perl5
>-USE_GCC=	any
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-suid-install --localstatedir="${PREFIX}/var"
>Index: distinfo
>===================================================================
>--- distinfo	(revision 490017)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1542928199
>-SHA256 (ndisc6-1.0.3.tar.bz2) = 0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821
>-SIZE (ndisc6-1.0.3.tar.bz2) = 260294
>+TIMESTAMP = 1547299650
>+SHA256 (ndisc6-1.0.4.tar.bz2) = abb1da4a98d94e5abe1dd7b1c975de540306b0581cbbd36aff035118b2f25c1f
>+SIZE (ndisc6-1.0.4.tar.bz2) = 264071
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 490017)
>+++ files/patch-configure	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.orig	2014-12-14 10:09:45 UTC
>+--- configure.orig	2019-01-06 14:36:38 UTC
> +++ configure
>-@@ -5713,7 +5713,7 @@ fi
>+@@ -5900,7 +5900,7 @@ fi
>                  if test "X$additional_includedir" = "X/usr/local/include"; then
>                    if test -n "$GCC"; then
>                      case $host_os in
>@@ -9,7 +9,7 @@
>                      esac
>                    fi
>                  fi
>-@@ -5759,7 +5759,7 @@ 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
>@@ -18,7 +18,7 @@
>                            esac
>                          fi
>                        fi
>-@@ -6597,7 +6597,7 @@ 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
>@@ -27,7 +27,7 @@
>                      esac
>                    fi
>                  fi
>-@@ -6643,7 +6643,7 @@ 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
>Index: files/patch-rdnss_merge-hook.in
>===================================================================
>--- files/patch-rdnss_merge-hook.in	(nonexistent)
>+++ files/patch-rdnss_merge-hook.in	(working copy)
>@@ -0,0 +1,28 @@
>+--- 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
>+ 
>
>Property changes on: files/patch-rdnss_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: files/patch-rdnss_rdnssd.c
>===================================================================
>--- files/patch-rdnss_rdnssd.c	(nonexistent)
>+++ files/patch-rdnss_rdnssd.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- rdnss/rdnssd.c.orig	2014-12-14 10:39:28 UTC
>++++ rdnss/rdnssd.c
>+@@ -28,6 +28,7 @@
>+ #include <stdbool.h>
>+ #include <locale.h>
>+ #include <signal.h>
>++#include <stdint.h>
>+ 
>+ #include <sys/types.h>
>+ #include <sys/stat.h>
>
>Property changes on: files/patch-rdnss_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: files/patch-rdnss_rdnssd.h
>===================================================================
>--- files/patch-rdnss_rdnssd.h	(nonexistent)
>+++ files/patch-rdnss_rdnssd.h	(working copy)
>@@ -0,0 +1,27 @@
>+--- 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
>
>Property changes on: files/patch-rdnss_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: files/patch-rdnssd__merge-hook.in
>===================================================================
>--- files/patch-rdnssd__merge-hook.in	(revision 490017)
>+++ files/patch-rdnssd__merge-hook.in	(nonexistent)
>@@ -1,28 +0,0 @@
>---- 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
>- 
>
>Property changes on: 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: files/patch-rdnssd__rdnssd.c
>===================================================================
>--- files/patch-rdnssd__rdnssd.c	(revision 490017)
>+++ files/patch-rdnssd__rdnssd.c	(nonexistent)
>@@ -1,10 +0,0 @@
>---- 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>
>-+#include <stdint.h>
>- 
>- #include <sys/types.h>
>- #include <sys/stat.h>
>
>Property changes on: 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: files/patch-rdnssd__rdnssd.h
>===================================================================
>--- files/patch-rdnssd__rdnssd.h	(revision 490017)
>+++ files/patch-rdnssd__rdnssd.h	(nonexistent)
>@@ -1,27 +0,0 @@
>---- 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
>
>Property changes on: files/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: files/patch-src-ndisc.c
>===================================================================
>--- files/patch-src-ndisc.c	(revision 490017)
>+++ files/patch-src-ndisc.c	(working copy)
>@@ -1,6 +1,6 @@
>---- src/ndisc.c.orig	2014-12-14 10:39:28 UTC
>+--- src/ndisc.c.orig	2016-12-07 16:43:04 UTC
> +++ src/ndisc.c
>-@@ -532,7 +532,7 @@ parseadv (const uint8_t *buf, size_t len
>+@@ -532,7 +532,7 @@ parseadv (const uint8_t *buf, size_t len, const struct
>  		printf (_("Stateful other conf.      :          %3s\n"),
>  		        gettext ((v & ND_RA_FLAG_OTHER) ? N_ ("Yes") : N_("No")));
>  		printf (_("Mobile home agent         :          %3s\n"),

Actions: View | Diff

Attachments on bug 233187: 199194 | 199400 | 199401 | 201057 | 201058