From 5e5794a0130c3fe30f94a0e506eecefb88582c5d Mon Sep 17 00:00:00 2001
From: Petr Sabata <contyk@redhat.com>
Date: Thu, 6 Oct 2011 15:20:07 +0200
Subject: [PATCH] Fix ss, lnstat and arpd usage and manpages

---
 iproute.spec                                  | 11 +++-
 ...2-arpd-fix-usage-and-manpage-options.patch | 49 +++++++++++++++
 ...te2-2.6.39-iproute2-lnstat-fix-typos.patch | 35 +++++++++++
 ...9-iproute2-ss-fix-missing-parameters.patch | 60 +++++++++++++++++++
 4 files changed, 154 insertions(+), 1 deletion(-)
 create mode 100644 iproute2-2.6.39-iproute2-arpd-fix-usage-and-manpage-options.patch
 create mode 100644 iproute2-2.6.39-iproute2-lnstat-fix-typos.patch
 create mode 100644 iproute2-2.6.39-iproute2-ss-fix-missing-parameters.patch

diff --git a/iproute.spec b/iproute.spec
index 9cceb1e..f5d47b6 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -2,7 +2,7 @@
 Summary:            Advanced IP routing and network device configuration tools
 Name:               iproute
 Version:            2.6.39
-Release:            4%{?dist}
+Release:            5%{?dist}
 Group:              Applications/System
 URL:                http://www.linuxfoundation.org/collaborate/workgroups/networking/%{name}2
 Source0:            http://devresources.linuxfoundation.org/dev/iproute2/download/%{name}2-%{version}.tar.gz
@@ -21,6 +21,9 @@ Patch9:             iproute2-print-route-u32.patch
 Patch10:            iproute2-2.6.39-create-peer-veth-without-a-name.patch
 Patch11:            iproute2-2.6.39-xtables6.patch
 Patch12:            iproute2-2.6.39-lnstat-dump-to-stdout.patch
+Patch13:            iproute2-2.6.39-iproute2-ss-fix-missing-parameters.patch
+Patch14:            iproute2-2.6.39-iproute2-lnstat-fix-typos.patch
+Patch15:            iproute2-2.6.39-iproute2-arpd-fix-usage-and-manpage-options.patch
 
 License:            GPLv2+ and Public Domain
 BuildRequires:      tex(latex) tex(dvips) linuxdoc-tools
@@ -66,6 +69,9 @@ sed -i "s/_VERSION_/%{version}/" man/man8/ss.8
 %patch10 -p1 -b .peer-veth-without-name
 %patch11 -p1 -b .xtables6
 %patch12 -p1 -b .lnstat-dump-to-stdout
+%patch13 -p1 -b .ss-usage
+%patch14 -p1 -b .lnstat-usage
+%patch15 -p1 -b .arpd-usage
 
 %build
 export LIBDIR=/%{_libdir}
@@ -187,6 +193,9 @@ done
 %{_includedir}/libnetlink.h
 
 %changelog
