From patchwork Mon Apr 14 15:46:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 338992 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 05A4C14007B for ; Tue, 15 Apr 2014 01:46:28 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DF7A9273FD; Mon, 14 Apr 2014 15:46:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t1cYNI2Q+Duy; Mon, 14 Apr 2014 15:46:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 061DE2FB56; Mon, 14 Apr 2014 15:46:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3FD991CEA91 for ; Mon, 14 Apr 2014 15:46:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3B2A18ACF8 for ; Mon, 14 Apr 2014 15:46:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PDm6HXZqXsn7 for ; Mon, 14 Apr 2014 15:46:22 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9E01A888A2 for ; Mon, 14 Apr 2014 15:46:22 +0000 (UTC) Received: from asgard (host107.181-14-143.telecom.net.ar [181.14.143.107]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.8/8.14.8) with ESMTP id s3EFkErq015984 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 14 Apr 2014 15:46:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1397490380; bh=8UsYtI4Zz6SSAP7qI9VdGSOoXage0bJs8FF1pIQMj+Y=; h=From:To:Cc:Subject:Date; b=bGBKqlu9TFfsrpCUxjQ7/dZB5U1atzwLB9xC+I9lN10qEI+cIFsaBDh5/OrU8B3O2 CDniVU/Vn+RfXLNhC72/jXVoetk3tgcNCFhemefxLtBJaPpystoncBfGcsd+a0MXY6 25juxge39nwmQUFbD+GPKuz/q70FUw1rPP9o8eQc= Received: by asgard (sSMTP sendmail emulation); Mon, 14 Apr 2014 12:46:09 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Mon, 14 Apr 2014 12:46:08 -0300 Message-Id: <1397490368-29652-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.3.2 X-Virus-Scanned: clamav-milter 0.98.1 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] iproute2: bump to version 3.14.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Gustavo Zacarias --- .../iproute2/iproute2-02-vxlan-optional-ipv6.patch | 35 +++++++++++----------- package/iproute2/iproute2.mk | 2 +- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/package/iproute2/iproute2-02-vxlan-optional-ipv6.patch b/package/iproute2/iproute2-02-vxlan-optional-ipv6.patch index 0d6cf95..80ea97c 100644 --- a/package/iproute2/iproute2-02-vxlan-optional-ipv6.patch +++ b/package/iproute2/iproute2-02-vxlan-optional-ipv6.patch @@ -3,9 +3,9 @@ IPv6 support. Signed-off-by: Gustavo Zacarias -diff -Nura iproute2-3.12.0.orig/ip/iplink_vxlan.c iproute2-3.12.0/ip/iplink_vxlan.c ---- iproute2-3.12.0.orig/ip/iplink_vxlan.c 2013-11-26 14:09:13.804908955 -0300 -+++ iproute2-3.12.0/ip/iplink_vxlan.c 2013-11-26 14:21:55.561997689 -0300 +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 #include #include -@@ -179,26 +184,32 @@ - fprintf(stderr, "vxlan: missing virtual network identifier\n"); +@@ -188,12 +193,14 @@ return -1; } + +#ifndef NO_IPV6 if ((gaddr && daddr) || (memcmp(&gaddr6, &in6addr_any, sizeof(gaddr6)) && @@ -30,8 +30,10 @@ diff -Nura iproute2-3.12.0.orig/ip/iplink_vxlan.c iproute2-3.12.0/ip/iplink_vxla return -1; } +#endif - addattr32(n, 1024, IFLA_VXLAN_ID, vni); - if (gaddr) + + 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); @@ -51,15 +53,15 @@ diff -Nura iproute2-3.12.0.orig/ip/iplink_vxlan.c iproute2-3.12.0/ip/iplink_vxla if (link) addattr32(n, 1024, IFLA_VXLAN_LINK, link); -@@ -251,6 +262,7 @@ - fprintf(f, "remote %s ", - format_host(AF_INET, 4, &addr, s1, sizeof(s1))); - } -+#ifndef NO_IPV6 +@@ -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)); -@@ -262,6 +274,7 @@ ++#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))); } @@ -67,14 +69,11 @@ diff -Nura iproute2-3.12.0.orig/ip/iplink_vxlan.c iproute2-3.12.0/ip/iplink_vxla } if (tb[IFLA_VXLAN_LOCAL]) { -@@ -269,12 +282,14 @@ - if (addr) - fprintf(f, "local %s ", - format_host(AF_INET, 4, &addr, s1, sizeof(s1))); -+#ifndef NO_IPV6 +@@ -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))); diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 2350500..e51c33b 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 3.12.0 +IPROUTE2_VERSION = 3.14.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex