From ab4bcb426cb03d1c7ee9d61e1dd0f6def9b2b79dd886d618104c888349670c1a Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 30 Mar 2012 01:33:16 +0000
Subject: [PATCH 1/2] iproute 3.3.0

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=46
---
 iproute2-3.2.0.tar.xz   |  3 ---
 iproute2-3.3.0.tar.sign | 17 +++++++++++++++++
 iproute2-3.3.0.tar.xz   |  3 +++
 iproute2.changes        | 11 +++++++++++
 iproute2.spec           |  8 +++++---
 5 files changed, 36 insertions(+), 6 deletions(-)
 delete mode 100644 iproute2-3.2.0.tar.xz
 create mode 100644 iproute2-3.3.0.tar.sign
 create mode 100644 iproute2-3.3.0.tar.xz

diff --git a/iproute2-3.2.0.tar.xz b/iproute2-3.2.0.tar.xz
deleted file mode 100644
index 69ca016..0000000
--- a/iproute2-3.2.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59bc1c67a18653f989792a31eda5607a87689b9e6041f2d47ea8b5fe4842cb4d
-size 373804
diff --git a/iproute2-3.3.0.tar.sign b/iproute2-3.3.0.tar.sign
new file mode 100644
index 0000000..b23a37a
--- /dev/null
+++ b/iproute2-3.3.0.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABCAAGBQJPZ9NQAAoJEICnf2CVzeR+G1EQAJbGfzKYAJoUy3bPbVNoiU6j
+BjLMJXj2pNFAlno/PU6h0rwl/Ldmy0Yei+qVBMQ6sQVtwYT5C8Z8Af37QE3nh50b
+L5AecZdTohOFO3ipCuyLQNkYBjZVT612LbsL+UwPiz49lyxqhZb4SpaAXrASRsln
+9bz10fj9fYnJa49zboD3oaCLtqwv6DGOrqNMtMmoHj4Ej4zoW22w7LqdYuWZoPup
+gKuGPB0B7HLD8f+s2j6foOlA50Rp9Alh5f48hfddazA4iqB43UTuevV9tuohJRca
+atTDjiVs784mEqvIS7AugTtmvi6/sWKR87LR8ta0UjdTbAzHPoArW17mtTX6JUIk
+1IejXXctKAuQ/ZxRKNSITUCircaq3JBma/N5FEBSmNmmavHw7/pZaQijjsKRDOkM
+FdlJ3dr65YVpApklRoCOo7PXRDIPLYFpj67wn0sBdAekcO3ENkVgf28YBGKWL2cv
+9FFJFeEF87X1SAzbtCTf05s5W9dVfXRDK7aFpNtUhwkaXGhDe6E/ACwq2BGwbtip
+uL2jJlBcjMKMme2LZHMn3X7mOJF/9DmAeNk1lSxhAKdcWh8euBcppdyUxP4zsSgq
+etQnNc39JcH/J6SpGC5p+86Qm7zHKJL+1v7K8RCfNOK0aHR6czMxF2GnIWyWQQf3
+EmYMoSKrPHm4sXuUSPjz
+=GdB9
+-----END PGP SIGNATURE-----
diff --git a/iproute2-3.3.0.tar.xz b/iproute2-3.3.0.tar.xz
new file mode 100644
index 0000000..f9642f0
--- /dev/null
+++ b/iproute2-3.3.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e16d9ec1bd0bb2a3bb8be5ba0f0d9c53d39c0515a3ad58a58a89efe1748fb2a6
+size 377960
diff --git a/iproute2.changes b/iproute2.changes
index cde471c..7f2e33d 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Mar 30 01:20:08 UTC 2012 - jengelh@medozas.de
+
+- Update to new upstream release 3.3.0
+* This release updates qdisc parameters in sfq and red, adds Netem
+  extensions for shaping and for loss models, adds lots of manual
+  page corrections, adds the QFQ scheduler and the LLDP-to-ethernet
+  type table (along with support for processless network namespaces
+  and L2TPv3 plus L2TP tunneling), improves RED options, and adds
+  assorted bugfixes.
+
 -------------------------------------------------------------------
 Thu Mar  8 16:45:03 UTC 2012 - rschweikert@suse.com
 
diff --git a/iproute2.spec b/iproute2.spec
index 9e26604..12830a9 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -17,7 +17,8 @@
 
 
 Name:           iproute2
-Version:        3.2.0
+Provides:       iproute = %version
+Version:        3.3.0
 Release:        0
 Provides:       iproute = %version
 Summary:        Linux network configuration utilities
@@ -26,9 +27,10 @@ Group:          Productivity/Networking/Routing
 Url:            http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
 # Using GPL-2.0 instead of GPL-2.0+ because of tc_skbedit.h and tc/q_multiq.c
 
-#DL-URL:	http://kernel.org/pub/linux/utils/net/iproute2/iproute2-3.2.0.tar.bz2
+#DL-URL:	http://kernel.org/pub/linux/utils/net/iproute2/
 #Git-Clone:	git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2
-Source0:        %name-%version.tar.xz
+Source:         %name-%version.tar.xz
+Source2:        %name-%version.tar.sign
 # PATCH-FIX-UPSTREAM iproute2-libdir-1.diff status=unknown
 Patch0:         iproute2-libdir-1.diff
 # PATCH-??-OPENSUSE iproute2-HZ.diff status=noidea

From 3d3ffc41fc670e272132c8e4e064328f013f9ff1816002312d2de63efc21fe00 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 31 Mar 2012 12:39:54 +0000
Subject: [PATCH 2/2] Accepting request 112058 from
 home:BinLi:branches:security:netfilter

Distribute COPYING file

OBS-URL: https://build.opensuse.org/request/show/112058
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=47
---
 iproute2.changes | 5 +++++
 iproute2.spec    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/iproute2.changes b/iproute2.changes
index 7f2e33d..943f59c 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Mar 31 06:56:13 UTC 2012 - bili@suse.com
+
+- Distribute COPYING file for rpm(bnc#745225).
+
 -------------------------------------------------------------------
 Fri Mar 30 01:20:08 UTC 2012 - jengelh@medozas.de
 
diff --git a/iproute2.spec b/iproute2.spec
index 12830a9..2d622b3 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -128,7 +128,7 @@ rm %buildroot%_sbindir/ifcfg
 
 %files
 %defattr(-,root,root)
-%doc README*
+%doc README* COPYING
 %_sbindir/*
 #UsrMerge
 /sbin/*