[Astlinux-commits] SF.net SVN: astlinux:[7812] branches/1.0/package/wide-dhcpv6

[<abe...@us...>]

Revision: 7812
          http://sourceforge.net/p/astlinux/code/7812
Author:   abelbeck
Date:     2016-08-29 21:02:43 +0000 (Mon, 29 Aug 2016)
Log Message:
-----------
wide-dhcpv6, add Debian patches 0011, 0012 and 0015
Ref: https://github.com/rogers0/packaging_wide-dhcpv6/tree/master/debian/patches

Added Paths:
-----------
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0011-resolv-warnings-so-as-to-make-blhc-and-gcc-both-happ.patch
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0012-fix-a-redefined-YYDEBUG-warning-of-gcc-for-the-code-.patch
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0015-a-bit-info-to-logger-when-get-OPTION_RECONF_ACCEPT.patch

Added: branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0011-resolv-warnings-so-as-to-make-blhc-and-gcc-both-happ.patch
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0011-resolv-warnings-so-as-to-make-blhc-and-gcc-both-happ.patch	                        (rev 0)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0011-resolv-warnings-so-as-to-make-blhc-and-gcc-both-happ.patch	2016-08-29 21:02:43 UTC (rev 7812)
@@ -0,0 +1,107 @@
+From c648bd5c29e3ad4c53c7f584688e4ff5be5e85be Mon Sep 17 00:00:00 2001
+From: Roger Shimizu <rog...@gm...>
+Date: Wed, 9 Sep 2015 21:00:22 +0900
+Subject: [PATCH 2/3] resolv warnings so as to make "blhc" and "gcc" both happy
+
+- blhc complained: lacking of CFLAGS/CPPFLAGS for certain C files in Makefile
+- gcc complained implicit declaration of function 'time'
+- gcc complained ignoring return value of 'read'
+
+Signed-off-by: Roger Shimizu <rog...@gm...>
+---
+ Makefile.in          |  6 +++---
+ addrconf.c           | 11 ++++++++++-
+ missing/arc4random.c |  3 ++-
+ prefixconf.c         | 11 ++++++++++-
+ 4 files changed, 25 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index efc878d..f52d4e1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -86,11 +86,11 @@ getaddrinfo.o:	$(srcdir)/missing/getaddrinfo.c
+ getnameinfo.o:	$(srcdir)/missing/getnameinfo.c
+ 	$(CC) -c $(srcdir)/missing/$*.c
+ strlcat.o:	$(srcdir)/missing/strlcat.c
+-	$(CC) -c $(srcdir)/missing/$*.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/$*.c
+ strlcpy.o:	$(srcdir)/missing/strlcpy.c
+-	$(CC) -c $(srcdir)/missing/$*.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/$*.c
+ arc4random.o:	$(srcdir)/missing/arc4random.c
+-	$(CC) $(CFLAGS) -c $(srcdir)/missing/$*.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/$*.c
+ getifaddrs.o:	$(srcdir)/missing/getifaddrs.c
+ 	$(CC) -c $(srcdir)/missing/$*.c
+ daemon.o:	$(srcdir)/missing/daemon.c
+diff --git a/addrconf.c b/addrconf.c
+index 47f1738..a8c52bc 100644
+--- a/addrconf.c
++++ b/addrconf.c
+@@ -29,11 +29,20 @@
+  * SUCH DAMAGE.
+  */
+ #include <sys/types.h>
+-#include <sys/time.h>
+ #include <sys/socket.h>
+ #include <sys/queue.h>
+ #include <sys/ioctl.h>
+ 
++#if TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# if HAVE_SYS_TIME_H
++#  include <sys/time.h>
++# else
++#  include <time.h>
++# endif
++#endif
+ #include <net/if.h>
+ #ifdef __FreeBSD__
+ #include <net/if_var.h>
+diff --git a/missing/arc4random.c b/missing/arc4random.c
+index 8d1e050..7fe143b 100644
+--- a/missing/arc4random.c
++++ b/missing/arc4random.c
+@@ -59,9 +59,10 @@ u_int32_t
+ arc4random()
+ {
+ 	u_int32_t v;
++	ssize_t n;
+ 
+ 	if (fd < 0)
+ 		arc4random_init();
+-	read(fd, &v, sizeof(v));
++	n = read(fd, &v, sizeof(v));
+ 	return v;
+ }
+diff --git a/prefixconf.c b/prefixconf.c
+index 9450a3f..15b5417 100644
+--- a/prefixconf.c
++++ b/prefixconf.c
+@@ -29,11 +29,20 @@
+  * SUCH DAMAGE.
+  */
+ #include <sys/types.h>
+-#include <sys/time.h>
+ #include <sys/socket.h>
+ #include <sys/queue.h>
+ #include <sys/ioctl.h>
+ 
++#if TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# if HAVE_SYS_TIME_H
++#  include <sys/time.h>
++# else
++#  include <time.h>
++# endif
++#endif
+ #include <net/if.h>
+ #ifdef __FreeBSD__
+ #include <net/if_var.h>
+-- 
+2.5.1
+

