summaryrefslogtreecommitdiff
path: root/package/iproute2
diff options
context:
space:
mode:
Diffstat (limited to 'package/iproute2')
-rw-r--r--package/iproute2/Makefile61
-rw-r--r--package/iproute2/patches/patch-Makefile30
-rw-r--r--package/iproute2/patches/patch-configure77
-rw-r--r--package/iproute2/patches/patch-ip_iplink_can_c11
-rw-r--r--package/iproute2/patches/patch-misc_Makefile13
-rw-r--r--package/iproute2/patches/patch-netem_Makefile10
-rw-r--r--package/iproute2/patches/patch-netem_maketable_c6
-rw-r--r--package/iproute2/patches/patch-netem_normal_c13
-rw-r--r--package/iproute2/patches/patch-netem_pareto_c14
-rw-r--r--package/iproute2/patches/patch-netem_paretonormal_c14
-rw-r--r--package/iproute2/patches/patch-tc_m_xt_c28
11 files changed, 66 insertions, 211 deletions
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index cd5b54a3f..1c7b61d64 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -1,40 +1,36 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${TOPDIR}/rules.mk
+include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= iproute2
-PKG_VERSION:= 2.6.38
+PKG_VERSION:= 6.14.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= a243bfea837e71824b7ca26c3bb45fa8
-PKG_DESCR:= iproute2 routing control utility
-PKG_SECTION:= route
+PKG_HASH:= a6d23588150096591c3d00fc27a324a82ee71d7a1a9eea78df5df17ad9b8461f
+PKG_DESCR:= routing control utility
+PKG_SECTION:= net/route
+PKG_BUILDDEP:= iptables libnl
+PKG_DEPENDS:= libnl
PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2
-PKG_SITES:= http://distfiles.gentoo.org/distfiles/
+PKG_SITES:= http://www.kernel.org/pub/linux/utils/net/iproute2/
-PKG_SUBPKGS:= IP TC TC_ATM TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS
-PKGSD_TC:= iproute2 traffic control utility
-PKGSS_TC:= kmod-sched
+PKG_SUBPKGS:= IP TC TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS
+PKGSS_IP:= libmnl
+PKGSD_TC:= traffic control utility
PKGSB_TC:= iptables
-PKGSD_TC_ATM:= iproute2 traffic control ATM support library
-PKGSS_TC_ATM:= tc libatm
-PKGSB_TC_ATM:= linux-atm
-PKGSD_TC_IPT:= iproute2 traffic control IPTables support library
+PKGSD_TC_IPT:= traffic control iptables support library
PKGSS_TC_IPT:= tc iptables
PKGSB_TC_IPT:= iptables
-PKGSD_IFSTAT:= iproute2 interface statistics utility
-PKGSD_LNSTAT:= iproute2 network statistics utilities
-PKGSD_ROUTEL:= iproute2 route list and flush utilities
-PKGSD_RTMON:= iproute2 RTnetlink monitor
-PKGSD_SS:= iproute2 socket statistics utility
+PKGSD_IFSTAT:= interface statistics utility
+PKGSD_LNSTAT:= network statistics utilities
+PKGSD_ROUTEL:= route list and flush utilities
+PKGSD_RTMON:= rtnetlink monitor
+PKGSD_SS:= socket statistics utility
-DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC},${PKGSD_TC},${PKG_SECTION}))
-$(eval $(call PKG_template,TC_ATM,tc-atm,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC_ATM},${PKGSD_TC_ATM},${PKG_SECTION}))
$(eval $(call PKG_template,TC_IPT,tc-iptables,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC_IPT},${PKGSD_TC_IPT},${PKG_SECTION}))
$(eval $(call PKG_template,IFSTAT,ifstat,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_IFSTAT},${PKG_SECTION}))
$(eval $(call PKG_template,LNSTAT,lnstat,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LNSTAT},${PKG_SECTION}))
@@ -44,29 +40,22 @@ $(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}\"" \
- CFLAGS_FOR_BUILD+="-I${LINUX_HEADER_DIR}/include"
+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,usr/sbin}
- ${INSTALL_DATA} ${WRKINST}/etc/iproute2/* ${IDIR_IP}/etc/iproute2/
- ${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/usr/sbin/ip
+ ${INSTALL_DIR} ${IDIR_IP}/bin
+ ${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/bin/ip
tc-install:
- ${INSTALL_DIR} ${IDIR_TC}/{lib/tc,usr/sbin,usr/lib/tc}
+ ${INSTALL_DIR} ${IDIR_TC}/{usr/sbin,usr/lib/tc}
${CP} ${WRKINST}/usr/lib/tc/*.dist ${IDIR_TC}/usr/lib/tc/
${INSTALL_BIN} ${WRKINST}/sbin/tc ${IDIR_TC}/usr/sbin/
-tc-atm-install:
- ${INSTALL_DIR} ${IDIR_TC_ATM}/lib/tc
- ${INSTALL_DATA} ${WRKINST}/lib/tc/q_atm.so \
- ${IDIR_TC_ATM}/lib/tc/
-
tc-iptables-install:
- ${INSTALL_DIR} ${IDIR_TC_IPT}/lib/tc
+ ${INSTALL_DIR} ${IDIR_TC_IPT}/usr/lib/tc
# use ${CP} here, since m_ipt.so is a symlink to m_xt.so
- ${CP} ${WRKINST}/lib/tc/m_*.so ${IDIR_TC}/lib/tc/
+ ${CP} ${WRKINST}/usr/lib/tc/m_*.so ${IDIR_TC}/usr/lib/tc/
ifstat-install:
${INSTALL_DIR} ${IDIR_IFSTAT}/usr/sbin
@@ -91,4 +80,4 @@ ss-install:
${INSTALL_DIR} ${IDIR_SS}/usr/sbin
${INSTALL_BIN} ${WRKINST}/sbin/ss ${IDIR_SS}/usr/sbin
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/iproute2/patches/patch-Makefile b/package/iproute2/patches/patch-Makefile
deleted file mode 100644
index d84ffa57b..000000000
--- a/package/iproute2/patches/patch-Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
- - allow variables to be overridden
- - allow passing TARGET_CFLAGS
- overriding CCOPTS instead wont work, as this variable is being
- used to compile host-utils in netem/
- - define LIBUTIL for misc/ss to compile correctly
---- iproute2-2.6.37.orig/Makefile 2011-01-07 18:54:30.000000000 +0100
-+++ iproute2-2.6.37/Makefile 2011-01-18 02:19:41.379921947 +0100
-@@ -27,10 +27,10 @@ ADDLIB+=dnet_ntop.o dnet_pton.o
- #options for ipx
- ADDLIB+=ipx_ntop.o ipx_pton.o
-
--CC = gcc
--HOSTCC = gcc
--CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
--CFLAGS = $(CCOPTS) -I../include $(DEFINES)
-+CC := gcc
-+HOSTCC := gcc
-+CCOPTS ?= -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
-+CFLAGS = $(CCOPTS) -I../include $(DEFINES) ${TARGET_CFLAGS}
- YACCFLAGS = -d -t -v
-
- LDLIBS += -L../lib -lnetlink -lutil
-@@ -38,6 +38,7 @@ LDLIBS += -L../lib -lnetlink -lutil
- SUBDIRS=lib ip tc misc netem genl
-
- LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
-+LIBUTIL=../lib/libutil.a
-
- all: Config
- @set -e; \
diff --git a/package/iproute2/patches/patch-configure b/package/iproute2/patches/patch-configure
deleted file mode 100644
index 13b8fc905..000000000
--- a/package/iproute2/patches/patch-configure
+++ /dev/null
@@ -1,77 +0,0 @@
- - use the compiler passed in $CC
- - predefine iptables modules dir, since the check would
- always fail (cause of absolute search paths) and OpenADK
- (for now) doesn't compile iptables with shared objects
- - do not discard compiler output from tests, they're useful
- for debugging
- - additionally output the full compiler command before running
- it
---- iproute2-2.6.37.orig/configure 2011-01-07 18:54:30.000000000 +0100
-+++ iproute2-2.6.37/configure 2011-02-25 21:01:53.000000000 +0100
-@@ -1,4 +1,5 @@
- #! /bin/bash
-+set -x
- # This is not an autconf generated configure
- #
- INCLUDE=${1:-"$PWD/include"}
-@@ -15,7 +16,8 @@ int main(int argc, char **argv) {
- return 0;
- }
- EOF
--gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
-+echo "$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm"
-+$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm
- if [ $? -eq 0 ]
- then
- echo "TC_CONFIG_ATM:=y" >>Config
-@@ -49,7 +51,8 @@ int main(int argc, char **argv)
-
- EOF
-
--if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1
-+echo "$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables"
-+if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables
- then
- echo "TC_CONFIG_XT:=y" >>Config
- echo "using xtables"
-@@ -86,7 +89,8 @@ int main(int argc, char **argv) {
- }
-
- EOF
--gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
-+echo "$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl"
-+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl
-
- if [ $? -eq 0 ]
- then
-@@ -126,7 +130,8 @@ int main(int argc, char **argv) {
- }
-
- EOF
--gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
-+echo "$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl"
-+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl
-
- if [ $? -eq 0 ]
- then
-@@ -149,18 +154,8 @@ check_ipt()
-
- check_ipt_lib_dir()
- {
-- IPT_LIB_DIR=""
-- for dir in /lib /usr/lib /usr/local/lib
-- do
-- for file in $dir/$TABLES/lib*t_*so ; do
-- if [ -f $file ]; then
-- echo $dir/$TABLES
-- echo "IPT_LIB_DIR:=$dir/$TABLES" >> Config
-- return
-- fi
-- done
-- done
-- echo "not found!"
-+ echo "/usr/lib/$TABLES"
-+ echo "IPT_LIB_DIR:=/usr/lib/$TABLES" >> Config
- }
-
- echo "# Generated config based on" $INCLUDE >Config
diff --git a/package/iproute2/patches/patch-ip_iplink_can_c b/package/iproute2/patches/patch-ip_iplink_can_c
new file mode 100644
index 000000000..f08774b36
--- /dev/null
+++ b/package/iproute2/patches/patch-ip_iplink_can_c
@@ -0,0 +1,11 @@
+--- 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) {
+- float sp;
++ float sp = 0;
+
+ NEXT_ARG();
+ if (get_float(&sp, *argv))
diff --git a/package/iproute2/patches/patch-misc_Makefile b/package/iproute2/patches/patch-misc_Makefile
deleted file mode 100644
index 95dbe51ec..000000000
--- a/package/iproute2/patches/patch-misc_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
- disable compiling of arpd since it needs berkeley db which we dont have
- yet
---- iproute2-2.6.29-1.orig/misc/Makefile 2009-03-24 23:40:54.000000000 +0100
-+++ iproute2-2.6.29-1/misc/Makefile 2009-08-22 02:48:24.794861772 +0200
-@@ -1,7 +1,7 @@
- SSOBJ=ss.o ssfilter.o
- LNSTATOBJ=lnstat.o lnstat_util.o
-
--TARGETS=ss nstat ifstat rtacct arpd lnstat
-+TARGETS=ss nstat ifstat rtacct lnstat
-
- include ../Config
-
diff --git a/package/iproute2/patches/patch-netem_Makefile b/package/iproute2/patches/patch-netem_Makefile
index e49ab4415..6583220fc 100644
--- a/package/iproute2/patches/patch-netem_Makefile
+++ b/package/iproute2/patches/patch-netem_Makefile
@@ -1,12 +1,12 @@
---- iproute2-2.6.37.orig/netem/Makefile 2011-01-07 18:54:30.000000000 +0100
-+++ iproute2-2.6.37/netem/Makefile 2011-02-25 19:59:34.000000000 +0100
-@@ -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
-HOSTCC ?= $(CC)
-CCOPTS = $(CBUILD_CFLAGS)
- LDLIBS += -lm
+ LDLIBS += -lm
all: $(DISTGEN) $(DISTDATA)
@@ -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 719899301..ddf1927b2 100644
--- a/package/iproute2/patches/patch-netem_normal_c
+++ b/package/iproute2/patches/patch-netem_normal_c
@@ -1,10 +1,13 @@
---- iproute2-2.6.29-1.orig/netem/normal.c 2009-03-24 23:40:54.000000000 +0100
-+++ iproute2-2.6.29-1/netem/normal.c 2009-12-11 16:35:38.000000000 +0100
-@@ -8,7 +8,6 @@
+--- 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>
-#include <linux/types.h>
- #include <linux/pkt_sched.h>
-
+-#include <linux/pkt_sched.h>
+-
++#define NETEM_DIST_SCALE 8192
#define TABLESIZE 16384
+ #define TABLEFACTOR NETEM_DIST_SCALE
+
diff --git a/package/iproute2/patches/patch-netem_pareto_c b/package/iproute2/patches/patch-netem_pareto_c
new file mode 100644
index 000000000..1f6a9338f
--- /dev/null
+++ b/package/iproute2/patches/patch-netem_pareto_c
@@ -0,0 +1,14 @@
+--- 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>
+
+-#include <linux/types.h>
+-#include <linux/pkt_sched.h>
+-
+ static const double a=3.0;
++#define NETEM_DIST_SCALE 8192
+ #define TABLESIZE 16384
+ #define TABLEFACTOR NETEM_DIST_SCALE
+
diff --git a/package/iproute2/patches/patch-netem_paretonormal_c b/package/iproute2/patches/patch-netem_paretonormal_c
deleted file mode 100644
index d2c2ac4b6..000000000
--- a/package/iproute2/patches/patch-netem_paretonormal_c
+++ /dev/null
@@ -1,14 +0,0 @@
---- iproute2-2.6.29-1.orig/netem/paretonormal.c 2009-03-24 23:40:54.000000000 +0100
-+++ iproute2-2.6.29-1/netem/paretonormal.c 2009-12-11 16:59:02.000000000 +0100
-@@ -11,11 +11,9 @@
- */
- #include <stdio.h>
- #include <stdlib.h>
--#include <stdlib.h>
- #include <string.h>
- #include <math.h>
- #include <limits.h>
--#include <malloc.h>
-
- #include <linux/types.h>
- #include <linux/pkt_sched.h>
diff --git a/package/iproute2/patches/patch-tc_m_xt_c b/package/iproute2/patches/patch-tc_m_xt_c
deleted file mode 100644
index 8399e779a..000000000
--- a/package/iproute2/patches/patch-tc_m_xt_c
+++ /dev/null
@@ -1,28 +0,0 @@
---- iproute2-2.6.38.orig/tc/m_xt.c 2011-03-17 18:05:47.000000000 +0100
-+++ iproute2-2.6.38/tc/m_xt.c 2011-11-09 16:15:44.527071563 +0100
-@@ -162,7 +162,11 @@ static int parse_ipt(struct action_util
- return -1;
- }
- tcipt_globals.opts =
-- xtables_merge_options(tcipt_globals.opts,
-+ xtables_merge_options(
-+#if XTABLES_VERSION_CODE > 5
-+ tcipt_globals.orig_opts,
-+#endif
-+ tcipt_globals.opts,
- m->extra_opts,
- &m->option_offset);
- } else {
-@@ -307,7 +311,11 @@ print_ipt(struct action_util *au,FILE *
- }
-
- tcipt_globals.opts =
-- xtables_merge_options(tcipt_globals.opts,
-+ xtables_merge_options(
-+#if XTABLES_VERSION_CODE > 5
-+ tcipt_globals.orig_opts,
-+#endif
-+ tcipt_globals.opts,
- m->extra_opts,
- &m->option_offset);
- } else {
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-07 16:46:12 +0000