[openwrt/openwrt] iproute2: update to 5.18.0

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

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

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

    iproute2: update to 5.18.0
    
    The ip-tiny size grows from 124k (5.17.0) to 128k (5.18.0).
    
    The update introduces a commit "configure: add check_libtirpc()" that
    introduces a check for libtirpc. However, if libtirpc is already in the
    staging directory due to an other dependency the check yields that the
    library is installed and should be used resulting in failures like:
    
      Package ss is missing dependencies for the following libraries:
      libtirpc.so.3
    
    To fix it add a patch making libtirpc optional again and setting it
    "HAVE_TIRPC=n":
    - 155-keep_tirpc_optional.patch
    
    Fix patches:
    - 130-no_netem_tipc_dcb_man_vdpa.patch
    
    Refresh patches:
    - 140-keep_libmnl_optional.patch
    - 150-keep_libcap_optional.patch
    - 180-drop_FAILED_POLICY.patch
    - 200-drop_libbsd_dependency.patch
    
    Changes:
    6474b7c8 v5.18.0
    4429a6c9 tipc: fix keylen check
    6b6979b9 iplink: remove GSO_MAX_SIZE definition
    19c3e009 doc: fix 'infact' --> 'in fact' typo
    ed706c78 man: fix some typos
    03589beb man: devlink-region: fix typo in example
    b84fc332 tc: em_u32: fix offset parsing
    b6d17086 uapi: update of virtio_ids
    17bf51b7 libbpf: Remove use of bpf_map_is_offload_neutral
    fa305925 libbpf: Remove use of bpf_program__set_priv and bpf_program__priv
    9e0057b4 libbpf: Use bpf_object__load instead of bpf_object__load_xattr
    e81fd551 devlink: fix "devlink health dump" command without arg
    6f3b5843 man: use quote instead of acute accent
    42d351fa man: 'allow to' -> 'allow one to'
    d8a7a0f4 uapi: upstream update to stddef.h
    5b2ff061 uapi: update from 5.18-rc1
    292509f9 ss: remove an implicit dependency on rpcinfo
    1ee309a4 configure: add check_libtirpc()
    41848100 ip/geneve: add support for IFLA_GENEVE_INNER_PROTO_INHERIT
    28add137 f_flower: Implement gtp options support
    b25599c5 ip: GTP support in ip link
    e4880869 man: bridge: document per-port mcast_router settings
    9e82e828 bridge: support for controlling mcast_router per port
    f1d18e2e Update kernel headers
    8130653d vdpa: Update man page with added support to configure max vq pair
    56eb8bf4 vdpa: Support reading device features
    16482fd4 vdpa: Support for configuring max VQ pairs for a device
    bd91c764 vdpa: Allow for printing negotiated features of a device
    2d1954c8 vdpa: Remove unsupported command line option
    93fb6810 Makefile: move HAVE_MNL check to top-level Makefile
    2dee2101 man: ip-link: whitespace fixes to odd line breaks mid sentence
    609b90aa man: ip-link: mention bridge port's default mcast_flood state
    b1c3ad84 man: ip-link: document new bcast_flood flag on bridge ports
    c354a434 ip: iplink_bridge_slave: support for broadcast flooding
    909f0d51 man: bridge: add missing closing " in bridge show mdb
    3b681cf9 man: bridge: document new bcast_flood flag for bridge ports
    a6c848eb bridge: support for controlling flooding of broadcast per port
    8acb5247 ip/batadv: allow to specify RA when creating link
    0431d8e8 Import batman_adv.h header from last kernel sync point
    239bfd45 Revert "configure: Allow command line override of toolchain"
    a93c90c7 tc: separate action print for filter and action dump
    d9977eaf bpf: Remove use of bpf_create_map_xattr
    ac4e0913 bpf: Export bpf syscall wrapper
    873bb975 bpf_glue: Remove use of bpf_load_program from libbpf
    5e17b715 ss: display advertised TCP receive window and out-of-order counter
    712ec66e tc: bash-completion: Add profinet and ethercat to procotol completion list
    75061b35 lib: add profinet and ethercat as link layer protocol names
    0a685b98 man8/ip-link.8: add locked port feature description and cmd syntax
    d4fe3673 man8/bridge.8: add locked port feature description and cmd syntax
    092af16b ip: iplink_bridge_slave: add locked port flag support
    0e51a185 bridge: link: add command to set port in locked mode
    04a0077d Update kernel headers
    386ae64c configure: Allow command line override of toolchain
    bea92cb0 mptcp: add port support for setting flags
    2dbc6c90 mptcp: add fullmesh support for setting flags
    5fb6bda0 mptcp: add fullmesh check for adding address
    9831202f bond: add ns_ip6_target option
    e8fd4d4b devlink: Remove strtouint8_t in favor of get_u8
    2688abf0 devlink: Remove strtouint16_t in favor of get_u16
    95c03f40 devlink: Remove strtouint32_t in favor of get_u32
    7cb0e24d devlink: Remove strtouint64_t in favor of get_u64
    7848f6bb Update kernel headers
    4f015972 f_flower: fix indentation for enc_key_id and u32
    25a9c4fa tunnel: Fix missing space after local/remote print
    ff14875e Update documentation
    8908cb25 Add support for the IOAM insertion frequency
    cd24451e Update kernel headers
    e4ba36f7 iplink: add ip-link documentation
    5d57e130 iplink: add gro_max_size attribute handling
    721435dc tc: u32: add json support in `print_raw`, `print_ipv4`, `print_ipv6`
    c733722b tc: u32: add support for json output
    5f44590d tc/f_flower: fix indentation
    9948b6cb tc_util: fix breakage from clang changes
    f4cd4f12 tc: add skip_hw and skip_sw to control action offload
    ba5ac984 json_print: suppress clang format warning
    bf71c8f2 libbpf: fix clang warning about format non-literal
    5632cf69 tunnel: fix clang warning
    c0248878 tipc: fix clang warning about empty format string
    371c13e8 can: fix clang warning
    8d27eee5 ipl2tp: fix clang warning
    560d2336 tc_util: fix clang warning in print_masked_type
    b2450e46 flower: fix clang warnings
    4e27d538 netem: fix clang warnings
    9d5e29e6 utils: add format attribute
    343c4f52 tc: add format attribute to tc_print_rate
    
    Signed-off-by: Nick Hainke <vincent at systemli.org>
