From bf3ddce8a3ad11422c54aabd57ad64ede22c60bfb538dd68e13016928f4c4bc8 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 31 Jan 2024 18:32:59 +0000
Subject: [PATCH] - Update to release 6.7

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=248
---
 ...llation-directories-for-openSUSE-SLE.patch |  24 ++++++++----------
 iproute2-6.6.0.tar.sign                       | Bin 566 -> 0 bytes
 iproute2-6.6.0.tar.xz                         |   3 ---
 iproute2-6.7.0.tar.sign                       | Bin 0 -> 566 bytes
 iproute2-6.7.0.tar.xz                         |   3 +++
 iproute2.changes                              |  12 +++++++++
 iproute2.spec                                 |   6 ++---
 7 files changed, 29 insertions(+), 19 deletions(-)
 delete mode 100644 iproute2-6.6.0.tar.sign
 delete mode 100644 iproute2-6.6.0.tar.xz
 create mode 100644 iproute2-6.7.0.tar.sign
 create mode 100644 iproute2-6.7.0.tar.xz

diff --git a/adjust-installation-directories-for-openSUSE-SLE.patch b/adjust-installation-directories-for-openSUSE-SLE.patch
index d11782c..1f9f043 100644
--- a/adjust-installation-directories-for-openSUSE-SLE.patch
+++ b/adjust-installation-directories-for-openSUSE-SLE.patch
@@ -10,19 +10,17 @@ Match the directory layout of openSUSE and SLE.
  tc/q_netem.c   |    2 +-
  3 files changed, 7 insertions(+), 6 deletions(-)
 
-Index: iproute2-6.6.0/Makefile
+Index: iproute2-6.7.0/Makefile
 ===================================================================
---- iproute2-6.6.0.orig/Makefile
-+++ iproute2-6.6.0/Makefile
-@@ -15,10 +15,10 @@ MAKEFLAGS += --no-print-directory
+--- iproute2-6.7.0.orig/Makefile
++++ iproute2-6.7.0/Makefile
+@@ -15,8 +15,8 @@ MAKEFLAGS += --no-print-directory
  endif
  
  PREFIX?=/usr
 -SBINDIR?=/sbin
-+SBINDIR?=/usr/sbin
- CONF_ETC_DIR?=/etc/iproute2
- CONF_USR_DIR?=$(LIBDIR)/iproute2
 -NETNS_RUN_DIR?=/var/run/netns
++SBINDIR?=/usr/sbin
 +NETNS_RUN_DIR?=/run/netns
  NETNS_ETC_DIR?=/etc/netns
  DATADIR?=$(PREFIX)/share
@@ -36,10 +34,10 @@ Index: iproute2-6.6.0/Makefile
  ifneq ($(SHARED_LIBS),y)
  DEFINES+= -DNO_SHARED_LIBS
  endif
-Index: iproute2-6.6.0/netem/Makefile
+Index: iproute2-6.7.0/netem/Makefile
 ===================================================================
---- iproute2-6.6.0.orig/netem/Makefile
-+++ iproute2-6.6.0/netem/Makefile
+--- iproute2-6.7.0.orig/netem/Makefile
++++ iproute2-6.7.0/netem/Makefile
 @@ -7,6 +7,7 @@ DISTDATA = normal.dist pareto.dist paret
  HOSTCC ?= $(CC)
  CCOPTS  = $(CBUILD_CFLAGS)
@@ -60,10 +58,10 @@ Index: iproute2-6.6.0/netem/Makefile
  	done
  
  clean:
-Index: iproute2-6.6.0/tc/q_netem.c
+Index: iproute2-6.7.0/tc/q_netem.c
 ===================================================================
