From ec9ae5ab3a8b8b4c64be12e2fef0921ca571c123bc2bb51c4dc6369c7f35eae5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 25 Nov 2014 09:02:54 +0000
Subject: [PATCH] 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(<bE^r5CFXRT`o^k#Nn%7!UeMe
z;qw0u?SUj*|A^HW5^{Nz00$yVJg<ea=BcBO#FJ(bEU{dI)7#MRUYY0G`i!T4m}~+E
z@_L7P(X=6VSPqSh6Ljn+R`}U)N#|Qhd*&lPp+3c%l&YI3Os&QV+~p{GE8g{%<1%+f
zExB{-x#wGsAt({?=P`Y5f8b%wxj~v136E6_UkKjyb<y#+KPOW%s%$68EMgrmj88Pk
zIb9O4zq5Q%&8pPBvR(ZUEPl|=Vbd8BPQi3)p5bQY^z!JC6p@|BE~mmuOj{`F=D!t(
zv@!e)C1UC6qt)HIK^V`Oueqc11rw}1K12ubiAPi5Z`3e&-?ghRHvmpkB21H8tyRp<
zy%v$N8uODRaJ-u2Tai|rpjaGETeZSY?7Pe)F4S_OC*&Su6#D7vY=^Ekol)EBsuC|>
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(<bHB85CFlet1O}&VrrX!Hh!$D
zJ`E9If->}rvwAP5$=Xt-q&W%=fX8Z<2}H>Z08ac2@HLakBqq6o5=JydU`j(XYBncg
zLK2^&P;|-&Yd9itnjOPz9YdiyA6H29gVasZ?Ow<-l>`em<rj@wl_R_xzBd7MH$!~9
zQklf&cc3&C&JgNZegt$z|M;S6zi30C1Ysp~!MZEi5R`sfl{lx=A`1AM)^APW9r6D(
zOB3}B_R2n{kT)zBfa-OiBv|xr3UJVMQ?LaRlJ(d8c3Wwkus@k<NV*C`zfMd5gG~#-
zH-YT~aQOl_`EPF^^$Ml{6V)tc&xFm{cp?3ZV&{rfQf}!wSGwBnW28nBAPl(_s4ySW
zA*zp9JZ(s<OrpImy@Si!KmxOV9v(F|WI}QsZ(<RclYb?%Lbb2<fE9oUB9^iA_fSHC
zTj_c{k_s0bY|3435TXj!--s$>8iGn=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<FO@pqV~qpow`U;bBWS-#o(Mhw
h&l^81nE{{Y(lU9PwlhWiaiA?z`9rEhC#h-DOu&hh^Me2Y

literal 0
HcmV?d00001

diff --git a/iproute2-3.17.0.tar.xz b/iproute2-3.17.0.tar.xz
new file mode 100644
index 0000000..bae7fa2
--- /dev/null
+++ b/iproute2-3.17.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09e406636e7598e46d5d4f7b928bf5db57049d65dbeb9a496005957ee16f6000
+size 440188
diff --git a/iproute2-doc.changes b/iproute2-doc.changes
index 846279a..11487b8 100644
--- a/iproute2-doc.changes
+++ b/iproute2-doc.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+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
+  (3.16 regression)
+* ip: support of usec rtt in tcp_metrics
+* ip: allow to change slave options via type_slave
+* ip: add support for IPv6 VTI tunnels
+* tc: rsvp/tcindex/route classifier support for multiple actions
+* ip: print stats with "ip -s addr show"
+- Add revert-bison-fix.diff:
+  fix build on SLE11
+
 -------------------------------------------------------------------
 Sun Aug 10 16:02:36 UTC 2014 - jengelh@inai.de
 
diff --git a/iproute2-doc.spec b/iproute2-doc.spec
index 201eda2..a4cba7c 100644
--- a/iproute2-doc.spec
+++ b/iproute2-doc.spec
@@ -17,9 +17,9 @@
 
 
 Name:           iproute2-doc
-Version:        3.16
+Version:        3.17
 Release:        0
-%define rversion 3.16.0
+%define rversion 3.17.0
 Summary:        Documentation to iproute2
 License:        GPL-2.0+
 Group:          Documentation/Other
diff --git a/iproute2.changes b/iproute2.changes
index 846279a..11487b8 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+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
+  (3.16 regression)
+* ip: support of usec rtt in tcp_metrics
+* ip: allow to change slave options via type_slave
+* ip: add support for IPv6 VTI tunnels
+* tc: rsvp/tcindex/route classifier support for multiple actions
+* ip: print stats with "ip -s addr show"
+- Add revert-bison-fix.diff:
+  fix build on SLE11
+
 -------------------------------------------------------------------
 Sun Aug 10 16:02:36 UTC 2014 - jengelh@inai.de
 
diff --git a/iproute2.spec b/iproute2.spec
index 3f64ad2..fe77bc0 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -17,9 +17,9 @@
 
 
 Name:           iproute2
-Version:        3.16
+Version:        3.17
 Release:        0
-%define rversion 3.16.0
+%define rversion 3.17.0
 Summary:        Linux network configuration utilities
 License:        GPL-2.0
 Group:          Productivity/Networking/Routing
@@ -35,6 +35,7 @@ Source667:      %name.keyring
 Patch1:         iproute2-dirs.diff
 Patch2:         iproute2-HZ.diff
 Patch3:         revert-pdf-creation.diff
+Patch4:         revert-bison-fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  db-devel
@@ -80,6 +81,9 @@ tar -xf "%{S:0}" --use=xz;
 %if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220)
 %patch -P 3 -p1
 %endif
+%if 0%{?sles_version} == 11
+%patch -P 4 -p1
+%endif
 find . -name *.orig -delete
 
 %build
diff --git a/revert-bison-fix.diff b/revert-bison-fix.diff
new file mode 100644
index 0000000..b9d8cf9
--- /dev/null
+++ b/revert-bison-fix.diff
@@ -0,0 +1,28 @@
+From 184ea2afa279c94248db86f74a3f4fd3ba3cded1 Mon Sep 17 00:00:00 2001
+From: Michal Kubecek <mkubecek@suse.cz>
+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
+