iproute2: update to 6.11.0

11 files changed, 35 insertions, 58 deletions

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 1040eb93c..d1f583742 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		iproute2
-PKG_VERSION:=		5.8.0
+PKG_VERSION:=		6.11.0
 PKG_RELEASE:=		1
-PKG_HASH:=		cfcd1f890290f8c8afcc91d9444ad929b9252c16f9ab3f286c50dd3c59dc646e
+PKG_HASH:=		1f795398a04aeaacd06a8f6ace2cfd913c33fa5953ca99daae83bb5c534611c3
 PKG_DESCR:=		routing control utility
 PKG_SECTION:=		net/route
 PKG_BUILDDEP:=		iptables libnl linux-atm
@@ -15,6 +15,7 @@ PKG_URL:=		http://www.linuxfoundation.org/en/Net:Iproute2
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/net/iproute2/
 
 PKG_SUBPKGS:=		IP TC TC_ATM TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS
+PKGSS_IP:=		libmnl
 PKGSD_TC:=		traffic control utility
 PKGSB_TC:=		iptables
 PKGSD_TC_ATM:=		traffic control atm support library
@@ -43,12 +44,11 @@ $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PK
 
 CONFIG_STYLE:=		minimal
 TARGET_CFLAGS+=		-D_GNU_SOURCE
-XAKE_FLAGS+=		CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\""
+XAKE_FLAGS+=		CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" V=1
 CONFIGURE_ENV+=		CC="${TARGET_CC}" IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}"
 
 ip-install:
