v2.6.37 release bump

This commit is contained in:
Petr Sabata 2011-01-10 17:18:29 +01:00
parent a2dad4ce58
commit 32ac7b782a
4 changed files with 8 additions and 71 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
iproute2-2.6.34.tar.bz2 iproute2-2.6.34.tar.bz2
iproute2-2.6.35.tar.bz2 iproute2-2.6.35.tar.bz2
/iproute2-2.6.37.tar.bz2

View File

@ -3,8 +3,8 @@
Summary: Advanced IP routing and network device configuration tools Summary: Advanced IP routing and network device configuration tools
Name: iproute Name: iproute
Version: 2.6.35 Version: 2.6.37
Release: 10%{?dist} Release: 1%{?dist}
Group: Applications/System Group: Applications/System
##Source: iproute2-%{date_version}.tar.bz2 ##Source: iproute2-%{date_version}.tar.bz2
Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
@ -20,7 +20,6 @@ Patch7: iproute2-example-cbq-service.patch
Patch8: iproute2-2.6.35-print-route.patch Patch8: iproute2-2.6.35-print-route.patch
Patch9: iproute2-print-route-u32.patch Patch9: iproute2-print-route-u32.patch
Patch10: iproute2-2.6.33-create-peer-veth-without-a-name.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 License: GPLv2+ and Public Domain
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -57,7 +56,6 @@ sed -i "s/_VERSION_/%{version}/" man/man8/ss.8
%patch8 -p1 -b .print-route %patch8 -p1 -b .print-route
%patch9 -p1 -b .print-route-u32 %patch9 -p1 -b .print-route-u32
%patch10 -p1 -b .peer-veth-without-name %patch10 -p1 -b .peer-veth-without-name
%patch11 -p1 -b .ss8-improvements
%build %build
export LIBDIR=/%{_libdir} export LIBDIR=/%{_libdir}
@ -138,6 +136,10 @@ EOF
%doc RELNOTES %doc RELNOTES
%changelog %changelog
* Mon Jan 10 2011 Petr Sabata <psabata@redhat.com> - 2.6.37-1
- 2.6.37 upstream release
- ss(8) improvements patch removed (included upstream)
* Wed Dec 08 2010 Petr Sabata <psabata@redhat.com> - 2.6.35-10 * Wed Dec 08 2010 Petr Sabata <psabata@redhat.com> - 2.6.35-10
- fix a typo in ss(8) improvements patch, rhbz#661267 - fix a typo in ss(8) improvements patch, rhbz#661267

View File

@ -1,66 +0,0 @@
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.
--- iproute2-2.6.35/man/man8/ss.8 2010-12-08 13:39:59.810396849 +0100
+++ iproute2-2.6.35/man/man8/ss.8.new 2010-12-08 13:40:28.446397779 +0100
@@ -26,7 +26,7 @@
Output version information.
.TP
.B \-n, \-\-numeric
-Do now try to resolve service names.
+Do not try to resolve service names.
.TP
.B \-r, \-\-resolve
Try to resolve numeric address/ports.

View File

@ -1 +1 @@
b0f281b3124bf04669e18f5fe16d4934 iproute2-2.6.35.tar.bz2 9774ff9d74ebd301bf56bd8d74473786 iproute2-2.6.37.tar.bz2