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