[iproute] 3.12.0 bump

[Petr Šabata]

commit 1a082968b88f09cbf0e70d33b58b3b7dee10e0c5
Author: Petr Šabata <contyk at redhat.com>
Date:   Mon Nov 25 19:39:35 2013 +0900

    3.12.0 bump

 iproute.spec                                       |   31 ++--
 iproute2-3.10.0-lnstat-interval.patch              |   29 ----
 iproute2-3.10.0-xfrm-state-overflow.patch          |   38 -----
 ...ridge-Close-file-with-bridge-monitor-file.patch |   41 ------
 iproute2-3.11.0-iproute2-bridge-document-mdb.patch |  153 --------------------
 ... => iproute2-3.12.0-lnstat-dump-to-stdout.patch |   10 +-
 iproute2-3.12.0-lnstat-interval.patch              |   34 +++++
 iproute2-3.8.0-optflags.patch                      |   13 --
 8 files changed, 55 insertions(+), 294 deletions(-)
---
diff --git a/iproute.spec b/iproute.spec
index 95b774a..6486760 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,7 +1,7 @@
 %global             cbq_version v0.7.3
 Summary:            Advanced IP routing and network device configuration tools
 Name:               iproute
-Version:            3.11.0
+Version:            3.12.0
 Release:            1%{?dist}
 Group:              Applications/System
 URL:                http://kernel.org/pub/linux/utils/net/%{name}2/
@@ -15,15 +15,12 @@ Patch3:             iproute2-3.9.0-IPPROTO_IP_for_SA.patch
 Patch4:             iproute2-example-cbq-service.patch
 Patch5:             iproute2-2.6.35-print-route.patch
 Patch6:             iproute2-2.6.39-create-peer-veth-without-a-name.patch
-Patch7:             iproute2-2.6.39-lnstat-dump-to-stdout.patch
-Patch8:             iproute2-3.10.0-xfrm-state-overflow.patch
-Patch9:            iproute2-3.10.0-lnstat-interval.patch
-Patch10:            iproute2-3.10.0-rtnl_send.patch
+Patch7:             iproute2-3.12.0-lnstat-dump-to-stdout.patch
+Patch8:             iproute2-3.10.0-rtnl_send.patch
 # Rejected by upstream <http://thread.gmane.org/gmane.linux.network/284101>
-Patch11:            iproute2-3.11.0-tc-ok.patch
-Patch12:            iproute2-3.11.0-iproute2-bridge-document-mdb.patch
-# Bug #1011822, in upstream after 3.11.0
-Patch13:            iproute2-3.11.0-iproute2-bridge-Close-file-with-bridge-monitor-file.patch
+Patch9:             iproute2-3.11.0-tc-ok.patch
+Patch10:            iproute2-3.11.0-rtt.patch
+Patch11:            iproute2-3.12.0-lnstat-interval.patch
 License:            GPLv2+ and Public Domain
 BuildRequires:      bison
 BuildRequires:      flex
@@ -76,12 +73,10 @@ The libnetlink static library.
 %patch5 -p1 -b .print-route
 %patch6 -p1 -b .peer-veth-without-name
 %patch7 -p1 -b .lnstat-dump-to-stdout
-%patch8 -p1 -b .xfrm-state
-%patch9 -p1 -b .lnstat-interval
-%patch10 -p1 -b .rtnl_send
-%patch11 -p1 -b .tc_ok
-%patch12 -p1 -b .bridge_mdb_doc
-%patch13 -p1 -b .bridge_monitor_close
+%patch8 -p1 -b .rtnl_send
+%patch9 -p1 -b .tc_ok
+%patch10 -p1 -b .rtt
+%patch11 -p1 -b .lnstat-interval
 sed -i 's/^LIBDIR=/LIBDIR?=/' Makefile
 
 %build
@@ -181,6 +176,12 @@ done
 %{_includedir}/libnetlink.h
 
 %changelog
+* Mon Nov 25 2013 Petr Šabata <contyk at redhat.com> - 3.12.0-1
+- 3.12.0 bump
+
+* Thu Nov 21 2013 Petr Šabata <contyk at redhat.com> - 3.11.0-2
+- Fix the rtt time parsing again
+
 * Tue Oct 22 2013 Petr Šabata <contyk at redhat.com> - 3.11.0-1
 - 3.11 bump
 
diff --git a/iproute2-2.6.39-lnstat-dump-to-stdout.patch b/iproute2-3.12.0-lnstat-dump-to-stdout.patch
similarity index 63%
rename from iproute2-2.6.39-lnstat-dump-to-stdout.patch
rename to iproute2-3.12.0-lnstat-dump-to-stdout.patch
index a5b7b62..d16a4bb 100644
--- a/iproute2-2.6.39-lnstat-dump-to-stdout.patch
+++ b/iproute2-3.12.0-lnstat-dump-to-stdout.patch
@@ -1,13 +1,13 @@
 diff --git a/misc/lnstat.c b/misc/lnstat.c
-index 32ab6a4..431bfc7 100644
+index d6415ef..8608cfa 100644
 --- a/misc/lnstat.c
 +++ b/misc/lnstat.c
-@@ -322,7 +322,7 @@ int main(int argc, char **argv)
- 		int i;
- 		struct table_hdr *header;
+@@ -351,7 +351,7 @@ int main(int argc, char **argv)
+ 
+ 	switch (mode) {
  	case MODE_DUMP:
 -		lnstat_dump(stderr, lnstat_files);
 +		lnstat_dump(stdout, lnstat_files);
  		break;
- 	case MODE_NORMAL:
  
+ 	case MODE_NORMAL:
diff --git a/iproute2-3.12.0-lnstat-interval.patch b/iproute2-3.12.0-lnstat-interval.patch
new file mode 100644
index 0000000..b20f079
--- /dev/null
+++ b/iproute2-3.12.0-lnstat-interval.patch
@@ -0,0 +1,34 @@
+diff --git a/misc/lnstat.c b/misc/lnstat.c
+index 8608cfa..8e8b1ba 100644
+--- a/misc/lnstat.c
++++ b/misc/lnstat.c
+@@ -253,7 +253,7 @@ int main(int argc, char **argv)
+ 		MODE_JSON,
+ 		MODE_NORMAL,
+ 	} mode = MODE_NORMAL;
+-	unsigned long count = 1;
++	unsigned long count = 0;
+ 	struct table_hdr *header;
+ 	static struct field_params fp;
+ 	int num_req_files = 0;
+@@ -366,7 +366,7 @@ int main(int argc, char **argv)
+ 		if (interval < 1 )
+ 			interval = 1;
+ 
+-		for (i = 0; i < count; i++) {
++		for (i = 0; i < count || !count; ) {
+ 			lnstat_update(lnstat_files);
+ 			if (mode == MODE_JSON)
+ 				print_json(stdout, lnstat_files, &fp);
+@@ -377,8 +377,10 @@ int main(int argc, char **argv)
+ 				print_line(stdout, lnstat_files, &fp);
+ 			}
+ 			fflush(stdout);
+-			if (i < count - 1)
++			if (i < count - 1 || !count)
+ 				sleep(interval);
++			if (count)
++				++i;
+ 		}
+ 		break;
+ 	}