diff --git a/.cvsignore b/.cvsignore index 3e64af9..8437e70 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -iproute2-2.6.29.tar.bz2 +iproute2-20091009.tar.bz2 diff --git a/iproute.spec b/iproute.spec index 578d8f6..a9bf041 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,25 +1,21 @@ -##%define date_version 070710 +%define date_version 20091009 %define cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 2.6.29 -Release: 5%{?dist} +Release: 5.0.20091009gitdaf49fd6%{?dist} Group: Applications/System -Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2 -#Source1: iproute-doc-2.6.22.tar.gz +Source: iproute2-%{date_version}.tar.bz2 +#Source1: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2 URL: http://linux-net.osdl.org/index.php/Iproute2 Patch0: man-pages.patch -Patch1: iproute2-2.6.9-kernel.patch +Patch1: iproute2-2.6.29-kernel.patch Patch2: iproute2-ss050901-opt_flags.patch -Patch3: iproute-ip-man.patch -Patch4: iproute2-2.6.25-segfault.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 -Patch10: iproute2-2.6.29-IPPROTO_IP_for_SA.patch +Patch3: iproute2-2.6.25-segfault.patch +Patch4: iproute2-sharepath.patch +Patch5: iproute2-2.6.29-tc_modules.patch +Patch6: iproute2-2.6.29-IPPROTO_IP_for_SA.patch License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,18 +38,14 @@ License: GPLv2+ The iproute documentation contains howtos and examples of settings. %prep -%setup -q -n iproute2-%{version} +%setup -q -n iproute2-%{date_version} %patch0 -p1 %patch1 -p1 -b .kernel %patch2 -p1 -b .opt_flags -%patch3 -p1 -%patch4 -p1 -b .seg -%patch5 -p1 -b .share -%patch6 -p1 -b .hdrs -%patch7 -p1 -b .arpd -%patch8 -p1 -b .ip4ip6 -%patch9 -p1 -b .ipt -%patch10 -p1 -b .ipproto +%patch3 -p1 -b .seg +%patch4 -p1 -b .share +%patch5 -p1 -b .ipt +%patch6 -p1 -b .ipproto %build export LIBDIR=/%{_libdir} @@ -132,6 +124,9 @@ EOF %doc RELNOTES %changelog +* Fri Oct 9 2009 Marcela Mašláňová - 2.6.29-5.0.20091009gitdaf49fd6 +- new official version isn't available but it's needed -> switch to git snapshots + * Thu Sep 24 2009 Marcela Mašláňová - 2.6.29-5 - create missing man pages diff --git a/iproute2-2.6.29-kernel.patch b/iproute2-2.6.29-kernel.patch new file mode 100644 index 0000000..df9125a --- /dev/null +++ b/iproute2-2.6.29-kernel.patch @@ -0,0 +1,11 @@ +diff -up iproute2-20091009/Makefile.kernel iproute2-20091009/Makefile +--- iproute2-20091009/Makefile.kernel 2009-09-21 10:26:11.000000000 +0200 ++++ iproute2-20091009/Makefile 2009-10-09 12:27:03.687382422 +0200 +@@ -6,6 +6,7 @@ CONFDIR=/etc/iproute2 + DOCDIR=/share/doc/iproute2 + MANDIR=/share/man + ARPDDIR=/var/lib/arpd ++KERNEL_INCLUDE=/usr/include + + # Path to db_185.h include + DBM_INCLUDE:=$(ROOTDIR)/usr/include diff --git a/iproute2-2.6.29-tc_modules.patch b/iproute2-2.6.29-tc_modules.patch index a77896f..9c7d0eb 100644 --- a/iproute2-2.6.29-tc_modules.patch +++ b/iproute2-2.6.29-tc_modules.patch @@ -1,9 +1,9 @@ -diff -up iproute2-2.6.29/Makefile.ipt iproute2-2.6.29/Makefile ---- iproute2-2.6.29/Makefile.ipt 2009-04-23 15:19:19.000000000 +0200 -+++ iproute2-2.6.29/Makefile 2009-04-23 15:27:19.802477954 +0200 -@@ -10,7 +10,7 @@ ARPDDIR=/var/lib/arpd +diff -up iproute2-20091009/Makefile.ipt iproute2-20091009/Makefile +--- iproute2-20091009/Makefile.ipt 2009-10-09 13:29:27.137385281 +0200 ++++ iproute2-20091009/Makefile 2009-10-09 13:32:14.251632048 +0200 +@@ -11,7 +11,7 @@ KERNEL_INCLUDE=/usr/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)\" -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\" diff --git a/iproute2-2.6.9-kernel.patch b/iproute2-2.6.9-kernel.patch deleted file mode 100644 index 94d6988..0000000 --- a/iproute2-2.6.9-kernel.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up iproute2-2.6.29/iproute2-2.6.29/Makefile.kernel iproute2-2.6.29/iproute2-2.6.29/Makefile ---- iproute2-2.6.29/Makefile.kernel 2008-07-25 22:46:07.000000000 +0200 -+++ iproute2-2.6.29/Makefile 2008-08-12 14:19:58.000000000 +0200 -@@ -3,6 +3,7 @@ SBINDIR=/sbin - CONFDIR=/etc/iproute2 - DOCDIR=/share/doc/iproute2 - MANDIR=/share/man -+KERNEL_INCLUDE=/usr/include - - # Path to db_185.h include - DBM_INCLUDE:=/usr/include diff --git a/man-pages.patch b/man-pages.patch index d8cb1a9..4525aec 100644 --- a/man-pages.patch +++ b/man-pages.patch @@ -71,3 +71,27 @@ diff -up /dev/null iproute2-2.6.29/man/man8/nstat.8 @@ -0,0 +1 @@ +.so man8/rtacct.8 \ 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, diff --git a/sources b/sources index 0d767ac..73a398b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a3ecfaa091289656fae786b027b44eda iproute2-2.6.29.tar.bz2 +129797c64d5f79474304142a4213604d iproute2-20091009.tar.bz2