From 621801b621f2d668d902f9ed7485677b575753abfb1382f9fd5942bacb89f86b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 12 Sep 2023 15:13:49 +0000 Subject: [PATCH] - Update to release 6.5 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=244 --- ...llation-directories-for-openSUSE-SLE.patch | 33 +++++++++--------- iproute2-6.4.0.tar.sign | Bin 566 -> 0 bytes iproute2-6.4.0.tar.xz | 3 -- iproute2-6.5.0.tar.sign | Bin 0 -> 566 bytes iproute2-6.5.0.tar.xz | 3 ++ iproute2.changes | 7 ++++ iproute2.spec | 11 +++--- 7 files changed, 32 insertions(+), 25 deletions(-) delete mode 100644 iproute2-6.4.0.tar.sign delete mode 100644 iproute2-6.4.0.tar.xz create mode 100644 iproute2-6.5.0.tar.sign create mode 100644 iproute2-6.5.0.tar.xz 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 59425dbc7188b369ede8395c55a63ae4f8f0482678459c5fc89f9e8bae2609fe..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0%V!F2mlHR5P+wD zV3p0}etty{|8({-Zo;#aW{B>b9#)Nt9mYo;bh3890<8g(D`4_JziYkI9$#*&fgc?s zRy+6Ve49kkGkjq+=LzkUH)V8J7BPSmTa-~{Lo^9uTLyDpD~o_SUKbKYjcJeRn*J}z zllrm*(Oc772IuzgO+cF0b@FFMZcvkue+T3q-uX-^HyghAruowVNoV!8_Y;6M3~XKP z%Jw3bG6DESZ*_d|liTPQc~l2k|7v&uI|HSCUulxO=Jk zspb~5$MC{y{O1|Qd?64?M3ghG&eDM|H<6mWZj@m*V-~1Mw}ceS8LnZQE8Y*R!}5uF zY)N!%LgwrTAg6mrIqyL;WF{@uh97~ixs77$J?_ePW=HZ7;I;OsEoJx#3)n5ul-}M9 zmso$F4A8I}B|cK$SAzRXVBYn;nG9mFr0=atZC3qJ&n`$14&MS80kF$At+Ct3c1#pH z_9{3TWeF?)5x~LPqJndn!M&L;{`RnAhY9?T1yrms3=nibWZR759Q9q;$*M8yB!oBg zXxlIxda!Q_(XKkMAenj_>!(HE+H5M^6ads4lvs1*-fDjPNth(s8*{ZjPZ4*HuQ)Tj z=UagL&*uJ@t=y@tQJ1NwHXo4FUfQ(jwk{u=&)92It=}_w&K*0Db=%?|wGiM}>n#yE EVSR@b-T(jq 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 0000000000000000000000000000000000000000000000000000000000000000..53d8fa044c9f851e3ac68b651111ae9aec9450417e378fd49609f35f1048a036 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0%Z88ivS7<5P+wD zV3p0}ei9-N{v(ZJ4U88?r&x6oh_NeJp*EnoASlw+*44l}XPGe36)DftkqB|EXX>T# z95U?+gQU?1B5k?H_~&QMev28&YHi({NE0DW@7Y9*+?WL$NuW#`(C-EX)%5YGWscTP zpq>6S|7(E=uy5EKPC*M8aKudu4rTav7jS#47@=>JXhj-Ier%-?1aa?B;&2Jon0}*( zj>o%3!7RfElmoyhlau$2@v8bTQ!$|{O+;FBisZ}1Xs`c>lLicqFT{6D@0(?^UJI3DIH4vE;XV&B z^!v2DW?($;=^R!ib&)W-CHJ-n1c*FEnnnj@=LKUX2KEdAm|OE+FhnA1 z_3>J=rOjU%tnrAtz$N%i^_u5vv|EfGm)c+)t;VofdwAk(AB$&6pEJW4cWyaU>KR>v zi^~9CSUyGwqG4Y)d;YXQvqbbNNE55f3kTp+zfYr|RVul-Ij{p<#igfpuQL6;N8dov zm;J5^jUHdu)3hz*e;G^rb1i|CoB4y7Y{y9t&td?v?TrmBiq}>i-eynL$Y(-5x4~+5 zXr(g7%7^>L3ESkE|DN0x8;F9AEr4KvD}iiK?iIu`#Ilivkm2C*h%pjHE9?e|c2s|* ERaSBkbpQYW literal 0 HcmV?d00001 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/