From d7b1054f529b7d634e4a3ad27d4f6eef95e58177 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 20 Sep 2023 16:21:46 +0200 Subject: [PATCH 01/18] iproute-6.5.0-1.f40 * Wed Sep 20 2023 Andrea Claudi - 6.5.0-1.f40 - New version 6.5.0 (Andrea Claudi) [2237746] Signed-off-by: Andrea Claudi --- .gitignore | 1 + ...CONF_USR_DIR-honours-the-libdir-conf.patch | 48 +++++++++++++++++++ iproute.spec | 14 +++--- sources | 1 + 4 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch diff --git a/.gitignore b/.gitignore index 9cde5f7..36c29bc 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /iproute2-6.2.0.tar.xz /iproute2-6.3.0.tar.xz /iproute2-6.4.0.tar.xz +/iproute2-6.5.0.tar.xz diff --git a/0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch b/0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch new file mode 100644 index 0000000..645a6f9 --- /dev/null +++ b/0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch @@ -0,0 +1,48 @@ +From 358ce5cf068fb9f630a699e94e5aa1498856296a Mon Sep 17 00:00:00 2001 +Message-ID: <358ce5cf068fb9f630a699e94e5aa1498856296a.1695218419.git.aclaudi@redhat.com> +From: Andrea Claudi +Date: Wed, 20 Sep 2023 15:52:51 +0200 +Subject: [PATCH] Makefile: ensure CONF_USR_DIR honours the libdir config + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2237746 +Upstream Status: iproute2.git commit 946753a4 + +commit 946753a4459bd035132a27bb2eb87529c1979b90 +Author: Andrea Claudi +Date: Fri Sep 15 21:59:06 2023 +0200 + + Makefile: ensure CONF_USR_DIR honours the libdir config + + Following commit cee0cf84bd32 ("configure: add the --libdir option"), + iproute2 lib directory is configurable using the --libdir option on the + configure script. However, CONF_USR_DIR does not honour the configured + lib path in its default value. + + This fixes the issue simply using $(LIBDIR) instead of $(PREFIX)/lib. + Please note that the default value for $(LIBDIR) is exactly + $(PREFIX)/lib, so this does not change the default value for + CONF_USR_DIR. + + Fixes: 0a0a8f12fa1b ("Read configuration files from /etc and /usr") + Signed-off-by: Andrea Claudi + Signed-off-by: Stephen Hemminger +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 7d1819ce..54539ce4 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ endif + PREFIX?=/usr + SBINDIR?=/sbin + CONF_ETC_DIR?=/etc/iproute2 +-CONF_USR_DIR?=$(PREFIX)/lib/iproute2 ++CONF_USR_DIR?=$(LIBDIR)/iproute2 + NETNS_RUN_DIR?=/var/run/netns + NETNS_ETC_DIR?=/etc/netns + DATADIR?=$(PREFIX)/share +-- +2.41.0 + diff --git a/iproute.spec b/iproute.spec index 02c3545..c7e1b80 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,13 +1,13 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.4.0 +Version: 6.5.0 Release: %autorelease %if 0%{?rhel} Group: Applications/System %endif 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 - +Patch0: 0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison @@ -79,8 +79,8 @@ The libnetlink static library. %autosetup -p1 -n %{name}2-%{version} %build -%configure --libdir %{_libdir} -echo -e "\nPREFIX=%{_prefix}\nCONFDIR:=%{_sysconfdir}/iproute2\nSBINDIR=%{_sbindir}" >> config.mk +%configure +echo -e "\nCONFDIR:=%{_libdir}/iproute2\nSBINDIR=%{_sbindir}" >> config.mk %make_build %install @@ -97,11 +97,11 @@ rm -rf '%{buildroot}%{_docdir}' # append deprecated values to rt_dsfield for compatibility reasons %if 0%{?rhel} && ! 0%{?eln} -cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield +cat %{SOURCE1} >>%{buildroot}%{_libdir}/iproute2/rt_dsfield %endif %files -%dir %{_sysconfdir}/iproute2 +%dir %{_libdir}/iproute2 %license COPYING %doc README README.devel %{_mandir}/man7/* @@ -109,7 +109,7 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_mandir}/man8/* %exclude %{_mandir}/man8/tc* %exclude %{_mandir}/man8/cbq* -%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/* +%attr(644,root,root) %config(noreplace) %{_libdir}/iproute2/* %{_sbindir}/* %exclude %{_sbindir}/tc %exclude %{_sbindir}/routel diff --git a/sources b/sources index e8ae896..6fa712f 100644 --- a/sources +++ b/sources @@ -11,3 +11,4 @@ SHA512 (iproute2-6.1.0.tar.xz) = 4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e3738 SHA512 (iproute2-6.2.0.tar.xz) = b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151 SHA512 (iproute2-6.3.0.tar.xz) = aec1d8ceb54c8849a075ec1ce079678638e05ccaec093e8b3cbc7243b5fafea2a8c11f10930fced3df82f52d6750aa325178e44f9058e37a556ab108d4a968bf SHA512 (iproute2-6.4.0.tar.xz) = 42330be6e061302694ea301765ff8d3cbfaeca4b1d06e39778861e4390ed211c03cb2d41498190202b659f7f5647b1ca4857410ef8c16fd601a35e7162788d21 +SHA512 (iproute2-6.5.0.tar.xz) = 615ba6924becdf08af3f491d347d84897ff0198426d65b194c87146c4527b0856fc51688b59834abe1cb6f9a70b93c66ff7ade6b7c305c1ece0fd6a29df6bc54 From 8760a89e54d403da2bcbdb870dba250ef94dd33b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:14:40 +0000 Subject: [PATCH 02/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ff66d681df23a52b7c6a595d37391fcefb2f19c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 22:53:27 +0000 Subject: [PATCH 03/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f8ce70532360040d0a4cda79080899f71993f69a Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Sat, 10 Feb 2024 00:16:01 +0100 Subject: [PATCH 04/18] iproute-6.7.0-1.f40 * Fri Feb 09 2024 Andrea Claudi - 6.7.0-1.f40 - New version 6.7.0 (Andrea Claudi) [2247875] - Fix FTBFS on ppc64le (Andrea Claudi) [2261250] - Remove libdb-devel dependency from iproute [1788538] - Enable color output by default [2239120] Resolves: rhbz#2247875, rhbz#2261250, rhbz#1788538, #rhbz2239120 Signed-off-by: Andrea Claudi --- .gitignore | 1 + ...CONF_USR_DIR-honours-the-libdir-conf.patch | 48 -------------- ...proute2-fix-build-failure-on-ppc64le.patch | 66 +++++++++++++++++++ iproute.spec | 27 ++------ sources | 15 +---- 5 files changed, 75 insertions(+), 82 deletions(-) delete mode 100644 0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch create mode 100644 0001-iproute2-fix-build-failure-on-ppc64le.patch diff --git a/.gitignore b/.gitignore index 36c29bc..25f8579 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /iproute2-6.3.0.tar.xz /iproute2-6.4.0.tar.xz /iproute2-6.5.0.tar.xz +/iproute2-6.7.0.tar.xz diff --git a/0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch b/0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch deleted file mode 100644 index 645a6f9..0000000 --- a/0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 358ce5cf068fb9f630a699e94e5aa1498856296a Mon Sep 17 00:00:00 2001 -Message-ID: <358ce5cf068fb9f630a699e94e5aa1498856296a.1695218419.git.aclaudi@redhat.com> -From: Andrea Claudi -Date: Wed, 20 Sep 2023 15:52:51 +0200 -Subject: [PATCH] Makefile: ensure CONF_USR_DIR honours the libdir config - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2237746 -Upstream Status: iproute2.git commit 946753a4 - -commit 946753a4459bd035132a27bb2eb87529c1979b90 -Author: Andrea Claudi -Date: Fri Sep 15 21:59:06 2023 +0200 - - Makefile: ensure CONF_USR_DIR honours the libdir config - - Following commit cee0cf84bd32 ("configure: add the --libdir option"), - iproute2 lib directory is configurable using the --libdir option on the - configure script. However, CONF_USR_DIR does not honour the configured - lib path in its default value. - - This fixes the issue simply using $(LIBDIR) instead of $(PREFIX)/lib. - Please note that the default value for $(LIBDIR) is exactly - $(PREFIX)/lib, so this does not change the default value for - CONF_USR_DIR. - - Fixes: 0a0a8f12fa1b ("Read configuration files from /etc and /usr") - Signed-off-by: Andrea Claudi - Signed-off-by: Stephen Hemminger ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 7d1819ce..54539ce4 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,7 +17,7 @@ endif - PREFIX?=/usr - SBINDIR?=/sbin - CONF_ETC_DIR?=/etc/iproute2 --CONF_USR_DIR?=$(PREFIX)/lib/iproute2 -+CONF_USR_DIR?=$(LIBDIR)/iproute2 - NETNS_RUN_DIR?=/var/run/netns - NETNS_ETC_DIR?=/etc/netns - DATADIR?=$(PREFIX)/share --- -2.41.0 - diff --git a/0001-iproute2-fix-build-failure-on-ppc64le.patch b/0001-iproute2-fix-build-failure-on-ppc64le.patch new file mode 100644 index 0000000..1d621e4 --- /dev/null +++ b/0001-iproute2-fix-build-failure-on-ppc64le.patch @@ -0,0 +1,66 @@ +From ac4e9bd66d9c8461024dfd3698e120c678eb6cfc Mon Sep 17 00:00:00 2001 +Message-ID: +From: Andrea Claudi +Date: Fri, 9 Feb 2024 23:56:20 +0100 +Subject: [PATCH] iproute2: fix build failure on ppc64le +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2261250 +Upstream Status: posted upstream + +commit d13ef7c00b60a50a5e8ddbb7ff138399689d3483 +Author: Andrea Claudi +Date: Fri Feb 9 10:44:55 2024 +0100 + + iproute2: fix build failure on ppc64le + + ppc64le build fails with error on ifstat.c when + -Wincompatible-pointer-types is enabled: + + ifstat.c: In function ‘dump_raw_db’: + ifstat.c:323:44: error: initialization of ‘long long unsigned int *’ from incompatible pointer type ‘__u64 *’ {aka ‘long unsigned int *’} [-Wincompatible-pointer-types] + 323 | unsigned long long *vals = n->val; + + Several other warnings are produced when -Wformat= is set, for example: + + ss.c:3244:34: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 2 has type ‘__u64’ {aka ‘long unsigned int’} [-Wformat=] + 3244 | out(" rcv_nxt:%llu", s->mptcpi_rcv_nxt); + | ~~~^ ~~~~~~~~~~~~~~~~~ + | | | + | | __u64 {aka long unsigned int} + | long long unsigned int + | %lu + + This happens because __u64 is defined as long unsigned on ppc64le. As + pointed out by Florian Weimar, we should use -D__SANE_USERSPACE_TYPES__ + if we really want to use long long unsigned in iproute2. + + This fix the build failure and all the warnings without any change on + the code itself. + + Suggested-by: Florian Weimer + Signed-off-by: Andrea Claudi + +Signed-off-by: Andrea Claudi +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8024d45e..3b9daede 100644 +--- a/Makefile ++++ b/Makefile +@@ -60,7 +60,7 @@ CC := gcc + HOSTCC ?= $(CC) + DEFINES += -D_GNU_SOURCE + # Turn on transparent support for LFS +-DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE ++DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__SANE_USERSPACE_TYPES__ + CCOPTS = -O2 -pipe + WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes + WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2 +-- +2.43.0 + diff --git a/iproute.spec b/iproute.spec index c7e1b80..7d10d3c 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,13 +1,10 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.5.0 +Version: 6.7.0 Release: %autorelease -%if 0%{?rhel} -Group: Applications/System -%endif 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 -Patch0: 0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch +Patch0: 0001-iproute2-fix-build-failure-on-ppc64le.patch License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison @@ -17,7 +14,6 @@ BuildRequires: gcc BuildRequires: iptables-devel >= 1.4.5 BuildRequires: libbpf-devel BuildRequires: libcap-devel -BuildRequires: libdb-devel BuildRequires: libmnl-devel BuildRequires: libselinux-devel BuildRequires: make @@ -38,9 +34,6 @@ kernel. %package tc Summary: Linux Traffic Control utility -%if 0%{?rhel} -Group: Applications/System -%endif License: GPL-2.0-or-later Requires: %{name}%{?_isa} = %{version}-%{release} Provides: /sbin/tc @@ -53,9 +46,6 @@ Linux. %if ! 0%{?_module_build} %package doc Summary: Documentation for iproute2 utilities with examples -%if 0%{?rhel} -Group: Applications/System -%endif License: GPL-2.0-or-later Requires: %{name} = %{version}-%{release} @@ -65,9 +55,6 @@ The iproute documentation contains howtos and examples of settings. %package devel Summary: iproute development files -%if 0%{?rhel} -Group: Development/Libraries -%endif License: GPL-2.0-or-later Requires: %{name} = %{version}-%{release} Provides: iproute-static = %{version}-%{release} @@ -79,8 +66,8 @@ The libnetlink static library. %autosetup -p1 -n %{name}2-%{version} %build -%configure -echo -e "\nCONFDIR:=%{_libdir}/iproute2\nSBINDIR=%{_sbindir}" >> config.mk +%configure --color auto +echo -e "\nSBINDIR=%{_sbindir}" >> config.mk %make_build %install @@ -97,11 +84,11 @@ rm -rf '%{buildroot}%{_docdir}' # append deprecated values to rt_dsfield for compatibility reasons %if 0%{?rhel} && ! 0%{?eln} -cat %{SOURCE1} >>%{buildroot}%{_libdir}/iproute2/rt_dsfield +cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield %endif %files -%dir %{_libdir}/iproute2 +%dir %{_datadir}/iproute2 %license COPYING %doc README README.devel %{_mandir}/man7/* @@ -109,7 +96,7 @@ cat %{SOURCE1} >>%{buildroot}%{_libdir}/iproute2/rt_dsfield %{_mandir}/man8/* %exclude %{_mandir}/man8/tc* %exclude %{_mandir}/man8/cbq* -%attr(644,root,root) %config(noreplace) %{_libdir}/iproute2/* +%attr(644,root,root) %config(noreplace) %{_datadir}/iproute2/* %{_sbindir}/* %exclude %{_sbindir}/tc %exclude %{_sbindir}/routel diff --git a/sources b/sources index 6fa712f..9522a67 100644 --- a/sources +++ b/sources @@ -1,14 +1 @@ -SHA512 (iproute2-5.10.0.tar.xz) = a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13 -SHA512 (iproute2-5.11.0.tar.xz) = 8d0e7efc20db70af2d344962610b7fb7f464da567f63e094a2e2a9915f6e9087a2282163d2c73eb2065aaec4f0b0cf19614253798153b31e34b06f57e704f3ed -SHA512 (iproute2-5.12.0.tar.xz) = 9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c865e739b7ab84192549e8e94ebaee43c0a87c0291037746ffb6936346245220786e369201ee13d60fac -SHA512 (iproute2-5.13.0.tar.xz) = a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d -SHA512 (iproute2-5.14.0.tar.xz) = e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c -SHA512 (iproute2-5.15.0.tar.xz) = e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 -SHA512 (iproute2-5.17.0.tar.xz) = fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d -SHA512 (iproute2-5.18.0.tar.xz) = 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068 -SHA512 (iproute2-6.0.0.tar.xz) = be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a -SHA512 (iproute2-6.1.0.tar.xz) = 4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28 -SHA512 (iproute2-6.2.0.tar.xz) = b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151 -SHA512 (iproute2-6.3.0.tar.xz) = aec1d8ceb54c8849a075ec1ce079678638e05ccaec093e8b3cbc7243b5fafea2a8c11f10930fced3df82f52d6750aa325178e44f9058e37a556ab108d4a968bf -SHA512 (iproute2-6.4.0.tar.xz) = 42330be6e061302694ea301765ff8d3cbfaeca4b1d06e39778861e4390ed211c03cb2d41498190202b659f7f5647b1ca4857410ef8c16fd601a35e7162788d21 -SHA512 (iproute2-6.5.0.tar.xz) = 615ba6924becdf08af3f491d347d84897ff0198426d65b194c87146c4527b0856fc51688b59834abe1cb6f9a70b93c66ff7ade6b7c305c1ece0fd6a29df6bc54 +SHA512 (iproute2-6.7.0.tar.xz) = 5d8dca139b1b980dac6c841f477b951dd199074cb078b5ea8df23b3532eeb235cca1df9f6628b0f81b7edd62aaf4e95bad15a851843bd61e5715215da97cc546 From 02154c54ad2c3c3f8916a9faad0e0408a212a052 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Tue, 12 Mar 2024 13:23:51 +0100 Subject: [PATCH 05/18] iproute-6.8.0-1.f41 * Tue Mar 12 2024 Andrea Claudi - 6.8.0-1.f41 - New version 6.8.0 (Andrea Claudi) [2269034] Signed-off-by: Andrea Claudi --- .gitignore | 1 + ...proute2-fix-build-failure-on-ppc64le.patch | 66 ------------------- iproute.spec | 4 +- sources | 2 +- 4 files changed, 4 insertions(+), 69 deletions(-) delete mode 100644 0001-iproute2-fix-build-failure-on-ppc64le.patch diff --git a/.gitignore b/.gitignore index 25f8579..3976641 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /iproute2-6.4.0.tar.xz /iproute2-6.5.0.tar.xz /iproute2-6.7.0.tar.xz +/iproute2-6.8.0.tar.xz diff --git a/0001-iproute2-fix-build-failure-on-ppc64le.patch b/0001-iproute2-fix-build-failure-on-ppc64le.patch deleted file mode 100644 index 1d621e4..0000000 --- a/0001-iproute2-fix-build-failure-on-ppc64le.patch +++ /dev/null @@ -1,66 +0,0 @@ -From ac4e9bd66d9c8461024dfd3698e120c678eb6cfc Mon Sep 17 00:00:00 2001 -Message-ID: -From: Andrea Claudi -Date: Fri, 9 Feb 2024 23:56:20 +0100 -Subject: [PATCH] iproute2: fix build failure on ppc64le -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2261250 -Upstream Status: posted upstream - -commit d13ef7c00b60a50a5e8ddbb7ff138399689d3483 -Author: Andrea Claudi -Date: Fri Feb 9 10:44:55 2024 +0100 - - iproute2: fix build failure on ppc64le - - ppc64le build fails with error on ifstat.c when - -Wincompatible-pointer-types is enabled: - - ifstat.c: In function ‘dump_raw_db’: - ifstat.c:323:44: error: initialization of ‘long long unsigned int *’ from incompatible pointer type ‘__u64 *’ {aka ‘long unsigned int *’} [-Wincompatible-pointer-types] - 323 | unsigned long long *vals = n->val; - - Several other warnings are produced when -Wformat= is set, for example: - - ss.c:3244:34: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 2 has type ‘__u64’ {aka ‘long unsigned int’} [-Wformat=] - 3244 | out(" rcv_nxt:%llu", s->mptcpi_rcv_nxt); - | ~~~^ ~~~~~~~~~~~~~~~~~ - | | | - | | __u64 {aka long unsigned int} - | long long unsigned int - | %lu - - This happens because __u64 is defined as long unsigned on ppc64le. As - pointed out by Florian Weimar, we should use -D__SANE_USERSPACE_TYPES__ - if we really want to use long long unsigned in iproute2. - - This fix the build failure and all the warnings without any change on - the code itself. - - Suggested-by: Florian Weimer - Signed-off-by: Andrea Claudi - -Signed-off-by: Andrea Claudi ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 8024d45e..3b9daede 100644 ---- a/Makefile -+++ b/Makefile -@@ -60,7 +60,7 @@ CC := gcc - HOSTCC ?= $(CC) - DEFINES += -D_GNU_SOURCE - # Turn on transparent support for LFS --DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -+DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__SANE_USERSPACE_TYPES__ - CCOPTS = -O2 -pipe - WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes - WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2 --- -2.43.0 - diff --git a/iproute.spec b/iproute.spec index 7d10d3c..7d04056 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,10 +1,10 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.7.0 +Version: 6.8.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 -Patch0: 0001-iproute2-fix-build-failure-on-ppc64le.patch + License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison diff --git a/sources b/sources index 9522a67..92fbad4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iproute2-6.7.0.tar.xz) = 5d8dca139b1b980dac6c841f477b951dd199074cb078b5ea8df23b3532eeb235cca1df9f6628b0f81b7edd62aaf4e95bad15a851843bd61e5715215da97cc546 +SHA512 (iproute2-6.8.0.tar.xz) = 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0 From 741bac7f44dd5c478ae848d0be8e3e2a96c7d41b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 16 Apr 2024 00:16:12 -0400 Subject: [PATCH 06/18] Fix flatpak build config.mk does not set PREFIX, therefore DATADIR does not set properly either. --- iproute.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iproute.spec b/iproute.spec index 7d04056..f6a3ee4 100644 --- a/iproute.spec +++ b/iproute.spec @@ -67,7 +67,7 @@ The libnetlink static library. %build %configure --color auto -echo -e "\nSBINDIR=%{_sbindir}" >> config.mk +echo -e "\nPREFIX=%{_prefix}\nSBINDIR=%{_sbindir}" >> config.mk %make_build %install From 1110672bf6dafa03c253cdc900ba151d4800bed9 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 23 Jun 2024 22:54:28 -0400 Subject: [PATCH 07/18] Import rt_dsfield.deprecated for ELN builds Without Source1 being present, this cannot build when bootstrapping a new RHEL version (as happened in 10) without manual intervention, which is completely avoidable here. --- iproute.spec | 3 ++- rt_dsfield.deprecated | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 rt_dsfield.deprecated diff --git a/iproute.spec b/iproute.spec index f6a3ee4..edd9380 100644 --- a/iproute.spec +++ b/iproute.spec @@ -4,6 +4,7 @@ Version: 6.8.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 License: GPL-2.0-or-later AND NIST-PD @@ -83,7 +84,7 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a rm -rf '%{buildroot}%{_docdir}' # append deprecated values to rt_dsfield for compatibility reasons -%if 0%{?rhel} && ! 0%{?eln} +%if 0%{?rhel} cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield %endif diff --git a/rt_dsfield.deprecated b/rt_dsfield.deprecated new file mode 100644 index 0000000..c8eec63 --- /dev/null +++ b/rt_dsfield.deprecated @@ -0,0 +1,17 @@ + +# Deprecated values dropped upstream +# Kept in RHEL for backwards-compatibility +0x00 default +0x10 lowdelay +0x08 throughput +0x04 reliability +# This value overlap with ECT, do not use it! +0x02 mincost +# These values seems do not want to die, Cisco likes them by a strange reason. +0x20 priority +0x40 immediate +0x60 flash +0x80 flash-override +0xa0 critical +0xc0 internet +0xe0 network From 88661651e0059d0fc215a6c8e77e2ef9a82c0b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 13 Apr 2024 15:12:40 +0200 Subject: [PATCH 08/18] Add compat sbin Provides For https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin. A few packages require /usr/sbin/{ip,ss}. --- iproute.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/iproute.spec b/iproute.spec index edd9380..7a70541 100644 --- a/iproute.spec +++ b/iproute.spec @@ -26,7 +26,15 @@ BuildRequires: linux-atm-libs-devel %endif Requires: libbpf Requires: psmisc + +# Compat symlinks for Requires in other packages. Provides: /sbin/ip +%if "%{_sbindir}" == "%{_bindir}" +# We rely on filesystem to create the symlink for us. +Requires: filesystem(unmerged-sbin-symlinks) +Provides: /usr/sbin/ip +Provides: /usr/sbin/ss +%endif %description The iproute package contains networking utilities (ip and rtmon, for example) From 4a0051fa001c43c4472df8a1682555774750bae6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:32:53 +0000 Subject: [PATCH 09/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d10e375a529986e7519fb6815840461dea7ad3cb Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Tue, 23 Jul 2024 17:01:06 +0200 Subject: [PATCH 10/18] iproute-6.10.0-1.f41 * Tue Jul 23 2024 Andrea Claudi - 6.10.0-1.f41 - New version 6.10.0 (Andrea Claudi) [2298392] Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 3 +-- sources | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3976641..d0de316 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /iproute2-6.5.0.tar.xz /iproute2-6.7.0.tar.xz /iproute2-6.8.0.tar.xz +/iproute2-6.10.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 7a70541..1c7768a 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,12 +1,11 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.8.0 +Version: 6.10.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 - License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison BuildRequires: elfutils-libelf-devel diff --git a/sources b/sources index 92fbad4..73b0974 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (iproute2-6.8.0.tar.xz) = 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0 +SHA512 (iproute2-6.10.0.tar.xz) = 706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e23501bbbb41d3de50810bae014fcb41 From 052577f9e92734d44adf2a4d7b6fc44de100a1ae Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 27 Nov 2024 16:48:48 +0100 Subject: [PATCH 11/18] iproute-6.12.0-1.f42 * Wed Nov 27 2024 Andrea Claudi - 6.12.0-1.f42 - New version 6.12.0 (Andrea Claudi) [2298392] Signed-off-by: Andrea Claudi --- .gitignore | 27 +-------------------------- iproute.spec | 2 +- sources | 1 + 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index d0de316..a09786c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,3 @@ -/iproute2-4.18.0.tar.xz -/iproute2-4.20.0.tar.xz -/iproute2-5.0.0.tar.xz -/iproute2-5.1.0.tar.xz -/iproute2-5.2.0.tar.xz -/iproute2-5.3.0.tar.xz -/iproute2-5.4.0.tar.xz -/iproute2-5.5.0.tar.xz -/iproute2-5.7.0.tar.xz -/iproute2-5.8.0.tar.xz -/iproute2-5.9.0.tar.xz -/iproute2-5.10.0.tar.xz -/iproute2-5.11.0.tar.xz -/iproute2-5.12.0.tar.xz -/iproute2-5.13.0.tar.xz -/iproute2-5.14.0.tar.xz -/iproute2-5.15.0.tar.xz -/iproute2-5.17.0.tar.xz -/iproute2-5.18.0.tar.xz -/iproute2-6.0.0.tar.xz -/iproute2-6.1.0.tar.xz -/iproute2-6.2.0.tar.xz -/iproute2-6.3.0.tar.xz -/iproute2-6.4.0.tar.xz -/iproute2-6.5.0.tar.xz -/iproute2-6.7.0.tar.xz /iproute2-6.8.0.tar.xz /iproute2-6.10.0.tar.xz +/iproute2-6.12.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 1c7768a..7f7570b 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,6 +1,6 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.10.0 +Version: 6.12.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 diff --git a/sources b/sources index 73b0974..7074a5d 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (iproute2-6.8.0.tar.xz) = 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0 SHA512 (iproute2-6.10.0.tar.xz) = 706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e23501bbbb41d3de50810bae014fcb41 +SHA512 (iproute2-6.12.0.tar.xz) = dbd6afb8162a6086e4be9045b8dc53aa563bd4b7abaf43ee13cd7d493730ff0b90e6985f68c6f42d64f4af6a692d0589e0cefd2f24045ec1c10418cfb73940b2 From 7e1077b3ac5c7c4751fa4b8eaa8bf48ad8bc2d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 12 Jan 2025 14:31:21 +0100 Subject: [PATCH 12/18] Rebuilt for the bin-sbin merge (2nd attempt) https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin From 9fefd19efee268a3b566b554c7cc3cd97509690a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:21:19 +0000 Subject: [PATCH 13/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b5c2466bc330aaeaa9234e8f31349abfbfcc0589 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Mon, 5 May 2025 16:14:12 +0200 Subject: [PATCH 14/18] iproute-6.14.0-1.f43 * Mon May 05 2025 Andrea Claudi - 6.14.0-1.f43 - New version 6.14.0 (Andrea Claudi) [2339037] Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 3 ++- sources | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a09786c..d4a29ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /iproute2-6.8.0.tar.xz /iproute2-6.10.0.tar.xz /iproute2-6.12.0.tar.xz +/iproute2-6.14.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 7f7570b..0e4018a 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,6 +1,6 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.12.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 @@ -104,6 +104,7 @@ cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield %{_mandir}/man8/* %exclude %{_mandir}/man8/tc* %exclude %{_mandir}/man8/cbq* +%exclude %{_mandir}/man8/arpd* %attr(644,root,root) %config(noreplace) %{_datadir}/iproute2/* %{_sbindir}/* %exclude %{_sbindir}/tc diff --git a/sources b/sources index 7074a5d..3e3658e 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (iproute2-6.8.0.tar.xz) = 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0 SHA512 (iproute2-6.10.0.tar.xz) = 706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e23501bbbb41d3de50810bae014fcb41 SHA512 (iproute2-6.12.0.tar.xz) = dbd6afb8162a6086e4be9045b8dc53aa563bd4b7abaf43ee13cd7d493730ff0b90e6985f68c6f42d64f4af6a692d0589e0cefd2f24045ec1c10418cfb73940b2 +SHA512 (iproute2-6.14.0.tar.xz) = e79049bdca0e0381f0a93a40e4d597ce59fb509dabc6e8b04a510ff9953f091c67577d6faa62967bd197bf62ab6e56d928558270a1390621431acb237b77fa46 From 50f9619fb02bb0e399a594a36f2bebfbe915ba51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:45:38 +0000 Subject: [PATCH 15/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5659df63b3a54876efaecaa4c59603af43b230db Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 3 Sep 2025 17:31:48 +0200 Subject: [PATCH 16/18] iproute-6.16.0-1.f44 * Wed Sep 03 2025 Andrea Claudi - 6.16.0-1.f44 - New version 6.16.0 (Andrea Claudi) [2368627] Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 26 ++++++++++++++++++++++++-- sources | 1 + 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d4a29ef..f05cf9e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /iproute2-6.10.0.tar.xz /iproute2-6.12.0.tar.xz /iproute2-6.14.0.tar.xz +/iproute2-6.16.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 0e4018a..58b72f2 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,10 +1,13 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.14.0 +Version: 6.16.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 +%if 0%{?rhel} Source1: rt_dsfield.deprecated +Source2: README.etc +%endif License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison @@ -93,9 +96,25 @@ 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 + +# 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 %endif %files +%if 0%{?rhel} +%dir %{_sysconfdir}/iproute2 +%endif %dir %{_datadir}/iproute2 %license COPYING %doc README README.devel @@ -105,8 +124,11 @@ cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield %exclude %{_mandir}/man8/tc* %exclude %{_mandir}/man8/cbq* %exclude %{_mandir}/man8/arpd* -%attr(644,root,root) %config(noreplace) %{_datadir}/iproute2/* +%attr(644,root,root) %config %{_datadir}/iproute2/* %{_sbindir}/* +%if 0%{?rhel} +%attr(644,root,root) %{_sysconfdir}/iproute2/* +%endif %exclude %{_sbindir}/tc %exclude %{_sbindir}/routel %{_datadir}/bash-completion/completions/devlink diff --git a/sources b/sources index 3e3658e..f39b2df 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ SHA512 (iproute2-6.8.0.tar.xz) = 54e50340a73c8810d69bfd54704b469149731634a97d94d SHA512 (iproute2-6.10.0.tar.xz) = 706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e23501bbbb41d3de50810bae014fcb41 SHA512 (iproute2-6.12.0.tar.xz) = dbd6afb8162a6086e4be9045b8dc53aa563bd4b7abaf43ee13cd7d493730ff0b90e6985f68c6f42d64f4af6a692d0589e0cefd2f24045ec1c10418cfb73940b2 SHA512 (iproute2-6.14.0.tar.xz) = e79049bdca0e0381f0a93a40e4d597ce59fb509dabc6e8b04a510ff9953f091c67577d6faa62967bd197bf62ab6e56d928558270a1390621431acb237b77fa46 +SHA512 (iproute2-6.16.0.tar.xz) = 88930ea1a3a901594a69dc04e533bfd1de0f5b79f176dedb45f11f01035bd680edccc8e04e56d0922ee430580581c646473a3baa941254739878f7ab946f17df From 6deb8d6715636314fe01afde0c796369c9343d22 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 19 Sep 2025 04:00:55 -0400 Subject: [PATCH 17/18] Import README.etc --- README.etc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 README.etc 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. From e2fb4f806782daf154762a8e4b63ebaae16349f8 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 8 Oct 2025 00:31:40 +0200 Subject: [PATCH 18/18] iproute-6.17.0-1.f44 * Wed Oct 08 2025 Andrea Claudi - 6.17.0-1.f44 - New version 6.17.0 (Andrea Claudi) [2400133] - Create /etc/iproute2 for user configuration files (Andrea Claudi) [2343990] Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 14 ++++++-------- sources | 1 + 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f05cf9e..fd6d31a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /iproute2-6.12.0.tar.xz /iproute2-6.14.0.tar.xz /iproute2-6.16.0.tar.xz +/iproute2-6.17.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 58b72f2..77088b9 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,13 +1,13 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.16.0 +Version: 6.17.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 %if 0%{?rhel} Source1: rt_dsfield.deprecated -Source2: README.etc %endif +Source2: README.etc License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison @@ -93,16 +93,18 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a # drop these files, iproute-doc package extracts files directly from _builddir rm -rf '%{buildroot}%{_docdir}' +mkdir -p %{buildroot}%{_sysconfdir}/iproute2 +cp %{SOURCE2} %{buildroot}%{_sysconfdir}/iproute2/README + # 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 # 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 @@ -112,9 +114,7 @@ fi %endif %files -%if 0%{?rhel} %dir %{_sysconfdir}/iproute2 -%endif %dir %{_datadir}/iproute2 %license COPYING %doc README README.devel @@ -126,9 +126,7 @@ fi %exclude %{_mandir}/man8/arpd* %attr(644,root,root) %config %{_datadir}/iproute2/* %{_sbindir}/* -%if 0%{?rhel} %attr(644,root,root) %{_sysconfdir}/iproute2/* -%endif %exclude %{_sbindir}/tc %exclude %{_sbindir}/routel %{_datadir}/bash-completion/completions/devlink diff --git a/sources b/sources index f39b2df..9ad54ed 100644 --- a/sources +++ b/sources @@ -3,3 +3,4 @@ SHA512 (iproute2-6.10.0.tar.xz) = 706479aa37a25fcf30c525c6abd85e0861e484d046e063 SHA512 (iproute2-6.12.0.tar.xz) = dbd6afb8162a6086e4be9045b8dc53aa563bd4b7abaf43ee13cd7d493730ff0b90e6985f68c6f42d64f4af6a692d0589e0cefd2f24045ec1c10418cfb73940b2 SHA512 (iproute2-6.14.0.tar.xz) = e79049bdca0e0381f0a93a40e4d597ce59fb509dabc6e8b04a510ff9953f091c67577d6faa62967bd197bf62ab6e56d928558270a1390621431acb237b77fa46 SHA512 (iproute2-6.16.0.tar.xz) = 88930ea1a3a901594a69dc04e533bfd1de0f5b79f176dedb45f11f01035bd680edccc8e04e56d0922ee430580581c646473a3baa941254739878f7ab946f17df +SHA512 (iproute2-6.17.0.tar.xz) = 3d83d49233c1d984f15d285a46e2ec0eeb820c7cb84cfc84866921f37e8a57d31bc3953be07e8c79ed6079f326a25c3a85f591b0d67f9f689c0c70ccdb0fef77