diff --git a/Revert-emp-fix-warning-on-deprecated-bison-directive.patch b/Revert-emp-fix-warning-on-deprecated-bison-directive.patch deleted file mode 100644 index 91a18b0..0000000 --- a/Revert-emp-fix-warning-on-deprecated-bison-directive.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Michal Kubecek -Date: Tue, 25 Nov 2014 08:39:36 +0100 -Subject: Revert "emp: fix warning on deprecated bison directive" -Patch-mainline: Never, temporary workaround - -This reverts commit edd3979272e46d17456a4dabc3e9acf59e561d5a. - -For SLE11 only. Its bison [version 2.3] does not allow new syntax. ---- - tc/emp_ematch.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tc/emp_ematch.y b/tc/emp_ematch.y -index 2e6cf3530ef2..753e3075df71 100644 ---- a/tc/emp_ematch.y -+++ b/tc/emp_ematch.y -@@ -9,7 +9,7 @@ - %locations - %token-table - %error-verbose --%name-prefix "ematch_" -+%name-prefix="ematch_" - - %union { - unsigned int i; --- -2.14.1 - diff --git a/Revert-tc-ematch-fix-deprecated-yacc-warning.patch b/Revert-tc-ematch-fix-deprecated-yacc-warning.patch deleted file mode 100644 index b77e412..0000000 --- a/Revert-tc-ematch-fix-deprecated-yacc-warning.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Michal Kubecek -Date: Mon, 13 May 2019 11:09:08 +0200 -Subject: Revert "tc/ematch: fix deprecated yacc warning" -Patch-mainline: Never, build fix for older distributions - -This reverts commit 38983334f6d59318f40cda5cab771a92c2510695. - -For SLE <= 12 and openSUSE 42.3 only. Their bison (version 2.7) does not -recognize new syntax. ---- - tc/emp_ematch.y | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/tc/emp_ematch.y -+++ b/tc/emp_ematch.y -@@ -8,8 +8,8 @@ - - %locations - %token-table --%define parse.error verbose --%define api.prefix {ematch_} -+%error-verbose -+%name-prefix "ematch_" - - %union { - unsigned int i; diff --git a/iproute2-5.4.0.tar.sign b/iproute2-5.4.0.tar.sign deleted file mode 100644 index 544ee82..0000000 Binary files a/iproute2-5.4.0.tar.sign and /dev/null differ diff --git a/iproute2-5.4.0.tar.xz b/iproute2-5.4.0.tar.xz deleted file mode 100644 index e85eb6e..0000000 --- a/iproute2-5.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe97aa60a0d4c5ac830be18937e18dc3400ca713a33a89ad896ff1e3d46086ae -size 741328 diff --git a/iproute2-5.5.0.tar.sign b/iproute2-5.5.0.tar.sign new file mode 100644 index 0000000..47c82e2 Binary files /dev/null and b/iproute2-5.5.0.tar.sign differ diff --git a/iproute2-5.5.0.tar.xz b/iproute2-5.5.0.tar.xz new file mode 100644 index 0000000..eda31cb --- /dev/null +++ b/iproute2-5.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bac543435cac208a11db44c9cc8e35aa902befef8750594654ee71941c388f7b +size 747756 diff --git a/iproute2.changes b/iproute2.changes index 6eb3879..3dcc55f 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Sun Feb 9 17:16:03 UTC 2020 - Michal Kubecek + +- Update to new upstream version 5.5 + * bridge: support fdb get + * devlink: command line option to switch netns + * devlink: all changing netns on reload + * devlink: new timestamp format for health report dump + * ip: support for alternative device names + * ip link: support to get SR-IOV VF node GUID and port GUID + * ip neigh: support get + * rdma: relax requirement to have PID for HW objects + * rdma: stat show mr + * ss: allow dumping kTLS info + * tc: support action flags + * tc flower: support masked port destination and source match + * tc pie: add dq_rate_estimator option + * tipc: new commands to set TIPC AEAD key + * more json support +- drop patches obsoleted by version upgrade: + * ss-fix-end-of-line-printing-in-misc-ss.c.patch + * no-double-definitions.patch + * Revert-emp-fix-warning-on-deprecated-bison-directive.patch + * Revert-tc-ematch-fix-deprecated-yacc-warning.patch +- refresh + * split-link-and-compile-steps-for-binaries.patch + ------------------------------------------------------------------- Wed Jan 8 10:05:13 UTC 2020 - Jan Engelhardt diff --git a/iproute2.spec b/iproute2.spec index cc7587d..ad25c32 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -17,9 +17,8 @@ Name: iproute2 -Version: 5.4 +Version: 5.5.0 Release: 0 -%define rversion 5.4.0 Summary: Linux network configuration utilities License: GPL-2.0-only Group: Productivity/Networking/Routing @@ -28,18 +27,14 @@ URL: https://www.linuxfoundation.org/collaborate/workgroups/networkin #DL-URL: https://kernel.org/pub/linux/utils/net/iproute2/ #Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2 -Source: https://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.xz -Source2: https://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.sign +Source: https://kernel.org/pub/linux/utils/net/iproute2/%name-%version.tar.xz +Source2: https://kernel.org/pub/linux/utils/net/iproute2/%name-%version.tar.sign Source9: %name.keyring Patch1: adjust-installation-directories-for-openSUSE-SLE.patch Patch2: use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch Patch3: add-explicit-typecast-to-avoid-gcc-warning.patch Patch4: xfrm-support-displaying-transformations-used-for-Mob.patch Patch6: split-link-and-compile-steps-for-binaries.patch -Patch7: ss-fix-end-of-line-printing-in-misc-ss.c.patch -Patch8: no-double-definitions.patch -Patch101: Revert-tc-ematch-fix-deprecated-yacc-warning.patch -Patch102: Revert-emp-fix-warning-on-deprecated-bison-directive.patch Patch201: bpf-data-section-support-poc.patch Patch202: bpf-bss-section-poc.patch BuildRequires: bison @@ -87,14 +82,7 @@ Requires: bash-completion bash command line completion support for iproute. %prep -%setup -qn %name-%rversion -%patch -P 1 -P 2 -P 3 -P 4 -P 6 -P 7 -P 8 -P 201 -P 202 -p1 -%if 0%{?suse_version} < 1500 -%patch -P 101 -p1 -%endif -%if 0%{?sles_version} == 11 -%patch -P 102 -p1 -%endif +%autosetup -p1 find . -name *.orig -delete %build diff --git a/no-double-definitions.patch b/no-double-definitions.patch deleted file mode 100644 index 13b1c38..0000000 --- a/no-double-definitions.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 3346c4e96148c4fea1113aab40ab4cdab11bb2f5 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Wed, 8 Jan 2020 10:56:59 +0100 -Subject: [PATCH] build: fix build failure with -fno-common -Message-Id: <20200108100424.26642-1-jengelh@inai.de> -X-Mailer: git-send-email 2.24.1 - -$ make CCOPTS=-fno-common -gcc ... -o ip -ld: rt_names.o (symbol from plugin): in function "rtnl_rtprot_n2a": -(.text+0x0): multiple definition of "numeric"; ip.o (symbol from plugin):(.text+0x0): first defined here - -gcc ... -o tipc -ld: ../lib/libutil.a(utils.o):(.bss+0xc): multiple definition of `pretty'; -tipc.o:tipc.c:28: first defined here - -References: https://bugzilla.opensuse.org/1160244 -Signed-off-by: Jan Engelhardt ---- - include/rt_names.h | 2 ++ - ip/ip.c | 2 +- - misc/ss.c | 2 +- - tc/tc.c | 2 +- - tipc/tipc.c | 2 +- - 5 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/include/rt_names.h b/include/rt_names.h -index 62ebbd6a..7afce170 100644 ---- a/include/rt_names.h -+++ b/include/rt_names.h -@@ -33,4 +33,6 @@ int ll_proto_a2n(unsigned short *id, const char *buf); - const char *nl_proto_n2a(int id, char *buf, int len); - int nl_proto_a2n(__u32 *id, const char *arg); - -+extern int numeric; -+ - #endif -diff --git a/ip/ip.c b/ip/ip.c -index fed26f8d..90392c2a 100644 ---- a/ip/ip.c -+++ b/ip/ip.c -@@ -23,6 +23,7 @@ - #include "ip_common.h" - #include "namespace.h" - #include "color.h" -+#include "rt_names.h" - - int preferred_family = AF_UNSPEC; - int human_readable; -@@ -36,7 +37,6 @@ int timestamp; - int force; - int max_flush_loops = 10; - int batch_mode; --int numeric; - bool do_all; - - struct rtnl_handle rth = { .fd = -1 }; -diff --git a/misc/ss.c b/misc/ss.c -index 95f1d37a..1e8bca5a 100644 ---- a/misc/ss.c -+++ b/misc/ss.c -@@ -35,6 +35,7 @@ - #include "libnetlink.h" - #include "namespace.h" - #include "SNAPSHOT.h" -+#include "rt_names.h" - - #include - #include -@@ -121,7 +122,6 @@ static int follow_events; - static int sctp_ino; - static int show_tipcinfo; - static int show_tos; --int numeric; - int oneline; - - enum col_id { -diff --git a/tc/tc.c b/tc/tc.c -index 37294b31..b72657ec 100644 ---- a/tc/tc.c -+++ b/tc/tc.c -@@ -29,6 +29,7 @@ - #include "tc_util.h" - #include "tc_common.h" - #include "namespace.h" -+#include "rt_names.h" - - int show_stats; - int show_details; -@@ -43,7 +44,6 @@ bool use_names; - int json; - int color; - int oneline; --int numeric; - - static char *conf_file; - -diff --git a/tipc/tipc.c b/tipc/tipc.c -index f85ddee0..60176a04 100644 ---- a/tipc/tipc.c -+++ b/tipc/tipc.c -@@ -22,10 +22,10 @@ - #include "node.h" - #include "peer.h" - #include "cmdl.h" -+#include "utils.h" - - int help_flag; - int json; --int pretty; - - static void about(struct cmdl *cmdl) - { --- -2.24.1 - diff --git a/split-link-and-compile-steps-for-binaries.patch b/split-link-and-compile-steps-for-binaries.patch index 857f06a..4747e0d 100644 --- a/split-link-and-compile-steps-for-binaries.patch +++ b/split-link-and-compile-steps-for-binaries.patch @@ -43,5 +43,5 @@ to work. +arpd: arpd.o + $(QUIET_CC)$(CC) $(LDFLAGS) -o arpd arpd.o $(LDLIBS) -ldb - ssfilter.c: ssfilter.y - $(QUIET_YACC)bison ssfilter.y -o ssfilter.c + ssfilter.tab.c: ssfilter.y + $(QUIET_YACC)$(YACC) -b ssfilter ssfilter.y diff --git a/ss-fix-end-of-line-printing-in-misc-ss.c.patch b/ss-fix-end-of-line-printing-in-misc-ss.c.patch deleted file mode 100644 index d7d08d2..0000000 --- a/ss-fix-end-of-line-printing-in-misc-ss.c.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Brian Vazquez -Subject: ss: fix end-of-line printing in misc/ss.c -Patch-mainline: Submitted - 20191126 - http://lkml.kernel.org/r/20191127052118.163594-1-brianvv@google.com -References: none - -Before commit 5883c6eba517, function field_is_last() was incorrectly -reporting which column was the last because it was missing COL_PROC -and by purely coincidence it was correctly printing the end-of-line and -moving to the first column since the very last field was empty, and -end-of-line was added for the last non-empty token since it was seen as -the last field. - -This commits correcrly prints the end-of-line for the last entrien in -the ss command. - -Tested: -diff <(./ss.old -nltp) <(misc/ss -nltp) -38c38 -< LISTEN 0 128 [::1]:35417 [::]:* users:(("foo",pid=65254,fd=116)) -\ No newline at end of file - -Cc: Hritik Vijay -Fixes: 5883c6eba517 ("ss: show header for --processes/-p") -Signed-off-by: Brian Vazquez ---- - misc/ss.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/misc/ss.c -+++ b/misc/ss.c -@@ -1289,6 +1289,11 @@ static void render(void) - - token = buf_token_next(token); - } -+ /* Deal with final end-of-line when the last non-empty field printed -+ * is not the last field. -+ */ -+ if (line_started) -+ printf("\n"); - - buf_free_all(); - current_field = columns;