diff --git a/.gitignore b/.gitignore index b020ac8..307de56 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/iproute2-6.7.0.tar.xz +SOURCES/iproute2-6.11.0.tar.xz diff --git a/.iproute.metadata b/.iproute.metadata index 3dc6323..48488fa 100644 --- a/.iproute.metadata +++ b/.iproute.metadata @@ -1 +1 @@ -dae0e08a0593ad005b50f0fb9f45eeffd5e83735 SOURCES/iproute2-6.7.0.tar.xz +7617e7896c1aa049fd2c371c7e07c6a6f89f7b3e SOURCES/iproute2-6.11.0.tar.xz diff --git a/SOURCES/0001-iproute2-fix-build-failure-on-ppc64le.patch b/SOURCES/0001-iproute2-fix-build-failure-on-ppc64le.patch deleted file mode 100644 index 1d621e4..0000000 --- a/SOURCES/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/SPECS/iproute.spec b/SPECS/iproute.spec index 2bde873..d95db8d 100644 --- a/SPECS/iproute.spec +++ b/SPECS/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 = 5; + release_number = 1; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -10,12 +10,11 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.7.0 +Version: 6.11.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 -Patch0: 0001-iproute2-fix-build-failure-on-ppc64le.patch License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison @@ -36,7 +35,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) @@ -78,7 +85,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 @@ -94,7 +101,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 @@ -138,6 +145,12 @@ cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield %changelog ## START: Generated by rpmautospec +* Wed Dec 18 2024 Andrea Claudi - 6.11.0-1 +- iproute-6.11.0-1.el10 + +* Thu Nov 28 2024 Mingyu Shi - 6.7.0-6 +- Use osci.brew-build.tier0.functional as test_case_name in gating.yaml + * Tue Oct 29 2024 Troy Dawson - 6.7.0-5 - Bump release for October 2024 mass rebuild: