From fdb095ffbeeb44d1d354b1e25bcd2a65b7b1e8c9b9935a77f88680de88857e7f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 13 May 2019 10:10:03 +0000 Subject: [PATCH] Accepting request 702616 from home:mkubecek:branches:security:netfilter - update to version 5.1 OBS-URL: https://build.opensuse.org/request/show/702616 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=172 --- ...c-ematch-fix-deprecated-yacc-warning.patch | 26 +++++++++++++++ iproute2-5.0.0.tar.sign | Bin 566 -> 0 bytes iproute2-5.0.0.tar.xz | 3 -- iproute2-5.1.0.tar.sign | Bin 0 -> 566 bytes iproute2-5.1.0.tar.xz | 3 ++ iproute2.changes | 31 ++++++++++++++++++ iproute2.spec | 10 ++++-- 7 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 Revert-tc-ematch-fix-deprecated-yacc-warning.patch delete mode 100644 iproute2-5.0.0.tar.sign delete mode 100644 iproute2-5.0.0.tar.xz create mode 100644 iproute2-5.1.0.tar.sign create mode 100644 iproute2-5.1.0.tar.xz diff --git a/Revert-tc-ematch-fix-deprecated-yacc-warning.patch b/Revert-tc-ematch-fix-deprecated-yacc-warning.patch new file mode 100644 index 0000000..b77e412 --- /dev/null +++ b/Revert-tc-ematch-fix-deprecated-yacc-warning.patch @@ -0,0 +1,26 @@ +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.0.0.tar.sign b/iproute2-5.0.0.tar.sign deleted file mode 100644 index 141601655434c0ecadbff92fa1c6082520d86998d06e35bc849ce8a2a6882814..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0$hJD=aHvW0veft$)S$<4#RhA|Ik)sW(d!LM9aQZYHP zLEE-V>nSzE;htDNokv;lXViIhp+QM-RLzgmSy=i3XXJzJ09P8VOaFpzR~zE(&Kw*f zh^Tdo2uL*EHz#moF$pgpw`JQC+fCH_)fMnN6bnSX)-a<#3ANMXIWzQf%L;%xFNIueLy9C@2Y40RNVOwd&crMWxB z@(F5ko0mcQum_F^hp#a?qJTd4bFdIvw_AYoSfu$qBo`3ZbVFKOHcj`=2j0;gU&91p zL|bWmzM%r71Yr`8{#RL0MNhg0w;t=#;LjDePsb|oNT-ZhC|~`@NaRlQFtp=Igzrm> EotyOw$^ZZW diff --git a/iproute2-5.0.0.tar.xz b/iproute2-5.0.0.tar.xz deleted file mode 100644 index 55b4192..0000000 --- a/iproute2-5.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df047302a39650ef832c07e8dab5df7a23218cd398bd310c8628e386161d20ba -size 710656 diff --git a/iproute2-5.1.0.tar.sign b/iproute2-5.1.0.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..20d20f53278cd0afb090c30454b9a2cf2da1fce363bf731d5dfd398cab9252f3 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0$kOciU0};5P+wD zV3p0}eh8fq0EK1sfilW?qMde8_hT$gz6BZLEZ1Wv`yZeI9v&)D2p^6Z}L>U9uG_#9>B8Pmxf!L4QqN5Nt2%GYgsMOU}VBb4Y2 zbirp!X49ro*HaG&-^tgz2zR5pd1OpHGs<@nH7-Y=xJqhqKJ@ZHqUH2%SXM4PUR<+n zUKOSl=mfGUrKh!PXRuFUC@d-kx9O5$(A1mVPtC_;q{1244v#4THEJ_OdFIvYKFN`J zc}Iy0wV5MQOu)b+^^&EFp8Q<{3OTAvoDh~g-5b1FECV>m+7<(s0gZOhy_n$D!+5-H zdYIwHWpphY(*C7~LS~iIfBb>S$7QnrE+2~oO{hnaoHUQNjwIFAFJwbsl`3EXPD6+#?QXe43C8@7B)5$m|k&`~KprsI+{vWIz E;q@sAh5!Hn literal 0 HcmV?d00001 diff --git a/iproute2-5.1.0.tar.xz b/iproute2-5.1.0.tar.xz new file mode 100644 index 0000000..4d01142 --- /dev/null +++ b/iproute2-5.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc5a980873eabf6b00c0be976b6e5562b1400d47d1d07d2ac35d5e5acbcf7bcf +size 722412 diff --git a/iproute2.changes b/iproute2.changes index 172cdda..01bd419 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Mon May 13 09:28:09 UTC 2019 - Michal Kubecek + +- Revert-tc-ematch-fix-deprecated-yacc-warning.patch: + fix build on SLE12 and openSUSE Leap 42.3 + +------------------------------------------------------------------- +Mon May 13 08:25:42 UTC 2019 - Michal Kubecek + +- Update to new upstream release 5.1 + * bridge: fdb: add support for src_vni option + * devlink: report cell size + * devlink: add dev info and dev flash subcommands + * devlink: add health subcommand + * ip link: display netrom link type + * ip link: bond_slave: add xstats support + * ip link: bridge: support mcast to unicast flag + * ip netns: add attach subcommand to attach existing netns + * ip xfrm: add option to hide keys in state output + * ip xfrm: support xfrm interfaces + * rdma: add unbound workqueue to list of poll context types + * rdma: provide parent context index for all objects except CM_ID + * rdma: add prefix for driver attributes + * ss: support AF_XDP + * tc: add hit counter for matchall + * tc: add kind property to csum action + * tc: q_cake: support fwmark option + * improve batch and dump performance by caching link lookups + * more JSON support + * many text/JSON output fixes + ------------------------------------------------------------------- Sat Mar 23 05:39:54 UTC 2019 - seanlew@opensuse.org diff --git a/iproute2.spec b/iproute2.spec index b3728d3..35d2544 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -12,14 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: iproute2 -Version: 5.0.0 +Version: 5.1 Release: 0 -%define rversion 5.0.0 +%define rversion 5.1.0 Summary: Linux network configuration utilities License: GPL-2.0-only Group: Productivity/Networking/Routing @@ -37,6 +37,7 @@ 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: examples-fix-bashisms-in-example-script.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 @@ -87,6 +88,9 @@ 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 201 -P 202 -p1 +%if 0%{?suse_version} < 1500 +%patch -P 101 -p1 +%endif %if 0%{?sles_version} == 11 %patch -P 102 -p1 %endif