+* Thu Oct 06 2011 Petr Sabata <contyk@redhat.com> - 2.6.39-5
+- Fix ss, lnstat and arpd usage and manpages
+
 * Wed Sep 07 2011 Petr Sabata <contyk@redhat.com> - 2.6.39-4
 - lnstat should dump (-d) to stdout instead of stderr (#736332)
 
diff --git a/iproute2-2.6.39-iproute2-arpd-fix-usage-and-manpage-options.patch b/iproute2-2.6.39-iproute2-arpd-fix-usage-and-manpage-options.patch
new file mode 100644
index 0000000..50b66cb
--- /dev/null
+++ b/iproute2-2.6.39-iproute2-arpd-fix-usage-and-manpage-options.patch
@@ -0,0 +1,49 @@
+From 0936556fa65a1ca905934be78b537810567205b2 Mon Sep 17 00:00:00 2001
+From: Petr Sabata <contyk@redhat.com>
+Date: Thu, 6 Oct 2011 14:38:48 +0200
+Subject: [PATCH 3/3] iproute2: arpd - fix usage and manpage options
+
+Signed-off-by: Petr Sabata <contyk@redhat.com>
+---
+ man/man8/arpd.8 |    4 ++--
+ misc/arpd.c     |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/man/man8/arpd.8 b/man/man8/arpd.8
+index d172600..37b6ba4 100644
+--- a/man/man8/arpd.8
++++ b/man/man8/arpd.8
+@@ -4,7 +4,7 @@
+ arpd \- userspace arp daemon.
+ 
+ .SH SYNOPSIS
+-Usage: arpd [ -lk ] [ -a N ] [ -b dbase ] [ -f file ] [ interfaces ]
++Usage: arpd [ -lkh? ] [ -a N ] [ -b dbase ] [ -B number ] [ -f file ] [ -n time ] [ -R rate ] [ interfaces ]
+ 
+ .SH DESCRIPTION
+ The
+@@ -34,7 +34,7 @@ Suppress sending broadcast queries by kernel. It takes sense together with optio
+ -n <TIME>
+ Timeout of negative cache. When resolution fails arpd suppresses further attempts to resolve for this period. It makes sense only together with option -k This timeout should not be too much longer than boot time of a typical host not supporting gratuitous ARP. Default value is 60 seconds.
+ .TP
+--r <RATE>
++-R <RATE>
+ Maximal steady rate of broadcasts sent by arpd in packets per second. Default value is 1.
+ .TP
+ -B <NUMBER>
+diff --git a/misc/arpd.c b/misc/arpd.c
+index 128c49d..124d3fb 100644
+--- a/misc/arpd.c
++++ b/misc/arpd.c
+@@ -94,7 +94,7 @@ int broadcast_burst = 3000;
+ void usage(void)
+ {
+ 	fprintf(stderr,
+-"Usage: arpd [ -lk ] [ -a N ] [ -b dbase ] [ -f file ] [ interfaces ]\n");
++"Usage: arpd [ -lkh? ] [ -a N ] [ -b dbase ] [ -B number ] [ -f file ] [ -n time ] [ -R rate ] [ interfaces ]\n");
+ 	exit(1);
+ }
+ 
+-- 
+1.7.6.4
+
diff --git a/iproute2-2.6.39-iproute2-lnstat-fix-typos.patch b/iproute2-2.6.39-iproute2-lnstat-fix-typos.patch
new file mode 100644
index 0000000..75cb19b
--- /dev/null
+++ b/iproute2-2.6.39-iproute2-lnstat-fix-typos.patch
@@ -0,0 +1,35 @@
+From a8e6d2d6a49e296ee7b4352e353c9cd745df5246 Mon Sep 17 00:00:00 2001
+From: Petr Sabata <contyk@redhat.com>
+Date: Thu, 6 Oct 2011 14:25:32 +0200
+Subject: [PATCH 2/3] iproute2: lnstat - fix typos
+
+Signed-off-by: Petr Sabata <contyk@redhat.com>
+---
+ misc/lnstat.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/misc/lnstat.c b/misc/lnstat.c
+index 32ab6a4..bd19cc1 100644
+--- a/misc/lnstat.c
++++ b/misc/lnstat.c
+@@ -45,7 +45,7 @@ static struct option opts[] = {
+ 	{ "file", 1, NULL, 'f' },
+ 	{ "help", 0, NULL, 'h' },
+ 	{ "interval", 1, NULL, 'i' },
+-	{ "key", 1, NULL, 'k' },
++	{ "keys", 1, NULL, 'k' },
+ 	{ "subject", 1, NULL, 's' },
+ 	{ "width", 1, NULL, 'w' },
+ };
+@@ -61,7 +61,7 @@ static int usage(char *name, int exit_code)
+ 	fprintf(stderr, "\t-V --version\t\tPrint Version of Program\n");
+ 	fprintf(stderr, "\t-c --count <count>\t"
+ 			"Print <count> number of intervals\n");
+-	fprintf(stderr, "\t-d --dumpt\t\t"
++	fprintf(stderr, "\t-d --dump\t\t"
+ 			"Dump list of available files/keys\n");
+ 	fprintf(stderr, "\t-f --file <file>\tStatistics file to use\n");
+ 	fprintf(stderr, "\t-h --help\t\tThis help message\n");
+-- 
+1.7.6.4
+
diff --git a/iproute2-2.6.39-iproute2-ss-fix-missing-parameters.patch b/iproute2-2.6.39-iproute2-ss-fix-missing-parameters.patch
new file mode 100644
index 0000000..d0950da
--- /dev/null
+++ b/iproute2-2.6.39-iproute2-ss-fix-missing-parameters.patch
@@ -0,0 +1,60 @@
+From 886485fd9c87ed1594815e1aa2468c2cc959b105 Mon Sep 17 00:00:00 2001
+From: Petr Sabata <contyk@redhat.com>
+Date: Thu, 6 Oct 2011 14:21:57 +0200
+Subject: [PATCH 1/3] iproute2: ss - fix missing parameters
+
+Signed-off-by: Petr Sabata <contyk@redhat.com>
+---
+ man/man8/ss.8 |    4 ++--
+ misc/ss.c     |    6 ++++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/man/man8/ss.8 b/man/man8/ss.8
+index b309df2..0b9a8c4 100644
+--- a/man/man8/ss.8
++++ b/man/man8/ss.8
+@@ -85,12 +85,12 @@ Display Unix domain sockets (alias for -f unix).
+ Display sockets of type FAMILY.
+ Currently the following families are supported: unix, inet, inet6, link, netlink.
+ .TP
+-.B \-A QUERY, \-\-query=QUERY
++.B \-A QUERY, \-\-query=QUERY, \-\-socket=QUERY
+ List of socket tables to dump, separated by commas. The following identifiers
+ are understood: all, inet, tcp, udp, raw, unix, packet, netlink, unix_dgram,
+ unix_stream, packet_raw, packet_dgram.
+ .TP
+-.B \-D FILE
++.B \-D FILE, \-\-diag=FILE
+ Do not display anything, just dump raw information about TCP sockets to FILE after applying filters. If FILE is - stdout is used.
+ .TP
+ .B \-F FILE, \-\-filter=FILE
+diff --git a/misc/ss.c b/misc/ss.c
+index 1597ff9..253f8d3 100644
+--- a/misc/ss.c
++++ b/misc/ss.c
+@@ -2416,9 +2416,10 @@ static void _usage(FILE *dest)
+ "   -x, --unix		display only Unix domain sockets\n"
+ "   -f, --family=FAMILY display sockets of type FAMILY\n"
+ "\n"
+-"   -A, --query=QUERY\n"
++"   -A, --query=QUERY, --socket=QUERY\n"
+ "       QUERY := {all|inet|tcp|udp|raw|unix|packet|netlink}[,QUERY]\n"
+ "\n"
++"   -D, --diag=FILE     Dump raw information about TCP sockets to FILE\n"
+ "   -F, --filter=FILE   read filter information from FILE\n"
+ "       FILTER := [ state TCP-STATE ] [ EXPRESSION ]\n"
+ 		);
+@@ -2486,8 +2487,9 @@ static const struct option long_opts[] = {
+ 	{ "packet", 0, 0, '0' },
+ 	{ "family", 1, 0, 'f' },
+ 	{ "socket", 1, 0, 'A' },
++	{ "query", 1, 0, 'A' },
+ 	{ "summary", 0, 0, 's' },
+-	{ "diag", 0, 0, 'D' },
++	{ "diag", 1, 0, 'D' },
+ 	{ "filter", 1, 0, 'F' },
+ 	{ "version", 0, 0, 'V' },
+ 	{ "help", 0, 0, 'h' },
+-- 
+1.7.6.4
+