Rebase package on top of iproute2-5.5.0

.gitignore

@@ -5,3 +5,4 @@
 /iproute2-5.2.0.tar.xz
 /iproute2-5.3.0.tar.xz
 /iproute2-5.4.0.tar.xz
+/iproute2-5.5.0.tar.xz

0001-devlink-allow-full-range-of-resource-sizes.patch

@@ -1,43 +0,0 @@
-From b9cee97db2169bd9627c5a7117e57c0892e8f552 Mon Sep 17 00:00:00 2001
-From: Jakub Kicinski <jakub.kicinski@netronome.com>
-Date: Tue, 5 Nov 2019 13:17:07 -0800
-Subject: [PATCH] devlink: allow full range of resource sizes
-
-Resource size is a 64 bit attribute at netlink level.
-Make the command line argument 64 bit as well.
-
-Fixes: 8cd644095842 ("devlink: Add support for devlink resource abstraction")
-Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
-Acked-by: Jiri Pirko <jiri@mellanox.com>
-Signed-off-by: David Ahern <dsahern@gmail.com>
-(cherry picked from commit c3f69bf923dea50e48564fd520fec6314ddbcf5f)
-Signed-off-by: Phil Sutter <psutter@redhat.com>
----
- devlink/devlink.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/devlink/devlink.c b/devlink/devlink.c
-index 056ac95ee726f..ebffa8c80ffef 100644
---- a/devlink/devlink.c
-+++ b/devlink/devlink.c
-@@ -281,7 +281,7 @@ struct dl_opts {
- 	bool dpipe_counters_enable;
- 	bool eswitch_encap_mode;
- 	const char *resource_path;
--	uint32_t resource_size;
-+	uint64_t resource_size;
- 	uint32_t resource_id;
- 	bool resource_id_valid;
- 	const char *param_name;
-@@ -1334,7 +1334,7 @@ static int dl_argv_parse(struct dl *dl, uint64_t o_required,
- 		} else if (dl_argv_match(dl, "size") &&
- 			   (o_all & DL_OPT_RESOURCE_SIZE)) {
- 			dl_arg_inc(dl);
--			err = dl_argv_uint32_t(dl, &opts->resource_size);
-+			err = dl_argv_uint64_t(dl, &opts->resource_size);
- 			if (err)
- 				return err;
- 			o_found |= DL_OPT_RESOURCE_SIZE;
--- 
-2.24.0
-

iproute.spec

@@ -1,13 +1,11 @@
 %global             cbq_version v0.7.3
 Summary:            Advanced IP routing and network device configuration tools
 Name:               iproute
-Version:            5.4.0
+Version:            5.5.0
 Release:            1%{?dist}
 URL:                http://kernel.org/pub/linux/utils/net/%{name}2/
 Source0:            http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz
 
-Patch1:  0001-devlink-allow-full-range-of-resource-sizes.patch
-
 License:            GPLv2+ and Public Domain
 BuildRequires:      gcc
 BuildRequires:      bison
@@ -109,6 +107,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
 %{_includedir}/iproute2/bpf_elf.h
 
 %changelog
+* Tue Jan 28 2020 Phil Sutter <psutter@redhat.com> - 5.5.0-1
+- New version 5.5.0
+
 * Tue Nov 26 2019 Phil Sutter <psutter@redhat.com> - 5.4.0-1
 - New version 5.4.0
 - Drop iproute-doc package, upstream removed all non-manpage documentation

sources

@@ -1 +1 @@
-SHA512 (iproute2-5.4.0.tar.xz) = 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051
+SHA512 (iproute2-5.5.0.tar.xz) = a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78