iproute2: bump to version 3.18.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/iproute2/0001-optional-ipv6.patch b/package/iproute2/0001-optional-ipv6.patch
new file mode 100644 (file)
index 0000000..c51f695
--- /dev/null
+++ b/package/iproute2/0001-optional-ipv6.patch
@@ -0,0 +1,89 @@
+[PATCH] fix build on uClibc without IPv6 support
+
+Disable IPv6 support code when building with uClibc configured without IPv6
+support.
+
+[Gustavo: update for iproute2 3.10.0]
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura iproute2-3.10.0.orig/ip/ip6tunnel.c iproute2-3.10.0/ip/ip6tunnel.c
+--- iproute2-3.10.0.orig/ip/ip6tunnel.c        2013-08-14 09:17:56.538089916 -0300
++++ iproute2-3.10.0/ip/ip6tunnel.c     2013-08-14 09:18:02.952298534 -0300
+@@ -20,6 +20,10 @@
+  *    Masahide NAKAMURA @USAGI
+  */
+
++#include <features.h>
++#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
++#else
++
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -425,3 +429,5 @@
+       fprintf(stderr, "Command \"%s\" is unknown, try \"ip -f inet6 tunnel help\".\n", *argv);
+       exit(-1);
+ }
++
++#endif /* no ipv6 */
+diff -Nura iproute2-3.10.0.orig/ip/ipprefix.c iproute2-3.10.0/ip/ipprefix.c
+--- iproute2-3.10.0.orig/ip/ipprefix.c 2013-08-14 09:17:56.539089949 -0300
++++ iproute2-3.10.0/ip/ipprefix.c      2013-08-14 09:19:29.065099291 -0300
+@@ -23,11 +23,18 @@
+  *    Masahide NAKAMURA @USAGI
+  */
+
++#include <features.h>
++#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
++#define NO_IPV6
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/socket.h>
++#ifndef NO_IPV6
+ #include <netinet/icmp6.h>
++#endif
+
+ #include "utils.h"
+ #include "ip_common.h"
+@@ -65,10 +72,12 @@
+               fprintf(stderr, "incorrect protocol family: %d\n", prefix->prefix_family);
+               return 0;
+       }
++#ifdef ND_OPT_PREFIX_INFORMATION
+       if (prefix->prefix_type != ND_OPT_PREFIX_INFORMATION) {
+               fprintf(stderr, "wrong ND type %d\n", prefix->prefix_type);
+               return 0;
+       }
++#endif
+
+       parse_rtattr(tb, RTA_MAX, RTM_RTA(prefix), len);
+
+diff -Nura iproute2-3.10.0.orig/ip/iptunnel.c iproute2-3.10.0/ip/iptunnel.c
+--- iproute2-3.10.0.orig/ip/iptunnel.c 2013-08-14 09:17:56.538089916 -0300
++++ iproute2-3.10.0/ip/iptunnel.c      2013-08-14 09:18:02.953298566 -0300
+@@ -9,6 +9,10 @@
+  * Authors:   Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+  *
+  */
++#include <features.h>
++#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
++#define NO_IPV6
++#endif
+
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -634,8 +638,10 @@
+        * protocol-independent because of unarranged structure between
+        * IPv4 and IPv6.
+        */
++#ifndef NO_IPV6
+       case AF_INET6:
+               return do_ip6tunnel(argc, argv);
++#endif
+       default:
+               fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
+               exit(-1);

