From e7d37b2972fdbfc2ae546de6117a637234a3b6324053bc4feceab0c063aad293 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 17 Oct 2020 11:57:38 +0000 Subject: [PATCH] - Update to release 5.9 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=203 --- ...or-reporting-when-RTM_GETNSID-failed.patch | 50 ------------------ iproute2-5.8.0.tar.sign | Bin 566 -> 0 bytes iproute2-5.8.0.tar.xz | 3 -- iproute2-5.9.0.tar.sign | Bin 0 -> 566 bytes iproute2-5.9.0.tar.xz | 3 ++ iproute2.changes | 8 +++ iproute2.spec | 4 +- 7 files changed, 13 insertions(+), 55 deletions(-) delete mode 100644 0001-ip-add-error-reporting-when-RTM_GETNSID-failed.patch delete mode 100644 iproute2-5.8.0.tar.sign delete mode 100644 iproute2-5.8.0.tar.xz create mode 100644 iproute2-5.9.0.tar.sign create mode 100644 iproute2-5.9.0.tar.xz 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 8fafbacac4062083587f757176451708786f7d3136839d67e3b44d16f1104143..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0$(od>i`M~5P+wD zV3p0}eq9F-{xIp0bB01@?oI(cY+O+I5{m2&!Yc$8syb$IgSb8QVftQm({xZ{V1Hx# zdickX0zS1(lqYwa5^JkmeD;iy$Yg$LRAGG+^RT(n@Y%Mk4|DAyFx5Ps=N_9S$s95I zq5Qrk$Ah*>qlGm1EHABzTMGDgJO`py_kRrC$U+5Jcb|!Bkk7`gMMI#6U`cg9=d${n zehMdbU{F^SS(Coy(Z%q9)6O@{VZu}750gD617#(6YS0DB4ddj6#i;5Ie6OVC;2Bev#qoz-GuNCm!QvE8oKunm8~QJ>c=JS?)XsrTuG1lS z&0M+A+%%2+#6$~k^Nw2H&2Z~6W*42-F&wN)N=5l_RuVI|iz3qx)|~ zIvLf-^!Wm%;_h=MG%@Bib{(WlFk{X~aFf|(J623W9C^qlIg>QYNd>WA^-`+Rj4Kb_ z2X>_3u}lLd*NqO6f-ChB&f~ixizdD^X(pVSc6m9jX&u|%8xL>I%Za4zrwz+e%4-FE z)b@ru8+IP#AbmOH)wES!D8r$?p6!*-H3EpLG)`CH;Jq*M7e@qXte>Y{7uYruhhgIK z)&kNEX&|EqE9E;8N@&l1FxS^~-|p~6=p&AKI-Q5)(hgR~Q%a**Q2VC2IQ_6`SQ zFh8*pVcfBJyZ4`Y5o>0&I6{zbO;NIRnBXx*$oZ_NeJwteP%{-1g(vw_B7t+03CtXa zp!5x{JM<4qWVON4m5j1doUw&80JcYO}C3KAay`u%(7{R)L0+^iRSD7#myc}WBx z-pnEsM#o;;?-RT8?R<_+3@ox^sM&xRL8LtOvheB&Pz9lm6w-Zy>djpD1N8OlXWLh9 zX5sT%nHM&zp`1#pCAr41IQMLAc1b_oy~pm_nK~uR(C?CK4%mtP7YEyqw^DRQ zl;K@V1!po0G)Nh%k(b9{z4T;OBn6Rm+OsQ(!Vl~{jU?H0fu}kD#+=Ed%Dq0%tE!)4 zF6RG5A51D&C^}liabp1-3tpJTMK0}58PvLW1Mpd9!aQU$@Q!CEv}BK + +- 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