From 40e8463b94ab29aecf18df6d01c679d9678cacd4 Mon Sep 17 00:00:00 2001
From: Petr Sabata <psabata@redhat.com>
Date: Tue, 30 Nov 2010 10:24:15 +0100
Subject: [PATCH] ss(8) improvements

---
 iproute.spec                           |  7 +++-
 iproute2-2.6.35-ss8-improvements.patch | 55 ++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 iproute2-2.6.35-ss8-improvements.patch

diff --git a/iproute.spec b/iproute.spec
index adcf50d..7dd0ce8 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -4,7 +4,7 @@
 Summary:    Advanced IP routing and network device configuration tools
 Name:       iproute
 Version:    2.6.35
-Release:    8%{?dist}
+Release:    9%{?dist}
 Group:      Applications/System
 ##Source: iproute2-%{date_version}.tar.bz2
 Source:     http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
@@ -20,6 +20,7 @@ Patch7:     iproute2-example-cbq-service.patch
 Patch8:     iproute2-2.6.35-print-route.patch
 Patch9:     iproute2-print-route-u32.patch
 Patch10:    iproute2-2.6.33-create-peer-veth-without-a-name.patch
+Patch11:    iproute2-2.6.35-ss8-improvements.patch
 
 License:    GPLv2+ and Public Domain
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +57,7 @@ sed -i "s/_VERSION_/%{version}/" man/man8/ss.8
 %patch8 -p1 -b .print-route
 %patch9 -p1 -b .print-route-u32
 %patch10 -p1 -b .peer-veth-without-name
+%patch11 -p1 -b .ss8-improvements
 
 %build
 export LIBDIR=/%{_libdir}
@@ -136,6 +138,9 @@ EOF
 %doc RELNOTES
 
 %changelog
+* Tue Nov 30 2010 Petr Sabata <psabata@redhat.com> - 2.6.35-9
+- ss(8) improvements patch by jpopelka; should be included in 2.6.36
+
 * Tue Nov 09 2010 Petr Sabata <psabata@redhat.com> - 2.6.35-8
 - rhbz#641599, use the versioned path, man-pages.patch update, prep update
 
diff --git a/iproute2-2.6.35-ss8-improvements.patch b/iproute2-2.6.35-ss8-improvements.patch
new file mode 100644
index 0000000..de4fbfb
--- /dev/null
+++ b/iproute2-2.6.35-ss8-improvements.patch
@@ -0,0 +1,55 @@
+diff -up iproute2-2.6.35/man/man8/ss.8.ss-man iproute2-2.6.35/man/man8/ss.8
+--- iproute2-2.6.35/man/man8/ss.8.ss-man	2010-11-24 17:20:50.000000000 +0100
++++ iproute2-2.6.35/man/man8/ss.8	2010-11-24 17:42:57.000000000 +0100
+@@ -12,6 +12,9 @@ to
+ It can display more TCP and state informations than other tools.
+ 
+ .SH OPTIONS
++When no option is used ss displays a list of 
++open non-listening TCP sockets that have established connection.
++.TP
+ These programs follow the usual GNU command line syntax, with long
+ options starting with two dashes (`-').
+ A summary of options is included below.
+@@ -29,10 +32,10 @@ Do now try to resolve service names.
+ Try to resolve numeric address/ports.
+ .TP
+ .B \-a, \-\-all
+-Display all sockets.
++Display both listening and non-listening (for TCP this means established connections) sockets.
+ .TP
+ .B \-l, \-\-listening
+-Display listening sockets.
++Display only listening sockets (these are omitted by default).
+ .TP
+ .B \-o, \-\-options
+ Show timer information.
+@@ -61,22 +64,22 @@ Display only IP version 4 sockets (alias
+ Display only IP version 6 sockets (alias for -f inet6).
+ .TP
+ .B \-0, \-\-packet
+-Display PACKET sockets.
++Display PACKET sockets (alias for -f link).
+ .TP
+ .B \-t, \-\-tcp
+-Display only TCP sockets.
++Display TCP sockets.
+ .TP
+ .B \-u, \-\-udp
+-Display only UDP sockets.
++Display UDP sockets.
+ .TP
+ .B \-d, \-\-dccp
+-Display only DCCP sockets.
++Display DCCP sockets.
+ .TP
+ .B \-w, \-\-raw
+-Display only RAW sockets.
++Display RAW sockets.
+ .TP
+ .B \-x, \-\-unix
+-Display only Unix domain sockets.
++Display Unix domain sockets (alias for -f unix).
+ .TP
+ .B \-f FAMILY, \-\-family=FAMILY
+ Display sockets of type FAMILY.