---
 package/network/utils/iproute2/Makefile                       |  5 +++--
 .../iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch     | 11 +++++++----
 .../utils/iproute2/patches/140-keep_libmnl_optional.patch     |  2 +-
 .../utils/iproute2/patches/150-keep_libcap_optional.patch     |  2 +-
 .../utils/iproute2/patches/155-keep_tirpc_optional.patch      | 11 +++++++++++
 .../utils/iproute2/patches/180-drop_FAILED_POLICY.patch       |  2 +-
 .../utils/iproute2/patches/200-drop_libbsd_dependency.patch   |  2 +-
 7 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index 6058b5e8d9..123b0ce238 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.17.0
+PKG_VERSION:=5.18.0
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
-PKG_HASH:=6e384f1b42c75e1a9daac57866da37dcff909090ba86eb25a6e764da7893660e
+PKG_HASH:=5ba3d464d51c8c283550d507ffac3d10f7aec587b7c66b0ccb6950643646389e
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=iptables
 PKG_LICENSE:=GPL-2.0
@@ -184,6 +184,7 @@ MAKE_FLAGS += \
 	HAVE_ELF=$(HAVE_ELF) \
 	HAVE_MNL=$(HAVE_MNL) \
 	HAVE_CAP=$(HAVE_CAP) \
+	HAVE_TIRPC=n \
 	IPT_LIB_DIR=/usr/lib/iptables \
 	XT_LIB_DIR=/usr/lib/iptables \
 	TC_CONFIG_XT=$(TC_CONFIG_XT) \
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 1386dd9e1f..2a3f9eb90f 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,11 +1,14 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -65,7 +65,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
+@@ -65,9 +65,9 @@ WFLAGS += -Wmissing-declarations -Wold-s
  CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS)
  YACCFLAGS = -d -t -v
  
--SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma dcb man vdpa
-+SUBDIRS=lib ip tc bridge misc genl devlink rdma
+-SUBDIRS=lib ip tc bridge misc netem genl man
++SUBDIRS=lib ip tc bridge misc genl
+ ifeq ($(HAVE_MNL),y)
+-SUBDIRS += tipc devlink rdma dcb vdpa
++SUBDIRS += devlink rdma
+ endif
  
  LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a
- LDLIBS += $(LIBNETLINK)
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 576da0fd59..a8cdd103ba 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
-@@ -398,7 +398,7 @@ check_selinux()
+@@ -411,7 +411,7 @@ check_tirpc()
  
  check_mnl()
  {
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 e945d802f3..4cce2c3ca6 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
-@@ -456,7 +456,7 @@ EOF
+@@ -469,7 +469,7 @@ EOF
  
  check_cap()
  {
diff --git a/package/network/utils/iproute2/patches/155-keep_tirpc_optional.patch b/package/network/utils/iproute2/patches/155-keep_tirpc_optional.patch
new file mode 100644
index 0000000000..28ba7e5217
--- /dev/null
+++ b/package/network/utils/iproute2/patches/155-keep_tirpc_optional.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -398,7 +398,7 @@ check_selinux()
+ 
+ check_tirpc()
+ {
+-	if ${PKG_CONFIG} libtirpc --exists; then
++	if [ "${HAVE_TIRPC}" = "y" ] && ${PKG_CONFIG} libtirpc --exists; then
+ 		echo "HAVE_RPC:=y" >>$CONFIG
+ 		echo "yes"
+ 
diff --git a/package/network/utils/iproute2/patches/180-drop_FAILED_POLICY.patch b/package/network/utils/iproute2/patches/180-drop_FAILED_POLICY.patch
index 07d5230a6e..094ff393a6 100644
--- a/package/network/utils/iproute2/patches/180-drop_FAILED_POLICY.patch
+++ b/package/network/utils/iproute2/patches/180-drop_FAILED_POLICY.patch
@@ -31,7 +31,7 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY
  		if (!end || end == arg || *end || res > 255)
 --- a/include/uapi/linux/rtnetlink.h
 +++ b/include/uapi/linux/rtnetlink.h
-@@ -256,6 +256,7 @@ enum {
+@@ -265,6 +265,7 @@ enum {
  	RTN_THROW,		/* Not in this table		*/
  	RTN_NAT,		/* Translate this address	*/
  	RTN_XRESOLVE,		/* Use external resolver	*/
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 bc316c7dde..d1948860e8 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
-@@ -442,14 +442,8 @@ EOF
+@@ -455,14 +455,8 @@ EOF
      if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
  	echo "no"
      else

More information about the lede-commits mailing list