From aa52aa98c36dfaf11914448ec7f2dfd058e39cec Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Thu, 23 Mar 2023 19:35:21 +0000 Subject: [PATCH] iproute2: update to 6.2.0. `check` is the make target to run tests, at least in iproute2 6.2.0, so that's why I removed `do_check`. --- .../0001-ipstats-Add-param.h-for-musl.patch | 28 ---------------- .../0002-ipstats-add-missing-headers.patch | 32 ------------------- srcpkgs/iproute2/template | 12 +++---- 3 files changed, 5 insertions(+), 67 deletions(-) delete mode 100644 srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch delete 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 deleted file mode 100644 index 82363b263654..000000000000 --- a/srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch +++ /dev/null @@ -1,28 +0,0 @@ -From beb3215602f9a3a8fa5404bd308e0f2820492b19 Mon Sep 17 00:00:00 2001 -From: Changhyeok Bae -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 ---- - 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/0002-ipstats-add-missing-headers.patch b/srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch deleted file mode 100644 index d6825e4e77d2..000000000000 --- a/srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7115ca05b23d66ce5a88e52a05b7813443f5059e Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger -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 ---- - 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 - #include - #include -+#include -+#include - #include -+#include - - #include "list.h" - #include "utils.h" --- -2.37.3 - diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template index 4e4beeed7be8..413c49151c02 100644 --- a/srcpkgs/iproute2/template +++ b/srcpkgs/iproute2/template @@ -1,6 +1,6 @@ # Template file for 'iproute2' pkgname=iproute2 -version=5.19.0 +version=6.2.0 revision=1 build_style=configure make_install_args="SBINDIR=/usr/bin" @@ -10,8 +10,10 @@ short_desc="IP Routing Utilities" 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=26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791 +distfiles="${KERNEL_SITE}/utils/net/iproute2/iproute2-${version}.tar.xz" +checksum=4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62 +# Requires unshare, which is not provided by chroot-util-linux. +make_check=no conf_files=" /etc/iproute2/ematch_map @@ -24,10 +26,6 @@ conf_files=" /etc/iproute2/group /etc/iproute2/nl_protos" -do_check() { - make -C testsuite -} - post_install() { rm -r ${DESTDIR}/usr/share/man/man3 }