From 501f87e98ee54c057b5ac34f37bf074417e3b637 Mon Sep 17 00:00:00 2001 From: lemmi Date: Sun, 11 Sep 2022 15:24:17 +0200 Subject: [PATCH] iproute2: update to 5.19.0. --- .../0001-ipstats-include-sys-param.h.patch | 25 +++++++++++++ ...0001-lib-fix-ax25.h-include-for-musl.patch | 36 ------------------- srcpkgs/iproute2/template | 4 +-- 3 files changed, 27 insertions(+), 38 deletions(-) create mode 100644 srcpkgs/iproute2/patches/0001-ipstats-include-sys-param.h.patch delete mode 100644 srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch diff --git a/srcpkgs/iproute2/patches/0001-ipstats-include-sys-param.h.patch b/srcpkgs/iproute2/patches/0001-ipstats-include-sys-param.h.patch new file mode 100644 index 000000000000..74ea4b018ed8 --- /dev/null +++ b/srcpkgs/iproute2/patches/0001-ipstats-include-sys-param.h.patch @@ -0,0 +1,25 @@ +From 204b59ccd76442007ac0350de78acccb5530302c Mon Sep 17 00:00:00 2001 +From: lemmi +Date: Sun, 11 Sep 2022 15:08:22 +0200 +Subject: [PATCH] ipstats: include sys/param.h + +Required on musl for the MIN macro used in IPSTATS_RTA_PAYLOAD. +--- + 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 + #include ++#include + + #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 -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 -Signed-off-by: Stephen Hemminger ---- - 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 - #include --#include -+#include - - #include "utils.h" - --- -2.35.1 - 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 " 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