[openwrt/openwrt] iproute2: update to 5.17.0

Sat Aug 13 11:55:20 PDT 2022

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/e65337ce65eb5487f10895b75e93002983aa6194

commit e65337ce65eb5487f10895b75e93002983aa6194
Author: Nick Hainke <vincent at systemli.org>
AuthorDate: Fri Aug 5 12:31:06 2022 +0200

    iproute2: update to 5.17.0
    
    Remove backports:
    - 0001-lib-fix-ax25.h-include-for-musl.patch
    
    Changes:
    4c424dfd v5.17.0
    7846496b link_xfrm: if_id must be non zero
    eed4bb1a testsuite: link xfrm delete no if_id test
    ac0a54b2 rdma: make RES_PID and RES_KERN_NAME alternative to each other
    885e281e uapi: update vdpa.h
    19c0def1 ipaddress: remove 'label' compatibility with Linux-2.0 net aliases
    1808f002 lib/fs: fix memory leak in get_task_name()
    62c0700c uapi: update magic.h
    c8d9d925 rdma: Fix the logic to print unsigned int.
    a42dfaa4 Revert "rdma: Fix res_print_uint() and add res_print_u64()"
    9d0badec rdma: Fix res_print_uint() and add res_print_u64()
    86a1452b uapi: update to xfrm.h
    09c6a3d2 bridge: Remove vlan listing from `bridge link`
    e4fda259 bridge: Fix error string typo
    cc143bda lnstat: fix strdup leak in -w argument parsing
    90bbf861 iplink_can: print_usage: typo fix, add missing spaces
    1b5c7414 dcb: Fix error reporting when accessing "dcb app"
    a38d305d tc: fix duplicate fall-through
    f8beda6e libnetlink: fix socket leak in rtnl_open_byproto()
    7f70eb2a tc_util: Fix parsing action control with space and slash
    29da83f8 iprule: Allow option dsfield in 'ip rule show'
    07012a1f ss: use freecon() instead of free() when appropriate
    03b4de0b man: Fix a typo in the flag documentation of ip address
    924f6b4a dcb: app: Add missing "dcb app show dev X default-prio"
    5c9571bc uapi: update kernel headers from 5.17-rc1
    d542543b tc/action: print error to stderr
    52370c61 mptcp: add id check for deleting address
    c556f577 dcb: Rewrite array-formatting code to not cause warnings with Clang
    0dc5da8e f_flower: fix checkpatch warnings
    ffbcb246 netem: fix checkpatch warnings
    8bced38a lib: fix ax25.h include for musl
    e27bb8e5 uapi: add missing virtio headers
    26ff0afa uapi: add missing rose and ax25 files
    eb4206ec q_cake: allow changing to diffserv3
    db530529 iplink_can: add ctrlmode_{supported,_static} to the "--details --json" output
    ac2e9148 Update kernel headers
    bb4cc9cc rdma: Don't allocate sparse array
    b8767168 rdma: Limit copy data by the destination size
    167e33f3 vdpa: Enable user to set mtu of the vdpa device
    384938f9 vdpa: Enable user to set mac address of vdpa device
    a311f0c4 vdpa: Enable user to query vdpa device config layout
    9d8882d5 vdpa: Update kernel headers
    5cb7ec0c Update kernel headers and import virtio_net
    26113360 mptcp: add support for changing the backup flag
    4b301b87 tc: Add support for ce_threshold_value/mask in fq_codel
    99d09ee9 bond: add arp_missed_max option
    432cb06b mptcp: add support for fullmesh flag
    2d777dfe Update kernel headers
    a21458fc vdpa: Remove duplicate vdpa UAPI header file
    
    Signed-off-by: Nick Hainke <vincent at systemli.org>
---
 package/network/utils/iproute2/Makefile            |  4 +--
 .../0001-lib-fix-ax25.h-include-for-musl.patch     | 31 ----------------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index cd453b4c98..6058b5e8d9 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iproute2
-PKG_VERSION:=5.16.0
+PKG_VERSION:=5.17.0
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
-PKG_HASH:=c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f
+PKG_HASH:=6e384f1b42c75e1a9daac57866da37dcff909090ba86eb25a6e764da7893660e
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=iptables
 PKG_LICENSE:=GPL-2.0
diff --git a/package/network/utils/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch b/package/network/utils/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
deleted file mode 100644
index fa6a6c9f25..0000000000
--- a/package/network/utils/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001
-From: Sam James <sam at gentoo.org>
-Date: Thu, 13 Jan 2022 08:14:13 +0000
-Subject: [PATCH 1/1] 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 at gentoo.org>
-Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
----
- lib/ax25_ntop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- 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"
- 


