[packages/iproute2.git] / iproute2-build.patch

diff -urNbB iproute2-2.6.14-051107.org/configure iproute2-2.6.14-051107/configure
--- iproute2-2.6.14-051107.org/configure	2005-01-18 00:26:46.000000000 +0100
+++ iproute2-2.6.14-051107/configure	2005-11-10 16:04:15.024922750 +0100
@@ -8,7 +8,7 @@
 echo "TC schedulers"
 
 echo -n " ATM	"
-cat >/tmp/atmtest.c <<EOF
+cat >atmtest.c <<EOF
 #include <atm.h>
 int main(int argc, char **argv) {
 	struct atm_qos qos;
@@ -16,7 +16,7 @@
 	return 0;
 }
 EOF
-gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 
+gcc -I$INCLUDE -o atmtest atmtest.c -latm >/dev/null 2>&1 
 if [ $? -eq 0 ]
 then
     echo "TC_CONFIG_ATM:=y" >>Config
@@ -24,4 +24,4 @@
 else
     echo no
 fi
-rm -f /tmp/atmtest.c /tmp/atmtest
+rm -f atmtest*
diff -urNbB iproute2-2.6.14-051107.org/ip/iptunnel.c iproute2-2.6.14-051107/ip/iptunnel.c
--- iproute2-2.6.14-051107.org/ip/iptunnel.c	2005-02-10 19:31:18.000000000 +0100
+++ iproute2-2.6.14-051107/ip/iptunnel.c	2005-11-10 16:04:15.024922750 +0100
@@ -16,6 +16,7 @@
  * Phil Karn <karn@ka9q.ampr.org>	990408:	"pmtudisc" flag
  */
 
+#include <asm/byteorder.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -urNbB iproute2-2.6.14-051107.org/Makefile iproute2-2.6.14-051107/Makefile
--- iproute2-2.6.14-051107.org/Makefile	2005-07-09 00:08:47.000000000 +0200
+++ iproute2-2.6.14-051107/Makefile	2005-11-10 16:04:15.024922750 +0100
@@ -10,7 +10,7 @@
 DEFINES= -DRESOLVE_HOSTNAMES
 
 #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
-LDLIBS=-lresolv
+LDLIBS=
 ADDLIB=
 
 #options for decnet
@@ -21,7 +21,7 @@
 
 CC = gcc
 HOSTCC = gcc
-CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
+CCOPTS = -D_GNU_SOURCE $(OPT) -Wstrict-prototypes -Wall
 CFLAGS = $(CCOPTS) -I../include $(DEFINES)
 YACCFLAGS = -d -t -v
 
diff -urNbB iproute2-2.6.14-051107.org/Makefile.orig iproute2-2.6.14-051107/Makefile.orig
--- iproute2-2.6.14-051107.org/Makefile.orig	1970-01-01 01:00:00.000000000 +0100
+++ iproute2-2.6.14-051107/Makefile.orig	2005-07-09 00:08:47.000000000 +0200
@@ -0,0 +1,72 @@
+DESTDIR=
+SBINDIR=/usr/sbin
+CONFDIR=/etc/iproute2
+DOCDIR=/usr/share/doc/iproute2
+MANDIR=/usr/share/man
+
+# Path to db_185.h include
+DBM_INCLUDE:=/usr/include
+
+DEFINES= -DRESOLVE_HOSTNAMES
+
+#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
+LDLIBS=-lresolv
+ADDLIB=
+
+#options for decnet
+ADDLIB+=dnet_ntop.o dnet_pton.o
+
+#options for ipx
+ADDLIB+=ipx_ntop.o ipx_pton.o
+
+CC = gcc
+HOSTCC = gcc
+CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
+CFLAGS = $(CCOPTS) -I../include $(DEFINES)
+YACCFLAGS = -d -t -v
+
+LDLIBS += -L../lib -lnetlink -lutil
+
+SUBDIRS=lib ip tc misc netem
+
+LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
+
+all: Config
+	@for i in $(SUBDIRS); \
+	do $(MAKE) $(MFLAGS) -C $$i; done
+
+Config:
+	sh configure $(KERNEL_INCLUDE)
+
+install: all
+	install -m 0755 -d $(DESTDIR)$(SBINDIR)
+	install -m 0755 -d $(DESTDIR)$(CONFDIR)
+	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) \
+		$(DESTDIR)$(DOCDIR)/examples
+	install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \
+		$(DESTDIR)$(DOCDIR)/examples/diffserv
+	@for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done
+	install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR)
+	install -m 0755 -d $(DESTDIR)$(MANDIR)/man8
+	install -m 0644 $(shell find man/man8 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man8
+	ln -sf tc-pbfifo.8  $(DESTDIR)$(MANDIR)/man8/tc-bfifo.8
+	ln -sf tc-pbfifo.8  $(DESTDIR)$(MANDIR)/man8/tc-pfifo.8
+	install -m 0755 -d $(DESTDIR)$(MANDIR)/man3
+	install -m 0644 $(shell find man/man3 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man3
+
+clean:
+	rm -f cscope.*
+	@for i in $(SUBDIRS) doc; \
+	do $(MAKE) $(MFLAGS) -C $$i clean; done
+
+clobber: clean
+	rm -f Config
+
+distclean: clobber
+
+cscope:
+	cscope -b -q -R -Iinclude -sip -slib -smisc -snetem -stc
+
+.EXPORT_ALL_VARIABLES:
diff -urNbB iproute2-2.6.14-051107.org/misc/ss.c iproute2-2.6.14-051107/misc/ss.c
--- iproute2-2.6.14-051107.org/misc/ss.c	2005-09-01 21:21:50.000000000 +0200
+++ iproute2-2.6.14-051107/misc/ss.c	2005-11-10 16:04:23.933479500 +0100
@@ -35,7 +35,6 @@
 
 #include <linux/inet_diag.h>
 #include <linux/tcp.h>
-#include <net/tcp_states.h>
 
 int resolve_hosts = 0;
 int resolve_services = 1;
Commit	Line	Data
48238981 AM	1	diff -urNbB iproute2-2.6.14-051107.org/configure iproute2-2.6.14-051107/configure
	2	--- iproute2-2.6.14-051107.org/configure 2005-01-18 00:26:46.000000000 +0100
	3	+++ iproute2-2.6.14-051107/configure 2005-11-10 16:04:15.024922750 +0100
0e5bb75f PS	4	@@ -8,7 +8,7 @@
	5	echo "TC schedulers"
	6
	7	echo -n " ATM "
	8	-cat >/tmp/atmtest.c <<EOF
	9	+cat >atmtest.c <<EOF
	10	#include <atm.h>
	11	int main(int argc, char **argv) {
	12	struct atm_qos qos;
	13	@@ -16,7 +16,7 @@
	14	return 0;
	15	}
	16	EOF
	17	-gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
	18	+gcc -I$INCLUDE -o atmtest atmtest.c -latm >/dev/null 2>&1
	19	if [ $? -eq 0 ]
	20	then
	21	echo "TC_CONFIG_ATM:=y" >>Config
	22	@@ -24,4 +24,4 @@
	23	else
	24	echo no
	25	fi
	26	-rm -f /tmp/atmtest.c /tmp/atmtest
	27	+rm -f atmtest*
48238981 AM	28	diff -urNbB iproute2-2.6.14-051107.org/ip/iptunnel.c iproute2-2.6.14-051107/ip/iptunnel.c
	29	--- iproute2-2.6.14-051107.org/ip/iptunnel.c 2005-02-10 19:31:18.000000000 +0100
	30	+++ iproute2-2.6.14-051107/ip/iptunnel.c 2005-11-10 16:04:15.024922750 +0100
	31	@@ -16,6 +16,7 @@
	32	* Phil Karn <karn@ka9q.ampr.org> 990408: "pmtudisc" flag
	33	*/
	34
	35	+#include <asm/byteorder.h>
	36	#include <stdio.h>
	37	#include <stdlib.h>
	38	#include <string.h>
	39	diff -urNbB iproute2-2.6.14-051107.org/Makefile iproute2-2.6.14-051107/Makefile
	40	--- iproute2-2.6.14-051107.org/Makefile 2005-07-09 00:08:47.000000000 +0200
	41	+++ iproute2-2.6.14-051107/Makefile 2005-11-10 16:04:15.024922750 +0100
	42	@@ -10,7 +10,7 @@
	43	DEFINES= -DRESOLVE_HOSTNAMES
	44
	45	#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
	46	-LDLIBS=-lresolv
	47	+LDLIBS=
	48	ADDLIB=
	49
	50	#options for decnet
	51	@@ -21,7 +21,7 @@
	52
	53	CC = gcc
	54	HOSTCC = gcc
	55	-CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
	56	+CCOPTS = -D_GNU_SOURCE $(OPT) -Wstrict-prototypes -Wall
	57	CFLAGS = $(CCOPTS) -I../include $(DEFINES)
	58	YACCFLAGS = -d -t -v
	59
	60	diff -urNbB iproute2-2.6.14-051107.org/Makefile.orig iproute2-2.6.14-051107/Makefile.orig
	61	--- iproute2-2.6.14-051107.org/Makefile.orig 1970-01-01 01:00:00.000000000 +0100
	62	+++ iproute2-2.6.14-051107/Makefile.orig 2005-07-09 00:08:47.000000000 +0200
	63	@@ -0,0 +1,72 @@
	64	+DESTDIR=
	65	+SBINDIR=/usr/sbin
	66	+CONFDIR=/etc/iproute2
	67	+DOCDIR=/usr/share/doc/iproute2
	68	+MANDIR=/usr/share/man
	69	+
	70	+# Path to db_185.h include
	71	+DBM_INCLUDE:=/usr/include
	72	+
	73	+DEFINES= -DRESOLVE_HOSTNAMES
	74	+
	75	+#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
	76	+LDLIBS=-lresolv
	77	+ADDLIB=
	78	+
	79	+#options for decnet
	80	+ADDLIB+=dnet_ntop.o dnet_pton.o
	81	+
	82	+#options for ipx
	83	+ADDLIB+=ipx_ntop.o ipx_pton.o
	84	+
	85	+CC = gcc
	86	+HOSTCC = gcc
	87	+CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
	88	+CFLAGS = $(CCOPTS) -I../include $(DEFINES)
	89	+YACCFLAGS = -d -t -v
	90	+
	91	+LDLIBS += -L../lib -lnetlink -lutil
92	+
93	+SUBDIRS=lib ip tc misc netem
94	+
95	+LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
96	+
97	+all: Config
98	+ @for i in $(SUBDIRS); \
99	+ do $(MAKE) $(MFLAGS) -C $$i; done
100	+
101	+Config:
102	+ sh configure $(KERNEL_INCLUDE)
103	+
104	+install: all
105	+ install -m 0755 -d $(DESTDIR)$(SBINDIR)
106	+ install -m 0755 -d $(DESTDIR)$(CONFDIR)
107	+ install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
108	+ install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv
109	+ install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1 -type f) \
110	+ $(DESTDIR)$(DOCDIR)/examples
111	+ install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \
112	+ $(DESTDIR)$(DOCDIR)/examples/diffserv
113	+ @for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done
114	+ install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR)
115	+ install -m 0755 -d $(DESTDIR)$(MANDIR)/man8
116	+ install -m 0644 $(shell find man/man8 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man8
117	+ ln -sf tc-pbfifo.8 $(DESTDIR)$(MANDIR)/man8/tc-bfifo.8
118	+ ln -sf tc-pbfifo.8 $(DESTDIR)$(MANDIR)/man8/tc-pfifo.8
119	+ install -m 0755 -d $(DESTDIR)$(MANDIR)/man3
120	+ install -m 0644 $(shell find man/man3 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man3
121	+
122	+clean:
123	+ rm -f cscope.*
124	+ @for i in $(SUBDIRS) doc; \
125	+ do $(MAKE) $(MFLAGS) -C $$i clean; done
126	+
127	+clobber: clean
128	+ rm -f Config
129	+
130	+distclean: clobber
131	+
132	+cscope:
133	+ cscope -b -q -R -Iinclude -sip -slib -smisc -snetem -stc
134	+
135	+.EXPORT_ALL_VARIABLES:
136	diff -urNbB iproute2-2.6.14-051107.org/misc/ss.c iproute2-2.6.14-051107/misc/ss.c
137	--- iproute2-2.6.14-051107.org/misc/ss.c 2005-09-01 21:21:50.000000000 +0200
138	+++ iproute2-2.6.14-051107/misc/ss.c 2005-11-10 16:04:23.933479500 +0100
139	@@ -35,7 +35,6 @@
140
141	#include <linux/inet_diag.h>
142	#include <linux/tcp.h>
143	-#include <net/tcp_states.h>
144
145	int resolve_hosts = 0;
146	int resolve_services = 1;