From dfbb7f212cfb31d78f9c67d389fd659e2a7723ad Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Thu, 4 Nov 2021 18:52:27 +0100 Subject: [PATCH] iproute-5.15.0-1 * Thu Nov 04 2021 Andrea Claudi - 5.15.0-1 - New version 5.15.0 [2019267] Resolves: rhbz#2019267 Signed-off-by: Andrea Claudi --- .gitignore | 1 + ...-parsing-issue-on-include_dir-option.patch | 6 +-- ...igure-restore-backward-compatibility.patch | 50 ------------------- ...x-parsing-issue-on-libbpf_dir-option.patch | 6 +-- ...rsing-issue-with-more-than-one-value.patch | 6 +-- ...4-configure-simplify-options-parsing.patch | 6 +-- ...-configure-support-param-value-style.patch | 6 +-- ...0006-configure-add-the-prefix-option.patch | 6 +-- ...0007-configure-add-the-libdir-option.patch | 6 +-- iproute.spec | 33 ++++++------ sources | 1 + 11 files changed, 37 insertions(+), 90 deletions(-) rename 0002-configure-fix-parsing-issue-on-include_dir-option.patch => 0001-configure-fix-parsing-issue-on-include_dir-option.patch (91%) delete mode 100644 0001-configure-restore-backward-compatibility.patch rename 0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch => 0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch (92%) rename 0004-configure-fix-parsing-issue-with-more-than-one-value.patch => 0003-configure-fix-parsing-issue-with-more-than-one-value.patch (89%) rename 0005-configure-simplify-options-parsing.patch => 0004-configure-simplify-options-parsing.patch (93%) rename 0006-configure-support-param-value-style.patch => 0005-configure-support-param-value-style.patch (86%) rename 0007-configure-add-the-prefix-option.patch => 0006-configure-add-the-prefix-option.patch (90%) rename 0008-configure-add-the-libdir-option.patch => 0007-configure-add-the-libdir-option.patch (95%) diff --git a/.gitignore b/.gitignore index 2f6d853..03cfd44 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /iproute2-5.12.0.tar.xz /iproute2-5.13.0.tar.xz /iproute2-5.14.0.tar.xz +/iproute2-5.15.0.tar.xz diff --git a/0002-configure-fix-parsing-issue-on-include_dir-option.patch b/0001-configure-fix-parsing-issue-on-include_dir-option.patch similarity index 91% rename from 0002-configure-fix-parsing-issue-on-include_dir-option.patch rename to 0001-configure-fix-parsing-issue-on-include_dir-option.patch index c061c51..231fffe 100644 --- a/0002-configure-fix-parsing-issue-on-include_dir-option.patch +++ b/0001-configure-fix-parsing-issue-on-include_dir-option.patch @@ -1,7 +1,7 @@ From 290ce87f0a59ec4ddc83918c073364540057ae64 Mon Sep 17 00:00:00 2001 -Message-Id: <290ce87f0a59ec4ddc83918c073364540057ae64.1634733799.git.aclaudi@redhat.com> -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: <290ce87f0a59ec4ddc83918c073364540057ae64.1636047125.git.aclaudi@redhat.com> +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: fix parsing issue on include_dir option diff --git a/0001-configure-restore-backward-compatibility.patch b/0001-configure-restore-backward-compatibility.patch deleted file mode 100644 index ad8178d..0000000 --- a/0001-configure-restore-backward-compatibility.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 5e6e93a55d2335b90aacb0107e962610cce64007 Mon Sep 17 00:00:00 2001 -Message-Id: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -From: Andrea Claudi -Date: Wed, 20 Oct 2021 12:32:38 +0200 -Subject: [PATCH] configure: restore backward compatibility - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 -Upstream Status: iproute2.git commit a3272b93 - -commit a3272b93725a406bc98b67373da67a4bdf6fcdb0 -Author: Luca Boccassi -Date: Thu Sep 2 12:38:54 2021 +0100 - - configure: restore backward compatibility - - Commit a9c3d70d902a0473ee5c13336317006a52ce8242 broke backward compatibility - by making 'configure' error out if parameters are passed, instead of - ignoring them. - Sometimes packaging systems detect 'configure' and assume it's from - autotools, and pass a bunch of options. Eg: - - dh_auto_configure - ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking - - Ignore unknown options again instead of erroring out. - - Fixes: a9c3d70d902a ("configure: add options ability") - - Signed-off-by: Luca Boccassi - Signed-off-by: Stephen Hemminger ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 0a4a0fc9..7f4f3bd9 100755 ---- a/configure -+++ b/configure -@@ -518,7 +518,7 @@ else - "") - break ;; - *) -- usage 1 ;; -+ shift 1 ;; - esac - done - fi --- -2.31.1 - diff --git a/0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch b/0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch similarity index 92% rename from 0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch rename to 0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch index 5a8c17d..007e9bb 100644 --- a/0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch +++ b/0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch @@ -1,7 +1,7 @@ From 5f717b9a1bb8c49e101670682d73bc5ae9ee701a Mon Sep 17 00:00:00 2001 -Message-Id: <5f717b9a1bb8c49e101670682d73bc5ae9ee701a.1634733799.git.aclaudi@redhat.com> -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: <5f717b9a1bb8c49e101670682d73bc5ae9ee701a.1636047125.git.aclaudi@redhat.com> +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: fix parsing issue on libbpf_dir option diff --git a/0004-configure-fix-parsing-issue-with-more-than-one-value.patch b/0003-configure-fix-parsing-issue-with-more-than-one-value.patch similarity index 89% rename from 0004-configure-fix-parsing-issue-with-more-than-one-value.patch rename to 0003-configure-fix-parsing-issue-with-more-than-one-value.patch index 72d90a6..2f4d55a 100644 --- a/0004-configure-fix-parsing-issue-with-more-than-one-value.patch +++ b/0003-configure-fix-parsing-issue-with-more-than-one-value.patch @@ -1,7 +1,7 @@ From 4f9ade07eafe74db184eb09603e8187f3ca14423 Mon Sep 17 00:00:00 2001 -Message-Id: <4f9ade07eafe74db184eb09603e8187f3ca14423.1634733799.git.aclaudi@redhat.com> -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: <4f9ade07eafe74db184eb09603e8187f3ca14423.1636047125.git.aclaudi@redhat.com> +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: fix parsing issue with more than one value per diff --git a/0005-configure-simplify-options-parsing.patch b/0004-configure-simplify-options-parsing.patch similarity index 93% rename from 0005-configure-simplify-options-parsing.patch rename to 0004-configure-simplify-options-parsing.patch index b44439c..e27ddab 100644 --- a/0005-configure-simplify-options-parsing.patch +++ b/0004-configure-simplify-options-parsing.patch @@ -1,7 +1,7 @@ From e563a97894c173dcfe2ccdb061c9bfe16526678b Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: simplify options parsing diff --git a/0006-configure-support-param-value-style.patch b/0005-configure-support-param-value-style.patch similarity index 86% rename from 0006-configure-support-param-value-style.patch rename to 0005-configure-support-param-value-style.patch index 0596c47..d012369 100644 --- a/0006-configure-support-param-value-style.patch +++ b/0005-configure-support-param-value-style.patch @@ -1,7 +1,7 @@ From 6de1c71cf82d67784a185ba912bdbfa24fa6bce5 Mon Sep 17 00:00:00 2001 -Message-Id: <6de1c71cf82d67784a185ba912bdbfa24fa6bce5.1634733799.git.aclaudi@redhat.com> -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: <6de1c71cf82d67784a185ba912bdbfa24fa6bce5.1636047125.git.aclaudi@redhat.com> +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: support --param=value style diff --git a/0007-configure-add-the-prefix-option.patch b/0006-configure-add-the-prefix-option.patch similarity index 90% rename from 0007-configure-add-the-prefix-option.patch rename to 0006-configure-add-the-prefix-option.patch index be26253..0725dfb 100644 --- a/0007-configure-add-the-prefix-option.patch +++ b/0006-configure-add-the-prefix-option.patch @@ -1,7 +1,7 @@ From aad7307a1ca9f2c8df26e1ed5e8a8b9816f87792 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: add the --prefix option diff --git a/0008-configure-add-the-libdir-option.patch b/0007-configure-add-the-libdir-option.patch similarity index 95% rename from 0008-configure-add-the-libdir-option.patch rename to 0007-configure-add-the-libdir-option.patch index 425b5cc..6c7beac 100644 --- a/0008-configure-add-the-libdir-option.patch +++ b/0007-configure-add-the-libdir-option.patch @@ -1,7 +1,7 @@ From d2e278fcff8a699a2dbac8d74758b4e5f86fd5f0 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: add the --libdir option diff --git a/iproute.spec b/iproute.spec index 8e6cc6f..6114a8a 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,6 +1,6 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.14.0 +Version: 5.15.0 Release: 1%{?dist}%{?buildid} %if 0%{?rhel} Group: Applications/System @@ -8,17 +8,15 @@ Group: Applications/System 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%{?fedora} -Source1: iproute2.sh -Source2: rt_dsfield.deprecated +Source1: rt_dsfield.deprecated %endif -Patch0: 0001-configure-restore-backward-compatibility.patch -Patch1: 0002-configure-fix-parsing-issue-on-include_dir-option.patch -Patch2: 0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch -Patch3: 0004-configure-fix-parsing-issue-with-more-than-one-value.patch -Patch4: 0005-configure-simplify-options-parsing.patch -Patch5: 0006-configure-support-param-value-style.patch -Patch6: 0007-configure-add-the-prefix-option.patch -Patch7: 0008-configure-add-the-libdir-option.patch +Patch0: 0001-configure-fix-parsing-issue-on-include_dir-option.patch +Patch1: 0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch +Patch2: 0003-configure-fix-parsing-issue-with-more-than-one-value.patch +Patch3: 0004-configure-simplify-options-parsing.patch +Patch4: 0005-configure-support-param-value-style.patch +Patch5: 0006-configure-add-the-prefix-option.patch +Patch6: 0007-configure-add-the-libdir-option.patch License: GPLv2+ and Public Domain BuildRequires: bison @@ -107,12 +105,9 @@ 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}' -# RHEL-specific stuff -%if ! 0%{?fedora} -# use TC_LIB_DIR environment variable -install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/iproute2.sh # append deprecated values to rt_dsfield for compatibility reasons -cat %{SOURCE2} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield +%if ! 0%{?fedora} +cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %endif %files @@ -131,9 +126,6 @@ cat %{SOURCE2} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %files tc %license COPYING -%if ! 0%{?fedora} -%{_sysconfdir}/profile.d/iproute2.sh -%endif %{_mandir}/man7/tc-* %{_mandir}/man8/tc* %{_mandir}/man8/cbq* @@ -156,6 +148,9 @@ cat %{SOURCE2} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog +* Thu Nov 04 2021 Andrea Claudi - 5.15.0-1 +- New version 5.15.0 [2019267] + * Wed Oct 20 2021 Andrea Claudi - 5.14.0-1 - New version 5.14.0 [1999860] diff --git a/sources b/sources index c893066..d426c9e 100644 --- a/sources +++ b/sources @@ -3,3 +3,4 @@ SHA512 (iproute2-5.11.0.tar.xz) = 8d0e7efc20db70af2d344962610b7fb7f464da567f63e0 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