From d431b8d3f9b60172006852b20e38374afed0cc8a Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 15 Sep 2025 12:04:53 +0000 Subject: [PATCH] import CS iproute-6.14.0-2.el9 --- .gitignore | 2 +- .iproute.metadata | 2 +- SOURCES/README.etc | 16 +++++ SPECS/iproute.spec | 143 ++++++++++++++++++++++++++++++++------------- 4 files changed, 120 insertions(+), 43 deletions(-) create mode 100644 SOURCES/README.etc diff --git a/.gitignore b/.gitignore index 307de56..b4e5470 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/iproute2-6.11.0.tar.xz +SOURCES/iproute2-6.14.0.tar.xz diff --git a/.iproute.metadata b/.iproute.metadata index 48488fa..f23d711 100644 --- a/.iproute.metadata +++ b/.iproute.metadata @@ -1 +1 @@ -7617e7896c1aa049fd2c371c7e07c6a6f89f7b3e SOURCES/iproute2-6.11.0.tar.xz +895ddddd52cb96e8c40d0177722f360aaccb808b SOURCES/iproute2-6.14.0.tar.xz diff --git a/SOURCES/README.etc b/SOURCES/README.etc new file mode 100644 index 0000000..6fc09c3 --- /dev/null +++ b/SOURCES/README.etc @@ -0,0 +1,16 @@ +You are looking for your iproute2 config in /etc/iproute2 and it's gone? + +Here's an explanation on what's going on: + +From v6.5.0, iproute2 supports stateless configuration pattern. This +means that iproute2 now read its config from /etc/iproute2/FOO, and, +if it does not exist, fall back to /usr/share/iproute2/FOO. + +You can find iproute2 default configuration in /usr/share/iproute2, +while you can store your user-modified config files in /etc/iproute2. + +/usr/share/iproute2 files are not supposed to be manually modified. + +If a previous update broke your user config for iproute2, you may +have one or more ".rpmsave" files in /etc/iproute2. You can restore +your config simply dropping the ".rpmsave" suffix from the file name. diff --git a/SPECS/iproute.spec b/SPECS/iproute.spec index 6e7f35c..8f51ba2 100644 --- a/SPECS/iproute.spec +++ b/SPECS/iproute.spec @@ -1,8 +1,8 @@ ## START: Set by rpmautospec ## (rpmautospec version 0.6.5) -## RPMAUTOSPEC: autorelease +## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 1; + release_number = 2; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -10,11 +10,12 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.11.0 +Version: 6.14.0 Release: %autorelease URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz Source1: rt_dsfield.deprecated +Source2: README.etc License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison @@ -103,9 +104,23 @@ rm -rf '%{buildroot}%{_docdir}' # append deprecated values to rt_dsfield for compatibility reasons %if 0%{?rhel} cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield +mkdir -p %{buildroot}%{_sysconfdir}/iproute2 +cp %{SOURCE2} %{buildroot}%{_sysconfdir}/iproute2/README +cp %{SOURCE2} %{buildroot}%{_datadir}/iproute2/README %endif +# RHEL-94662: restore /etc/iproute2 conf files, if modified +# this is safe because we don't have conf files in /etc/iproute2 anymore, so +# every *.rpmsave file over there is a leftover from a failed conf upgrade +%posttrans +if [ -f /etc/iproute2/*rpmsave ]; then + for conffile in /etc/iproute2/*rpmsave; do + mv $conffile ${conffile%.rpmsave} + done +fi + %files +%dir %{_sysconfdir}/iproute2 %dir %{_datadir}/iproute2 %license COPYING %doc README README.devel @@ -114,8 +129,10 @@ cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield %{_mandir}/man8/* %exclude %{_mandir}/man8/tc* %exclude %{_mandir}/man8/cbq* -%attr(644,root,root) %config(noreplace) %{_datadir}/iproute2/* +%exclude %{_mandir}/man8/arpd* +%attr(644,root,root) %config %{_datadir}/iproute2/* %{_sbindir}/* +%attr(644,root,root) %{_sysconfdir}/iproute2/* %exclude %{_sbindir}/tc %exclude %{_sbindir}/routel %{_datadir}/bash-completion/completions/devlink @@ -144,56 +161,100 @@ cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog -* Thu Dec 12 2024 Andrea Claudi - 6.11.0-1.el9 -- New version 6.11.0 (Andrea Claudi) [RHEL-62931] -- Remove old iproute2 source tarballs +## START: Generated by rpmautospec +* Sun Jun 22 2025 Andrea Claudi - 6.14.0-2 +- iproute-6.14.0-2.el9 -* Tue Jan 23 2024 Andrea Claudi - 6.7.0-2.el9 -- rpmautospec not available in build root, revert spec file changes (Andrea Claudi) +* Tue May 27 2025 Andrea Claudi - 6.14.0-1 +- iproute-6.14.0-1.el9 -* Fri Jan 19 2024 Andrea Claudi - 6.7.0-1.el9 -- New version 6.7.0 (Andrea Claudi) [RHEL-9703] +* Wed Apr 02 2025 Andrea Claudi - 6.11.0-5 +- image-mode: double test duration -* Tue Jun 06 2023 Andrea Claudi - 6.2.0-5.el9 -- tc: add missing separator (Andrea Claudi) [RHEL-337] -- u32: fix TC_U32_TERMINAL printing (Andrea Claudi) [RHEL-586] +* Mon Mar 31 2025 Andrea Claudi - 6.11.0-4 +- Add image-mode testing -* Mon Jun 05 2023 Andrea Claudi - 6.2.0-4.el9 -- Fix NVR, %autorelease not working (Andrea Claudi) +* Mon Mar 31 2025 Andrea Claudi - 6.11.0-3 +- Add tmt test plan -* Thu Jun 01 2023 Wen Liang - 6.2.0-3.el9 -- mptcp: add support for implicit flag (Wen Liang) [2109135] +* Mon Mar 31 2025 Andrea Claudi - 6.11.0-2 +- Fix gating yaml -* Wed May 03 2023 Andrea Claudi - 6.2.0-2.el9 -- macvlan: Add bclim parameter (Andrea Claudi) [2186945] -- Update kernel headers (Andrea Claudi) [2186945] +* Thu Dec 12 2024 Andrea Claudi - 6.11.0-1 +- iproute-6.11.0-1.el9 -* Thu Apr 27 2023 Andrea Claudi - 6.2.0-1.el9 -- New version 6.2.0 (Andrea Claudi) [RHEL-428] +* Tue Jan 23 2024 Andrea Claudi - 6.7.0-2 +- iproute-6.7.0-2.el9 -* Sat Jan 28 2023 Andrea Claudi - 6.1.0-1.el9 -- New version 6.1.0 [2155604] +* Fri Jan 19 2024 Andrea Claudi - 6.7.0-1 +- iproute-6.7.0-1.el9 -* Fri Jan 06 2023 Viktor Malik - 6.0.0-2.el9 -- Rebuild for libbpf 1.0.0 [2158727] +* Tue Jun 06 2023 Andrea Claudi - 6.2.0-5 +- iproute-6.2.0-5.el9 -* Thu Oct 06 2022 Andrea Claudi - 6.0.0-1.el9 -- New version 6.0.0 [2132427] +* Mon Jun 05 2023 Andrea Claudi - 6.2.0-4 +- iproute-6.2.0-4.el9 -* Wed Jun 15 2022 Andrea Claudi - 5.18.0-1.el9 -- New version 5.18.0 [2074608] +* Thu Jun 01 2023 Wen Liang - 6.2.0-3 +- iproute-6.2.0-3.el9 -* Thu Nov 25 2021 Andrea Claudi - 5.15.0-2.el9 -- Fix gating.yaml [2009355] +* Wed May 03 2023 Andrea Claudi - 6.2.0-2 +- iproute-6.2.0-2.el9 -* Wed Nov 24 2021 Andrea Claudi - 5.15.0-1.el9 -- New version 5.15.0 [2009355] +* Thu Apr 27 2023 Andrea Claudi - 6.2.0-1 +- iproute-6.2.0-1.el9 -* Wed Aug 18 2021 Andrea Claudi - 5.13.0-5.el9 -- Add build and runtime dependency on libbpf (Andrea Claudi) [1994520] -- Use TC_LIB_DIR environment variable (Andrea Claudi) [1994545] -- Re-add iproute-doc package on the specfile (Andrea Claudi) [1994581] +* Sat Jan 28 2023 Andrea Claudi - 6.1.0-1 +- iproute-6.1.0-1.el9 -* Mon Aug 09 2021 Mohan Boddu - 5.13.0-4.el9 +* Fri Jan 06 2023 Viktor Malik - 6.0.0-2 +- Rebuild for libbpf 1.0.0 + +* Thu Oct 06 2022 Andrea Claudi - 6.0.0-1 +- iproute-6.0.0-1.el9 + +* Wed Jun 15 2022 Andrea Claudi - 5.18.0-1 +- iproute-5.18.0-1.el9 + +* Thu Nov 25 2021 Andrea Claudi - 5.15.0-2 +- iproute-5.15.0-2.el9 + +* Wed Nov 24 2021 Andrea Claudi - 5.15.0-1 +- iproute-5.15.0-1.el9 + +* Wed Aug 18 2021 Andrea Claudi - 5.13.0-6 +- iproute-5.13.0-5.el9 + +* Mon Aug 09 2021 Mohan Boddu - 5.13.0-5 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 + +* Fri Jul 16 2021 Andrea Claudi - 5.13.0-4 +- iproute-5.13.0-3.el9 + +* Fri Jul 16 2021 Aleksandra Fedorova - 5.13.0-3 +- Add RHEL gating configuration + +* Thu Jul 15 2021 Andrea Claudi - 5.13.0-2 +- iproute-5.13.0-2.el9 + +* Thu Jul 01 2021 Andrea Claudi - 5.13.0-1 +- Rebase package on top of iproute2-5.13.0 + +* Fri Apr 16 2021 Mohan Boddu - 5.10.0-3 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Thu Feb 04 2021 DistroBaker - 5.10.0-2 +- Merged update from upstream sources + +* Mon Dec 21 2020 DistroBaker - 5.10.0-1 +- Merged update from upstream sources + +* Wed Dec 16 2020 DistroBaker - 5.9.0-2 +- Merged update from upstream sources + +* Fri Dec 04 2020 DistroBaker - 5.9.0-1 +- Merged update from upstream sources + +* Thu Oct 15 2020 Petr Šabata - 5.8.0-1 +- RHEL 9.0.0 Alpha bootstrap +## END: Generated by rpmautospec