[iproute] 3.9.0 bump

[Petr Šabata]

commit a6699c9016115b5a1689291a86ed9b28dc35a818
Author: Petr Šabata <contyk at redhat.com>
Date:   Tue Apr 30 17:32:29 2013 +0200

    3.9.0 bump

 .gitignore                              |    1 +
 iproute.spec                            |   11 ++++----
 iproute2-2.6.29-IPPROTO_IP_for_SA.patch |   11 --------
 iproute2-3.8.0-up.patch                 |   41 -------------------------------
 iproute2-3.9.0-IPPROTO_IP_for_SA.patch  |   12 +++++++++
 sources                                 |    2 +-
 6 files changed, 20 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a004c88..65d223d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ iproute2-2.6.35.tar.bz2
 /iproute2-3.6.0.tar.gz
 /iproute2-3.7.0.tar.gz
 /iproute2-3.8.0.tar.gz
+/iproute2-3.9.0.tar.gz
diff --git a/iproute.spec b/iproute.spec
index 4c6bbeb..0ef5f70 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,8 +1,8 @@
 %global             cbq_version v0.7.3
 Summary:            Advanced IP routing and network device configuration tools
 Name:               iproute
-Version:            3.8.0
-Release:            4%{?dist}
+Version:            3.9.0
+Release:            1%{?dist}
 Group:              Applications/System
 URL:                http://kernel.org/pub/linux/utils/net/%{name}2/
 Source0:            http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.gz
@@ -12,13 +12,12 @@ Patch0:             man-pages.patch
 Patch1:             iproute2-3.4.0-kernel.patch
 Patch2:             iproute2-3.8.0-optflags.patch
 Patch3:             iproute2-3.4.0-sharepath.patch
-Patch4:             iproute2-2.6.29-IPPROTO_IP_for_SA.patch
+Patch4:             iproute2-3.9.0-IPPROTO_IP_for_SA.patch
 Patch5:             iproute2-example-cbq-service.patch
 Patch6:             iproute2-2.6.35-print-route.patch
 Patch7:             iproute2-2.6.39-create-peer-veth-without-a-name.patch
 Patch8:             iproute2-2.6.39-lnstat-dump-to-stdout.patch
 Patch9:             iproute2-3.8.0-unused-result.patch
-Patch10:            iproute2-3.8.0-up.patch
 License:            GPLv2+ and Public Domain
 BuildRequires:      bison
 BuildRequires:      flex
@@ -74,7 +73,6 @@ sed -i "s/_VERSION_/%{version}/" man/man8/ss.8
 %patch7 -p1 -b .peer-veth-without-name
 %patch8 -p1 -b .lnstat-dump-to-stdout
 %patch9 -p1 -b .unused-result
-%patch10 -p1 -b .up
 
 %build
 export LIBDIR=/%{_libdir}
@@ -183,6 +181,9 @@ done
 %{_includedir}/libnetlink.h
 
 %changelog
+* Tue Apr 30 2013 Petr Šabata <contyk at redhat.com> - 3.9.0-1
+- 3.9.0 bump
+
 * Thu Apr 25 2013 Petr Šabata <contyk at redhat.com> - 3.8.0-4
 - ATM is available in Fedora only
 
diff --git a/iproute2-3.9.0-IPPROTO_IP_for_SA.patch b/iproute2-3.9.0-IPPROTO_IP_for_SA.patch
new file mode 100644
index 0000000..6c150ec
--- /dev/null
+++ b/iproute2-3.9.0-IPPROTO_IP_for_SA.patch
@@ -0,0 +1,12 @@
+diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
+index 0495ff4..b1d4c6e 100644
+--- a/ip/ipxfrm.c
++++ b/ip/ipxfrm.c
+@@ -1275,6 +1275,7 @@ static int xfrm_selector_upspec_parse(struct xfrm_selector *sel,
+ 		case IPPROTO_UDP:
+ 		case IPPROTO_SCTP:
+ 		case IPPROTO_DCCP:
++		case IPPROTO_IP: /* to allow shared SA for different protocols */
+ 			break;
+ 		default:
+ 			fprintf(stderr, "\"sport\" and \"dport\" are invalid with PROTO value \"%s\"\n", strxf_proto(sel->proto));
diff --git a/sources b/sources
index 8902469..bb34926 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-efa7cbac81028bfb70f7ef073a70f002  iproute2-3.8.0.tar.gz
+4777718bde8796347d17497ad9033105  iproute2-3.9.0.tar.gz