diff --git a/0001-ip-add-error-reporting-when-RTM_GETNSID-failed.patch b/0001-ip-add-error-reporting-when-RTM_GETNSID-failed.patch deleted file mode 100644 index 0bee424..0000000 --- a/0001-ip-add-error-reporting-when-RTM_GETNSID-failed.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4222d059c910136f5e2b5c6de96ddaf06828c1d5 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Tue, 22 Sep 2020 01:41:50 +0200 -Subject: [PATCH] ip: add error reporting when RTM_GETNSID failed -Upstream: https://marc.info/?t=160073241300004&r=1&w=2 - -`ip addr` when run under qemu-user-riscv64, fails. This likely is -due to qemu-5.1 not doing translation of RTM_GETNSID calls. Aborting -ip completely is the wrong response however. This patch reworks the -error handling. - -2: host0@if5: mtu 1500 qdisc noqueue state UP group default qlen 1000 - link/ether 5a:44:da:1a:c4:0b brd ff:ff:ff:ff:ff:ff -request send failed: Operation not supported - -Signed-off-by: Jan Engelhardt ---- - ip/ipnetns.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/ip/ipnetns.c b/ip/ipnetns.c -index 46cc235b..e7a45653 100644 ---- a/ip/ipnetns.c -+++ b/ip/ipnetns.c -@@ -78,6 +78,8 @@ static int ipnetns_have_nsid(void) - if (have_rtnl_getnsid < 0) { - fd = open("/proc/self/ns/net", O_RDONLY); - if (fd < 0) { -+ fprintf(stderr, "/proc/self/ns/net: %s. " -+ "Continuing anyway.\n", strerror(errno)); - have_rtnl_getnsid = 0; - return 0; - } -@@ -85,8 +87,11 @@ static int ipnetns_have_nsid(void) - addattr32(&req.n, 1024, NETNSA_FD, fd); - - if (rtnl_send(&rth, &req.n, req.n.nlmsg_len) < 0) { -- perror("request send failed"); -- exit(1); -+ fprintf(stderr, "rtnl_send(RTM_GETNSID): %s. " -+ "Continuing anyway.\n", strerror(errno)); -+ have_rtnl_getnsid = 0; -+ close(fd); -+ return 0; - } - rtnl_listen(&rth, ipnetns_accept_msg, NULL); - close(fd); --- -2.28.0 - diff --git a/iproute2-5.8.0.tar.sign b/iproute2-5.8.0.tar.sign deleted file mode 100644 index 8fafbac..0000000 Binary files a/iproute2-5.8.0.tar.sign and /dev/null differ diff --git a/iproute2-5.8.0.tar.xz b/iproute2-5.8.0.tar.xz deleted file mode 100644 index a87a878..0000000 --- a/iproute2-5.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cfcd1f890290f8c8afcc91d9444ad929b9252c16f9ab3f286c50dd3c59dc646e -size 780612 diff --git a/iproute2-5.9.0.tar.sign b/iproute2-5.9.0.tar.sign new file mode 100644 index 0000000..f9bd593 Binary files /dev/null and b/iproute2-5.9.0.tar.sign differ diff --git a/iproute2-5.9.0.tar.xz b/iproute2-5.9.0.tar.xz new file mode 100644 index 0000000..622639a --- /dev/null +++ b/iproute2-5.9.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a25dac94bcdcf2f73316c7f812115ea7a5710580bad892b08a83d00c6b33dacf +size 786524 diff --git a/iproute2.changes b/iproute2.changes index b73397f..44ec11f 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Oct 17 11:23:47 UTC 2020 - Jan Engelhardt + +- Update to release 5.9 + * iplink: hsr: add support for creating PRP device similar to HSR +- Drop 0001-ip-add-error-reporting-when-RTM_GETNSID-failed.patch + (merged) + ------------------------------------------------------------------- Wed Sep 23 21:57:45 UTC 2020 - Jan Engelhardt diff --git a/iproute2.spec b/iproute2.spec index 0645c9a..45ff056 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -18,7 +18,7 @@ %define _buildshell /bin/bash Name: iproute2 -Version: 5.8.0 +Version: 5.9.0 Release: 0 Summary: Linux network configuration utilities License: GPL-2.0-only @@ -37,7 +37,6 @@ 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: 0001-ip-add-error-reporting-when-RTM_GETNSID-failed.patch BuildRequires: bison BuildRequires: db-devel BuildRequires: fdupes @@ -96,6 +95,7 @@ depending on type) of the kernel ARP cache. %prep %autosetup -p1 + find . -name *.orig -delete %build