From 506e8c375d7892e283a202788508d620c853eac5 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sun, 11 Sep 2022 15:24:17 +0200
Subject: [PATCH] iproute2: update to 5.19.0.

---
 .../0001-ipstats-Add-param.h-for-musl.patch   | 28 +++++++++++++++
 ...0001-lib-fix-ax25.h-include-for-musl.patch | 36 -------------------
 .../0002-ipstats-add-missing-headers.patch    | 32 +++++++++++++++++
 srcpkgs/iproute2/template                     |  4 +--
 4 files changed, 62 insertions(+), 38 deletions(-)
 create mode 100644 srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch
 delete mode 100644 srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
 create mode 100644 srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch

diff --git a/srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch b/srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch
new file mode 100644
index 000000000000..82363b263654
--- /dev/null
+++ b/srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch
@@ -0,0 +1,28 @@
+From beb3215602f9a3a8fa5404bd308e0f2820492b19 Mon Sep 17 00:00:00 2001
+From: Changhyeok Bae <changhyeok.bae@gmail.com>
+Date: Tue, 9 Aug 2022 04:01:05 +0000
+Subject: [PATCH 1/2] ipstats: Add param.h for musl
+
+Fix build error for musl
+| /usr/src/debug/iproute2/5.19.0-r0/iproute2-5.19.0/ip/ipstats.c:231: undefined reference to `MIN'
+
+Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
+---
+ ip/ipstats.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ip/ipstats.c b/ip/ipstats.c
+index 5cdd15ae..1ac275bd 100644
+--- a/ip/ipstats.c
++++ b/ip/ipstats.c
+@@ -1,6 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0+
+ #include <assert.h>
+ #include <errno.h>
++#include <sys/param.h>
+ 
+ #include "list.h"
+ #include "utils.h"
+-- 
+2.37.3
+
diff --git a/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch b/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
deleted file mode 100644
index 401965b0a348..000000000000
--- a/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 13 Jan 2022 08:14:13 +0000
-Subject: [PATCH] lib: fix ax25.h include for musl
-
-ax25.h isn't guaranteed to be avilable in netax25/*;
-it's dependent on our choice of libc (it's not available
-on musl at least) [0].
-
-Let's use the version from linux-headers.
-
-[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers
-Bug: https://bugs.gentoo.org/831102
-
-Signed-off-by: Sam James <sam@gentoo.org>
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
----
- lib/ax25_ntop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c
-index cfd0e04b06f9..3a72a43e9b77 100644
---- a/lib/ax25_ntop.c
-+++ b/lib/ax25_ntop.c
-@@ -2,7 +2,7 @@
- 
- #include <errno.h>
- #include <sys/socket.h>
--#include <netax25/ax25.h>
-+#include <linux/ax25.h>
- 
- #include "utils.h"
- 
--- 
-2.35.1
-
diff --git a/srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch b/srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch
new file mode 100644
index 000000000000..d6825e4e77d2
--- /dev/null
+++ b/srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch
@@ -0,0 +1,32 @@
+From 7115ca05b23d66ce5a88e52a05b7813443f5059e Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <stephen@networkplumber.org>
+Date: Tue, 9 Aug 2022 13:27:33 -0700
+Subject: [PATCH 2/2] ipstats: add missing headers
+
+IWYU reports several headers are not explicitly
+included by ipstats.
+
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+---
+ ip/ipstats.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ip/ipstats.c b/ip/ipstats.c
+index 1ac275bd..dadded14 100644
+--- a/ip/ipstats.c
++++ b/ip/ipstats.c
+@@ -1,7 +1,11 @@
+ // SPDX-License-Identifier: GPL-2.0+
++#include <alloca.h>
+ #include <assert.h>
+ #include <errno.h>
++#include <stdio.h>
++#include <string.h>
+ #include <sys/param.h>
++#include <sys/socket.h>
+ 
+ #include "list.h"
+ #include "utils.h"
+-- 
+2.37.3
+
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 9dbba00b6fe0..4e4beeed7be8 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,6 +1,6 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=5.16.0
+version=5.19.0
 revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
 distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f
+checksum=26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791
 
 conf_files="
  /etc/iproute2/ematch_map