mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-10 08:44:39 +01:00
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: https://github.com/openwrt/openwrt/pull/20545 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
b4a8ba2e88
commit
6d04c7b6dc
6 changed files with 33 additions and 6 deletions
|
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=iproute2
|
PKG_NAME:=iproute2
|
||||||
PKG_VERSION:=6.14.0
|
PKG_VERSION:=6.17.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
|
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
|
||||||
PKG_HASH:=a6d23588150096591c3d00fc27a324a82ee71d7a1a9eea78df5df17ad9b8461f
|
PKG_HASH:=9781e59410ab7dea8e9f79bb10ff1488e63d10fcbb70503b94426ba27a8e2dec
|
||||||
PKG_BUILD_PARALLEL:=1
|
PKG_BUILD_PARALLEL:=1
|
||||||
PKG_BUILD_DEPENDS:=iptables
|
PKG_BUILD_DEPENDS:=iptables
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
From 7119f3736f689ab396ca4193ac593938affd55fa Mon Sep 17 00:00:00 2001
|
||||||
|
From: Yureka <yureka@cyberchaos.dev>
|
||||||
|
Date: Sun, 12 Oct 2025 14:39:47 +0200
|
||||||
|
Subject: lib: bridge: avoid redefinition of in6_addr
|
||||||
|
|
||||||
|
On musl libc, which does not use the kernel definitions of in6_addr, including
|
||||||
|
the libc headers after the kernel (UAPI) headers would cause a redefinition
|
||||||
|
error. The opposite order avoids the redefinition.
|
||||||
|
|
||||||
|
Fixes: 9e89d5b94d749f37525cd8778311e1c9f28f172a
|
||||||
|
Signed-off-by: Yureka <yureka@cyberchaos.dev>
|
||||||
|
---
|
||||||
|
lib/bridge.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
--- a/lib/bridge.c
|
||||||
|
+++ b/lib/bridge.c
|
||||||
|
@@ -2,8 +2,8 @@
|
||||||
|
|
||||||
|
#include <net/if.h>
|
||||||
|
|
||||||
|
-#include "bridge.h"
|
||||||
|
#include "utils.h"
|
||||||
|
+#include "bridge.h"
|
||||||
|
|
||||||
|
void bridge_print_vlan_flags(__u16 flags)
|
||||||
|
{
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/tc/Makefile
|
--- a/tc/Makefile
|
||||||
+++ b/tc/Makefile
|
+++ b/tc/Makefile
|
||||||
@@ -107,6 +107,9 @@ CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PR
|
@@ -108,6 +108,9 @@ CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PR
|
||||||
ifneq ($(IPT_LIB_DIR),)
|
ifneq ($(IPT_LIB_DIR),)
|
||||||
CFLAGS += -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
|
CFLAGS += -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -105,4 +105,4 @@
|
||||||
+
|
+
|
||||||
UTILOBJ = utils.o utils_math.o rt_names.o ll_map.o ll_types.o ll_proto.o ll_addr.o \
|
UTILOBJ = utils.o utils_math.o rt_names.o ll_map.o ll_types.o ll_proto.o ll_addr.o \
|
||||||
inet_proto.o namespace.o json_writer.o json_print.o json_print_math.o \
|
inet_proto.o namespace.o json_writer.o json_print.o json_print_math.o \
|
||||||
names.o color.o bpf_legacy.o bpf_glue.o exec.o fs.o cg_map.o ppp_proto.o
|
names.o color.o bpf_legacy.o bpf_glue.o exec.o fs.o cg_map.o \
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY
|
||||||
if (!end || end == arg || *end || res > 255)
|
if (!end || end == arg || *end || res > 255)
|
||||||
--- a/include/uapi/linux/rtnetlink.h
|
--- a/include/uapi/linux/rtnetlink.h
|
||||||
+++ b/include/uapi/linux/rtnetlink.h
|
+++ b/include/uapi/linux/rtnetlink.h
|
||||||
@@ -265,6 +265,7 @@ enum {
|
@@ -273,6 +273,7 @@ enum {
|
||||||
RTN_THROW, /* Not in this table */
|
RTN_THROW, /* Not in this table */
|
||||||
RTN_NAT, /* Translate this address */
|
RTN_NAT, /* Translate this address */
|
||||||
RTN_XRESOLVE, /* Use external resolver */
|
RTN_XRESOLVE, /* Use external resolver */
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
--- a/tc/Makefile
|
--- a/tc/Makefile
|
||||||
+++ b/tc/Makefile
|
+++ b/tc/Makefile
|
||||||
@@ -120,7 +120,7 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
|
@@ -121,7 +121,7 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
|
||||||
$(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic $< -o $@
|
$(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic $< -o $@
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue