hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade to iproute2-2.6.15-060110

Browse Source 
SVN-Revision: 3449
master
Imre Kaloz 19 years ago
parent 25cafbfd9c
commit 0d7f22b39d
2 changed files with 51 additions and 51 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      openwrt/package/iproute2/Makefile
  2. 98
      openwrt/package/iproute2/patches/000-debian_patches_3.patch

4
openwrt/package/iproute2/Makefile
Unescape View File

@ -3,9 +3,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=iproute2 PKG_NAME:=iproute2
PKG_VERSION:=2.6.11-050330 PKG_VERSION:=2.6.15-060110
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=e705f26b5ae93e0332e46a3ff15d934 PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5
PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/ PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

98
openwrt/package/iproute2/patches/000-debian_patches_3.patch
Unescape View File

@ -1,6 +1,6 @@
diff -Nur iproute2-2.6.11-050330/doc/ip-cref.tex iproute2-2.6.11-050330.new/doc/ip-cref.tex diff -Nur iproute2-2.6.15-060110/doc/ip-cref.tex iproute2-2.6.15-060110-owrt/doc/ip-cref.tex
--- iproute2-2.6.11-050330/doc/ip-cref.tex 2005-04-01 21:58:11.000000000 +0200 --- iproute2-2.6.15-060110/doc/ip-cref.tex 2004-04-15 22:56:59.000000000 +0200
+++ iproute2-2.6.11-050330.new/doc/ip-cref.tex 2005-05-27 12:13:08.000000000 +0200 +++ iproute2-2.6.15-060110-owrt/doc/ip-cref.tex 2006-03-22 12:49:35.000000000 +0100
@@ -1322,6 +1322,19 @@ @@ -1322,6 +1322,19 @@
If it is not given, Linux uses the value selected with \verb|sysctl| If it is not given, Linux uses the value selected with \verb|sysctl|
variable \verb|net/ipv4/tcp_reordering|. variable \verb|net/ipv4/tcp_reordering|.
@ -31,9 +31,9 @@ diff -Nur iproute2-2.6.11-050330/doc/ip-cref.tex iproute2-2.6.11-050330.new/doc/
\end{thebibliography} \end{thebibliography}
diff -Nur iproute2-2.6.11-050330/doc/Makefile iproute2-2.6.11-050330.new/doc/Makefile diff -Nur iproute2-2.6.15-060110/doc/Makefile iproute2-2.6.15-060110-owrt/doc/Makefile
--- iproute2-2.6.11-050330/doc/Makefile 2005-04-01 21:58:11.000000000 +0200 --- iproute2-2.6.15-060110/doc/Makefile 2005-03-10 20:01:36.000000000 +0100
+++ iproute2-2.6.11-050330.new/doc/Makefile 2005-05-27 12:12:31.000000000 +0200 +++ iproute2-2.6.15-060110-owrt/doc/Makefile 2006-03-22 12:49:35.000000000 +0100
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
PAGESPERPAGE=2 PAGESPERPAGE=2
@ -65,9 +65,9 @@ diff -Nur iproute2-2.6.11-050330/doc/Makefile iproute2-2.6.11-050330.new/doc/Mak
clean: clean:
- rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html - rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html
+ rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html $(TXTFILES) + rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html $(TXTFILES)
diff -Nur iproute2-2.6.11-050330/include/linux/pkt_sched.h iproute2-2.6.11-050330.new/include/linux/pkt_sched.h 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.11-050330/include/linux/pkt_sched.h 2005-04-01 21:58:11.000000000 +0200 --- iproute2-2.6.15-060110/include/linux/pkt_sched.h 2005-12-10 00:27:44.000000000 +0100
+++ iproute2-2.6.11-050330.new/include/linux/pkt_sched.h 2005-05-27 12:13:08.000000000 +0200 +++ iproute2-2.6.15-060110-owrt/include/linux/pkt_sched.h 2006-03-22 12:49:35.000000000 +0100
@@ -1,3 +1,409 @@ @@ -1,3 +1,409 @@
+#if 0 +#if 0
+#ifndef __LINUX_PKT_SCHED_H +#ifndef __LINUX_PKT_SCHED_H
@ -478,7 +478,7 @@ diff -Nur iproute2-2.6.11-050330/include/linux/pkt_sched.h iproute2-2.6.11-05033
#ifndef __LINUX_PKT_SCHED_H #ifndef __LINUX_PKT_SCHED_H
#define __LINUX_PKT_SCHED_H #define __LINUX_PKT_SCHED_H
@@ -451,4 +857,116 @@ @@ -466,4 +872,116 @@
#define NETEM_DIST_SCALE 8192 #define NETEM_DIST_SCALE 8192
@ -595,10 +595,10 @@ diff -Nur iproute2-2.6.11-050330/include/linux/pkt_sched.h iproute2-2.6.11-05033
+}; +};
+ +
#endif #endif
diff -Nur iproute2-2.6.11-050330/ip/iproute.c iproute2-2.6.11-050330.new/ip/iproute.c diff -Nur iproute2-2.6.15-060110/ip/iproute.c iproute2-2.6.15-060110-owrt/ip/iproute.c
--- iproute2-2.6.11-050330/ip/iproute.c 2005-04-01 21:58:11.000000000 +0200 --- iproute2-2.6.15-060110/ip/iproute.c 2005-10-13 00:49:50.000000000 +0200
+++ iproute2-2.6.11-050330.new/ip/iproute.c 2005-05-27 12:22:30.000000000 +0200 +++ iproute2-2.6.15-060110-owrt/ip/iproute.c 2006-03-22 12:49:35.000000000 +0100
@@ -58,7 +58,7 @@ @@ -60,7 +60,7 @@
fprintf(stderr, "OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ]\n"); fprintf(stderr, "OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ]\n");
fprintf(stderr, " [ rtt NUMBER ] [ rttvar NUMBER ]\n"); fprintf(stderr, " [ rtt NUMBER ] [ rttvar NUMBER ]\n");
fprintf(stderr, " [ window NUMBER] [ cwnd NUMBER ] [ ssthresh NUMBER ]\n"); fprintf(stderr, " [ window NUMBER] [ cwnd NUMBER ] [ ssthresh NUMBER ]\n");
@ -607,7 +607,7 @@ diff -Nur iproute2-2.6.11-050330/ip/iproute.c iproute2-2.6.11-050330.new/ip/ipro
fprintf(stderr, "TYPE := [ unicast | local | broadcast | multicast | throw |\n"); fprintf(stderr, "TYPE := [ unicast | local | broadcast | multicast | throw |\n");
fprintf(stderr, " unreachable | prohibit | blackhole | nat ]\n"); fprintf(stderr, " unreachable | prohibit | blackhole | nat ]\n");
fprintf(stderr, "TABLE_ID := [ local | main | default | all | NUMBER ]\n"); fprintf(stderr, "TABLE_ID := [ local | main | default | all | NUMBER ]\n");
@@ -478,6 +478,8 @@ @@ -497,6 +497,8 @@
"cwnd", "cwnd",
"advmss", "advmss",
"reordering", "reordering",
@ -616,7 +616,7 @@ diff -Nur iproute2-2.6.11-050330/ip/iproute.c iproute2-2.6.11-050330.new/ip/ipro
}; };
static int hz; static int hz;
if (mxrta[i] == NULL) if (mxrta[i] == NULL)
@@ -746,6 +748,30 @@ @@ -764,6 +766,30 @@
invarg("\"reordering\" value is invalid\n", *argv); invarg("\"reordering\" value is invalid\n", *argv);
rta_addattr32(mxrta, sizeof(mxbuf), RTAX_REORDERING, reord); rta_addattr32(mxrta, sizeof(mxbuf), RTAX_REORDERING, reord);
#endif #endif
@ -647,9 +647,9 @@ diff -Nur iproute2-2.6.11-050330/ip/iproute.c iproute2-2.6.11-050330.new/ip/ipro
} else if (strcmp(*argv, "rtt") == 0) { } else if (strcmp(*argv, "rtt") == 0) {
unsigned rtt; unsigned rtt;
NEXT_ARG(); NEXT_ARG();
diff -Nur iproute2-2.6.11-050330/ip/iptunnel.c iproute2-2.6.11-050330.new/ip/iptunnel.c diff -Nur iproute2-2.6.15-060110/ip/iptunnel.c iproute2-2.6.15-060110-owrt/ip/iptunnel.c
--- iproute2-2.6.11-050330/ip/iptunnel.c 2005-04-01 21:58:11.000000000 +0200 --- iproute2-2.6.15-060110/ip/iptunnel.c 2005-02-10 19:31:18.000000000 +0100
+++ iproute2-2.6.11-050330.new/ip/iptunnel.c 2005-05-27 12:13:08.000000000 +0200 +++ iproute2-2.6.15-060110-owrt/ip/iptunnel.c 2006-03-22 12:49:35.000000000 +0100
@@ -225,7 +225,7 @@ @@ -225,7 +225,7 @@
NEXT_ARG(); NEXT_ARG();
p->i_flags |= GRE_KEY; p->i_flags |= GRE_KEY;
@ -659,10 +659,10 @@ diff -Nur iproute2-2.6.11-050330/ip/iptunnel.c iproute2-2.6.11-050330.new/ip/ipt
else { else {
if (get_unsigned(&uval, *argv, 0)<0) { if (get_unsigned(&uval, *argv, 0)<0) {
fprintf(stderr, "invalid value of \"ikey\"\n"); fprintf(stderr, "invalid value of \"ikey\"\n");
diff -Nur iproute2-2.6.11-050330/Makefile iproute2-2.6.11-050330.new/Makefile diff -Nur iproute2-2.6.15-060110/Makefile iproute2-2.6.15-060110-owrt/Makefile
--- iproute2-2.6.11-050330/Makefile 2005-04-01 21:58:11.000000000 +0200 --- iproute2-2.6.15-060110/Makefile 2005-07-09 00:08:47.000000000 +0200
+++ iproute2-2.6.11-050330.new/Makefile 2005-05-27 12:16:13.000000000 +0200 +++ iproute2-2.6.15-060110-owrt/Makefile 2006-03-22 12:51:29.000000000 +0100
@@ -31,7 +31,7 @@ @@ -32,7 +32,7 @@
LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
all: Config all: Config
@ -671,7 +671,7 @@ diff -Nur iproute2-2.6.11-050330/Makefile iproute2-2.6.11-050330.new/Makefile
do $(MAKE) $(MFLAGS) -C $$i; done do $(MAKE) $(MFLAGS) -C $$i; done
Config: Config:
@@ -46,7 +46,7 @@ @@ -47,7 +47,7 @@
$(DESTDIR)$(DOCDIR)/examples $(DESTDIR)$(DOCDIR)/examples
install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \ install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \
$(DESTDIR)$(DOCDIR)/examples/diffserv $(DESTDIR)$(DOCDIR)/examples/diffserv
@ -680,19 +680,19 @@ diff -Nur iproute2-2.6.11-050330/Makefile iproute2-2.6.11-050330.new/Makefile
install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR) install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR)
install -m 0755 -d $(DESTDIR)$(MANDIR)/man8 install -m 0755 -d $(DESTDIR)$(MANDIR)/man8
install -m 0644 $(shell find man/man8 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man8 install -m 0644 $(shell find man/man8 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man8
@@ -56,7 +56,7 @@ @@ -58,7 +58,7 @@
install -m 0644 $(shell find man/man3 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man3
clean: clean:
rm -f cscope.*
- @for i in $(SUBDIRS) doc; \ - @for i in $(SUBDIRS) doc; \
+ @set -e; for i in $(SUBDIRS) doc; \ + @set -e; for i in $(SUBDIRS) doc; \
do $(MAKE) $(MFLAGS) -C $$i clean; done do $(MAKE) $(MFLAGS) -C $$i clean; done
clobber: clean clobber: clean
diff -Nur iproute2-2.6.11-050330/man/man8/ip.8 iproute2-2.6.11-050330.new/man/man8/ip.8 diff -Nur iproute2-2.6.15-060110/man/man8/ip.8 iproute2-2.6.15-060110-owrt/man/man8/ip.8
--- iproute2-2.6.11-050330/man/man8/ip.8 2005-04-01 21:58:11.000000000 +0200 --- iproute2-2.6.15-060110/man/man8/ip.8 2006-01-03 20:25:29.000000000 +0100
+++ iproute2-2.6.11-050330.new/man/man8/ip.8 2005-05-27 12:13:08.000000000 +0200 +++ iproute2-2.6.15-060110-owrt/man/man8/ip.8 2006-03-22 12:49:35.000000000 +0100
@@ -1805,6 +1805,8 @@ @@ -1808,6 +1808,8 @@
.RB "IP Command reference " ip-cref.ps .RB "IP Command reference " ip-cref.ps
.br .br
.RB "IP tunnels " ip-cref.ps .RB "IP tunnels " ip-cref.ps
@ -701,9 +701,9 @@ diff -Nur iproute2-2.6.11-050330/man/man8/ip.8 iproute2-2.6.11-050330.new/man/ma
.SH AUTHOR .SH AUTHOR
Original Manpage by Michail Litvak <mci@owl.openwall.com> Original Manpage by Michail Litvak <mci@owl.openwall.com>
diff -Nur iproute2-2.6.11-050330/man/man8/tc.8 iproute2-2.6.11-050330.new/man/man8/tc.8 diff -Nur iproute2-2.6.15-060110/man/man8/tc.8 iproute2-2.6.15-060110-owrt/man/man8/tc.8
--- iproute2-2.6.11-050330/man/man8/tc.8 2005-04-01 21:58:11.000000000 +0200 --- iproute2-2.6.15-060110/man/man8/tc.8 2004-06-08 22:34:17.000000000 +0200
+++ iproute2-2.6.11-050330.new/man/man8/tc.8 2005-05-27 12:13:08.000000000 +0200 +++ iproute2-2.6.15-060110-owrt/man/man8/tc.8 2006-03-22 12:49:35.000000000 +0100
@@ -341,7 +341,7 @@ @@ -341,7 +341,7 @@
.BR tc-pfifo (8), .BR tc-pfifo (8),
.BR tc-bfifo (8), .BR tc-bfifo (8),
@ -713,9 +713,9 @@ diff -Nur iproute2-2.6.11-050330/man/man8/tc.8 iproute2-2.6.11-050330.new/man/ma
.SH AUTHOR .SH AUTHOR
Manpage maintained by bert hubert (ahu@ds9a.nl) Manpage maintained by bert hubert (ahu@ds9a.nl)
diff -Nur iproute2-2.6.11-050330/misc/Makefile iproute2-2.6.11-050330.new/misc/Makefile diff -Nur iproute2-2.6.15-060110/misc/Makefile iproute2-2.6.15-060110-owrt/misc/Makefile
--- iproute2-2.6.11-050330/misc/Makefile 2005-04-01 21:58:11.000000000 +0200 --- iproute2-2.6.15-060110/misc/Makefile 2005-06-23 19:39:57.000000000 +0200
+++ iproute2-2.6.11-050330.new/misc/Makefile 2005-05-27 12:13:08.000000000 +0200 +++ iproute2-2.6.15-060110-owrt/misc/Makefile 2006-03-22 12:49:35.000000000 +0100
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
SSOBJ=ss.o ssfilter.o SSOBJ=ss.o ssfilter.o
LNSTATOBJ=lnstat.o lnstat_util.o LNSTATOBJ=lnstat.o lnstat_util.o
@ -726,9 +726,9 @@ diff -Nur iproute2-2.6.11-050330/misc/Makefile iproute2-2.6.11-050330.new/misc/M
include ../Config include ../Config
diff -Nur iproute2-2.6.11-050330/misc/netbug iproute2-2.6.11-050330.new/misc/netbug diff -Nur iproute2-2.6.15-060110/misc/netbug iproute2-2.6.15-060110-owrt/misc/netbug
--- iproute2-2.6.11-050330/misc/netbug 2005-04-01 21:58:11.000000000 +0200 --- iproute2-2.6.15-060110/misc/netbug 2004-04-15 22:56:59.000000000 +0200
+++ iproute2-2.6.11-050330.new/misc/netbug 2005-05-27 12:13:08.000000000 +0200 +++ iproute2-2.6.15-060110-owrt/misc/netbug 2006-03-22 12:49:35.000000000 +0100
@@ -1,23 +1,16 @@ @@ -1,23 +1,16 @@
#! /bin/bash #! /bin/bash
@ -771,10 +771,10 @@ diff -Nur iproute2-2.6.11-050330/misc/netbug iproute2-2.6.11-050330.new/misc/net
echo "Sending to <$mail>; subject is $netbug" echo "Sending to <$mail>; subject is $netbug"
diff -Nur iproute2-2.6.11-050330/tc/Makefile iproute2-2.6.11-050330.new/tc/Makefile diff -Nur iproute2-2.6.15-060110/tc/Makefile iproute2-2.6.15-060110-owrt/tc/Makefile
--- iproute2-2.6.11-050330/tc/Makefile 2005-04-01 21:58:11.000000000 +0200 --- iproute2-2.6.15-060110/tc/Makefile 2005-07-06 00:11:37.000000000 +0200
+++ iproute2-2.6.11-050330.new/tc/Makefile 2005-05-27 12:13:08.000000000 +0200 +++ iproute2-2.6.15-060110-owrt/tc/Makefile 2006-03-22 12:49:35.000000000 +0100
@@ -10,6 +10,7 @@ @@ -11,6 +11,7 @@
TCMODULES += q_prio.o TCMODULES += q_prio.o
TCMODULES += q_tbf.o TCMODULES += q_tbf.o
TCMODULES += q_cbq.o TCMODULES += q_cbq.o
@ -782,9 +782,9 @@ diff -Nur iproute2-2.6.11-050330/tc/Makefile iproute2-2.6.11-050330.new/tc/Makef
TCMODULES += f_rsvp.o TCMODULES += f_rsvp.o
TCMODULES += f_u32.o TCMODULES += f_u32.o
TCMODULES += f_route.o TCMODULES += f_route.o
diff -Nur iproute2-2.6.11-050330/tc/q_htb.c iproute2-2.6.11-050330.new/tc/q_htb.c diff -Nur iproute2-2.6.15-060110/tc/q_htb.c iproute2-2.6.15-060110-owrt/tc/q_htb.c
--- iproute2-2.6.11-050330/tc/q_htb.c 2005-04-01 21:58:11.000000000 +0200 --- iproute2-2.6.15-060110/tc/q_htb.c 2005-01-18 23:11:58.000000000 +0100
+++ iproute2-2.6.11-050330.new/tc/q_htb.c 2005-05-27 12:13:08.000000000 +0200 +++ iproute2-2.6.15-060110-owrt/tc/q_htb.c 2006-03-22 12:49:35.000000000 +0100
@@ -1,3 +1,311 @@ @@ -1,3 +1,311 @@
+#if 0 +#if 0
+/* +/*
@ -1097,9 +1097,9 @@ diff -Nur iproute2-2.6.11-050330/tc/q_htb.c iproute2-2.6.11-050330.new/tc/q_htb.
/* /*
* q_htb.c HTB. * q_htb.c HTB.
* *
diff -Nur iproute2-2.6.11-050330/tc/q_wrr.c iproute2-2.6.11-050330.new/tc/q_wrr.c diff -Nur iproute2-2.6.15-060110/tc/q_wrr.c iproute2-2.6.15-060110-owrt/tc/q_wrr.c
--- iproute2-2.6.11-050330/tc/q_wrr.c 1970-01-01 01:00:00.000000000 +0100 --- iproute2-2.6.15-060110/tc/q_wrr.c 1970-01-01 01:00:00.000000000 +0100
+++ iproute2-2.6.11-050330.new/tc/q_wrr.c 2005-05-27 12:13:08.000000000 +0200 +++ iproute2-2.6.15-060110-owrt/tc/q_wrr.c 2006-03-22 12:49:35.000000000 +0100
@@ -0,0 +1,322 @@ @@ -0,0 +1,322 @@
+#include <stdio.h> +#include <stdio.h>
+#include <stdlib.h> +#include <stdlib.h>

Write Preview
Loading…
Cancel
Save