From 31c2334e96f69fe3c62c175f2c79d91fea207e4ed423d819908f0799ec7444ff Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 4 May 2023 07:34:29 +0000 Subject: [PATCH] Accepting request 1084545 from home:polslinux:branches:security:netfilter - Update to release 6.3: * New release of iproute2 corresponding to the 6.3 kernel. No large feature improvements only incremental improvements to the bridge mdb support, mostly just bug fixes. - Rebase patches. OBS-URL: https://build.opensuse.org/request/show/1084545 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=240 --- ...plicit-typecast-to-avoid-gcc-warning.patch | 13 ++++---- ...llation-directories-for-openSUSE-SLE.patch | 28 +++++++++++------- iproute2-6.2.0.tar.sign | Bin 566 -> 0 bytes iproute2-6.2.0.tar.xz | 3 -- iproute2-6.3.0.tar.sign | Bin 0 -> 566 bytes iproute2-6.3.0.tar.xz | 3 ++ iproute2.changes | 9 ++++++ iproute2.spec | 2 +- ...-link-and-compile-steps-for-binaries.patch | 6 ++-- use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch | 13 ++++---- 10 files changed, 45 insertions(+), 32 deletions(-) delete mode 100644 iproute2-6.2.0.tar.sign delete mode 100644 iproute2-6.2.0.tar.xz create mode 100644 iproute2-6.3.0.tar.sign create mode 100644 iproute2-6.3.0.tar.xz diff --git a/add-explicit-typecast-to-avoid-gcc-warning.patch b/add-explicit-typecast-to-avoid-gcc-warning.patch index 2966eec..05ecdb8 100644 --- a/add-explicit-typecast-to-avoid-gcc-warning.patch +++ b/add-explicit-typecast-to-avoid-gcc-warning.patch @@ -7,11 +7,11 @@ Patch-mainline: No lib/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/lib/utils.c b/lib/utils.c -index 0919bb201229..8709e82de5bc 100644 ---- a/lib/utils.c -+++ b/lib/utils.c -@@ -707,8 +707,8 @@ int matches(const char *cmd, const char *pattern) +Index: iproute2-6.3.0/lib/utils.c +=================================================================== +--- iproute2-6.3.0.orig/lib/utils.c ++++ iproute2-6.3.0/lib/utils.c +@@ -881,8 +881,8 @@ bool matches(const char *prefix, const c int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits) { @@ -22,6 +22,3 @@ index 0919bb201229..8709e82de5bc 100644 int words = bits >> 0x05; bits &= 0x1f; --- -2.14.1 - diff --git a/adjust-installation-directories-for-openSUSE-SLE.patch b/adjust-installation-directories-for-openSUSE-SLE.patch index f17deb5..7e92761 100644 --- a/adjust-installation-directories-for-openSUSE-SLE.patch +++ b/adjust-installation-directories-for-openSUSE-SLE.patch @@ -10,9 +10,12 @@ Match the directory layout of openSUSE and SLE. tc/q_netem.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) ---- a/Makefile -+++ b/Makefile -@@ -14,7 +14,7 @@ endif +Index: iproute2-6.3.0/Makefile +=================================================================== +--- iproute2-6.3.0.orig/Makefile ++++ iproute2-6.3.0/Makefile +@@ -15,9 +15,9 @@ MAKEFLAGS += --no-print-directory + endif PREFIX?=/usr -SBINDIR?=/sbin @@ -22,7 +25,8 @@ Match the directory layout of openSUSE and SLE. +NETNS_RUN_DIR?=/run/netns NETNS_ETC_DIR?=/etc/netns DATADIR?=$(PREFIX)/share -@@ -31,7 +31,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include + HDRDIR?=$(PREFIX)/include/iproute2 +@@ -32,7 +32,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include SHARED_LIBS = y @@ -31,9 +35,11 @@ Match the directory layout of openSUSE and SLE. ifneq ($(SHARED_LIBS),y) DEFINES+= -DNO_SHARED_LIBS endif ---- a/netem/Makefile -+++ b/netem/Makefile -@@ -7,6 +7,7 @@ DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist +Index: iproute2-6.3.0/netem/Makefile +=================================================================== +--- iproute2-6.3.0.orig/netem/Makefile ++++ iproute2-6.3.0/netem/Makefile +@@ -7,6 +7,7 @@ DISTDATA = normal.dist pareto.dist paret HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) LDLIBS += -lm @@ -53,9 +59,11 @@ Match the directory layout of openSUSE and SLE. done clean: ---- a/tc/q_netem.c -+++ b/tc/q_netem.c -@@ -96,7 +96,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata) +Index: iproute2-6.3.0/tc/q_netem.c +=================================================================== +--- iproute2-6.3.0.orig/tc/q_netem.c ++++ iproute2-6.3.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.2.0.tar.sign b/iproute2-6.2.0.tar.sign deleted file mode 100644 index 64190a7caa04561f647a2e3c51ee54d6291bc92af43f4fdf6cdd065941b83466..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0%P;BumB1P5P+wD zV3p0}enP1b0FWd(#4r`QkR6?uxOs?hQ6{s7yiGVR`;nb>&7UMqA!@aA8L>;sFGg+# zl*;=&iymDRzW};|@J}g~4rBswm}GD-a9vKoF^vju`RwX@`>5-sx+JcEAo!q>@AqJF z#(&ToA6eKRh8(}?7B?5bG$F7ZZ&AVZRoQ-8WBV&&rmhu_m=jJC0g9ANS3}w&ln*Jf z$A|e3tc6!D%`#OcSVVxkuwAl=V4D1bBJ~Di9%Ra^%aQlj9WN0p`U)icgNgS36bvnM z72rD-7sm#9`Z_z$^Cmnkk-!hNXKNnTv~+I-A&(BxvD#S$ux}HWHu9MN{<%VgGz4x& zZ((Dxp2i2{p1<4RZa%7>wK?$X*D2V&G3-0RWh(JJ?X))5w}i!#O^zV$`&`-Ki6}q@?=^u#NvFbJrVNf5a^stF3ce%EWL*9 zD%q-KWKLq4qD;@^aTyj0P~U`ngjz_?>G-cfBv*j4S%hGBs*?w7tJmX#u({@y_=UN7 zRhT9Im1fxZu+f47JX2jps~QmEVS?=>dFf0XcxD`-p@>z?ui{#@>k(TF0ESPo#1DPe zH~egrsps|x3AynU;X}w1Y-S}2$sb1y#A>8}to$vcU35}3)`NGc6qY7Lg|ZW3Rpj6T zDlcJ0hyV6O|8R(!Vf4TZ}^UMP7SbtQ>?8Vcqi18|D2gi+g#+0tvyER2A79rq1h zdp|fr7DaKK(0ZK~Ug&&okBe?H(-o|b+@bha6<)7SzwkL|S{0>RX|avZAvf2X3* zA|F0p`b#B!oP0>Bo=hDTglsaWutC`A(<_@bzAWXAdXW~X`tG1FE5F|ad6NjO*jyXL0g*)q{TobQ1oq@}puz-M{0Xg|ooPa&%S14{$EfZ}t|knVB~Vt6+SdBjG8_QAi{v5-w*; E{9+Repa1{> literal 0 HcmV?d00001 diff --git a/iproute2-6.3.0.tar.xz b/iproute2-6.3.0.tar.xz new file mode 100644 index 0000000..51084aa --- /dev/null +++ b/iproute2-6.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfb2a98db96e7a653cffc6693335a1a466e29a34b6ac528be48f35e1d2766732 +size 914700 diff --git a/iproute2.changes b/iproute2.changes index 00d65f0..9c6df21 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu May 4 07:20:24 UTC 2023 - Paolo Stivanin + +- Update to release 6.3: + * New release of iproute2 corresponding to the 6.3 kernel. + No large feature improvements only incremental improvements to + the bridge mdb support, mostly just bug fixes. +- Rebase patches. + ------------------------------------------------------------------- Mon Mar 20 21:21:52 UTC 2023 - Jan Engelhardt diff --git a/iproute2.spec b/iproute2.spec index 687a5d8..4cbfb5c 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -18,7 +18,7 @@ %define _buildshell /bin/bash Name: iproute2 -Version: 6.2 +Version: 6.3 Release: 0 Summary: Linux network configuration utilities License: GPL-2.0-only diff --git a/split-link-and-compile-steps-for-binaries.patch b/split-link-and-compile-steps-for-binaries.patch index 4747e0d..cb19317 100644 --- a/split-link-and-compile-steps-for-binaries.patch +++ b/split-link-and-compile-steps-for-binaries.patch @@ -10,8 +10,10 @@ to work. misc/Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) ---- a/misc/Makefile -+++ b/misc/Makefile +Index: iproute2-6.3.0/misc/Makefile +=================================================================== +--- iproute2-6.3.0.orig/misc/Makefile ++++ iproute2-6.3.0/misc/Makefile @@ -9,23 +9,24 @@ include ../config.mk ifeq ($(HAVE_BERKELEY_DB),y) TARGETS += arpd diff --git a/use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch b/use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch index 207345b..90ea8d7 100644 --- a/use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch +++ b/use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch @@ -7,11 +7,11 @@ Patch-mainline: No lib/utils.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/lib/utils.c b/lib/utils.c -index e77bd302530b..0919bb201229 100644 ---- a/lib/utils.c -+++ b/lib/utils.c -@@ -49,6 +49,10 @@ int get_hex(char c) +Index: iproute2-6.3.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; } @@ -22,6 +22,3 @@ index e77bd302530b..0919bb201229 100644 int get_integer(int *val, const char *arg, int base) { long res; --- -2.14.1 -