-	${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,bin}
-	${INSTALL_DATA} ${WRKINST}/etc/iproute2/* ${IDIR_IP}/etc/iproute2/
+	${INSTALL_DIR} ${IDIR_IP}/bin
 	${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/bin/ip
 
 tc-install:
diff --git a/package/iproute2/patches/patch-bridge_mst_c b/package/iproute2/patches/patch-bridge_mst_c
new file mode 100644
index 000000000..ed62eb842
--- /dev/null
+++ b/package/iproute2/patches/patch-bridge_mst_c
@@ -0,0 +1,10 @@
+--- iproute2-6.11.0.orig/bridge/mst.c	2024-09-15 21:42:26.000000000 +0200
++++ iproute2-6.11.0/bridge/mst.c	2024-09-24 09:58:39.165522637 +0200
+@@ -4,6 +4,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <netinet/in.h>
+ #include <linux/if_bridge.h>
+ #include <net/if.h>
+ 
diff --git a/package/iproute2/patches/patch-ip_iplink_can_c b/package/iproute2/patches/patch-ip_iplink_can_c
index 491987005..f08774b36 100644
--- a/package/iproute2/patches/patch-ip_iplink_can_c
+++ b/package/iproute2/patches/patch-ip_iplink_can_c
@@ -1,6 +1,6 @@
---- iproute2-4.9.0.orig/ip/iplink_can.c	2016-12-13 00:07:42.000000000 +0100
-+++ iproute2-4.9.0/ip/iplink_can.c	2016-12-26 01:27:39.734025890 +0100
-@@ -119,7 +119,7 @@ static int can_parse_opt(struct link_uti
+--- iproute2-6.11.0.orig/ip/iplink_can.c	2024-09-15 21:42:26.000000000 +0200
++++ iproute2-6.11.0/ip/iplink_can.c	2024-09-24 09:43:33.522450056 +0200
+@@ -137,7 +137,7 @@ static int can_parse_opt(struct link_uti
  			if (get_u32(&bt.bitrate, *argv, 0))
  				invarg("invalid \"bitrate\" value\n", *argv);
  		} else if (matches(*argv, "sample-point") == 0) {
diff --git a/package/iproute2/patches/patch-misc_ifstat_c b/package/iproute2/patches/patch-misc_ifstat_c
deleted file mode 100644
index 7f6584649..000000000
--- a/package/iproute2/patches/patch-misc_ifstat_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- iproute2-3.10.0.orig/misc/ifstat.c	2013-07-16 19:06:36.000000000 +0200
-+++ iproute2-3.10.0/misc/ifstat.c	2013-08-17 15:27:59.236199157 +0200
-@@ -21,7 +21,7 @@
- #include <sys/file.h>
- #include <sys/socket.h>
- #include <sys/un.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <signal.h>
diff --git a/package/iproute2/patches/patch-misc_nstat_c b/package/iproute2/patches/patch-misc_nstat_c
deleted file mode 100644
index feed4df14..000000000
--- a/package/iproute2/patches/patch-misc_nstat_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- iproute2-3.10.0.orig/misc/nstat.c	2013-07-16 19:06:36.000000000 +0200
-+++ iproute2-3.10.0/misc/nstat.c	2013-08-17 15:27:46.412360373 +0200
-@@ -21,7 +21,7 @@
- #include <sys/file.h>
- #include <sys/socket.h>
- #include <sys/un.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <signal.h>
diff --git a/package/iproute2/patches/patch-misc_rtacct_c b/package/iproute2/patches/patch-misc_rtacct_c
deleted file mode 100644
index ac0c7d5e2..000000000
--- a/package/iproute2/patches/patch-misc_rtacct_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- iproute2-3.10.0.orig/misc/rtacct.c	2013-07-16 19:06:36.000000000 +0200
-+++ iproute2-3.10.0/misc/rtacct.c	2013-08-17 15:26:02.313669072 +0200
-@@ -22,7 +22,7 @@
- #include <sys/file.h>
- #include <sys/socket.h>
- #include <sys/un.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
diff --git a/package/iproute2/patches/patch-netem_Makefile b/package/iproute2/patches/patch-netem_Makefile
index 69141bd62..6583220fc 100644
--- a/package/iproute2/patches/patch-netem_Makefile
+++ b/package/iproute2/patches/patch-netem_Makefile
@@ -1,6 +1,6 @@
---- iproute2-4.10.0.orig/netem/Makefile	2017-02-20 17:47:52.000000000 +0100
-+++ iproute2-4.10.0/netem/Makefile	2017-04-23 20:23:07.404790192 +0200
-@@ -1,14 +1,12 @@
+--- iproute2-6.11.0.orig/netem/Makefile	2024-09-15 21:42:26.000000000 +0200
++++ iproute2-6.11.0/netem/Makefile	2024-09-24 09:43:33.530449869 +0200
+@@ -4,14 +4,12 @@ include ../config.mk
  DISTGEN = maketable normal pareto paretonormal
  DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
  
@@ -16,7 +16,7 @@
  
  %.dist: %
  	./$* > $@
-@@ -17,7 +15,7 @@ experimental.dist: maketable experimenta
+@@ -20,7 +18,7 @@ experimental.dist: maketable experimenta
  	./maketable experimental.dat > experimental.dist
  
  stats: stats.c
diff --git a/package/iproute2/patches/patch-netem_maketable_c b/package/iproute2/patches/patch-netem_maketable_c
index b6eb03405..0fe26932f 100644
--- a/package/iproute2/patches/patch-netem_maketable_c
+++ b/package/iproute2/patches/patch-netem_maketable_c
@@ -1,6 +1,6 @@
---- iproute2-2.6.29-1.orig/netem/maketable.c	2009-03-24 23:40:54.000000000 +0100
-+++ iproute2-2.6.29-1/netem/maketable.c	2009-12-11 16:32:33.000000000 +0100
-@@ -10,7 +10,7 @@
+--- iproute2-6.11.0.orig/netem/maketable.c	2024-09-15 21:42:26.000000000 +0200
++++ iproute2-6.11.0/netem/maketable.c	2024-09-24 09:43:33.538449682 +0200
+@@ -11,7 +11,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <math.h>
diff --git a/package/iproute2/patches/patch-netem_normal_c b/package/iproute2/patches/patch-netem_normal_c
index 3eada6d03..ddf1927b2 100644
--- a/package/iproute2/patches/patch-netem_normal_c
+++ b/package/iproute2/patches/patch-netem_normal_c
@@ -1,6 +1,6 @@
---- iproute2-3.12.0.orig/netem/normal.c	2013-11-23 02:10:33.000000000 +0100
-+++ iproute2-3.12.0/netem/normal.c	2014-02-09 11:40:30.000000000 +0100
-@@ -8,9 +8,7 @@
+--- iproute2-6.11.0.orig/netem/normal.c	2024-09-15 21:42:26.000000000 +0200
++++ iproute2-6.11.0/netem/normal.c	2024-09-24 09:43:33.542449589 +0200
+@@ -9,9 +9,7 @@
  #include <string.h>
  #include <limits.h>
  
diff --git a/package/iproute2/patches/patch-netem_pareto_c b/package/iproute2/patches/patch-netem_pareto_c
index b422a56a0..1f6a9338f 100644
--- a/package/iproute2/patches/patch-netem_pareto_c
+++ b/package/iproute2/patches/patch-netem_pareto_c
@@ -1,6 +1,6 @@
---- iproute2-3.12.0.orig/netem/pareto.c	2013-11-23 02:10:33.000000000 +0100
-+++ iproute2-3.12.0/netem/pareto.c	2014-02-09 11:46:07.000000000 +0100
-@@ -7,10 +7,8 @@
+--- iproute2-6.11.0.orig/netem/pareto.c	2024-09-15 21:42:26.000000000 +0200
++++ iproute2-6.11.0/netem/pareto.c	2024-09-24 09:43:33.550449401 +0200
+@@ -8,10 +8,8 @@
  #include <math.h>
  #include <limits.h>
  
diff --git a/package/iproute2/patches/patch-tc_tc_core_h b/package/iproute2/patches/patch-tc_tc_core_h
index 2716b71c8..25c259cee 100644
--- a/package/iproute2/patches/patch-tc_tc_core_h
+++ b/package/iproute2/patches/patch-tc_tc_core_h
@@ -1,6 +1,6 @@
---- iproute2-3.12.0.orig/tc/tc_core.h	2013-11-23 02:10:33.000000000 +0100
-+++ iproute2-3.12.0/tc/tc_core.h	2014-02-08 20:19:59.000000000 +0100
-@@ -1,7 +1,7 @@
+--- iproute2-6.11.0.orig/tc/tc_core.h	2024-09-15 21:42:26.000000000 +0200
++++ iproute2-6.11.0/tc/tc_core.h	2024-09-24 09:43:33.562449121 +0200
+@@ -2,7 +2,7 @@
  #ifndef _TC_CORE_H_
  #define _TC_CORE_H_ 1
  
@@ -8,4 +8,4 @@
 +#include <sys/types.h>
  #include <linux/pkt_sched.h>
  
- #define TIME_UNITS_PER_SEC	1000000
+ enum link_layer {