[openwrt/openwrt] iproute2: update to 5.16.0

Sat Aug 13 11:55:19 PDT 2022

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

commit 991351431998698aa3d43c9578b8a5184794d1da
Author: Nick Hainke <vincent at systemli.org>
AuthorDate: Fri Aug 5 12:11:28 2022 +0200

    iproute2: update to 5.16.0
    
    Import patch:
    - 0001-lib-fix-ax25.h-include-for-musl.patch
    
    Refreshed patches:
    - 100-configure.patch
    - 130-no_netem_tipc_dcb_man_vdpa.patch
    - 140-keep_libmnl_optional.patch
    - 145-keep_libelf_optional.patch
    - 150-keep_libcap_optional.patch
    - 170-ip_tiny.patch
    - 190-fix-nls-rpath-link.patch
    - 195-build_variant_ip_tc.patch
    - 200-drop_libbsd_dependency.patch
    - 300-selinux-configurable.patch
    
    Size ip-full (mips_24kc):
    - 176K  ip-full_5.16.0-1_mips_24kc.ipk
    - 172K  ip-full_5.15.0-2_mips_24kc.ipk
    
    Size ip-tiny (mips_24kc):
    - 124K  ip-tiny_5.16.0-1_mips_24kc.ipk
    - 124K  ip-tiny_5.15.0-2_mips_24kc.ipk
    
    Changes:
    ade99e20 v5.16.0
    1225e307 testsuite: Fix tc/vlan.t test
    4734fdb9 uapi: update to mptcp.h
    c04e45d0 lib/bpf: fix verbose flag when using libbpf
    73590d95 tc: flower: Fix buffer overflow on large labels
    3f77bc62 uapi: update to if_ether.h
    5f8bb902 ip/ipnexthop: fix unsigned overflow in parse_nh_group_type_res()
    3184de37 lib/bpf_legacy: remove always-true check
    79026c12 rdma: update uapi headers
    fa58de9b vdpa: align uapi headers
    be31c264 lnstat: fix buffer overflow in header output
    0e949725 tc/m_vlan: fix print_vlan() conditional on TCA_VLAN_ACT_PUSH_ETH
    9bd5ab0f mptcp: fix JSON output when dumping endpoints by id
    a787d9ae man: tc-u32: Fix page to match new firstfrag behavior
    af96c7b5 Fix some typos detected by Lintian in manpages
    35c81b18 uapi: update vdpa.h
    0c263d7c iplink_can: add new CAN FD bittiming parameters: Transmitter Delay Compensation (TDC)
    0f7bb8d8 iplink_can: print brp and dbrp bittiming variables
    67f3c7a5 iplink_can: use PRINT_ANY to factorize code and fix signedness
    fd5e958c iplink_can: code refactoring of print_ctrlmode()
    8316df6e iplink_can: fix configuration ranges in print_usage() and add unit
    6e15d27a ip: add AMT support
    9cae1de5 Import amt.h
    258e350c Update kernel headers
    047e9ae5 devlink: Fix cmd_dev_param_set() to check configuration mode
    9e009e78 ip, neigh: Add NTF_EXT_MANAGED support
    040e5252 ip, neigh: Add missing NTF_USE support
    c76a3849 ip, neigh: Fix up spacing in netlink dump
    76b30805 xfrm: enable to manage default policies
    95cd2a62 iplink: enable to specify index when changing netns
    cee0cf84 configure: add the --libdir option
    0ee1950b configure: add the --prefix option
    4b8bca5f configure: support --param=value style
    99245d17 configure: simplify options parsing
    c330d097 configure: fix parsing issue with more than one value per option
    48c379bc configure: fix parsing issue on libbpf_dir option
    1d819dcc configure: fix parsing issue on include_dir option
    19ba785f rdma: Add optional-counters set/unset support
    7d5cb70e rdma: Add stat "mode" support
    d480cb71 rdma: Update uapi headers
    e4ca6a49 Update kernel headers
    a31e7b79 mptcp: cleanup include section.
    41020eb0 Update documentation
    8fb522cd Add support for IOAM encap modes
    b840c620 ip: nexthop: keep cache netlink socket open
    b9017435 devlink: print maximum number of snapshots if available
    6448ed37 Update kernel headers
    7ca868a7 ip: nexthop: add print_cache_nexthop which prints and manages the nh cache
    5d5dc549 ip: route: print and cache detailed nexthop information when requested
    cb3d18c2 ip: nexthop: add a helper which retrieves and prints cached nh entry
    60a97030 ip: nexthop: add cache helpers
    53d7c43b ip: nexthop: factor out ipnh_get_id rtnl talk into a helper
    a2ca4312 ip: nexthop: factor out print_nexthop's nh entry printing
    945c26db ip: nexthop: parse attributes into nh entry structure before printing
    7ec1cee6 ip: nexthop: add nh entry structure
    60a7515b ip: nexthop: split print_nh_res_group into parse and print parts
    cfb0a872 ip: nexthop: add resilient group structure
    371e889d ip: export print_rta_gateway version which outputs prepared gateway string
    f7278996 ip: print_rta_if takes ifindex as device argument instead of attribute
    e2cc9840 ROSE: Print decoded addresses rather than hex numbers.
    26c5782f ROSE: Add rose_ntop implementation.
    fd4c1c81 NETROM: Print decoded addresses rather than hex numbers.
    c63b769a NETROM: Add netrom_ntop implementation.
    399ae00a AX.25: Print decoded addresses rather than hex numbers.
    3a92669b AX.25: Add ax25_ntop implementation.
    ebbb7017 lib: bpf_legacy: add prog name, load time, uid and btf id in prog info dump
    0431e1e7 ip: Support filter links/neighs with no master
    12b3d6a2 man: ip-macsec: fix gcm-aes-256 formatting issue
    ae895504 bridge: vlan: add support for mcast_router option
    12fbe3e4 bridge: vlan: set vlan option attributes while parsing
    db28c944 Update kernel headers
    6d676ad9 ip: rewrite routel in python
    1eaebad2 ip: remove routef script
    adddf30c ip: remove ifcfg script
    2c811088 ip: remove old rtpr script
    72222cd4 bridge: vlan: add support for dumping router ports
    7ad5505b bridge: vlan: add global mcast_querier option
    061da2e2 bridge: vlan: add global mcast_startup_query_interval option
    60dcd5c3 bridge: vlan: add global mcast_query_response_interval option
    0e4cfa03 bridge: vlan: add global mcast_query_interval option
    ebcee09c bridge: vlan: add global mcast_querier_interval option
    3ae784f5 bridge: vlan: add global mcast_membership_interval option
    2b6cc38d bridge: vlan: add global mcast_last_member_interval option
    7cc7dbf4 bridge: vlan: add global mcast_startup_query_count option
    3399c075 bridge: vlan: add global mcast_last_member_count option
    a8d7212a bridge: vlan: add global mcast_mld_version option
    29fada0f bridge: vlan: add global mcast_igmp_version option
    1f608d59 bridge: vlan: add global mcast_snooping option
    dee5eb05 bridge: vlan: add support to set global vlan options
    ecf6d8b4 bridge: vlan: add support for vlan filtering when dumping options
    720f8613 bridge: vlan: add support to show global vlan options
    d3a961a9 bridge: vlan: skip unknown attributes when printing options
    312e22fe bridge: vlan: factor out vlan option printing
    d2eecb9d ip: bridge: add support for mcast_vlan_snooping
    ebaa603b ip/bond: add lacp active support
    8d6134b2 Update kernel headers
    51d8fc70 ip/tunnel: always print all known attributes
    71ba9c18 ipioam6: use print_nl instead of print_null
    e7841194 tc/skbmod: Introduce SKBMOD_F_ECN option
    78832863 IOAM man8
    32f4969d New IOAM6 encap type for routes
    29098125 Add, show, link, remove IOAM namespaces and schemas
    e53f4cd5 Import ioam6 uapi headers
    236696e5 Update kernel headers
    cf866f0a ipneigh: add support to print brief output of neigh cache in tabular format
    
    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 ++++++++++++++++++++++
 .../utils/iproute2/patches/100-configure.patch     |  2 +-
 .../patches/130-no_netem_tipc_dcb_man_vdpa.patch   |  2 +-
 .../patches/140-keep_libmnl_optional.patch         |  2 +-
 .../patches/145-keep_libelf_optional.patch         |  2 +-
 .../patches/150-keep_libcap_optional.patch         |  2 +-
 .../utils/iproute2/patches/170-ip_tiny.patch       | 10 +++----
 .../iproute2/patches/190-fix-nls-rpath-link.patch  |  4 +--
 .../iproute2/patches/195-build_variant_ip_tc.patch |  4 +--
 .../patches/200-drop_libbsd_dependency.patch       |  2 +-
 .../patches/300-selinux-configurable.patch         |  2 +-
 12 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index 55c00a0d6d..cd453b4c98 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.15.0
+PKG_VERSION:=5.16.0
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
-PKG_HASH:=38e3e4a5f9a7f5575c015027a10df097c149111eeb739993128e5b2b35b291ff
+PKG_HASH:=c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f
 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
new file mode 100644
index 0000000000..fa6a6c9f25
--- /dev/null
+++ b/package/network/utils/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
@@ -0,0 +1,31 @@
+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"
+ 
diff --git a/package/network/utils/iproute2/patches/100-configure.patch b/package/network/utils/iproute2/patches/100-configure.patch
index 0c19b2086a..2d4fb7b9b3 100644
--- a/package/network/utils/iproute2/patches/100-configure.patch
+++ b/package/network/utils/iproute2/patches/100-configure.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -34,7 +34,8 @@ int main(int argc, char **argv) {
+@@ -36,7 +36,8 @@ int main(int argc, char **argv) {
  }
  EOF
  
diff --git a/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch b/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch
index 8ddb316744..1386dd9e1f 100644
--- a/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch
+++ b/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -55,7 +55,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
+@@ -65,7 +65,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
  CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS)
  YACCFLAGS = -d -t -v
  
diff --git a/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch b/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch
index ff7e9ca4e5..576da0fd59 100644
--- a/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch
+++ b/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -387,7 +387,7 @@ check_selinux()
+@@ -398,7 +398,7 @@ check_selinux()
  
  check_mnl()
  {
diff --git a/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch b/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch
index 079ca0512e..0c5c3f59ed 100644
--- a/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch
+++ b/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -255,7 +255,7 @@ EOF
+@@ -266,7 +266,7 @@ EOF
  
  check_elf()
  {
diff --git a/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch b/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch
index 68e1624166..e945d802f3 100644
--- a/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch
+++ b/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -445,7 +445,7 @@ EOF
+@@ -456,7 +456,7 @@ EOF
  
  check_cap()
  {
diff --git a/package/network/utils/iproute2/patches/170-ip_tiny.patch b/package/network/utils/iproute2/patches/170-ip_tiny.patch
index cd687e7601..399dd4fc87 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
-@@ -17,6 +17,13 @@ RTMONOBJ=rtmon.o
+@@ -18,6 +18,13 @@ RTMONOBJ=rtmon.o
  
  include ../config.mk
  
@@ -12,9 +12,9 @@
 +STATIC_SYM_SOURCES:=$(filter-out $(STATIC_SYM_FILTER),$(wildcard *.c))
 +
  ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=ifcfg rtpr routel routef
+ SCRIPTS=routel
  TARGETS=ip rtmon
-@@ -46,7 +53,7 @@ else
+@@ -47,7 +54,7 @@ else
  
  ip: static-syms.o
  static-syms.o: static-syms.h
@@ -30,8 +30,8 @@
  		"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
  		"       ip [ -force ] -batch filename\n"
 +#ifndef IPROUTE2_TINY
- 		"where  OBJECT := { address | addrlabel | fou | help | ila | ioam | l2tp | link |\n"
- 		"                   macsec | maddress | monitor | mptcp | mroute | mrule |\n"
+ 		"where  OBJECT := { address | addrlabel | amt | fou | help | ila | ioam | l2tp |\n"
+ 		"                   link | macsec | maddress | monitor | mptcp | mroute | mrule |\n"
  		"                   neighbor | neighbour | netconf | netns | nexthop | ntable |\n"
  		"                   ntbl | route | rule | sr | tap | tcpmetrics |\n"
  		"                   token | tunnel | tuntap | vrf | xfrm }\n"
diff --git a/package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch b/package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch
index 92d02b9a4e..c7fceb2e22 100644
--- a/package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch
+++ b/package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -279,7 +279,7 @@ int main(int argc, char **argv) {
+@@ -290,7 +290,7 @@ int main(int argc, char **argv) {
  }
  EOF
  
@@ -9,7 +9,7 @@
      local ret=$?
  
      rm -f $TMPDIR/libbpf_test.c $TMPDIR/libbpf_test
-@@ -297,7 +297,7 @@ int main(int argc, char **argv) {
+@@ -308,7 +308,7 @@ int main(int argc, char **argv) {
  }
  EOF
  
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 13418662ee..a219251573 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,9 +1,9 @@
 --- a/ip/Makefile
 +++ b/ip/Makefile
-@@ -26,7 +26,7 @@ STATIC_SYM_SOURCES:=$(filter-out $(STATI
+@@ -27,7 +27,7 @@ STATIC_SYM_SOURCES:=$(filter-out $(STATI
  
  ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=ifcfg rtpr routel routef
+ SCRIPTS=routel
 -TARGETS=ip rtmon
 +TARGETS=$(findstring ip,$(BUILD_VARIANT)) rtmon
  
diff --git a/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch b/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch
index 12a1ccfa33..bc316c7dde 100644
--- a/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch
+++ b/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -431,14 +431,8 @@ EOF
+@@ -442,14 +442,8 @@ EOF
      if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
  	echo "no"
      else
diff --git a/package/network/utils/iproute2/patches/300-selinux-configurable.patch b/package/network/utils/iproute2/patches/300-selinux-configurable.patch
index b7e61fd3bd..817abf7d17 100644
--- a/package/network/utils/iproute2/patches/300-selinux-configurable.patch
+++ b/package/network/utils/iproute2/patches/300-selinux-configurable.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -374,7 +374,7 @@ check_libbpf()
+@@ -385,7 +385,7 @@ check_libbpf()
  check_selinux()
  # SELinux is a compile time option in the ss utility
  {


