iproute2: bump to version 4.12.0
PATCH 1/1 iproute2: bump to version 4.12.0
Drop upstream patch.
Add uClibc-ng compatibility fix. This is needed due to missing definition in netinet/in.h.
Correct the license. Source files license headers include the GPL "or ... any later version" language.
Add license file hash.
--- .../iproute2/0002-Fix-build-with-uClibc-ng.patch | 38 ++++++++++++++++++++++ .../0002-ip-include-libc-headers-first.patch | 35 -------------------- package/iproute2/iproute2.hash | 3 +- package/iproute2/iproute2.mk | 4 +-- 4 files changed, 42 insertions(+), 38 deletions(-) create mode 100644 package/iproute2/0002-Fix-build-with-uClibc-ng.patch delete mode 100644 package/iproute2/0002-ip-include-libc-headers-first.patch
package/iproute2/0002-Fix-build-with-uClibc-ng.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 2ac2f416072d9968a9ea2dd9f48168223a1147b0 Mon Sep 17 00:00:00 2001 +From: Baruch Siach <[email protected]> +Date: Tue, 18 Jul 2017 14:09:06 +0300 +Subject: [PATCH] Fix build with uClibc-ng + +Add a local definition for IPPROTO_MH to fix build with uClibc-ng. As of +version 1.0.25, the uClibc-ng netinet/in.h header does not provide this +definition. The kernel provided definition is masked by libc-compat.h. Add +this local fix until uClibc-ng syncs netinet/in.h with glibc. + +This partially reverts upstream commit a9ae195a2169 (xfrm: get #define's from +linux includes) + +Signed-off-by: Baruch Siach <[email protected]> +--- +Upstream status: non upstreamable; local uClibc-ng compatibility fix +--- + ip/xfrm.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ip/xfrm.h b/ip/xfrm.h +index 54d80ce5e949..50b85550fb45 100644 +--- a/ip/xfrm.h ++++ b/ip/xfrm.h +@@ -30,6 +30,10 @@ + #include <linux/xfrm.h> + #include <linux/ipsec.h> + ++#ifndef IPPROTO_MH ++# define IPPROTO_MH 135 ++#endif ++ + #define XFRMS_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_usersa_info)))) + #define XFRMS_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct xfrm_usersa_info)) + +-- +2.13.2 +
package/iproute2/0002-ip-include-libc-headers-first.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 8afdd8babb9e82bcfde78e851b24b698436a6f9f Mon Sep 17 00:00:00 2001 -Message-Id: <8afdd8babb9e82bcfde78e851b24b698436a6f9f.1495466847.git.baruch@tkos.co.il> -From: Baruch Siach <[email protected]> -Date: Mon, 22 May 2017 15:42:49 +0300 -Subject: [PATCH] ip: include libc headers first - -Including libc headers first helps as a workaround to redefinition of struct -ethhdr with a suitably patched musl libc that suppresses the kernel -if_ether.h. - -Signed-off-by: Baruch Siach <[email protected]> ---- -Upstream status: posted http://marc.info/?l=linux-netdev&m=149545968900803&w=2 - - ip/iplink_bridge.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c -index 818b43c89b5b..cccdec1c203a 100644 ---- a/ip/iplink_bridge.c -+++ b/ip/iplink_bridge.c -@@ -13,9 +13,9 @@ - #include <stdlib.h> - #include <string.h> - #include <netinet/in.h> -+#include <netinet/ether.h> - #include <linux/if_link.h> - #include <linux/if_bridge.h> --#include <netinet/ether.h> - #include <net/if.h> - - #include "rt_names.h" --- -2.11.0 -
package/iproute2/iproute2.hash +2 -1
@@ -1,2 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026 iproute2-4.11.0.tar.xz +sha256 2e0a4c4262d9f6c169885a6e16c4c5c5f1ef6fd57b6a0e7b41f42be5bb6ebd7d iproute2-4.12.0.tar.xz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING
package/iproute2/iproute2.mk +2 -2
@@ -4,12 +4,12 @@ # ################################################################################ -IPROUTE2_VERSION = 4.11.0 +IPROUTE2_VERSION = 4.12.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ $(if $(BR2_PACKAGE_LIBMNL),libmnl) -IPROUTE2_LICENSE = GPL-2.0 +IPROUTE2_LICENSE = GPL-2.0+ IPROUTE2_LICENSE_FILES = COPYING # If both iproute2 and busybox are selected, make certain we win
Signature · 1 line
2.13.2
PATCH 1/1 iproute2: bump to version 4.12.0
Hi Baruch,
Baruch Siach wrote,
Quoted 4 lines
Drop upstream patch.
Add uClibc-ng compatibility fix. This is needed due to missing definition in
netinet/in.h.
Thanks for the report,
fixed in
https://cgit.openadk.org/cgi/cgit/uclibc-ng.git/commit/?id=85c9aaf9e4410bcd367c3e5f6dab13ce9ba936f4
best regards
Waldemar
PATCH 1/1 iproute2: bump to version 4.12.0
In reply to Baruch SiachHello,
Quoted 7 lines · Baruch Siach
Drop upstream patch.
Add uClibc-ng compatibility fix. This is needed due to missing definition in
netinet/in.h.Correct the license. Source files license headers include the GPL "or ... any later version" language.
If I'm not mistaken, this change in the license is not related to the 4.12.0 bump. I looked at the 4.11.0 version, and it already contains "or .. any later version".
So it seems like the license change should be in a separate patch, which should be backported to our LTS/maintenance branches.
Could you double check this and if you agree send separate patches?
Thanks a lot!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 1/1 iproute2: bump to version 4.12.0
Hi Thomas,
Quoted 9 lines · Thomas Petazzoni
Quoted 7 lines · Baruch Siach
Drop upstream patch.
Add uClibc-ng compatibility fix. This is needed due to missing definition in
netinet/in.h.Correct the license. Source files license headers include the GPL "or ... any later version" language.
Quoted 8 lines
If I'm not mistaken, this change in the license is not related to the 4.12.0 bump. I looked at the 4.11.0 version, and it already contains "or .. any later version".
So it seems like the license change should be in a separate patch, which should be backported to our LTS/maintenance branches.
Could you double check this and if you agree send separate patches?
The "any later version" language is there at least since the initial git import. I'll split this change out and repost.
baruch
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -