rpms/iproute
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- create missing man pages

Browse Source
This commit is contained in:
Marcela Mašláňová 2009-10-09 11:49:26 +00:00
parent 8bf7d19692
commit 90554a3f9c
9 changed files with 37 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
iproute2-2.6.29.tar.bz2 iproute2-20091009.tar.bz2

24
iproute-ip-man.patch
View File

@ -1,24 +0,0 @@
diff -up iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8.mm iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8
--- iproute2-2.6.29/man/man8/ip.8.mm 2008-07-25 22:46:07.000000000 +0200
+++ iproute2-2.6.29/man/man8/ip.8 2008-08-12 14:24:01.000000000 +0200
@@ -190,6 +190,8 @@ replace " | " monitor " } "
.IR NUMBER " ] [ "
.B cwnd
.IR NUMBER " ] [ "
+.B initcwnd
+.IR NUMBER " ] [ "
.B ssthresh
.IR REALM " ] [ "
.B realms
@@ -1480,6 +1482,11 @@ the clamp for congestion window. It is
flag is not used.
.TP
+.BI initcwnd " NUMBER "
+the maximum initial congestion window (cwnd) size in MSS of a
+TCP connection.
+
+.TP
.BI advmss " NUMBER " "(2.3.15+ only)"
the MSS ('Maximal Segment Size') to advertise to these
destinations when establishing TCP connections. If it is not given,

19
iproute.spec
View File

@ -1,23 +1,20 @@
##%define date_version 070710 %define date_version 20091009
%define cbq_version v0.7.3 %define cbq_version v0.7.3
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.29 Version: 2.6.29
Release: 5%{?dist} Release: 5.0.20091009gitdaf49fd6%{?dist}
Group: Applications/System Group: Applications/System
Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2 Source: iproute2-%{date_version}.tar.bz2
Source1: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
#Source1: iproute-doc-2.6.22.tar.gz #Source1: iproute-doc-2.6.22.tar.gz
URL: http://linux-net.osdl.org/index.php/Iproute2 URL: http://linux-net.osdl.org/index.php/Iproute2
Patch0: man-pages.patch Patch0: man-pages.patch
Patch1: iproute2-2.6.9-kernel.patch Patch1: iproute2-2.6.29-kernel.patch
Patch2: iproute2-ss050901-opt_flags.patch Patch2: iproute2-ss050901-opt_flags.patch
Patch3: iproute-ip-man.patch
Patch4: iproute2-2.6.25-segfault.patch Patch4: iproute2-2.6.25-segfault.patch
Patch5: iproute2-sharepath.patch Patch5: iproute2-sharepath.patch
Patch6: iproute2-2.6.29-fix_headers_for_gre.patch
Patch7: iproute2-missing-arpd-directory.patch
Patch8: iproute2-display_ip4ip6tunnels.patch
Patch9: iproute2-2.6.29-tc_modules.patch Patch9: iproute2-2.6.29-tc_modules.patch
Patch10: iproute2-2.6.29-IPPROTO_IP_for_SA.patch Patch10: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
@ -42,16 +39,12 @@ License: GPLv2+
The iproute documentation contains howtos and examples of settings. The iproute documentation contains howtos and examples of settings.
%prep %prep
%setup -q -n iproute2-%{version} %setup -q -n iproute2-%{date_version}
%patch0 -p1 %patch0 -p1
%patch1 -p1 -b .kernel %patch1 -p1 -b .kernel
%patch2 -p1 -b .opt_flags %patch2 -p1 -b .opt_flags
%patch3 -p1
%patch4 -p1 -b .seg %patch4 -p1 -b .seg
%patch5 -p1 -b .share %patch5 -p1 -b .share
%patch6 -p1 -b .hdrs
%patch7 -p1 -b .arpd
%patch8 -p1 -b .ip4ip6
%patch9 -p1 -b .ipt %patch9 -p1 -b .ipt
%patch10 -p1 -b .ipproto %patch10 -p1 -b .ipproto

31
iproute2-2.6.29-fix_headers_for_gre.patch
View File

@ -1,31 +0,0 @@
From 1957a322c9932e1a1d2ca1fd37ce4b335ceb7113 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Tue, 24 Mar 2009 15:40:54 -0700
Subject: [PATCH] Fix headers needed for gre
Need to get right headers or build breaks.
---
ip/link_gre.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ip/link_gre.c b/ip/link_gre.c
index 9109312..9f8bde6 100644
--- iproute2-2.6.29/ip/link_gre.c.old
+++ iproute2-2.6.29/ip/link_gre.c
@@ -12,11 +12,12 @@
#include <string.h>
#include <net/if.h>
-#include <linux/if_tunnel.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
+#include <linux/ip.h>
+#include <linux/if_tunnel.h>
#include "rt_names.h"
#include "utils.h"
#include "ip_common.h"
--
1.6.0.6

10
iproute2-2.6.29-tc_modules.patch
View File