---- iproute2-6.6.0.orig/tc/q_netem.c
-+++ iproute2-6.6.0/tc/q_netem.c
+--- iproute2-6.7.0.orig/tc/q_netem.c
++++ iproute2-6.7.0/tc/q_netem.c
 @@ -131,7 +131,7 @@ static int get_distribution(const char *
  	char *line = NULL;
  	char name[128];
diff --git a/iproute2-6.6.0.tar.sign b/iproute2-6.6.0.tar.sign
deleted file mode 100644
index 4cc86aea936e43599fb5ab1b896cf1eb4101a55bb87ff490b54e4a78223997cf..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0%b;T*Z>L%5P+wD
zV3p0}eyfxa0EgQA@8pT)jak$gG?xglsW%QI>z|od>wT5EDPA+>_cuu@iZxf)92hG%
zo*N^Fn0o=?Mm0FDVx31Q`#l)6+g$mm$c-$t_^kpiFEsG0#J`=F`57%YdbsOQy#J+a
z&~rQTDX?L9+;CDRvo#(6YkWI?>bP#X^$?*B#_<z3!T{ktN5q3EoHCiP<V59pgm(_>
z8E5X)3yKL4K9#cQ1Lp0-&bLQP>}sD#xyu7LMp9z>XyiQ3+F+<QVbQGkIO~w=EyJ~$
ziz*k!3CJ_{0U*vku$M3A8syM_5`0;fLY+7_lFrt(@E$w^tQ&kufM!Ui1*NO14xYp!
zyTnk^$_n9IVN=0UujAe-yS5!fvO|zmA%B@RR~wD6>{Zx#d07T>&8^UehP~E}S$q;I
zp~2CgF6bs4kl&jl*G_ueFIxgMBvH-x_SS)RSV(l2&1~;l>E(JlV5F`e0EXSp+G9mq
zt+!gZ2Y+Ol<YY?ISA;h5`|x=nu!<78oKY->`?_9I;IrF!N{B8jI*ThU$^Z<XPfXn}
zDc!R!w}rV6K6~>HC&<4%K5=UbPk9pET_GGQcO_09B21lHzl}Lg08&lrPqXR`C7F72
z%bT83n`QA!Xi5#~euqL|iU-ruk9Y2^WWg*_mDepA>0w`x)eoS~PtV6{?YnNjQ9&Md
ET%hR?ga7~l

diff --git a/iproute2-6.6.0.tar.xz b/iproute2-6.6.0.tar.xz
deleted file mode 100644
index 206c976..0000000
--- a/iproute2-6.6.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8738c804afd09f0bf756937f0c3de23117832a98d8cbbf50386cf5005cd613ce
-size 917964
diff --git a/iproute2-6.7.0.tar.sign b/iproute2-6.7.0.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..7dc4ce0585ba9311fd4663eb4dcc8f5ce271a4339e9cb866d193a7bc90e0e586
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0%e>tB>)Nu5P+wD
zV3p0}ekV~70ErWNJo7V20=-|$5-4A+$^<gPEJmyuy`xq*6)ycV9yNlgC#C%RmHw<<
z{%msBO+#`Ps?iGa;xqT7i7|9@IqJT7l|VOlw4#WbeMp+jwP@a<I22W36ZgjC+r(4O
zt#S-k*ik!6)?2q}b{|XH8x#95KYha@WNyHhyHG}Q(9AP$c{gS8=P+&x23TET7$T`j
zK@~;T4J%Sd;$=qva!1<48NEw)nZP*f-OiHymsyuN9bTrHp-A6)l)aDGMLS*<`irNA
zcTiO}`x{puNbI>Xs<baBtv5$BbSU8{u4D1+8+-H(jL9FrmXQqSvz8~iIqoh`6w3FN
zpRA9rM!kKNsWEu=-v%+9M9Dlr7W0xU28kP1988#-w$iCefyJfxMj&>nefxd-E*BEe
zH;p`Fab^In5^o?e=$k!EakNEZ7t^vchq5Tnwd@Wxor5+qgo>utzr#)8n1<u2Dx;^7
zh1B>Sp>B3-w0Q0P&|OWeed9-XBwEr)gAxtnri0F7U?;1qZ605_jUGCY%4pSG);Z)u
zkv9=2b@5JRuAFK4*M-d)$amk2&oS|gUh(+o9v!PM=?d(&-0nJ+{c>C7Rmk_pFZ+1U
zBX4_?Hj~C))zzEm=KkW7n!1nJ45y4tx4|K)p6tZ2qDZE2@RSBd{^YQS(Ic&S%H3|4
E-_)NNUjP6A

literal 0
HcmV?d00001

diff --git a/iproute2-6.7.0.tar.xz b/iproute2-6.7.0.tar.xz
new file mode 100644
index 0000000..525d303
--- /dev/null
+++ b/iproute2-6.7.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff942dd9828d7d1f867f61fe72ce433078c31e5d8e4a78e20f02cb5892e8841d
+size 919800
diff --git a/iproute2.changes b/iproute2.changes
index d0f8f5d..36fa5d0 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jan 31 18:09:41 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 6.7
+  * devlink: Support setting port function ipsec_crypto cap and
+    ipsec_packet cap
+  * iplink: bridge: Add support for bridge FDB learning limits
+  * bridge: fdb: support match on source VNI, nexthop ID,
+    destination VNI, destination port, destination IP address and
+    [no]router flag in the flush command
+  * bridge: mdb: Add get support
+
 -------------------------------------------------------------------
 Thu Nov 30 22:40:27 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/iproute2.spec b/iproute2.spec
index d614668..6453f12 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package iproute2
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %define _buildshell /bin/bash
 Name:           iproute2
-Version:        6.6
+Version:        6.7
 Release:        0
 Summary:        Linux network configuration utilities
 License:        GPL-2.0-only
@@ -166,7 +166,7 @@ EOF
 %_mandir/man7/*
 %_mandir/man8/*
 %exclude %_mandir/man8/arpd.8*
-/usr/lib/iproute2
+%_datadir/iproute2/
 %_libdir/tc/
 %_datadir/tc/
 %_docdir/%name/