diff --git a/.gitignore b/.gitignore index 95eaf06..bcca87d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -iproute2-6.11.0.tar.xz +iproute2-6.14.0.tar.xz diff --git a/README.etc b/README.etc new file mode 100644 index 0000000..6fc09c3 --- /dev/null +++ b/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/iproute.spec b/iproute.spec index dc64080..7797303 100644 --- a/iproute.spec +++ b/iproute.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.6.5) ## 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 @@ -145,6 +162,21 @@ cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield %changelog ## START: Generated by rpmautospec +* Sun Jun 22 2025 Andrea Claudi - 6.14.0-2 +- iproute-6.14.0-2.el10 + +* Tue May 27 2025 Andrea Claudi - 6.14.0-1 +- iproute-6.14.0-1.el10 + +* Wed Apr 02 2025 Andrea Claudi - 6.11.0-4 +- Add image-mode testing + +* Mon Mar 31 2025 Andrea Claudi - 6.11.0-3 +- Add tmt test plan + +* Mon Mar 31 2025 Andrea Claudi - 6.11.0-2 +- Fix gating yaml + * Wed Dec 18 2024 Andrea Claudi - 6.11.0-1 - iproute-6.11.0-1.el10 diff --git a/sources b/sources index f86d101..e636ffe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iproute2-6.11.0.tar.xz) = 06bedd7ae573fe5cf9c72af698987ba03e53dc6fce5f41813bf5bb155b683490e5c75cc835ce5ba4509e491eb6138e96da162204c28ea1b3d80887107997a3b3 +SHA512 (iproute2-6.14.0.tar.xz) = e79049bdca0e0381f0a93a40e4d597ce59fb509dabc6e8b04a510ff9953f091c67577d6faa62967bd197bf62ab6e56d928558270a1390621431acb237b77fa46