diff --git a/package/iproute2/0002-vxlan-optional-ipv6.patch b/package/iproute2/0002-vxlan-optional-ipv6.patch
new file mode 100644 (file)
index 0000000..80ea97c
--- /dev/null
+++ b/package/iproute2/0002-vxlan-optional-ipv6.patch
@@ -0,0 +1,83 @@
+Disable IPv6 support code in vxlan when building with uClibc configured without
+IPv6 support.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura iproute2-3.14.0/ip/iplink_vxlan.c iproute2-3.14.0-noipv6/ip/iplink_vxlan.c
+--- iproute2-3.14.0/ip/iplink_vxlan.c  2014-04-11 21:48:41.000000000 -0300
++++ iproute2-3.14.0-noipv6/ip/iplink_vxlan.c   2014-04-14 08:36:22.638235721 -0300
+@@ -9,6 +9,11 @@
+  * Authors:     Stephen Hemminger <shemminger@vyatta.com
+  */
+ 
++#include <features.h>
++#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
++#define NO_IPV6
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -188,12 +193,14 @@
+               return -1;
+       }
+ 
++#ifndef NO_IPV6
+       if ((gaddr && daddr) ||
+               (memcmp(&gaddr6, &in6addr_any, sizeof(gaddr6)) &&
+                memcmp(&daddr6, &in6addr_any, sizeof(daddr6)))) {
+               fprintf(stderr, "vxlan: both group and remote cannot be specified\n");
+               return -1;
+       }
++#endif
+ 
+       if (!dst_port_set) {
+               fprintf(stderr, "vxlan: destination port not specified\n"
+@@ -208,15 +215,19 @@
+               addattr_l(n, 1024, IFLA_VXLAN_GROUP, &gaddr, 4);
+       else if (daddr)
+               addattr_l(n, 1024, IFLA_VXLAN_GROUP, &daddr, 4);
++#ifndef NO_IPV6
+       if (memcmp(&gaddr6, &in6addr_any, sizeof(gaddr6)) != 0)
+               addattr_l(n, 1024, IFLA_VXLAN_GROUP6, &gaddr6, sizeof(struct in6_addr));
+       else if (memcmp(&daddr6, &in6addr_any, sizeof(daddr6)) != 0)
+               addattr_l(n, 1024, IFLA_VXLAN_GROUP6, &daddr6, sizeof(struct in6_addr));
++#endif
+ 
+       if (saddr)
+               addattr_l(n, 1024, IFLA_VXLAN_LOCAL, &saddr, 4);
++#ifndef NO_IPV6
+       else if (memcmp(&saddr6, &in6addr_any, sizeof(saddr6)) != 0)
+               addattr_l(n, 1024, IFLA_VXLAN_LOCAL6, &saddr6, sizeof(struct in6_addr));
++#endif
+ 
+       if (link)
+               addattr32(n, 1024, IFLA_VXLAN_LINK, link);
+@@ -275,6 +286,7 @@
+       } else if (tb[IFLA_VXLAN_GROUP6]) {
+               struct in6_addr addr;
+               memcpy(&addr, RTA_DATA(tb[IFLA_VXLAN_GROUP6]), sizeof(struct in6_addr));
++#ifndef NO_IPV6
+               if (memcmp(&addr, &in6addr_any, sizeof(addr)) != 0) {
+                       if (IN6_IS_ADDR_MULTICAST(&addr))
+                               fprintf(f, "group %s ",
+@@ -283,6 +295,7 @@
+                               fprintf(f, "remote %s ",
+                                       format_host(AF_INET6, sizeof(struct in6_addr), &addr, s1, sizeof(s1)));
+               }
++#endif
+       }
+ 
+       if (tb[IFLA_VXLAN_LOCAL]) {
+@@ -293,9 +306,11 @@
+       } else if (tb[IFLA_VXLAN_LOCAL6]) {
+               struct in6_addr addr;
+               memcpy(&addr, RTA_DATA(tb[IFLA_VXLAN_LOCAL6]), sizeof(struct in6_addr));
++#ifndef NO_IPV6
+               if (memcmp(&addr, &in6addr_any, sizeof(addr)) != 0)
+                       fprintf(f, "local %s ",
+                               format_host(AF_INET6, sizeof(struct in6_addr), &addr, s1, sizeof(s1)));
++#endif
+       }
+ 
+       if (tb[IFLA_VXLAN_LINK] &&

diff --git a/package/iproute2/iproute2-01-optional-ipv6.patch b/package/iproute2/iproute2-01-optional-ipv6.patch
deleted file mode 100644 (file)
index c51f695..0000000
--- a/package/iproute2/iproute2-01-optional-ipv6.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-[PATCH] fix build on uClibc without IPv6 support
-
-Disable IPv6 support code when building with uClibc configured without IPv6
-support.
-
-[Gustavo: update for iproute2 3.10.0]
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura iproute2-3.10.0.orig/ip/ip6tunnel.c iproute2-3.10.0/ip/ip6tunnel.c
---- iproute2-3.10.0.orig/ip/ip6tunnel.c        2013-08-14 09:17:56.538089916 -0300
-+++ iproute2-3.10.0/ip/ip6tunnel.c     2013-08-14 09:18:02.952298534 -0300
-@@ -20,6 +20,10 @@
-  *    Masahide NAKAMURA @USAGI
-  */
-
-+#include <features.h>
-+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
-+#else
-+
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-@@ -425,3 +429,5 @@
-       fprintf(stderr, "Command \"%s\" is unknown, try \"ip -f inet6 tunnel help\".\n", *argv);
-       exit(-1);
- }
-+
-+#endif /* no ipv6 */
-diff -Nura iproute2-3.10.0.orig/ip/ipprefix.c iproute2-3.10.0/ip/ipprefix.c
---- iproute2-3.10.0.orig/ip/ipprefix.c 2013-08-14 09:17:56.539089949 -0300
-+++ iproute2-3.10.0/ip/ipprefix.c      2013-08-14 09:19:29.065099291 -0300
-@@ -23,11 +23,18 @@
-  *    Masahide NAKAMURA @USAGI
-  */
-
-+#include <features.h>
-+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
-+#define NO_IPV6
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/socket.h>
-+#ifndef NO_IPV6
- #include <netinet/icmp6.h>
-+#endif
-
- #include "utils.h"
- #include "ip_common.h"
-@@ -65,10 +72,12 @@
-               fprintf(stderr, "incorrect protocol family: %d\n", prefix->prefix_family);
-               return 0;
-       }
-+#ifdef ND_OPT_PREFIX_INFORMATION
-       if (prefix->prefix_type != ND_OPT_PREFIX_INFORMATION) {
-               fprintf(stderr, "wrong ND type %d\n", prefix->prefix_type);
-               return 0;
-       }
-+#endif
-
-       parse_rtattr(tb, RTA_MAX, RTM_RTA(prefix), len);
-
-diff -Nura iproute2-3.10.0.orig/ip/iptunnel.c iproute2-3.10.0/ip/iptunnel.c
---- iproute2-3.10.0.orig/ip/iptunnel.c 2013-08-14 09:17:56.538089916 -0300
-+++ iproute2-3.10.0/ip/iptunnel.c      2013-08-14 09:18:02.953298566 -0300
-@@ -9,6 +9,10 @@
-  * Authors:   Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-  *
-  */
-+#include <features.h>
-+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
-+#define NO_IPV6
-+#endif
-
- #include <stdio.h>
- #include <stdlib.h>
-@@ -634,8 +638,10 @@
-        * protocol-independent because of unarranged structure between
-        * IPv4 and IPv6.
-        */
-+#ifndef NO_IPV6
-       case AF_INET6:
-               return do_ip6tunnel(argc, argv);
-+#endif
-       default:
-               fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
-               exit(-1);

diff --git a/package/iproute2/iproute2-02-vxlan-optional-ipv6.patch b/package/iproute2/iproute2-02-vxlan-optional-ipv6.patch
deleted file mode 100644 (file)
index 80ea97c..0000000
--- a/package/iproute2/iproute2-02-vxlan-optional-ipv6.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Disable IPv6 support code in vxlan when building with uClibc configured without
-IPv6 support.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura iproute2-3.14.0/ip/iplink_vxlan.c iproute2-3.14.0-noipv6/ip/iplink_vxlan.c
---- iproute2-3.14.0/ip/iplink_vxlan.c  2014-04-11 21:48:41.000000000 -0300
-+++ iproute2-3.14.0-noipv6/ip/iplink_vxlan.c   2014-04-14 08:36:22.638235721 -0300
-@@ -9,6 +9,11 @@
-  * Authors:     Stephen Hemminger <shemminger@vyatta.com
-  */
- 
-+#include <features.h>
-+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
-+#define NO_IPV6
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -188,12 +193,14 @@
-               return -1;
-       }
- 
-+#ifndef NO_IPV6
-       if ((gaddr && daddr) ||
-               (memcmp(&gaddr6, &in6addr_any, sizeof(gaddr6)) &&
-                memcmp(&daddr6, &in6addr_any, sizeof(daddr6)))) {
-               fprintf(stderr, "vxlan: both group and remote cannot be specified\n");
-               return -1;
-       }
-+#endif
- 
-       if (!dst_port_set) {
-               fprintf(stderr, "vxlan: destination port not specified\n"
-@@ -208,15 +215,19 @@
-               addattr_l(n, 1024, IFLA_VXLAN_GROUP, &gaddr, 4);
-       else if (daddr)
-               addattr_l(n, 1024, IFLA_VXLAN_GROUP, &daddr, 4);
-+#ifndef NO_IPV6
-       if (memcmp(&gaddr6, &in6addr_any, sizeof(gaddr6)) != 0)
-               addattr_l(n, 1024, IFLA_VXLAN_GROUP6, &gaddr6, sizeof(struct in6_addr));
-       else if (memcmp(&daddr6, &in6addr_any, sizeof(daddr6)) != 0)
-               addattr_l(n, 1024, IFLA_VXLAN_GROUP6, &daddr6, sizeof(struct in6_addr));
-+#endif
- 
-       if (saddr)
-               addattr_l(n, 1024, IFLA_VXLAN_LOCAL, &saddr, 4);
-+#ifndef NO_IPV6
-       else if (memcmp(&saddr6, &in6addr_any, sizeof(saddr6)) != 0)
-               addattr_l(n, 1024, IFLA_VXLAN_LOCAL6, &saddr6, sizeof(struct in6_addr));
-+#endif
- 
-       if (link)
-               addattr32(n, 1024, IFLA_VXLAN_LINK, link);
-@@ -275,6 +286,7 @@
-       } else if (tb[IFLA_VXLAN_GROUP6]) {
-               struct in6_addr addr;
-               memcpy(&addr, RTA_DATA(tb[IFLA_VXLAN_GROUP6]), sizeof(struct in6_addr));
-+#ifndef NO_IPV6
-               if (memcmp(&addr, &in6addr_any, sizeof(addr)) != 0) {
-                       if (IN6_IS_ADDR_MULTICAST(&addr))
-                               fprintf(f, "group %s ",
-@@ -283,6 +295,7 @@
-                               fprintf(f, "remote %s ",
-                                       format_host(AF_INET6, sizeof(struct in6_addr), &addr, s1, sizeof(s1)));
-               }
-+#endif
-       }
- 
-       if (tb[IFLA_VXLAN_LOCAL]) {
-@@ -293,9 +306,11 @@
-       } else if (tb[IFLA_VXLAN_LOCAL6]) {
-               struct in6_addr addr;
-               memcpy(&addr, RTA_DATA(tb[IFLA_VXLAN_LOCAL6]), sizeof(struct in6_addr));
-+#ifndef NO_IPV6
-               if (memcmp(&addr, &in6addr_any, sizeof(addr)) != 0)
-                       fprintf(f, "local %s ",
-                               format_host(AF_INET6, sizeof(struct in6_addr), &addr, s1, sizeof(s1)));
-+#endif
-       }
- 
-       if (tb[IFLA_VXLAN_LINK] &&

diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash
index 3aecbfce5584352d1da08270e9ab217eb6835e55..35dc554e0e1cd0a827df13ac87264a90dd1f208a 100644 (file)
--- a/package/iproute2/iproute2.hash
+++ b/package/iproute2/iproute2.hash
@@ -1,2 +1,2 @@
 # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc
-sha256 09e406636e7598e46d5d4f7b928bf5db57049d65dbeb9a496005957ee16f6000        iproute2-3.17.0.tar.xz
+sha256 d5a182154abd0749b1df7d1649115a32c65f559951477396203b1f514dbff1df        iproute2-3.18.0.tar.xz

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index a6ab4451702576b23285478d7359475a0b6f802b..0838463ed9484af909a0d02cfb33ddcab06f5e96 100644 (file)
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IPROUTE2_VERSION = 3.17.0
+IPROUTE2_VERSION = 3.18.0
 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_DEPENDENCIES = host-bison host-flex