up to 6.6.0

diff --git a/iproute2-2.2.4-wrr.patch b/iproute2-2.2.4-wrr.patch
index d2233fd9dcd566984f34465632d1bb221af443d0..b844559895ab22e349fc6d47c56c54652a5a3c7a 100644 (file)
--- a/iproute2-2.2.4-wrr.patch
+++ b/iproute2-2.2.4-wrr.patch
@@ -5,9 +5,9 @@
  TCMODULES += q_choke.o
  TCMODULES += q_sfb.o
 +TCMODULES += q_wrr.o
- TCMODULES += f_rsvp.o
  TCMODULES += f_u32.o
  TCMODULES += f_route.o
+ TCMODULES += f_fw.o
 --- iproute2-5.10.0/include/uapi/linux/pkt_sched.h.orig        2021-02-24 19:26:51.060368757 +0100
 +++ iproute2-5.10.0/include/uapi/linux/pkt_sched.h     2021-02-24 19:28:08.234354809 +0100
 @@ -676,6 +676,119 @@

diff --git a/iproute2-q_srr.v0.4.patch b/iproute2-q_srr.v0.4.patch
index ec38750de914c1f09449dbed67922ea6869ceeb3..9dfcfa23ec1008f5d962374ba03de39cba9b8e7d 100644 (file)
--- a/iproute2-q_srr.v0.4.patch
+++ b/iproute2-q_srr.v0.4.patch
@@ -145,5 +145,5 @@ diff -ruN iproute-20041019/tc/q_srr.c iproute-20041019.srr.patched.v0.4/tc/q_srr
  TCMODULES += q_sfb.o
 +TCMODULES += q_srr.o
  TCMODULES += q_wrr.o
- TCMODULES += f_rsvp.o
  TCMODULES += f_u32.o
+ TCMODULES += f_route.o

diff --git a/iproute2.spec b/iproute2.spec
index d101c0505ef795c1adaf6a949e36b48bfd9a5e95..fde69bb3ba15f1ecba758b1c6ffe21141caf2f51 100644 (file)
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -14,12 +14,12 @@ Summary(es.UTF-8):  Herramientas para encaminamiento avanzado y configuración de
 Summary(pl.UTF-8):     Narzędzie do konfigurowania sieci
 Summary(pt_BR.UTF-8):  Ferramentas para roteamento avançado e configuração de interfaces de rede
 Name:          iproute2
-Version:       6.5.0
+Version:       6.6.0
 Release:       1
 License:       GPL v2+
 Group:         Networking/Admin
 Source0:       https://www.kernel.org/pub/linux/utils/net/iproute2/%{name}-%{version}.tar.xz
-# Source0-md5: ae811fc51b3a2c9c7701be308152c45a
+# Source0-md5: 6716fc3188dbea226997fa2478a190d7
 Source1:       %{name}.tmpfiles
 Patch0:                %{name}-link.patch
 Patch3:                %{name}-LDFLAGS.patch
@@ -231,7 +231,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/tipc
 %attr(755,root,root) %{_sbindir}/vdpa
 # default configs
-%{_prefix}/lib/iproute2
+%{_libdir}/iproute2
 # config overrides
 %dir %{_sysconfdir}/iproute2
 %{_mandir}/man8/bridge.8*