From 82ec9f13d99fabb5ac6a63887f107c5d9f68ae3afb46e887d10f085b3380d092 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 15 Apr 2013 08:27:29 +0000
Subject: [PATCH 1/3] iproute-3.8.0

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=64
---
 iproute2-3.7.0.tar.sign |  17 -----------------
 iproute2-3.7.0.tar.xz   |   3 ---
 iproute2-3.8.0.tar.sign | Bin 0 -> 543 bytes
 iproute2-3.8.0.tar.xz   |   3 +++
 iproute2-dirs.diff      |  26 +++++++++++++-------------
 iproute2.changes        |  10 ++++++++++
 iproute2.spec           |  11 ++++++-----
 7 files changed, 32 insertions(+), 38 deletions(-)
 delete mode 100644 iproute2-3.7.0.tar.sign
 delete mode 100644 iproute2-3.7.0.tar.xz
 create mode 100644 iproute2-3.8.0.tar.sign
 create mode 100644 iproute2-3.8.0.tar.xz

diff --git a/iproute2-3.7.0.tar.sign b/iproute2-3.7.0.tar.sign
deleted file mode 100644
index 08af501..0000000
--- a/iproute2-3.7.0.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iQIcBAABCAAGBQJQx3OMAAoJEICnf2CVzeR+riwP/A4c+uxCP4NyN9m+Wh+BT7wg
-vqQ7sGM++Vufcj+rb+dS/qjZivTDf32Eg/1D6iZttO8JcaOvWGa0Q2FiAn7XBQSS
-zIvaAidpLAxAvHqwcYMdW4e19orP6XMiItYYLfg2Q1BjLfyuybtZDU8pnAY1HH1q
-pDIfYRDMZtP3FrKYImfEp38ZSxSl+vLzTozGF9Gah9QOnfUXO6lPHvvk6+61umZL
-z2nR6EKvoMI2XeBp5g8PANZ3lGzmzPftoyUyathqu7waRryno75f7Hr+I/6nra3Q
-luO2hblS0CQ2v/1qbr86odGLdfWweGF6xi1iwBg12gMGIDi9JJ0qLdS3W4w3mB4M
-HpDClPcD4pbwFg0XXCSTtWKb8lZl3DJ6swGyUCb943W3CbRFZLJaF55n4/j6uFKn
-en1M/h75EpKeQid48py7Dsxr42k1qgpXwuVNi7SXo7mN48ShXJUf5I76j7erLWEG
-ZjtrEL8OeCRGuaanddHt96s3r3dWchamsp4kEcIj2ZPatWh4yHq+/midgo49mAsu
-a0clZESmhC3WQO0aS4/b0guP9tlVwfJPRyzEXRDMCiNh4cEtDJ3IYDkkcw2NOg/c
-MpCczaaKN7E1ntS1MvcfTJixBI7f3qUll3YsYRDqDbqpUPfmBzsZOb3OMy4PMG9I
-ZipC+zdFcurN7uoxK2Wb
-=xnXs
------END PGP SIGNATURE-----
diff --git a/iproute2-3.7.0.tar.xz b/iproute2-3.7.0.tar.xz
deleted file mode 100644
index 4d632f0..0000000
--- a/iproute2-3.7.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:102b7b47ccb8397b14a1426c76e0764158cf337251e9ef5d9b38283733429b0e
-size 399964
diff --git a/iproute2-3.8.0.tar.sign b/iproute2-3.8.0.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..c328f4a1f0e71aa0e9f92f630b32a055d64fa478ad21c18ec4c9f5c8e0e195d3
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0SEvF1p-kfPB8!q2@rs%e_)l(<bFMp5C1}ZTfe0eFZJ03CN--o
zwRdItOzL##A(8jFVa>v{zu*sWqfq{U{6sT%1iYOflyJ^bbbR!u-p?KOZsI}n*LzmF
zfrgYxE}s96%<4+~99y3wV|W@DuD&H$1&wP~iW1~;UT)vreX7L{qP`nh!eM-YOWNvw
zC$-A9DsfQ2FX@q>y=$0_S_TcpWzh@&$~AT;i4W}gHi*|djAk8u&t>^wA@uXjbQom0
zhgJ-%w<b+oDes!%3{k@Z6Siw6+`kr{6L%%D1%g{Ybw8%3%)LwVOG1^gBmXx+G09?`
zLJN8iI$tf3+Mo>55^*q(A_&-NgX(lfb;te?Bm2P#C*JPNClKwU5DyMJzId80#Y?1q
zL0;lvo#xlc=u%Y_%$qfdhn5q6g-gO(Ee+Ge*t9Hp{*+FE0gJQi8j~~My`r*64vkuk
zfZTpWEyW%1ecKtAeZ>XZ&<6J>7uL>xAbLx%P`>hE^40N`jG$#REYZ#JDKLv!2j*vV
zr7&kZrMV=dA8XwdNzqMlhcd<JPFMOw!U>PTH*L65_S4)KdbbGppR(H3?%$Tn83}aU
zp|xe-zUYJF^xOUXQZxho6D$M@y&WSq9<Ia%7(6-+<XWIHY5h&+mX03$>vA4aIpWHI
hbi*`$9SiPlSKU|80@f1EdUdM)(5r{D?B<v~PuF@H3U~kj

literal 0
HcmV?d00001

diff --git a/iproute2-3.8.0.tar.xz b/iproute2-3.8.0.tar.xz
new file mode 100644
index 0000000..97b2f3b
--- /dev/null
+++ b/iproute2-3.8.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:579145749f1aaf60e7c7a5de24b7f00fa2200a961094733c792b4ff139181e4f
+size 407608
diff --git a/iproute2-dirs.diff b/iproute2-dirs.diff
index ea1fd18..82f3ae6 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.6.0/Makefile
+Index: iproute2-3.8.0/Makefile
 ===================================================================
---- iproute2-3.6.0.orig/Makefile
-+++ iproute2-3.6.0/Makefile
+--- iproute2-3.8.0.orig/Makefile
++++ iproute2-3.8.0/Makefile
 @@ -1,7 +1,7 @@
  ROOTDIR=$(DESTDIR)
  PREFIX=/usr
@@ -17,19 +17,19 @@ Index: iproute2-3.6.0/Makefile
  CONFDIR=/etc/iproute2
  DATADIR=$(PREFIX)/share
  DOCDIR=$(DATADIR)/doc/iproute2
-@@ -35,7 +35,7 @@ HOSTCC = gcc
- DEFINES += -D_GNU_SOURCE
- CCOPTS = -O2
- WFLAGS = -Wall -Wstrict-prototypes
+@@ -33,7 +33,7 @@ CCOPTS = -O2
+ WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
+ WFLAGS += -Wmissing-declarations -Wold-style-definition
+ 
 -CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
 +CFLAGS = -DLIBDIR=\"${LIBDIR}\" $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
  YACCFLAGS = -d -t -v
  
  SUBDIRS=lib ip tc bridge misc netem genl man
-Index: iproute2-3.6.0/include/iptables.h
+Index: iproute2-3.8.0/include/iptables.h
 ===================================================================
---- iproute2-3.6.0.orig/include/iptables.h
-+++ iproute2-3.6.0/include/iptables.h
+--- iproute2-3.8.0.orig/include/iptables.h
++++ iproute2-3.8.0/include/iptables.h
 @@ -5,7 +5,7 @@
  #include "libiptc/libiptc.h"
  
@@ -39,10 +39,10 @@ Index: iproute2-3.6.0/include/iptables.h
  #endif
  
  #ifndef IPPROTO_SCTP
-Index: iproute2-3.6.0/netem/Makefile
+Index: iproute2-3.8.0/netem/Makefile
 ===================================================================
---- iproute2-3.6.0.orig/netem/Makefile
-+++ iproute2-3.6.0/netem/Makefile
+--- iproute2-3.8.0.orig/netem/Makefile
++++ iproute2-3.8.0/netem/Makefile
 @@ -5,6 +5,8 @@ HOSTCC ?= $(CC)
  CCOPTS  = $(CBUILD_CFLAGS)
  LDLIBS += -lm 
diff --git a/iproute2.changes b/iproute2.changes
index 4b53735..6110e78 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Apr 15 07:31:11 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 3.8.0
+* implement bridge mdb commands
+* add DOVE extensions
+* add `ip netns pids` and `ip netns identify`
+* tc netem: allow negative packet/cell overhead
+* support tunnels in `ip link type ipip|sit|ip6tnl`
+
 -------------------------------------------------------------------
 Thu Dec 13 06:43:49 UTC 2012 - jengelh@inai.de
 
diff --git a/iproute2.spec b/iproute2.spec
index 606c98b..51852f4 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package iproute2
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           iproute2
-Version:        3.7.0
+Version:        3.8.0
 Release:        0
 Summary:        Linux network configuration utilities
 License:        GPL-2.0
@@ -99,10 +99,10 @@ as well as examples and other outdated files.
 
 %prep
 %if 0%{?__xz:1}
-%setup -qn iproute-%version
+%setup -q
 %else
 tar -xf "%{S:0}" --use=xz;
-%setup -DTqn iproute-%version
+%setup -DTq
 %endif
 %patch -P 1 -P 2 -p1
 %if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220)
@@ -115,7 +115,7 @@ find . -name *.orig -delete
 # https://bugzilla.novell.com/show_bug.cgi?id=388021
 xt_libdir="$(pkg-config xtables --variable=xtlibdir)";
 xt_cflags="$(pkg-config xtables --cflags)";
-make %{?_smp_mflags} LIBDIR="%_libdir" CCOPTS="-D_GNU_SOURCE %optflags -Wstrict-prototypes -fPIC -DXT_LIB_DIR=\\\"$xt_libdir\\\" $xt_cflags"
+make %{?_smp_mflags} LIBDIR="%_libdir" CCOPTS="-D_GNU_SOURCE %optflags -Wstrict-prototypes -Wno-error -fPIC -DXT_LIB_DIR=\\\"$xt_libdir\\\" $xt_cflags"
 cd doc
 make pdf
 
@@ -152,6 +152,7 @@ cp -an README* COPYING doc/*.pdf ip/{ifcfg,routef,routel} \
 /sbin/*
 /bin/ip
 #EndUsrMerge
+%_mandir/man7/*
 %_mandir/man8/*
 %dir %_sysconfdir/iproute2
 %config(noreplace) %_sysconfdir/iproute2/*

From de9706111fd61357557886db5854ee75d3253ab50b6fb1619aaa23bfb074cdbc Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 17 Apr 2013 06:54:13 +0000
Subject: [PATCH 2/3] Resolve SLE build failure

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=65
---
 ...compile-error-due-to-missing-include.patch | 38 +++++++++++++++++++
 iproute2-headers.diff                         | 16 ++++++++
 iproute2.changes                              |  1 +
 iproute2.spec                                 |  3 ++
 4 files changed, 58 insertions(+)
 create mode 100644 0001-build-resolve-compile-error-due-to-missing-include.patch
 create mode 100644 iproute2-headers.diff

diff --git a/0001-build-resolve-compile-error-due-to-missing-include.patch b/0001-build-resolve-compile-error-due-to-missing-include.patch
new file mode 100644
index 0000000..b130134
--- /dev/null
+++ b/0001-build-resolve-compile-error-due-to-missing-include.patch
@@ -0,0 +1,38 @@
+From 8a204b39e28a195e34a6e59d360fce05853eec17 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Wed, 17 Apr 2013 08:44:46 +0200
+Subject: [PATCH] build: resolve compile error due to missing include
+Upstream: sent on Apr 17 08:53 +0200
+
+I get a compilation error with linux-glibc-devel-2.6.32 (SLES 11 SP2):
+
+ipnetns.c: In function 'netns_exec':
+ipnetns.c:156: error: 'MS_SLAVE' undeclared (first use in this function)
+ipnetns.c:156: error: (Each undeclared identifier is reported only once
+ipnetns.c:156: error: for each function it appears in.)
+ipnetns.c:156: error: 'MS_REC' undeclared (first use in this function)
+ipnetns.c: In function 'netns_add':
+ipnetns.c:372: error: 'MS_SHARED' undeclared (first use in this function)
+ipnetns.c:372: error: 'MS_REC' undeclared (first use in this function)
+make[1]: *** [ipnetns.o] Error 1
+
+This patch fixes that.
+---
+ ip/ipnetns.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ip/ipnetns.c b/ip/ipnetns.c
+index b047b97..48b1ad5 100644
+--- a/ip/ipnetns.c
++++ b/ip/ipnetns.c
+@@ -14,6 +14,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <ctype.h>
++#include <linux/fs.h>
+ 
+ #include "utils.h"
+ #include "ip_common.h"
+-- 
+1.8.2
+
diff --git a/iproute2-headers.diff b/iproute2-headers.diff
new file mode 100644
index 0000000..34de6fe
--- /dev/null
+++ b/iproute2-headers.diff
@@ -0,0 +1,16 @@
+---
+ ip/ipnetns.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: iproute2-3.8.0/ip/ipnetns.c
+===================================================================
+--- iproute2-3.8.0.orig/ip/ipnetns.c
++++ iproute2-3.8.0/ip/ipnetns.c
+@@ -14,6 +14,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <ctype.h>
++#include <linux/fs.h>
+ 
+ #include "utils.h"
+ #include "ip_common.h"
diff --git a/iproute2.changes b/iproute2.changes
index 6110e78..9eb4692 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -7,6 +7,7 @@ Mon Apr 15 07:31:11 UTC 2013 - jengelh@inai.de
 * add `ip netns pids` and `ip netns identify`
 * tc netem: allow negative packet/cell overhead
 * support tunnels in `ip link type ipip|sit|ip6tnl`
+- Add 0001-build-resolve-compile-error-due-to-missing-include.patch
 
 -------------------------------------------------------------------
 Thu Dec 13 06:43:49 UTC 2012 - jengelh@inai.de
diff --git a/iproute2.spec b/iproute2.spec
index 51852f4..a3ebb46 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -32,12 +32,14 @@ Source2:        %name-%version.tar.sign
 Patch1:         iproute2-dirs.diff
 Patch2:         iproute2-HZ.diff
 Patch3:         revert-pdf-creation.diff
+Patch4:         0001-build-resolve-compile-error-due-to-missing-include.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  db-devel
 BuildRequires:  flex
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
+#BuildRequires:  linux-glibc-devel >= 2.6.15
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  xorg-x11-devel
 BuildRequires:  xz
@@ -108,6 +110,7 @@ tar -xf "%{S:0}" --use=xz;
 %if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220)
 %patch -P 3 -p1
 %endif
+%patch -P 4 -p1
 find . -name *.orig -delete
 
 %build

From b12c7fc1fdeb04c4063fa6c78fb7c26e914d34a745844d0df8d60dd35c5c3ff8 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 15 May 2013 17:34:14 +0000
Subject: [PATCH 3/3] Remove duplicate patch file iproute2-headers.diff

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=66
---
 iproute2-headers.diff | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 iproute2-headers.diff

diff --git a/iproute2-headers.diff b/iproute2-headers.diff
deleted file mode 100644
index 34de6fe..0000000
--- a/iproute2-headers.diff
+++ /dev/null
@@ -1,16 +0,0 @@
----
- ip/ipnetns.c |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: iproute2-3.8.0/ip/ipnetns.c
-===================================================================
---- iproute2-3.8.0.orig/ip/ipnetns.c
-+++ iproute2-3.8.0/ip/ipnetns.c
-@@ -14,6 +14,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <ctype.h>
-+#include <linux/fs.h>
- 
- #include "utils.h"
- #include "ip_common.h"