- Update to release 6.5

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=244
This commit is contained in:
Jan Engelhardt 2023-09-12 15:13:49 +00:00 committed by Git OBS Bridge
parent 1fdf658a2f
commit 621801b621
7 changed files with 32 additions and 25 deletions

View File

@ -5,28 +5,29 @@ Patch-mainline: Never, SUSE specific
Match the directory layout of openSUSE and SLE. Match the directory layout of openSUSE and SLE.
--- ---
Makefile | 4 ++-- Makefile | 6 +++---
netem/Makefile | 5 +++-- netem/Makefile | 5 +++--
tc/q_netem.c | 2 +- tc/q_netem.c | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-) 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.5.0.orig/Makefile
+++ iproute2-6.3.0/Makefile +++ iproute2-6.5.0/Makefile
@@ -15,9 +15,9 @@ MAKEFLAGS += --no-print-directory @@ -15,10 +15,10 @@ MAKEFLAGS += --no-print-directory
endif endif
PREFIX?=/usr PREFIX?=/usr
-SBINDIR?=/sbin -SBINDIR?=/sbin
+SBINDIR?=/usr/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?=/var/run/netns
+NETNS_RUN_DIR?=/run/netns +NETNS_RUN_DIR?=/run/netns
NETNS_ETC_DIR?=/etc/netns NETNS_ETC_DIR?=/etc/netns
DATADIR?=$(PREFIX)/share DATADIR?=$(PREFIX)/share
HDRDIR?=$(PREFIX)/include/iproute2 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 SHARED_LIBS = y
@ -35,10 +36,10 @@ Index: iproute2-6.3.0/Makefile
ifneq ($(SHARED_LIBS),y) ifneq ($(SHARED_LIBS),y)
DEFINES+= -DNO_SHARED_LIBS DEFINES+= -DNO_SHARED_LIBS
endif endif
Index: iproute2-6.3.0/netem/Makefile Index: iproute2-6.5.0/netem/Makefile
=================================================================== ===================================================================
--- iproute2-6.3.0.orig/netem/Makefile --- iproute2-6.5.0.orig/netem/Makefile
+++ iproute2-6.3.0/netem/Makefile +++ iproute2-6.5.0/netem/Makefile
@@ -7,6 +7,7 @@ DISTDATA = normal.dist pareto.dist paret @@ -7,6 +7,7 @@ DISTDATA = normal.dist pareto.dist paret
HOSTCC ?= $(CC) HOSTCC ?= $(CC)
CCOPTS = $(CBUILD_CFLAGS) CCOPTS = $(CBUILD_CFLAGS)
@ -59,10 +60,10 @@ Index: iproute2-6.3.0/netem/Makefile
done done
clean: 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.5.0.orig/tc/q_netem.c
+++ iproute2-6.3.0/tc/q_netem.c +++ iproute2-6.5.0/tc/q_netem.c
@@ -130,7 +130,7 @@ static int get_distribution(const char * @@ -130,7 +130,7 @@ static int get_distribution(const char *
char *line = NULL; char *line = NULL;
char name[128]; char name[128];

Binary file not shown.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4c51b8decbc7e4da159ffb066f590cfb93dbf9af7ff86b1647ce42b7c179a272
size 922164

BIN
iproute2-6.5.0.tar.sign Normal file

Binary file not shown.

3
iproute2-6.5.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a70179085fa1b96d3c33b040c809b75e2b57563adc505a4ad05e2609df373463
size 925940

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Sep 12 14:22:29 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- 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 <jengelh@inai.de> Fri Jul 14 11:44:38 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

View File

@ -18,7 +18,7 @@
%define _buildshell /bin/bash %define _buildshell /bin/bash
Name: iproute2 Name: iproute2
Version: 6.4 Version: 6.5
Release: 0 Release: 0
Summary: Linux network configuration utilities Summary: Linux network configuration utilities
License: GPL-2.0-only License: GPL-2.0-only
@ -74,9 +74,9 @@ New programs should use libmnl-devel instead.
Summary: Bash completion for iproute Summary: Bash completion for iproute
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Shells Group: System/Shells
Requires: %{name} Requires: %name
Requires: bash-completion Requires: bash-completion
Supplements: (%{name} and bash-completion) Supplements: (%name and bash-completion)
%description bash-completion %description bash-completion
bash command line completion support for iproute. bash command line completion support for iproute.
@ -85,7 +85,7 @@ bash command line completion support for iproute.
Summary: Userspace ARP daemon Summary: Userspace ARP daemon
License: GPL-2.0-only License: GPL-2.0-only
Group: Productivity/Networking/Routing Group: Productivity/Networking/Routing
Provides: iproute2:/usr/sbin/arpd Provides: iproute2:%_sbindir/arpd
%description arpd %description arpd
The arpd daemon collects gratuitous ARP information, saving it on The arpd daemon collects gratuitous ARP information, saving it on
@ -166,8 +166,7 @@ EOF
%_mandir/man7/* %_mandir/man7/*
%_mandir/man8/* %_mandir/man8/*
%exclude %_mandir/man8/arpd.8* %exclude %_mandir/man8/arpd.8*
%dir %_sysconfdir/iproute2 /usr/lib/iproute2
%config(noreplace) %_sysconfdir/iproute2/*
%_libdir/tc/ %_libdir/tc/
%_datadir/tc/ %_datadir/tc/
%_docdir/%name/ %_docdir/%name/