diff --git a/adjust-installation-directories-for-openSUSE-SLE.patch b/adjust-installation-directories-for-openSUSE-SLE.patch index 91851cb..d11782c 100644 --- a/adjust-installation-directories-for-openSUSE-SLE.patch +++ b/adjust-installation-directories-for-openSUSE-SLE.patch @@ -10,10 +10,10 @@ Match the directory layout of openSUSE and SLE. tc/q_netem.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) -Index: iproute2-6.5.0/Makefile +Index: iproute2-6.6.0/Makefile =================================================================== ---- iproute2-6.5.0.orig/Makefile -+++ iproute2-6.5.0/Makefile +--- iproute2-6.6.0.orig/Makefile ++++ iproute2-6.6.0/Makefile @@ -15,10 +15,10 @@ MAKEFLAGS += --no-print-directory endif @@ -21,7 +21,7 @@ Index: iproute2-6.5.0/Makefile -SBINDIR?=/sbin +SBINDIR?=/usr/sbin CONF_ETC_DIR?=/etc/iproute2 - CONF_USR_DIR?=$(PREFIX)/lib/iproute2 + CONF_USR_DIR?=$(LIBDIR)/iproute2 -NETNS_RUN_DIR?=/var/run/netns +NETNS_RUN_DIR?=/run/netns NETNS_ETC_DIR?=/etc/netns @@ -36,10 +36,10 @@ Index: iproute2-6.5.0/Makefile ifneq ($(SHARED_LIBS),y) DEFINES+= -DNO_SHARED_LIBS endif -Index: iproute2-6.5.0/netem/Makefile +Index: iproute2-6.6.0/netem/Makefile =================================================================== ---- iproute2-6.5.0.orig/netem/Makefile -+++ iproute2-6.5.0/netem/Makefile +--- iproute2-6.6.0.orig/netem/Makefile ++++ iproute2-6.6.0/netem/Makefile @@ -7,6 +7,7 @@ DISTDATA = normal.dist pareto.dist paret HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) @@ -60,11 +60,11 @@ Index: iproute2-6.5.0/netem/Makefile done clean: -Index: iproute2-6.5.0/tc/q_netem.c +Index: iproute2-6.6.0/tc/q_netem.c =================================================================== ---- iproute2-6.5.0.orig/tc/q_netem.c -+++ iproute2-6.5.0/tc/q_netem.c -@@ -130,7 +130,7 @@ static int get_distribution(const char * +--- iproute2-6.6.0.orig/tc/q_netem.c ++++ iproute2-6.6.0/tc/q_netem.c +@@ -131,7 +131,7 @@ static int get_distribution(const char * char *line = NULL; char name[128]; diff --git a/iproute2-6.5.0.tar.sign b/iproute2-6.5.0.tar.sign deleted file mode 100644 index 53d8fa0..0000000 Binary files a/iproute2-6.5.0.tar.sign and /dev/null differ diff --git a/iproute2-6.5.0.tar.xz b/iproute2-6.5.0.tar.xz deleted file mode 100644 index 3ee5231..0000000 --- a/iproute2-6.5.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a70179085fa1b96d3c33b040c809b75e2b57563adc505a4ad05e2609df373463 -size 925940 diff --git a/iproute2-6.6.0.tar.sign b/iproute2-6.6.0.tar.sign new file mode 100644 index 0000000..4cc86ae Binary files /dev/null and b/iproute2-6.6.0.tar.sign differ diff --git a/iproute2-6.6.0.tar.xz b/iproute2-6.6.0.tar.xz new file mode 100644 index 0000000..206c976 --- /dev/null +++ b/iproute2-6.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8738c804afd09f0bf756937f0c3de23117832a98d8cbbf50386cf5005cd613ce +size 917964 diff --git a/iproute2.changes b/iproute2.changes index d9030db..d0f8f5d 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Nov 30 22:40:27 UTC 2023 - Jan Engelhardt + +- Update to release 6.6 + * bridge: Add backup nexthop ID support + * tc: Classifier support for SPI field + * tc: support the netem seed parameter for loss and corruption + events + * tc: remove support for CBQ + * tc: remove support for RSVP classifier + * tc: remove tcindex classifier + * tc: remove dsmark qdisc + * tc: drop support for ATM qdisc + ------------------------------------------------------------------- Tue Sep 12 14:22:29 UTC 2023 - Jan Engelhardt diff --git a/iproute2.spec b/iproute2.spec index 6abaf91..d614668 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -18,7 +18,7 @@ %define _buildshell /bin/bash Name: iproute2 -Version: 6.5 +Version: 6.6 Release: 0 Summary: Linux network configuration utilities License: GPL-2.0-only diff --git a/use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch b/use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch index 90ea8d7..bf1c30e 100644 --- a/use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch +++ b/use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch @@ -4,15 +4,15 @@ Subject: use sysconf(_SC_CLK_TCK) if HZ undefined Patch-mainline: No --- - lib/utils.c | 4 ++++ + lib/utils.c | 4 ++++ 1 file changed, 4 insertions(+) -Index: iproute2-6.3.0/lib/utils.c +Index: iproute2-6.6.0/lib/utils.c =================================================================== ---- iproute2-6.3.0.orig/lib/utils.c -+++ iproute2-6.3.0/lib/utils.c -@@ -108,6 +108,10 @@ int get_hex(char c) - return -1; +--- iproute2-6.6.0.orig/lib/utils.c ++++ iproute2-6.6.0/lib/utils.c +@@ -138,6 +138,10 @@ int get_long(long *val, const char *arg, + return 0; } +#ifndef HZ