diff options
Diffstat (limited to 'package/iproute2/patches')
6 files changed, 90 insertions, 68 deletions
diff --git a/package/iproute2/patches/000-debian_patches_3.patch b/package/iproute2/patches/000-debian_patches_3.patch index c6b1bd6bb7..b57963c969 100644 --- a/package/iproute2/patches/000-debian_patches_3.patch +++ b/package/iproute2/patches/000-debian_patches_3.patch @@ -1,6 +1,7 @@ -diff -Nur iproute2-2.6.15-060110/doc/ip-cref.tex iproute2-2.6.15-060110-owrt/doc/ip-cref.tex ---- iproute2-2.6.15-060110/doc/ip-cref.tex 2004-04-15 22:56:59.000000000 +0200 -+++ iproute2-2.6.15-060110-owrt/doc/ip-cref.tex 2006-03-22 12:49:35.000000000 +0100 +Index: iproute2-2.6.15-060110/doc/ip-cref.tex +=================================================================== +--- iproute2-2.6.15-060110.orig/doc/ip-cref.tex 2007-06-04 13:22:33.437771968 +0200 ++++ iproute2-2.6.15-060110/doc/ip-cref.tex 2007-06-04 13:22:33.577750688 +0200 @@ -1322,6 +1322,19 @@ If it is not given, Linux uses the value selected with \verb|sysctl| variable \verb|net/ipv4/tcp_reordering|. @@ -31,9 +32,10 @@ diff -Nur iproute2-2.6.15-060110/doc/ip-cref.tex iproute2-2.6.15-060110-owrt/doc \end{thebibliography} -diff -Nur iproute2-2.6.15-060110/doc/Makefile iproute2-2.6.15-060110-owrt/doc/Makefile ---- iproute2-2.6.15-060110/doc/Makefile 2005-03-10 20:01:36.000000000 +0100 -+++ iproute2-2.6.15-060110-owrt/doc/Makefile 2006-03-22 12:49:35.000000000 +0100 +Index: iproute2-2.6.15-060110/doc/Makefile +=================================================================== +--- iproute2-2.6.15-060110.orig/doc/Makefile 2007-06-04 13:22:33.444770904 +0200 ++++ iproute2-2.6.15-060110/doc/Makefile 2007-06-04 13:22:33.577750688 +0200 @@ -14,6 +14,7 @@ PAGESPERPAGE=2 @@ -65,9 +67,10 @@ diff -Nur iproute2-2.6.15-060110/doc/Makefile iproute2-2.6.15-060110-owrt/doc/Ma clean: - rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html + rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html $(TXTFILES) -diff -Nur iproute2-2.6.15-060110/include/linux/pkt_sched.h iproute2-2.6.15-060110-owrt/include/linux/pkt_sched.h ---- iproute2-2.6.15-060110/include/linux/pkt_sched.h 2005-12-10 00:27:44.000000000 +0100 -+++ iproute2-2.6.15-060110-owrt/include/linux/pkt_sched.h 2006-03-22 12:49:35.000000000 +0100 +Index: iproute2-2.6.15-060110/include/linux/pkt_sched.h +=================================================================== +--- iproute2-2.6.15-060110.orig/include/linux/pkt_sched.h 2007-06-04 13:22:33.451769840 +0200 ++++ iproute2-2.6.15-060110/include/linux/pkt_sched.h 2007-06-04 13:22:33.578750536 +0200 @@ -1,3 +1,409 @@ +#if 0 +#ifndef __LINUX_PKT_SCHED_H @@ -595,9 +598,10 @@ diff -Nur iproute2-2.6.15-060110/include/linux/pkt_sched.h iproute2-2.6.15-06011 +}; + #endif -diff -Nur iproute2-2.6.15-060110/ip/iproute.c iproute2-2.6.15-060110-owrt/ip/iproute.c ---- iproute2-2.6.15-060110/ip/iproute.c 2005-10-13 00:49:50.000000000 +0200 -+++ iproute2-2.6.15-060110-owrt/ip/iproute.c 2006-03-22 12:49:35.000000000 +0100 +Index: iproute2-2.6.15-060110/ip/iproute.c +=================================================================== +--- iproute2-2.6.15-060110.orig/ip/iproute.c 2007-06-04 13:22:33.456769080 +0200 ++++ iproute2-2.6.15-060110/ip/iproute.c 2007-06-04 13:22:33.578750536 +0200 @@ -60,7 +60,7 @@ fprintf(stderr, "OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ]\n"); fprintf(stderr, " [ rtt NUMBER ] [ rttvar NUMBER ]\n"); @@ -647,9 +651,10 @@ diff -Nur iproute2-2.6.15-060110/ip/iproute.c iproute2-2.6.15-060110-owrt/ip/ipr } else if (strcmp(*argv, "rtt") == 0) { unsigned rtt; NEXT_ARG(); -diff -Nur iproute2-2.6.15-060110/ip/iptunnel.c iproute2-2.6.15-060110-owrt/ip/iptunnel.c ---- iproute2-2.6.15-060110/ip/iptunnel.c 2005-02-10 19:31:18.000000000 +0100 -+++ iproute2-2.6.15-060110-owrt/ip/iptunnel.c 2006-03-22 12:49:35.000000000 +0100 +Index: iproute2-2.6.15-060110/ip/iptunnel.c +=================================================================== +--- iproute2-2.6.15-060110.orig/ip/iptunnel.c 2007-06-04 13:22:33.463768016 +0200 ++++ iproute2-2.6.15-060110/ip/iptunnel.c 2007-06-04 13:22:33.579750384 +0200 @@ -225,7 +225,7 @@ NEXT_ARG(); p->i_flags |= GRE_KEY; @@ -659,9 +664,10 @@ diff -Nur iproute2-2.6.15-060110/ip/iptunnel.c iproute2-2.6.15-060110-owrt/ip/ip else { if (get_unsigned(&uval, *argv, 0)<0) { fprintf(stderr, "invalid value of \"ikey\"\n"); -diff -Nur iproute2-2.6.15-060110/Makefile iproute2-2.6.15-060110-owrt/Makefile ---- iproute2-2.6.15-060110/Makefile 2005-07-09 00:08:47.000000000 +0200 -+++ iproute2-2.6.15-060110-owrt/Makefile 2006-03-22 12:51:29.000000000 +0100 +Index: iproute2-2.6.15-060110/Makefile +=================================================================== +--- iproute2-2.6.15-060110.orig/Makefile 2007-06-04 13:22:33.468767256 +0200 ++++ iproute2-2.6.15-060110/Makefile 2007-06-04 13:22:33.579750384 +0200 @@ -32,7 +32,7 @@ LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a @@ -689,9 +695,10 @@ diff -Nur iproute2-2.6.15-060110/Makefile iproute2-2.6.15-060110-owrt/Makefile do $(MAKE) $(MFLAGS) -C $$i clean; done clobber: clean -diff -Nur iproute2-2.6.15-060110/man/man8/ip.8 iproute2-2.6.15-060110-owrt/man/man8/ip.8 ---- iproute2-2.6.15-060110/man/man8/ip.8 2006-01-03 20:25:29.000000000 +0100 -+++ iproute2-2.6.15-060110-owrt/man/man8/ip.8 2006-03-22 12:49:35.000000000 +0100 +Index: iproute2-2.6.15-060110/man/man8/ip.8 +=================================================================== +--- iproute2-2.6.15-060110.orig/man/man8/ip.8 2007-06-04 13:22:33.473766496 +0200 ++++ iproute2-2.6.15-060110/man/man8/ip.8 2007-06-04 13:22:33.580750232 +0200 @@ -1808,6 +1808,8 @@ .RB "IP Command reference " ip-cref.ps .br @@ -701,9 +708,10 @@ diff -Nur iproute2-2.6.15-060110/man/man8/ip.8 iproute2-2.6.15-060110-owrt/man/m .SH AUTHOR Original Manpage by Michail Litvak <mci@owl.openwall.com> -diff -Nur iproute2-2.6.15-060110/man/man8/tc.8 iproute2-2.6.15-060110-owrt/man/man8/tc.8 ---- iproute2-2.6.15-060110/man/man8/tc.8 2004-06-08 22:34:17.000000000 +0200 -+++ iproute2-2.6.15-060110-owrt/man/man8/tc.8 2006-03-22 12:49:35.000000000 +0100 +Index: iproute2-2.6.15-060110/man/man8/tc.8 +=================================================================== +--- iproute2-2.6.15-060110.orig/man/man8/tc.8 2007-06-04 13:22:33.481765280 +0200 ++++ iproute2-2.6.15-060110/man/man8/tc.8 2007-06-04 13:22:33.580750232 +0200 @@ -341,7 +341,7 @@ .BR tc-pfifo (8), .BR tc-bfifo (8), @@ -713,9 +721,10 @@ diff -Nur iproute2-2.6.15-060110/man/man8/tc.8 iproute2-2.6.15-060110-owrt/man/m .SH AUTHOR Manpage maintained by bert hubert (ahu@ds9a.nl) -diff -Nur iproute2-2.6.15-060110/misc/Makefile iproute2-2.6.15-060110-owrt/misc/Makefile ---- iproute2-2.6.15-060110/misc/Makefile 2005-06-23 19:39:57.000000000 +0200 -+++ iproute2-2.6.15-060110-owrt/misc/Makefile 2006-03-22 12:49:35.000000000 +0100 +Index: iproute2-2.6.15-060110/misc/Makefile +=================================================================== +--- iproute2-2.6.15-060110.orig/misc/Makefile 2007-06-04 13:22:33.486764520 +0200 ++++ iproute2-2.6.15-060110/misc/Makefile 2007-06-04 13:22:33.580750232 +0200 @@ -1,7 +1,8 @@ SSOBJ=ss.o ssfilter.o LNSTATOBJ=lnstat.o lnstat_util.o @@ -726,9 +735,10 @@ diff -Nur iproute2-2.6.15-060110/misc/Makefile iproute2-2.6.15-060110-owrt/misc/ include ../Config -diff -Nur iproute2-2.6.15-060110/misc/netbug iproute2-2.6.15-060110-owrt/misc/netbug ---- iproute2-2.6.15-060110/misc/netbug 2004-04-15 22:56:59.000000000 +0200 -+++ iproute2-2.6.15-060110-owrt/misc/netbug 2006-03-22 12:49:35.000000000 +0100 +Index: iproute2-2.6.15-060110/misc/netbug +=================================================================== +--- iproute2-2.6.15-060110.orig/misc/netbug 2007-06-04 13:22:33.492763608 +0200 ++++ iproute2-2.6.15-060110/misc/netbug 2007-06-04 13:22:33.580750232 +0200 @@ -1,23 +1,16 @@ #! /bin/bash @@ -771,9 +781,10 @@ diff -Nur iproute2-2.6.15-060110/misc/netbug iproute2-2.6.15-060110-owrt/misc/ne echo "Sending to <$mail>; subject is $netbug" -diff -Nur iproute2-2.6.15-060110/tc/Makefile iproute2-2.6.15-060110-owrt/tc/Makefile ---- iproute2-2.6.15-060110/tc/Makefile 2005-07-06 00:11:37.000000000 +0200 -+++ iproute2-2.6.15-060110-owrt/tc/Makefile 2006-03-22 12:49:35.000000000 +0100 +Index: iproute2-2.6.15-060110/tc/Makefile +=================================================================== +--- iproute2-2.6.15-060110.orig/tc/Makefile 2007-06-04 13:22:33.498762696 +0200 ++++ iproute2-2.6.15-060110/tc/Makefile 2007-06-04 13:22:33.581750080 +0200 @@ -11,6 +11,7 @@ TCMODULES += q_prio.o TCMODULES += q_tbf.o @@ -782,9 +793,10 @@ diff -Nur iproute2-2.6.15-060110/tc/Makefile iproute2-2.6.15-060110-owrt/tc/Make TCMODULES += f_rsvp.o TCMODULES += f_u32.o TCMODULES += f_route.o -diff -Nur iproute2-2.6.15-060110/tc/q_htb.c iproute2-2.6.15-060110-owrt/tc/q_htb.c ---- iproute2-2.6.15-060110/tc/q_htb.c 2005-01-18 23:11:58.000000000 +0100 -+++ iproute2-2.6.15-060110-owrt/tc/q_htb.c 2006-03-22 12:49:35.000000000 +0100 +Index: iproute2-2.6.15-060110/tc/q_htb.c +=================================================================== +--- iproute2-2.6.15-060110.orig/tc/q_htb.c 2007-06-04 13:22:33.503761936 +0200 ++++ iproute2-2.6.15-060110/tc/q_htb.c 2007-06-04 13:22:33.581750080 +0200 @@ -1,3 +1,311 @@ +#if 0 +/* @@ -1097,9 +1109,10 @@ diff -Nur iproute2-2.6.15-060110/tc/q_htb.c iproute2-2.6.15-060110-owrt/tc/q_htb /* * q_htb.c HTB. * -diff -Nur iproute2-2.6.15-060110/tc/q_wrr.c iproute2-2.6.15-060110-owrt/tc/q_wrr.c ---- iproute2-2.6.15-060110/tc/q_wrr.c 1970-01-01 01:00:00.000000000 +0100 -+++ iproute2-2.6.15-060110-owrt/tc/q_wrr.c 2006-03-22 12:49:35.000000000 +0100 +Index: iproute2-2.6.15-060110/tc/q_wrr.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ iproute2-2.6.15-060110/tc/q_wrr.c 2007-06-04 13:22:33.582749928 +0200 @@ -0,0 +1,322 @@ +#include <stdio.h> +#include <stdlib.h> diff --git a/package/iproute2/patches/001-iproute2-2.6.11_Config.patch b/package/iproute2/patches/001-iproute2-2.6.11_Config.patch index c1491f455f..ea977c19f1 100644 --- a/package/iproute2/patches/001-iproute2-2.6.11_Config.patch +++ b/package/iproute2/patches/001-iproute2-2.6.11_Config.patch @@ -1,6 +1,7 @@ -diff -ruN iproute2-2.6.9-old/Config iproute2-2.6.9-new/Config ---- iproute2-2.6.9-old/Config 1970-01-01 01:00:00.000000000 +0100 -+++ iproute2-2.6.9-new/Config 2005-03-22 23:56:56.000000000 +0100 +Index: iproute2-2.6.15-060110/Config +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ iproute2-2.6.15-060110/Config 2007-06-04 13:22:33.920698552 +0200 @@ -0,0 +1,4 @@ +# Fixed config to disable ATM support even if present on host system +TC_CONFIG_ATM:=n diff --git a/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch b/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch index 34eaeb0553..fd7b22b437 100644 --- a/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch +++ b/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch @@ -1,6 +1,7 @@ -diff -Nur iproute2-2.6.11-050330/ip/ipxfrm.c iproute2-2.6.11-050330.new/ip/ipxfrm.c ---- iproute2-2.6.11-050330/ip/ipxfrm.c 2005-04-01 21:58:11.000000000 +0200 -+++ iproute2-2.6.11-050330.new/ip/ipxfrm.c 2005-05-27 12:27:44.000000000 +0200 +Index: iproute2-2.6.15-060110/ip/ipxfrm.c +=================================================================== +--- iproute2-2.6.15-060110.orig/ip/ipxfrm.c 2007-06-04 13:22:33.399777744 +0200 ++++ iproute2-2.6.15-060110/ip/ipxfrm.c 2007-06-04 13:22:34.104670584 +0200 @@ -444,7 +444,6 @@ switch (sel->proto) { case IPPROTO_TCP: diff --git a/package/iproute2/patches/003-iproute2-htb_overhead.patch b/package/iproute2/patches/003-iproute2-htb_overhead.patch index 77ab983835..5b1bdb8d86 100644 --- a/package/iproute2/patches/003-iproute2-htb_overhead.patch +++ b/package/iproute2/patches/003-iproute2-htb_overhead.patch @@ -1,6 +1,8 @@ ---- iproute2-2.6.11-050330.new/tc/q_htb.c Sun May 12 22:18:27 2002 -+++ iproute2-2.6.11-050330.new/tc/q_htb.c Sat Oct 18 00:05:18 2003 -@@ -34,10 +34,14 @@ +Index: iproute2-2.6.15-060110/tc/q_htb.c +=================================================================== +--- iproute2-2.6.15-060110.orig/tc/q_htb.c 2007-06-04 13:22:33.581750080 +0200 ++++ iproute2-2.6.15-060110/tc/q_htb.c 2007-06-04 13:22:34.291642160 +0200 +@@ -35,10 +35,14 @@ " default minor id of class to which unclassified packets are sent {0}\n" " r2q DRR quantums are computed as rate in Bps/r2q {10}\n" " debug string of 16 numbers each 0-3 {0}\n\n" @@ -16,7 +18,7 @@ " ceil definite upper class rate (no borrows) {rate}\n" " cburst burst but for ceil {computed}\n" " mtu max packet size we create rate map for {1600}\n" -@@ -102,7 +106,9 @@ +@@ -103,7 +107,9 @@ struct tc_htb_opt opt; __u32 rtab[256],ctab[256]; unsigned buffer=0,cbuffer=0; @@ -27,7 +29,7 @@ struct rtattr *tail; memset(&opt, 0, sizeof(opt)); mtu = 1600; /* eth packet len */ -@@ -119,6 +125,16 @@ +@@ -120,6 +126,16 @@ if (get_u32(&mtu, *argv, 10)) { explain1("mtu"); return -1; } @@ -44,7 +46,7 @@ } else if (matches(*argv, "quantum") == 0) { NEXT_ARG(); if (get_u32(&opt.quantum, *argv, 10)) { -@@ -190,14 +206,18 @@ +@@ -191,14 +207,18 @@ if (!buffer) buffer = opt.rate.rate / HZ + mtu; if (!cbuffer) cbuffer = opt.ceil.rate / HZ + mtu; @@ -65,7 +67,7 @@ fprintf(stderr, "htb: failed to calculate ceil rate table.\n"); return -1; } -@@ -221,6 +241,7 @@ +@@ -222,6 +242,7 @@ double buffer,cbuffer; SPRINT_BUF(b1); SPRINT_BUF(b2); @@ -73,7 +75,7 @@ if (opt == NULL) return 0; -@@ -243,10 +264,16 @@ +@@ -244,10 +265,16 @@ fprintf(f, "ceil %s ", sprint_rate(hopt->ceil.rate, b1)); cbuffer = ((double)hopt->ceil.rate*tc_core_tick2usec(hopt->cbuffer))/1000000; if (show_details) { diff --git a/package/iproute2/patches/004-darwin_fixes.patch b/package/iproute2/patches/004-darwin_fixes.patch index 775705c9a4..bb2ca3fd19 100644 --- a/package/iproute2/patches/004-darwin_fixes.patch +++ b/package/iproute2/patches/004-darwin_fixes.patch @@ -1,6 +1,7 @@ -diff -urN iproute2-2.6.15-060110/netem/maketable.c iproute2-2.6.15-060110.new/netem/maketable.c ---- iproute2-2.6.15-060110/netem/maketable.c 2005-02-09 23:05:41.000000000 +0100 -+++ iproute2-2.6.15-060110.new/netem/maketable.c 2007-04-08 22:40:21.000000000 +0200 +Index: iproute2-2.6.15-060110/netem/maketable.c +=================================================================== +--- iproute2-2.6.15-060110.orig/netem/maketable.c 2007-06-04 13:22:33.339786864 +0200 ++++ iproute2-2.6.15-060110/netem/maketable.c 2007-06-04 13:22:34.476614040 +0200 @@ -10,7 +10,9 @@ #include <stdio.h> #include <stdlib.h> @@ -11,9 +12,10 @@ diff -urN iproute2-2.6.15-060110/netem/maketable.c iproute2-2.6.15-060110.new/ne #include <string.h> #include <sys/types.h> #include <sys/stat.h> -diff -urN iproute2-2.6.15-060110/netem/normal.c iproute2-2.6.15-060110.new/netem/normal.c ---- iproute2-2.6.15-060110/netem/normal.c 2005-03-30 20:11:49.000000000 +0200 -+++ iproute2-2.6.15-060110.new/netem/normal.c 2007-04-08 22:47:26.000000000 +0200 +Index: iproute2-2.6.15-060110/netem/normal.c +=================================================================== +--- iproute2-2.6.15-060110.orig/netem/normal.c 2007-06-04 13:22:33.344786104 +0200 ++++ iproute2-2.6.15-060110/netem/normal.c 2007-06-04 13:22:34.476614040 +0200 @@ -8,8 +8,12 @@ #include <string.h> #include <limits.h> @@ -27,9 +29,10 @@ diff -urN iproute2-2.6.15-060110/netem/normal.c iproute2-2.6.15-060110.new/netem #define TABLESIZE 16384 #define TABLEFACTOR NETEM_DIST_SCALE -diff -urN iproute2-2.6.15-060110/netem/pareto.c iproute2-2.6.15-060110.new/netem/pareto.c ---- iproute2-2.6.15-060110/netem/pareto.c 2005-02-09 23:05:41.000000000 +0100 -+++ iproute2-2.6.15-060110.new/netem/pareto.c 2007-04-08 22:48:36.000000000 +0200 +Index: iproute2-2.6.15-060110/netem/pareto.c +=================================================================== +--- iproute2-2.6.15-060110.orig/netem/pareto.c 2007-06-04 13:22:33.349785344 +0200 ++++ iproute2-2.6.15-060110/netem/pareto.c 2007-06-04 13:22:34.476614040 +0200 @@ -7,8 +7,12 @@ #include <math.h> #include <limits.h> @@ -43,9 +46,10 @@ diff -urN iproute2-2.6.15-060110/netem/pareto.c iproute2-2.6.15-060110.new/netem static const double a=3.0; #define TABLESIZE 16384 -diff -urN iproute2-2.6.15-060110/netem/paretonormal.c iproute2-2.6.15-060110.new/netem/paretonormal.c ---- iproute2-2.6.15-060110/netem/paretonormal.c 2005-08-08 22:24:41.000000000 +0200 -+++ iproute2-2.6.15-060110.new/netem/paretonormal.c 2007-04-08 22:49:56.000000000 +0200 +Index: iproute2-2.6.15-060110/netem/paretonormal.c +=================================================================== +--- iproute2-2.6.15-060110.orig/netem/paretonormal.c 2007-06-04 13:22:33.356784280 +0200 ++++ iproute2-2.6.15-060110/netem/paretonormal.c 2007-06-04 13:22:34.476614040 +0200 @@ -15,10 +15,13 @@ #include <string.h> #include <math.h> diff --git a/package/iproute2/patches/005-flex-generated.patch b/package/iproute2/patches/005-flex-generated.patch index fa5f571d20..800c832748 100644 --- a/package/iproute2/patches/005-flex-generated.patch +++ b/package/iproute2/patches/005-flex-generated.patch @@ -1,6 +1,7 @@ -diff -urN iproute2-2.6.15-060110.old/tc/emp_ematch.lex.c iproute2-2.6.15-060110/tc/emp_ematch.lex.c ---- iproute2-2.6.15-060110.old/tc/emp_ematch.lex.c 1970-01-01 01:00:00.000000000 +0100 -+++ iproute2-2.6.15-060110/tc/emp_ematch.lex.c 2007-05-07 16:27:53.000000000 +0200 +Index: iproute2-2.6.15-060110/tc/emp_ematch.lex.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ iproute2-2.6.15-060110/tc/emp_ematch.lex.c 2007-06-04 13:22:34.695580752 +0200 @@ -0,0 +1,1764 @@ +#define yy_create_buffer ematch__create_buffer +#define yy_delete_buffer ematch__delete_buffer |