From ec9ae5ab3a8b8b4c64be12e2fef0921ca571c123bc2bb51c4dc6369c7f35eae5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 25 Nov 2014 09:02:54 +0000 Subject: [PATCH 1/2] Accepting request 262948 from home:mkubecek:branches:security:netfilter - Update to new upstream release 3.17 OBS-URL: https://build.opensuse.org/request/show/262948 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=87 --- iproute2-3.16.0.tar.sign | Bin 543 -> 0 bytes iproute2-3.16.0.tar.xz | 3 --- iproute2-3.17.0.tar.sign | Bin 0 -> 543 bytes iproute2-3.17.0.tar.xz | 3 +++ iproute2-doc.changes | 16 ++++++++++++++++ iproute2-doc.spec | 4 ++-- iproute2.changes | 16 ++++++++++++++++ iproute2.spec | 8 ++++++-- revert-bison-fix.diff | 28 ++++++++++++++++++++++++++++ 9 files changed, 71 insertions(+), 7 deletions(-) delete mode 100644 iproute2-3.16.0.tar.sign delete mode 100644 iproute2-3.16.0.tar.xz create mode 100644 iproute2-3.17.0.tar.sign create mode 100644 iproute2-3.17.0.tar.xz create mode 100644 revert-bison-fix.diff diff --git a/iproute2-3.16.0.tar.sign b/iproute2-3.16.0.tar.sign deleted file mode 100644 index 0aaa33a8a42acc2334d8823c13ef1b345f97ffa376ec68f3d54c4277484fe63b..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SEvF1p-sw;&T8B2@rs%e_)l( zI<__)30U3@nqhC7N?c=(oalC}Sn-OY`Pu9Fyzt3!RNsoY;iic;e*o06_AVKrEJgyr z=xQFx?nM1a5tAko@FnR+0-N|)l-3m_?-Pf@7`^XHKNM>d56ak1oK*6v{5GB?2Y$d? zyvAD^6*a8`V6uf)JIU?ttau!_3;3x=H`}qXNrddbFzzgi-;2va*shXye;k^EFpn20 hpE@gy$B*#}%IzHfvnqiUL&xAjeQZ0Q)lhhY*V`v=4i^9b diff --git a/iproute2-3.16.0.tar.xz b/iproute2-3.16.0.tar.xz deleted file mode 100644 index 5bfe1a1..0000000 --- a/iproute2-3.16.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f0a8a6c0e872166f75433f5cbf9766f3002b5c2f13501b3bb8c51846a127b79 -size 438820 diff --git a/iproute2-3.17.0.tar.sign b/iproute2-3.17.0.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..83346bb60a8ff5bb09980be4bd2f680646f9b5df138305cdc2ffee1bca9bb0b3 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0SEvF1p-u2%8URC2@rs%e_)l(}rvwAP5$=Xt-q&W%=fX8Z<2}H>Z08ac2@HLakBqq6o5=JydU`j(XYBncg zLK2^&P;|-&Yd9itnjOPz9YdiyA6H29gVasZ?Ow<-l>`em8iGn=LzZ1hE;XU8XqYl)4Rm>}IS0SwZmJ(&58(^+ zsLSR?oeA2%SfGU?#5^&Q6K^r${cwwjo~u!^;m%%fu!1@FQp=wec+n8IIZYTp?nsgA z&$)Jz1@eYxIHNZA!_w4ZLg6@m=Jehia1Bk$k<62 +Date: Tue, 25 Nov 2014 08:39:36 +0100 +Subject: [PATCH] Revert "emp: fix warning on deprecated bison directive" + +This reverts commit edd3979272e46d17456a4dabc3e9acf59e561d5a. + +SLE11 only, its bison doesn't 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 bc08da2..7043a80 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; +-- +1.8.4.5 + From 4d8f8c6d9c2b1b9a0928f5b1f067c3272042ff876a399c7c6c8dfc739b996c5a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 25 Nov 2014 09:15:38 +0000 Subject: [PATCH 2/2] General cleanups OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=88 --- iproute2-doc.changes | 4 ++-- iproute2.spec | 11 ++--------- revert-bison-fix.diff | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/iproute2-doc.changes b/iproute2-doc.changes index 11487b8..cdc67f1 100644 --- a/iproute2-doc.changes +++ b/iproute2-doc.changes @@ -3,8 +3,8 @@ Tue Nov 25 08:18:52 UTC 2014 - mkubecek@suse.cz - Update to new upstream release 3.17 * ip: allow to set ipv6 address generation mode -* nstat: 64bit support on 32bit architectures -* ip: don't require "name" keyword when adding device +* nstat: 64-bit support on 32-bit architectures +* ip: do not require "name" keyword when adding device (3.16 regression) * ip: support of usec rtt in tcp_metrics * ip: allow to change slave options via type_slave diff --git a/iproute2.spec b/iproute2.spec index fe77bc0..fa7d044 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -70,13 +70,7 @@ Provides: libnetlink = %version-%release libnetlink provides a higher level interface to rtnetlink(7). %prep -%{?gpg_verify: xz -dfk "%{S:0}"; %gpg_verify %{S:2}} -%if 0%{?__xz:1} %setup -qn %name-%rversion -%else -tar -xf "%{S:0}" --use=xz; -%setup -DTqn %name-%rversion -%endif %patch -P 1 -P 2 -p1 %if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220) %patch -P 3 -p1 @@ -131,9 +125,8 @@ cp -an README* COPYING "$b/%_docdir/%name/" %_mandir/man8/* %dir %_sysconfdir/iproute2 %config(noreplace) %_sysconfdir/iproute2/* -%_libdir/tc -%dir %_datadir/tc -%attr(644,root,root)%_datadir/tc/* +%_libdir/tc/ +%_datadir/tc/ %files -n libnetlink-devel %defattr(-,root,root) diff --git a/revert-bison-fix.diff b/revert-bison-fix.diff index b9d8cf9..d3e11bf 100644 --- a/revert-bison-fix.diff +++ b/revert-bison-fix.diff @@ -5,7 +5,7 @@ Subject: [PATCH] Revert "emp: fix warning on deprecated bison directive" This reverts commit edd3979272e46d17456a4dabc3e9acf59e561d5a. -SLE11 only, its bison doesn't allow new syntax. +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(-)