[openwrt/openwrt] iproute2: update to 5.19.0

LEDE Commits lede-commits at lists.infradead.org
Sat Aug 13 11:55:22 PDT 2022 

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

commit e87114401357ccd34893232b35a757d4c33ea710
Author: Nick Hainke <vincent at systemli.org>
AuthorDate: Sat Aug 6 09:41:38 2022 +0200

    iproute2: update to 5.19.0
    
    Add patch:
    - 105-ipstats-Define-MIN-function-to-fix-undefined-referen.patch
    
    Refreshed:
    - 170-ip_tiny.patch
    - 195-build_variant_ip_tc.patch
    
    Changes:
    deb48554 v5.19.0
    f8decf82 bpf_glue: include errno.h
    71178ae0 rdma: update uapi/ib_user_verbs.h
    96594fd2 vdpa: update uapi headers from 5.19-rc7
    30c7b77f Revert "uapi: add vdpa.h"
    c5433c4b ip neigh: Fix memory leak when doing 'get'
    2cb76253 mptcp: Fix memory leak when getting limits
    afdbb020 mptcp: Fix memory leak when doing 'endpoint show'
    6db01afd bridge: Fix memory leak when doing 'fdb get'
    1d540336 ip address: Fix memory leak when specifying device
    325f706b uapi: add virtio_ring.h
    291898c5 uapi: add vdpa.h
    6e2fb804 uapi: update bpf.h
    329fda18 ip: Fix size_columns() invocation that passes a 32-bit quantity
    2a00a4b1 man: tc-fq_codel: add drop_batch
    6bf5abef uapi: update mptcp.h
    02410392 ip: Fix size_columns() for very large values
    ed243312 man: tc-ct.8: fix example
    2bb37e90 l2tp: fix typo in AF_INET6 checksum JSON print
    855edb3d man: tc-fq_codel: Fix a typo.
    4044a453 tc: declaration hides parameter
    a44a7918 genl: fix duplicate include guard
    703f2de6 uapi: change name for zerocopy sendfile in tls
    248ad98e uapi: update socket.h
    11e41a63 ip: Convert non-constant initializers to macros
    8d3977ef Update kernel headers
    5a1ad9f8 man: ip-stats.8: Describe groups xstats, xstats_slave and afstats
    d9976d67 ipstats: Expose bond stats in ipstats
    36e10429 ipstats: Expose bridge stats in ipstats
    79f5ad95 iplink_bridge: Split bridge_print_stats_attr()
    1247ed51 ipstats: Add groups "xstats", "xstats_slave"
    c6900b79 ipstats: Add a third level of stats hierarchy, a "suite"
    2ed73b9a iplink: Add JSON support to MPLS stats formatter
    5ed8fd9d ipstats: Add a group "afstats", subgroup "mpls"
    dff392fd iplink: Publish a function to format MPLS stats
    72623b73 iplink: Fix formatting of MPLS stats
    ce41750f ip: ipstats: Do not assume length of response attribute payload
    40b50f15 bridge: vni: add support for stats dumping
    c7f12a15 ip: iplink_vxlan: add support to set vnifiltering flag on vxlan device
    45cd32f9 bridge: vxlan device vnifilter support
    837294e4 libbpf: Remove use of bpf_map_is_offload_neutral
    64e5ed77 libbpf: Remove use of bpf_program__set_priv and bpf_program__priv
    ba6519cb libbpf: Use bpf_object__load instead of bpf_object__load_xattr
    a6eb654d f_flower: add number of vlans man entry
    5788732e f_flower: Check args with num_of_vlans
    5ba31bcf f_flower: Add num of vlans parameter
    b28eb051 man: Add man pages for the "stats" functions
    a05a27c0 ipmonitor: Add monitoring support for stats events
    0f1fd40c ipstats: Add offload subgroup "l3_stats"
    179030fa ipstats: Add offload subgroup "hw_stats_info"
    af5e7955 ipstats: Add a group "offload", subgroup "cpu_hit"
    0517a2fd ipstats: Add a group "link"
    df0b2c6d ipstats: Add a shell of "show" command
    82f6444f ipstats: Add a "set" command
    54d82b06 ip: Add a new family of commands, "stats"
    5520cf16 ip: Publish functions for stats formatting
    a463d6b1 libnetlink: Add filtering to rtnl_statsdump_req_filter()
    38ae12d3 devlink: introduce -[he]x cmdline option to allow dumping numbers in hex format
    bba95837 Update kernel headers
    f6559bea ip-link: put types on man page in alphabetic order
    ee53174b ip/iplink_virt_wifi: add support for virt_wifi
    
    Signed-off-by: Nick Hainke <vincent at systemli.org>
