From cd97e2909cf1e2ded809da889edb1c109d45b122 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 17 Aug 2019 20:55:14 +0000
Subject: system/iproute2: bump to 5.2.0

---
 system/iproute2/APKBUILD              |  8 +++----
 system/iproute2/devlink-sysinfo.patch | 43 -----------------------------------
 2 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 system/iproute2/devlink-sysinfo.patch

diff --git a/system/iproute2/APKBUILD b/system/iproute2/APKBUILD
index b4e32f6a8..e42fb126f 100644
--- a/system/iproute2/APKBUILD
+++ b/system/iproute2/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=iproute2
-pkgver=5.1.0
+pkgver=5.2.0
 pkgrel=0
 pkgdesc="IP configuration, routing, and traffic control utilities"
 url="https://wiki.linuxfoundation.org/networking/iproute2"
@@ -12,8 +12,7 @@ license="GPL-2.0-only"
 depends=""
 makedepends="bison flex bash libelf-dev libmnl-dev libcap-dev bsd-compat-headers"
 subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
-source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz
-	devlink-sysinfo.patch"
+source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz"
 
 prepare() {
 	default_prepare
@@ -51,5 +50,4 @@ bashcomp() {
 	rmdir -p "$pkgdir"/usr/share 2>/dev/null || true
 }
 
-sha512sums="5c8319b040bd0ba98cf1225b2a77efafc662741344c53877ee38cf108ca01906b03328e4f9b00b7557e301c6e64bca4e42e92af477b4d657bcbff5120c0c4e87  iproute2-5.1.0.tar.xz
-3585c70d110749e0bdba7f1bbdc32c7d635147026fbb9662f63dfcca2405e8a45cc990cb6ad38b6405cde23a1535a59ff854387ae1649b4241597ec71f445e20  devlink-sysinfo.patch"
+sha512sums="82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1  iproute2-5.2.0.tar.xz"
diff --git a/system/iproute2/devlink-sysinfo.patch b/system/iproute2/devlink-sysinfo.patch
deleted file mode 100644
index 316fcefae..000000000
--- a/system/iproute2/devlink-sysinfo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Since commit 2f1242efe9d ("devlink: Add devlink health show command") we
-use the sys/sysinfo.h header for the sysinfo(2) system call. But since
-iproute2 carries a local version of the kernel struct sysinfo, this
-causes a collision with libc that do not rely on kernel defined sysinfo
-like musl libc:
-
-In file included from devlink.c:25:0:
-.../sysroot/usr/include/sys/sysinfo.h:10:8: error: redefinition of 'struct sysinfo'
- struct sysinfo {
-        ^~~~~~~
-In file included from ../include/uapi/linux/kernel.h:5:0,
-                 from ../include/uapi/linux/netlink.h:5,
-                 from ../include/uapi/linux/genetlink.h:6,
-                 from devlink.c:21:
-../include/uapi/linux/sysinfo.h:8:8: note: originally defined here
- struct sysinfo {
-		^~~~~~~
-
-Rely on the kernel header alone to avoid kernel and userspace headers
-collision of definitions.
-
-Cc: Aya Levin <ayal@xxxxxxxxxxxx>
-Cc: Moshe Shemesh <moshe@xxxxxxxxxxxx>
-Signed-off-by: Baruch Siach <baruch@xxxxxxxxxx>
----
- devlink/devlink.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/devlink/devlink.c b/devlink/devlink.c
-index 436935f88bda..d7a6ce94f0e6 100644
---- a/devlink/devlink.c
-+++ b/devlink/devlink.c
-@@ -22,7 +22,7 @@
- #include <linux/devlink.h>
- #include <libmnl/libmnl.h>
- #include <netinet/ether.h>
--#include <sys/sysinfo.h>
-+#include <linux/sysinfo.h>
- #include <sys/queue.h>
- 
- #include "SNAPSHOT.h"
--- 
-2.20.1
\ No newline at end of file
-- 
cgit v1.2.3-60-g2f50