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

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
-

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];
  

iproute2-6.2.0.tar.xz

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

iproute2.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu May  4 07:20:24 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
+
+- 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 <jengelh@inai.de>
 

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

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

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
-