Merge from bittboy/buildroot@26c91a9

package/ndisc6/0001-Fix-musl-build.patch

@@ -0,0 +1,34 @@
+From 12787f5936c79b56b24ffe0a92f4370804070223 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Thu, 7 Nov 2019 21:41:34 +0100
+Subject: [PATCH] Fix musl build
+
+Fixes
+src/trace-tcp.c:67:24: error: 'TH_SYN' undeclared (first use in this function); did you mean 'TH_CWR'?
+  packet->th.th_flags = TH_SYN | (ecn ? (TH_ECE | TH_CWR) : 0);
+
+Musl guards TH_SYN with if defined(_GNU_SOURCE):
+https://git.musl-libc.org/cgit/musl/tree/include/netinet/tcp.h#n82
+
+Patch sent via email to upstream.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/trace-tcp.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/trace-tcp.c b/src/trace-tcp.c
+index 5aba9d4..1b367ae 100644
+--- a/src/trace-tcp.c
++++ b/src/trace-tcp.c
+@@ -21,7 +21,6 @@
+ # include <config.h>
+ #endif
+ 
+-#undef _GNU_SOURCE
+ #define _DEFAULT_SOURCE 1
+ 
+ #include <string.h>
+-- 
+2.20.1
+

package/ndisc6/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_NDISC6
 	bool "ndisc6 tools"
 	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # c11
 	help
 	  NDisc6 is a small collection of useful tools for IPv6
 	  networking
@@ -45,3 +46,7 @@ config BR2_PACKAGE_NDISC6_TCPSPRAY
 	  TCP/IP bandwidth measurement tool (Discard and Echo client).
 
 endif
+
+comment "ndisc6 needs a toolchain w/ gcc >= 4.7"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7

package/ndisc6/ndisc6.hash

@@ -1,2 +1,4 @@
 # Locally calculated after checking pgp signature
-sha256 0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821  ndisc6-1.0.3.tar.bz2
+sha256 abb1da4a98d94e5abe1dd7b1c975de540306b0581cbbd36aff035118b2f25c1f  ndisc6-1.0.4.tar.bz2
+# Locally computed
+sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING

package/ndisc6/ndisc6.mk

@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-NDISC6_VERSION = 1.0.3
+NDISC6_VERSION = 1.0.4
 NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2
 NDISC6_SITE = http://www.remlab.net/files/ndisc6
-NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99" LIBS=$(TARGET_NLS_LIBS)
+NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=c11" LIBS=$(TARGET_NLS_LIBS)
 NDISC6_CONF_OPTS = --disable-rpath --disable-suid-install
 NDISC6_LICENSE = GPL-2.0 or GPL-3.0
 NDISC6_LICENSE_FILES = COPYING