Skip to content

Commit 6d04c7b

Browse files
committed
iproute2: Update to version 6.17
https://www.spinics.net/lists/netdev/msg1094722.html https://www.spinics.net/lists/netdev/msg1112693.html https://www.spinics.net/lists/netdev/msg1126307.html Only small size increases: ``` 42470 bin/packages/mipsel_24kc/base/devlink-6.17.0-r1.apk 7553 bin/packages/mipsel_24kc/base/genl-6.17.0-r1.apk 35340 bin/packages/mipsel_24kc/base/ip-bridge-6.17.0-r1.apk 195151 bin/packages/mipsel_24kc/base/ip-full-6.17.0-r1.apk 133690 bin/packages/mipsel_24kc/base/ip-tiny-6.17.0-r1.apk 12185 bin/packages/mipsel_24kc/base/nstat-6.17.0-r1.apk 21484 bin/packages/mipsel_24kc/base/rdma-6.17.0-r1.apk 40935 bin/packages/mipsel_24kc/base/ss-6.17.0-r1.apk 168132 bin/packages/mipsel_24kc/base/tc-bpf-6.17.0-r1.apk 169667 bin/packages/mipsel_24kc/base/tc-full-6.17.0-r1.apk 144693 bin/packages/mipsel_24kc/base/tc-tiny-6.17.0-r1.apk 41654 bin/packages/mipsel_24kc/base/devlink-6.14.0-r1.apk 7551 bin/packages/mipsel_24kc/base/genl-6.14.0-r1.apk 32847 bin/packages/mipsel_24kc/base/ip-bridge-6.14.0-r1.apk 194398 bin/packages/mipsel_24kc/base/ip-full-6.14.0-r1.apk 132656 bin/packages/mipsel_24kc/base/ip-tiny-6.14.0-r1.apk 12114 bin/packages/mipsel_24kc/base/nstat-6.14.0-r1.apk 21366 bin/packages/mipsel_24kc/base/rdma-6.14.0-r1.apk 40939 bin/packages/mipsel_24kc/base/ss-6.14.0-r1.apk 163878 bin/packages/mipsel_24kc/base/tc-bpf-6.14.0-r1.apk 165511 bin/packages/mipsel_24kc/base/tc-full-6.14.0-r1.apk 140497 bin/packages/mipsel_24kc/base/tc-tiny-6.14.0-r1.apk ``` Link: openwrt/openwrt#20545 Signed-off-by: Hauke Mehrtens <[email protected]>
1 parent b4a8ba2 commit 6d04c7b

File tree

6 files changed

+33
-6
lines changed

6 files changed

+33
-6
lines changed

package/network/utils/iproute2/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=iproute2
11-
PKG_VERSION:=6.14.0
11+
PKG_VERSION:=6.17.0
1212
PKG_RELEASE:=1
1313

1414
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
1515
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
16-
PKG_HASH:=a6d23588150096591c3d00fc27a324a82ee71d7a1a9eea78df5df17ad9b8461f
16+
PKG_HASH:=9781e59410ab7dea8e9f79bb10ff1488e63d10fcbb70503b94426ba27a8e2dec
1717
PKG_BUILD_PARALLEL:=1
1818
PKG_BUILD_DEPENDS:=iptables
1919
PKG_LICENSE:=GPL-2.0
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 7119f3736f689ab396ca4193ac593938affd55fa Mon Sep 17 00:00:00 2001
2+
From: Yureka <[email protected]>
3+
Date: Sun, 12 Oct 2025 14:39:47 +0200
4+
Subject: lib: bridge: avoid redefinition of in6_addr
5+
6+
On musl libc, which does not use the kernel definitions of in6_addr, including
7+
the libc headers after the kernel (UAPI) headers would cause a redefinition
8+
error. The opposite order avoids the redefinition.
9+
10+
Fixes: 9e89d5b94d749f37525cd8778311e1c9f28f172a
11+
Signed-off-by: Yureka <[email protected]>
12+
---
13+
lib/bridge.c | 2 +-
14+
1 file changed, 1 insertion(+), 1 deletion(-)
15+
16+
--- a/lib/bridge.c
17+
+++ b/lib/bridge.c
18+
@@ -2,8 +2,8 @@
19+
20+
#include <net/if.h>
21+
22+
-#include "bridge.h"
23+
#include "utils.h"
24+
+#include "bridge.h"
25+
26+
void bridge_print_vlan_flags(__u16 flags)
27+
{

package/network/utils/iproute2/patches/115-add-config-xtlibdir.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/tc/Makefile
22
+++ b/tc/Makefile
3-
@@ -107,6 +107,9 @@ CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PR
3+
@@ -108,6 +108,9 @@ CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PR
44
ifneq ($(IPT_LIB_DIR),)
55
CFLAGS += -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
66
endif

package/network/utils/iproute2/patches/170-ip_tiny.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@
105105
+
106106
UTILOBJ = utils.o utils_math.o rt_names.o ll_map.o ll_types.o ll_proto.o ll_addr.o \
107107
inet_proto.o namespace.o json_writer.o json_print.o json_print_math.o \
108-
names.o color.o bpf_legacy.o bpf_glue.o exec.o fs.o cg_map.o ppp_proto.o
108+
names.o color.o bpf_legacy.o bpf_glue.o exec.o fs.o cg_map.o \

package/network/utils/iproute2/patches/180-drop_FAILED_POLICY.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY
3131
if (!end || end == arg || *end || res > 255)
3232
--- a/include/uapi/linux/rtnetlink.h
3333
+++ b/include/uapi/linux/rtnetlink.h
34-
@@ -265,6 +265,7 @@ enum {
34+
@@ -273,6 +273,7 @@ enum {
3535
RTN_THROW, /* Not in this table */
3636
RTN_NAT, /* Translate this address */
3737
RTN_XRESOLVE, /* Use external resolver */

package/network/utils/iproute2/patches/195-build_variant_ip_tc.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
--- a/tc/Makefile
1313
+++ b/tc/Makefile
14-
@@ -120,7 +120,7 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
14+
@@ -121,7 +121,7 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
1515
$(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic $< -o $@
1616

1717

0 commit comments

Comments
 (0)