diff --git a/adjust-installation-directories-for-openSUSE-SLE.patch b/adjust-installation-directories-for-openSUSE-SLE.patch index 7e92761..91851cb 100644 --- a/adjust-installation-directories-for-openSUSE-SLE.patch +++ b/adjust-installation-directories-for-openSUSE-SLE.patch @@ -5,28 +5,29 @@ Patch-mainline: Never, SUSE specific Match the directory layout of openSUSE and SLE. --- - Makefile | 4 ++-- - netem/Makefile | 5 +++-- - tc/q_netem.c | 2 +- - 3 files changed, 6 insertions(+), 5 deletions(-) + Makefile | 6 +++--- + netem/Makefile | 5 +++-- + tc/q_netem.c | 2 +- + 3 files changed, 7 insertions(+), 6 deletions(-) -Index: iproute2-6.3.0/Makefile +Index: iproute2-6.5.0/Makefile =================================================================== ---- iproute2-6.3.0.orig/Makefile -+++ iproute2-6.3.0/Makefile -@@ -15,9 +15,9 @@ MAKEFLAGS += --no-print-directory +--- iproute2-6.5.0.orig/Makefile ++++ iproute2-6.5.0/Makefile +@@ -15,10 +15,10 @@ MAKEFLAGS += --no-print-directory endif PREFIX?=/usr -SBINDIR?=/sbin +SBINDIR?=/usr/sbin - CONFDIR?=/etc/iproute2 + CONF_ETC_DIR?=/etc/iproute2 + CONF_USR_DIR?=$(PREFIX)/lib/iproute2 -NETNS_RUN_DIR?=/var/run/netns +NETNS_RUN_DIR?=/run/netns NETNS_ETC_DIR?=/etc/netns DATADIR?=$(PREFIX)/share HDRDIR?=$(PREFIX)/include/iproute2 -@@ -32,7 +32,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include +@@ -33,7 +33,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include SHARED_LIBS = y @@ -35,10 +36,10 @@ Index: iproute2-6.3.0/Makefile ifneq ($(SHARED_LIBS),y) DEFINES+= -DNO_SHARED_LIBS endif -Index: iproute2-6.3.0/netem/Makefile +Index: iproute2-6.5.0/netem/Makefile =================================================================== ---- iproute2-6.3.0.orig/netem/Makefile -+++ iproute2-6.3.0/netem/Makefile +--- iproute2-6.5.0.orig/netem/Makefile ++++ iproute2-6.5.0/netem/Makefile @@ -7,6 +7,7 @@ DISTDATA = normal.dist pareto.dist paret HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) @@ -59,10 +60,10 @@ Index: iproute2-6.3.0/netem/Makefile done clean: -Index: iproute2-6.3.0/tc/q_netem.c +Index: iproute2-6.5.0/tc/q_netem.c =================================================================== ---- iproute2-6.3.0.orig/tc/q_netem.c -+++ iproute2-6.3.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 * char *line = NULL; char name[128]; diff --git a/iproute2-6.4.0.tar.sign b/iproute2-6.4.0.tar.sign deleted file mode 100644 index 59425db..0000000 Binary files a/iproute2-6.4.0.tar.sign and /dev/null differ diff --git a/iproute2-6.4.0.tar.xz b/iproute2-6.4.0.tar.xz deleted file mode 100644 index fcee3ff..0000000 --- a/iproute2-6.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c51b8decbc7e4da159ffb066f590cfb93dbf9af7ff86b1647ce42b7c179a272 -size 922164 diff --git a/iproute2-6.5.0.tar.sign b/iproute2-6.5.0.tar.sign new file mode 100644 index 0000000..53d8fa0 Binary files /dev/null and b/iproute2-6.5.0.tar.sign differ diff --git a/iproute2-6.5.0.tar.xz b/iproute2-6.5.0.tar.xz new file mode 100644 index 0000000..3ee5231 --- /dev/null +++ b/iproute2-6.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a70179085fa1b96d3c33b040c809b75e2b57563adc505a4ad05e2609df373463 +size 925940 diff --git a/iproute2.changes b/iproute2.changes index 909a466..d9030db 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 12 14:22:29 UTC 2023 - Jan Engelhardt + +- Update to release 6.5 + * rdma: Report device protocol + * ip: error out if iplink does not consume all options + ------------------------------------------------------------------- Fri Jul 14 11:44:38 UTC 2023 - Jan Engelhardt diff --git a/iproute2.spec b/iproute2.spec index 98ac062..6abaf91 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -18,7 +18,7 @@ %define _buildshell /bin/bash Name: iproute2 -Version: 6.4 +Version: 6.5 Release: 0 Summary: Linux network configuration utilities License: GPL-2.0-only @@ -74,9 +74,9 @@ New programs should use libmnl-devel instead. Summary: Bash completion for iproute License: GPL-2.0-or-later Group: System/Shells -Requires: %{name} +Requires: %name Requires: bash-completion -Supplements: (%{name} and bash-completion) +Supplements: (%name and bash-completion) %description bash-completion bash command line completion support for iproute. @@ -85,7 +85,7 @@ bash command line completion support for iproute. Summary: Userspace ARP daemon License: GPL-2.0-only Group: Productivity/Networking/Routing -Provides: iproute2:/usr/sbin/arpd +Provides: iproute2:%_sbindir/arpd %description arpd The arpd daemon collects gratuitous ARP information, saving it on @@ -166,8 +166,7 @@ EOF %_mandir/man7/* %_mandir/man8/* %exclude %_mandir/man8/arpd.8* -%dir %_sysconfdir/iproute2 -%config(noreplace) %_sysconfdir/iproute2/* +/usr/lib/iproute2 %_libdir/tc/ %_datadir/tc/ %_docdir/%name/