Added: branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0012-fix-a-redefined-YYDEBUG-warning-of-gcc-for-the-code-.patch
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0012-fix-a-redefined-YYDEBUG-warning-of-gcc-for-the-code-.patch	                        (rev 0)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0012-fix-a-redefined-YYDEBUG-warning-of-gcc-for-the-code-.patch	2016-08-29 21:02:43 UTC (rev 7812)
@@ -0,0 +1,28 @@
+From ce1792f23386abbb370f4288add23f5f667d6ce1 Mon Sep 17 00:00:00 2001
+From: Roger Shimizu <rog...@gm...>
+Date: Thu, 10 Sep 2015 22:19:10 +0900
+Subject: [PATCH 3/3] fix a redefined "YYDEBUG" warning of gcc for the code
+ generated by bison/flex
+
+Signed-off-by: Roger Shimizu <rog...@gm...>
+---
+ cftoken.l | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/cftoken.l b/cftoken.l
+index f480406..e307357 100644
+--- a/cftoken.l
++++ b/cftoken.l
+@@ -72,6 +72,9 @@ static int yy_first_time = 1;
+ static int yyerrorcount = 0;
+  
+ #ifndef NOCONFIG_DEBUG
++#ifdef YYDEBUG
++#undef YYDEBUG
++#endif
+ #define YYDEBUG 1
+ 
+ int cfdebug = 1;
+-- 
+2.5.1
+

Added: branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0015-a-bit-info-to-logger-when-get-OPTION_RECONF_ACCEPT.patch
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0015-a-bit-info-to-logger-when-get-OPTION_RECONF_ACCEPT.patch	                        (rev 0)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0015-a-bit-info-to-logger-when-get-OPTION_RECONF_ACCEPT.patch	2016-08-29 21:02:43 UTC (rev 7812)
@@ -0,0 +1,57 @@
+From: Roger Shimizu <rog...@gm...>
+Date: Thu, 24 Dec 2015 23:09:06 +0900
+Subject: Add a bit info to logger when get OPTION_RECONF_ACCEPT(20) dhcpv6
+ option
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Closes: #562079
+Reported-by: Bjørn Mork <bj...@mo...>
+Signed-off-by: Roger Shimizu <rog...@gm...>
+---
+ common.c | 10 ++++++++++
+ dhcp6.h  |  2 +-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/common.c b/common.c
+index 10d905f..cbb1c82 100644
+--- a/common.c
++++ b/common.c
+@@ -1723,6 +1723,14 @@ dhcp6_get_options(p, ep, optinfo)
+ 			memcpy(optinfo->ifidopt_id, cp, optlen);
+ 			optinfo->ifidopt_len = optlen;
+ 			break;
++		case DH6OPT_RECONF_ACCEPT:
++			/* Debian Bug: #562079 */
++			if (optlen != 0)
++				goto malformed;
++			debug_printf(LOG_INFO, FNAME,
++			    "received option: \"%s\" (len %d), however reconfigure negotiation is not supported yet",
++			    dhcp6optstr(opt), optlen);
++			break;
+ 		case DH6OPT_SIP_SERVER_D:
+ 			if (dhcp6_get_domain(optlen, cp, opt,
+ 			    &optinfo->sipname_list) == -1)
+@@ -3024,6 +3032,8 @@ dhcp6optstr(type)
+ 		return ("interface ID");
+ 	case DH6OPT_RECONF_MSG:
+ 		return ("reconfigure message");
++	case DH6OPT_RECONF_ACCEPT:
++		return ("reconfigure accept");
+ 	case DH6OPT_SIP_SERVER_D:
+ 		return ("SIP domain name");
+ 	case DH6OPT_SIP_SERVER_A:
+diff --git a/dhcp6.h b/dhcp6.h
+index 9f3a62d..985decb 100644
+--- a/dhcp6.h
++++ b/dhcp6.h
+@@ -296,7 +296,7 @@ struct dhcp6_relay {
+ #define DH6OPT_VENDOR_OPTS 17
+ #define DH6OPT_INTERFACE_ID 18
+ #define DH6OPT_RECONF_MSG 19
+-
++#define DH6OPT_RECONF_ACCEPT 20
+ #define DH6OPT_SIP_SERVER_D 21
+ #define DH6OPT_SIP_SERVER_A 22
+ #define DH6OPT_DNS 23

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.