@ -1,9 +1,9 @@
diff -up iproute2-2.6.29/Makefile.ipt iproute2-2.6.29/Makefile diff -up iproute2-20091009/Makefile.ipt iproute2-20091009/Makefile
--- iproute2-2.6.29/Makefile.ipt 2009-04-23 15:19:19.000000000 +0200 --- iproute2-20091009/Makefile.ipt 2009-10-09 13:29:27.137385281 +0200
+++ iproute2-2.6.29/Makefile 2009-04-23 15:27:19.802477954 +0200 +++ iproute2-20091009/Makefile 2009-10-09 13:32:14.251632048 +0200
@@ -10,7 +10,7 @@ ARPDDIR=/var/lib/arpd @@ -11,7 +11,7 @@ KERNEL_INCLUDE=/usr/include
# Path to db_185.h include # Path to db_185.h include
DBM_INCLUDE:=/usr/include DBM_INCLUDE:=$(ROOTDIR)/usr/include
-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\" +DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"

28
iproute2-display_ip4ip6tunnels.patch
View File

@ -1,28 +0,0 @@
From c3651bf4763d7247e3edd4e20526a85de459041b Mon Sep 17 00:00:00 2001
From: Srivats P <srivats.p@conexant.com>
Date: Fri, 27 Mar 2009 11:17:26 -0700
Subject: [PATCH] ip6tunnel: Fix no default display of ip4ip6 tunnels
"ip -6 tunnel show" displays only ip6ip6 tunnels not ip4ip6 tunnels
- it should display all irrespective of proto.
This is because the default tunnel proto is initialized to IPPROTO_IPV6 in ip6_tnl_parm_init() which is fine for a 'add' command but not for 'show'. This patch overrides proto with 0 signifying 'mode any' as the default in case of a 'show'.
---
ip/ip6tunnel.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
index 8421983..8852a67 100644
--- iproute2-2.6.29/ip/ip6tunnel.c.old
+++ iproute2-2.6.29/ip/ip6tunnel.c
@@ -335,6 +335,7 @@ static int do_show(int argc, char **argv)
struct ip6_tnl_parm p;
ip6_tnl_parm_init(&p, 0);
+ p.proto = 0; /* default to any */
if (parse_args(argc, argv, &p) < 0)
return -1;
--
1.6.2.2

30
iproute2-missing-arpd-directory.patch
View File

@ -1,30 +0,0 @@
From e48f73d6a5e90d2f883e15ccedf4f53d26bb6e74 Mon Sep 17 00:00:00 2001
From: Olaf Rempel <razzor@kopf-tisch.de>
Date: Wed, 9 Nov 2005 15:25:40 +0100
Subject: [PATCH] iproute2-2.6.14-051107: missing arpd directory
arpd requires a directory (/var/lib/arpd/) to run.
see attached patch, which lets iproute create this directroy during install.
---
Makefile | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff -up iproute-2.6.29/iproute2-2.6.29/Makefile.arpd iproute-2.6.29/iproute2-2.6.29/Makefile
--- iproute2-2.6.29/Makefile.arpd 2009-04-14 12:57:23.743114366 +0200
+++ iproute2-2.6.29/Makefile 2009-04-14 12:58:38.754111501 +0200
@@ -5,6 +5,7 @@ CONFDIR=/etc/iproute2
DOCDIR=/share/doc/iproute2
MANDIR=/share/man
KERNEL_INCLUDE=/usr/include
+ARPDDIR=/var/lib/arpd
# Path to db_185.h include
DBM_INCLUDE:=/usr/include
@@ -44,6 +45,7 @@ Config:
install: all
install -m 0755 -d $(DESTDIR)$(SBINDIR)
install -m 0755 -d $(DESTDIR)$(CONFDIR)
+ install -m 0755 -d $(DESTDIR)$(ARPDDIR)
install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv
install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1 -type f) \

24
man-pages.patch
View File

@ -71,3 +71,27 @@ diff -up /dev/null iproute2-2.6.29/man/man8/nstat.8
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+.so man8/rtacct.8 +.so man8/rtacct.8
\ No newline at end of file \ No newline at end of file
diff -up iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8.mm iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8
--- iproute2-2.6.29/man/man8/ip.8.mm 2008-07-25 22:46:07.000000000 +0200
+++ iproute2-2.6.29/man/man8/ip.8 2008-08-12 14:24:01.000000000 +0200
@@ -190,6 +190,8 @@ replace " | " monitor " } "
.IR NUMBER " ] [ "
.B cwnd
.IR NUMBER " ] [ "
+.B initcwnd
+.IR NUMBER " ] [ "
.B ssthresh
.IR REALM " ] [ "
.B realms
@@ -1480,6 +1482,11 @@ the clamp for congestion window. It is
flag is not used.
.TP
+.BI initcwnd " NUMBER "
+the maximum initial congestion window (cwnd) size in MSS of a
+TCP connection.
+
+.TP
.BI advmss " NUMBER " "(2.3.15+ only)"
the MSS ('Maximal Segment Size') to advertise to these
destinations when establishing TCP connections. If it is not given,

2
sources
View File

@ -1 +1 @@
a3ecfaa091289656fae786b027b44eda iproute2-2.6.29.tar.bz2 129797c64d5f79474304142a4213604d iproute2-20091009.tar.bz2