---
 package/network/utils/iproute2/Makefile            |  4 ++--
 ...ine-MIN-function-to-fix-undefined-referen.patch | 27 ++++++++++++++++++++++
 .../utils/iproute2/patches/170-ip_tiny.patch       |  6 ++---
 .../iproute2/patches/195-build_variant_ip_tc.patch |  2 +-
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index 123b0ce238..5439c050c1 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.18.0
+PKG_VERSION:=5.19.0
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
-PKG_HASH:=5ba3d464d51c8c283550d507ffac3d10f7aec587b7c66b0ccb6950643646389e
+PKG_HASH:=26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=iptables
 PKG_LICENSE:=GPL-2.0
diff --git a/package/network/utils/iproute2/patches/105-ipstats-Define-MIN-function-to-fix-undefined-referen.patch b/package/network/utils/iproute2/patches/105-ipstats-Define-MIN-function-to-fix-undefined-referen.patch
new file mode 100644
index 0000000000..7bf55dd57b
--- /dev/null
+++ b/package/network/utils/iproute2/patches/105-ipstats-Define-MIN-function-to-fix-undefined-referen.patch
@@ -0,0 +1,27 @@
+From c69e8e474936795a2cd7638b11ce3e99ff4d5ae7 Mon Sep 17 00:00:00 2001
+From: Nick Hainke <vincent at systemli.org>
+Date: Sat, 6 Aug 2022 10:00:20 +0200
+Subject: [PATCH] ipstats: Define MIN function to fix undefined references
+
+Fixes errors in the form of:
+ in function `ipstats_show_64':
+ <artificial>:(.text+0x4e30): undefined reference to `MIN'
+
+Signed-off-by: Nick Hainke <vincent at systemli.org>
+---
+ ip/ipstats.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/ip/ipstats.c
++++ b/ip/ipstats.c
+@@ -6,6 +6,10 @@
+ #include "utils.h"
+ #include "ip_common.h"
+ 
++#ifndef MIN
++#define MIN(a, b) ((a) < (b) ? (a) : (b))
++#endif
++
+ struct ipstats_stat_dump_filters {
+ 	/* mask[0] filters outer attributes. Then individual nests have their
+ 	 * filtering mask at the index of the nested attribute.
diff --git a/package/network/utils/iproute2/patches/170-ip_tiny.patch b/package/network/utils/iproute2/patches/170-ip_tiny.patch
index 399dd4fc87..1196be31f0 100644
--- a/package/network/utils/iproute2/patches/170-ip_tiny.patch
+++ b/package/network/utils/iproute2/patches/170-ip_tiny.patch
@@ -1,6 +1,6 @@
 --- a/ip/Makefile
 +++ b/ip/Makefile
-@@ -18,6 +18,13 @@ RTMONOBJ=rtmon.o
+@@ -19,6 +19,13 @@ RTMONOBJ=rtmon.o
  
  include ../config.mk
  
@@ -14,7 +14,7 @@
  ALLOBJ=$(IPOBJ) $(RTMONOBJ)
  SCRIPTS=routel
  TARGETS=ip rtmon
-@@ -47,7 +54,7 @@ else
+@@ -48,7 +55,7 @@ else
  
  ip: static-syms.o
  static-syms.o: static-syms.h
@@ -93,8 +93,8 @@
  	{ "ioam",	do_ioam6 },
 +#endif
  	{ "help",	do_help },
+ 	{ "stats",	do_ipstats },
  	{ 0 }
- };
 --- a/lib/Makefile
 +++ b/lib/Makefile
 @@ -3,6 +3,10 @@ include ../config.mk
diff --git a/package/network/utils/iproute2/patches/195-build_variant_ip_tc.patch b/package/network/utils/iproute2/patches/195-build_variant_ip_tc.patch
index a219251573..dc9c0b2969 100644
--- a/package/network/utils/iproute2/patches/195-build_variant_ip_tc.patch
+++ b/package/network/utils/iproute2/patches/195-build_variant_ip_tc.patch
@@ -1,6 +1,6 @@
 --- a/ip/Makefile
 +++ b/ip/Makefile
-@@ -27,7 +27,7 @@ STATIC_SYM_SOURCES:=$(filter-out $(STATI
+@@ -28,7 +28,7 @@ STATIC_SYM_SOURCES:=$(filter-out $(STATI
  
  ALLOBJ=$(IPOBJ) $(RTMONOBJ)
  SCRIPTS=routel

More information about the lede-commits mailing list