From 331fda1070177540586dfa9135c612f764af191291d8536ae9695e71c95b280f Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 12 Sep 2013 22:44:07 +0000
Subject: [PATCH] iproute-3.11

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=73
---
 iproute2-3.11.0.tar.sign | Bin 0 -> 543 bytes
 iproute2-3.11.0.tar.xz   |   3 +++
 iproute2-3.9.0.tar.sign  | Bin 543 -> 0 bytes
 iproute2-3.9.0.tar.xz    |   3 ---
 iproute2-dirs.diff       |  20 ++++++++++----------
 iproute2.changes         |  15 +++++++++++++++
 iproute2.spec            |  17 +++++++----------
 7 files changed, 35 insertions(+), 23 deletions(-)
 create mode 100644 iproute2-3.11.0.tar.sign
 create mode 100644 iproute2-3.11.0.tar.xz
 delete mode 100644 iproute2-3.9.0.tar.sign
 delete mode 100644 iproute2-3.9.0.tar.xz

diff --git a/iproute2-3.11.0.tar.sign b/iproute2-3.11.0.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..e4f9e2d309f505d7d188a9f67b9e28752c0a5c23b117cc1526de464a2e8272c6
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0SEvF1p-nf{@4Ht2@rs%e_)l(<bKqn5CFj4VfTHkD{rG-@+SvT
z&p3gOOT<+O)G-S>Urf8{2{L=mg@m+-LF!exC9#H&au`XUEu`!H$^O@HBsCk=><FPg
z@XDNP$SP}7e4pXz)6)hMHmH5^M!~eIJ~wDH-H16ok=Aw9^H!?%iNI5IzV^lnJM#Ki
zqD|QSO+(<LmV*>6ma?9cFM3M%0pBMJdlyd=<aJ(qa^*k6^)6SU`}@g#O3*~+a<nG8
zn<SE+r9*1){FYFILevgPWGaqxRmCp6;@+tv)D3)N9D$sZK-U@dI_Ov8aU1~8VzOul
zf!txyz+DfJ9?K{M=_Znm0WIa-^$Q4VMs&w{Jo!c!i^A~q;IvabQZx>3D@Odk9DO6$
z#G|IPw9pIp?A50XJn$jywvCT=&cUoT3+LD#597OCL0=@9g6Zr1YVeFeg~k+s1}b=s
zu#^kBLJmv9t_T>VQbk!w=2S)bn^oW&9)=Buk69+HzrZJ-xBixDz$_myrbzAlp6Y3C
zhlVd{JOuq!xu2lM7@}*Z`Ch$EtTaiA7&247@Opz<t^tSN;e*U!+E9)Pms1M=J}p^u
zbo(;ZD7IUi*zv2=-l?5#9PLH%2oX4%^%FK!8r}tRq_y4v2u;vzV>@?kK^$hsioPp4
hAxNHb5}{|dD@}(Gr#|`ThL6gdO1Ys}^<sZ@)8PEk3Zei2

literal 0
HcmV?d00001

diff --git a/iproute2-3.11.0.tar.xz b/iproute2-3.11.0.tar.xz
new file mode 100644
index 0000000..65e25ef
--- /dev/null
+++ b/iproute2-3.11.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ab31b52b5fd5ff0d3cf03f2068f05eeb4f0b37d107070fbbaacac94df5e88b7
+size 420300
diff --git a/iproute2-3.9.0.tar.sign b/iproute2-3.9.0.tar.sign
deleted file mode 100644
index 4d454365b4b5ed1bb83da2d23b08ddd4f631b7c033a5680de94b1b43b05589ac..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0SEvF1p-lj*_!|g2@rs%e_)l(<bHeN5CDbjl`ES<WbMi#nuWd_
z2<&!ZZC^wUoI_#=GwWJy38<Y9iU0!_%zwa!<Eqwy9cbDv+$&m8`%ij2wkadnlz#r?
z^M+J9gC0qX>({rd9Fg7FKVuvu1l}&-KQ1Hl3xs&a<@sBG3B!-brhQhw4Ta%2JL!nu
z?LGBRruE3)Ouw^*Zxy(3ZSQF4SQ;J^5KqT6dWKl3xh6YkmI88?Q3r325;T^1nFf~g
z+g1~E?i~~g{r!F(L&dp|Et6npa26|U-4023O9qxC(p%!mfC3M#yD-<fJB|kzpO%gv
z`^SjWD_#uCEv4~cDyj!NA1LeNqacnIi+IyL8f)c38Dm$`aaT#_E9z3$rH@5&n67W7
z#!dafiF01)MC?NTV9Bl~h?}{4r|k%!k~U<{cs1yi(LJM^I09`MW$`05!{$Olm9@5i
zG(jVsaDFiX95k?PpmNTjGU>DNOb=60C?ww(jpp}E4A)}ikK=fvvQ^TxP=ye5D41wO
zhehuQ-{$1K$68uB;dk^b;R;*;AV2ognz+^d^D0g1DY9^S9lCyq?pgrY*{P>80r7Mm
zEs8^YCsj+IA#jzATS)gI%Cpa`xRDQy??x!PHv0e_cSF`86THolf3Rrvm5?dz4BNi4
h(W_t?nlS{UEO>iP;5c4eq$XG-{swv9dx{<FmdiEk0XYBw

diff --git a/iproute2-3.9.0.tar.xz b/iproute2-3.9.0.tar.xz
deleted file mode 100644
index 1bb9698..0000000
--- a/iproute2-3.9.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16f027af432a05085813a2f859b7d42dafd29b8c035ead830d37565b7397592d
-size 412616
diff --git a/iproute2-dirs.diff b/iproute2-dirs.diff
index 82f3ae6..83718ed 100644
--- a/iproute2-dirs.diff
+++ b/iproute2-dirs.diff
@@ -4,10 +4,10 @@
  netem/Makefile     |    6 ++++--
  3 files changed, 7 insertions(+), 5 deletions(-)
 
-Index: iproute2-3.8.0/Makefile
+Index: iproute2-3.11.0/Makefile
 ===================================================================
---- iproute2-3.8.0.orig/Makefile
-+++ iproute2-3.8.0/Makefile
+--- iproute2-3.11.0.orig/Makefile
++++ iproute2-3.11.0/Makefile
 @@ -1,7 +1,7 @@
  ROOTDIR=$(DESTDIR)
  PREFIX=/usr
@@ -18,7 +18,7 @@ Index: iproute2-3.8.0/Makefile
  DATADIR=$(PREFIX)/share
  DOCDIR=$(DATADIR)/doc/iproute2
 @@ -33,7 +33,7 @@ CCOPTS = -O2
- WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
+ WFLAGS := -Wall -Wstrict-prototypes  -Wmissing-prototypes
  WFLAGS += -Wmissing-declarations -Wold-style-definition
  
 -CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
@@ -26,10 +26,10 @@ Index: iproute2-3.8.0/Makefile
  YACCFLAGS = -d -t -v
  
  SUBDIRS=lib ip tc bridge misc netem genl man
-Index: iproute2-3.8.0/include/iptables.h
+Index: iproute2-3.11.0/include/iptables.h
 ===================================================================
---- iproute2-3.8.0.orig/include/iptables.h
-+++ iproute2-3.8.0/include/iptables.h
+--- iproute2-3.11.0.orig/include/iptables.h
++++ iproute2-3.11.0/include/iptables.h
 @@ -5,7 +5,7 @@
  #include "libiptc/libiptc.h"
  
@@ -39,10 +39,10 @@ Index: iproute2-3.8.0/include/iptables.h
  #endif
  
  #ifndef IPPROTO_SCTP
-Index: iproute2-3.8.0/netem/Makefile
+Index: iproute2-3.11.0/netem/Makefile
 ===================================================================
---- iproute2-3.8.0.orig/netem/Makefile
-+++ iproute2-3.8.0/netem/Makefile
+--- iproute2-3.11.0.orig/netem/Makefile
++++ iproute2-3.11.0/netem/Makefile
 @@ -5,6 +5,8 @@ HOSTCC ?= $(CC)
  CCOPTS  = $(CBUILD_CFLAGS)
  LDLIBS += -lm 
diff --git a/iproute2.changes b/iproute2.changes
index 5de8f9e..ccd435d 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Sep 12 21:44:57 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 3.11
+* Support for Linux 3.11
+* iptunnel: check SIT_ISATAP flag only for SIT tunnel
+* ss: show destination address for netlink sockets
+* ss: Get netlink sockets info via sock_diag
+* vxlan: Allow setting destination to unicast address
+* ss: add fastopen support
+* htb: report overhead attribute
+* ip: allow to specify mode for sit tunnels
+* ip: iplink_vlan: add 802.1ad support
+* iptuntap: allow creation of multi-queue tun/tap device
+
 -------------------------------------------------------------------
 Wed Sep 11 13:13:56 UTC 2013 - werner@suse.de
 
diff --git a/iproute2.spec b/iproute2.spec
index dea148f..a508c39 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -17,8 +17,9 @@
 
 
 Name:           iproute2
-Version:        3.9.0
+Version:        3.11
 Release:        0
+%define rversion	3.11.0
 Summary:        Linux network configuration utilities
 License:        GPL-2.0
 Group:          Productivity/Networking/Routing
@@ -27,8 +28,8 @@ Url:            http://www.linuxfoundation.org/collaborate/workgroups/networking
 
 #DL-URL:	http://kernel.org/pub/linux/utils/net/iproute2/
 #Git-Clone:	git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2
-Source:         http://kernel.org/pub/linux/utils/net/iproute2/%name-%version.tar.xz
-Source2:        http://kernel.org/pub/linux/utils/net/iproute2/%name-%version.tar.sign
+Source:         http://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.xz
+Source2:        http://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.sign
 Patch1:         iproute2-dirs.diff
 Patch2:         iproute2-HZ.diff
 Patch3:         revert-pdf-creation.diff
@@ -72,9 +73,6 @@ BuildRequires:  pkgconfig(xtables) >= 1.4.11
 BuildRequires:  libxtables-devel >= 1.4.11
 %endif
 %endif
-%if 0%{?suse_version} >= 1230
-BuildRequires:  gpg-offline
-%endif
 Provides:       iproute = %version-%release
 
 %description
@@ -105,13 +103,12 @@ This package contains the PDF documentation from iproute2,
 as well as examples and other outdated files.
 
 %prep
-xz -dk "%{S:0}"
-%{?gpg_verify: %gpg_verify %{S:2}}
+%{?gpg_verify: xz -dfk "%{S:0}"; %gpg_verify %{S:2}}
 %if 0%{?__xz:1}
-%setup -q
+%setup -qn %name-%rversion
 %else
 tar -xf "%{S:0}" --use=xz;
-%setup -DTq
+%setup -DTqn %name-%rversion
 %endif
 %patch -P 1 -P 2 -p1
 %if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220)