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

diff -urN iproute2.orig/Makefile iproute2/Makefile
--- iproute2.orig/Makefile	2002-01-15 23:30:32.000000000 +0000
+++ iproute2/Makefile	2004-05-01 15:46:50.000000000 +0000
@@ -4,7 +4,5 @@
 CONFDIR=/etc/iproute2
 DOCDIR=/usr/doc/iproute2
 
-KERNEL_INCLUDE=/usr/src/linux/include
-LIBC_INCLUDE=/usr/include
 
 DEFINES= -DRESOLVE_HOSTNAMES
@@ -23,19 +22,11 @@
 #options for ipx
 ADDLIB+=ipx_ntop.o ipx_pton.o
 
-ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h))
-  ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h))
-    GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
-  endif
-endif
-ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
-  GLIBCFIX=-I../include-glibc -I/usr/include/db3 -include ../include-glibc/glibc-bugs.h
-endif
 
 
 CC = gcc
 CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
-CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)
+CFLAGS = $(CCOPTS) -I../include $(DEFINES)
 
 LDLIBS += -L../lib -lnetlink -lutil
 
@@ -43,19 +34,11 @@
 
 LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
 
-all: check-kernel
+all:
 	@set -e; \
 	for i in $(SUBDIRS); \
 	do $(MAKE) -C $$i; done
 
-check-kernel:
-ifeq ($(KERNEL_INCLUDE),)
-	@echo "Please, set correct KERNEL_INCLUDE"; false
-else
-	@set -e; \
-	if [ ! -r $(KERNEL_INCLUDE)/linux/autoconf.h ]; then \
-		echo "Please, compile the kernel first"; false; fi
-endif
 
 install: all
 	install -m 0755 -d $(DESTDIR)$(SBINDIR)
diff -urN iproute2.orig/include/rt_names.h iproute2/include/rt_names.h
--- iproute2.orig/include/rt_names.h	2000-04-16 17:42:50.000000000 +0000
+++ iproute2/include/rt_names.h	2004-05-01 15:50:25.000000000 +0000
@@ -1,6 +1,8 @@
 #ifndef RT_NAMES_H_
 #define RT_NAMES_H_ 1
 
+#include <asm/byteorder.h>
+
 const char* rtnl_rtprot_n2a(int id, char *buf, int len);
 const char* rtnl_rtscope_n2a(int id, char *buf, int len);
 const char* rtnl_rttable_n2a(int id, char *buf, int len);
diff -urN iproute2.orig/lib/rt_names.c iproute2/lib/rt_names.c
--- iproute2.orig/lib/rt_names.c	2000-04-16 17:42:52.000000000 +0000
+++ iproute2/lib/rt_names.c	2004-05-01 15:49:52.000000000 +0000
@@ -16,6 +16,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <sys/time.h>
+#include <asm/byteorder.h>
 
 static void rtnl_tab_initialize(char *file, char **tab, int size)
 {
diff -urN iproute2.orig/misc/arpd.c iproute2/misc/arpd.c
--- iproute2.orig/misc/arpd.c	2002-01-10 04:02:26.000000000 +0000
+++ iproute2/misc/arpd.c	2004-05-01 17:19:54.000000000 +0000
@@ -16,7 +16,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <netdb.h>
-#include <db.h>
+#include <db_185.h>
 #include <sys/ioctl.h>
 #include <sys/poll.h>
 #include <errno.h>
@@ -28,6 +28,7 @@
 #include <signal.h>
 #include <linux/if.h>
 #include <linux/if_arp.h>
+#include <linux/if_ether.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <linux/if_packet.h>
Commit	Line	Data
fa271200 MM	1	diff -urN iproute2.orig/Makefile iproute2/Makefile
	2	--- iproute2.orig/Makefile 2002-01-15 23:30:32.000000000 +0000
	3	+++ iproute2/Makefile 2004-05-01 15:46:50.000000000 +0000
	4	@@ -4,7 +4,5 @@
	5	CONFDIR=/etc/iproute2
	6	DOCDIR=/usr/doc/iproute2
	7
	8	-KERNEL_INCLUDE=/usr/src/linux/include
	9	-LIBC_INCLUDE=/usr/include
	10
	11	DEFINES= -DRESOLVE_HOSTNAMES
	12	@@ -23,19 +22,11 @@
	13	#options for ipx
	14	ADDLIB+=ipx_ntop.o ipx_pton.o
	15
	16	-ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h))
	17	- ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h))
	18	- GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
	19	- endif
	20	-endif
	21	-ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
	22	- GLIBCFIX=-I../include-glibc -I/usr/include/db3 -include ../include-glibc/glibc-bugs.h
	23	-endif
	24
	25
	26	CC = gcc
	27	CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
	28	-CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)
	29	+CFLAGS = $(CCOPTS) -I../include $(DEFINES)
	30
	31	LDLIBS += -L../lib -lnetlink -lutil
	32
	33	@@ -43,19 +34,11 @@
	34
	35	LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
	36
	37	-all: check-kernel
	38	+all:
	39	@set -e; \
	40	for i in $(SUBDIRS); \
	41	do $(MAKE) -C $$i; done
	42
	43	-check-kernel:
	44	-ifeq ($(KERNEL_INCLUDE),)
	45	- @echo "Please, set correct KERNEL_INCLUDE"; false
	46	-else
	47	- @set -e; \
	48	- if [ ! -r $(KERNEL_INCLUDE)/linux/autoconf.h ]; then \
	49	- echo "Please, compile the kernel first"; false; fi
	50	-endif
	51
	52	install: all
	53	install -m 0755 -d $(DESTDIR)$(SBINDIR)
	54	diff -urN iproute2.orig/include/rt_names.h iproute2/include/rt_names.h
	55	--- iproute2.orig/include/rt_names.h 2000-04-16 17:42:50.000000000 +0000
	56	+++ iproute2/include/rt_names.h 2004-05-01 15:50:25.000000000 +0000
e42218cf PS	57	@@ -1,6 +1,8 @@
	58	#ifndef RT_NAMES_H_
	59	#define RT_NAMES_H_ 1
	60
fa271200	61	+#include <asm/byteorder.h>
e42218cf PS	62	+
	63	const char* rtnl_rtprot_n2a(int id, char *buf, int len);
	64	const char* rtnl_rtscope_n2a(int id, char *buf, int len);
	65	const char* rtnl_rttable_n2a(int id, char *buf, int len);
fa271200 MM	66	diff -urN iproute2.orig/lib/rt_names.c iproute2/lib/rt_names.c
	67	--- iproute2.orig/lib/rt_names.c 2000-04-16 17:42:52.000000000 +0000
	68	+++ iproute2/lib/rt_names.c 2004-05-01 15:49:52.000000000 +0000
e42218cf PS	69	@@ -16,6 +16,7 @@
	70	#include <fcntl.h>
	71	#include <string.h>
	72	#include <sys/time.h>
fa271200	73	+#include <asm/byteorder.h>
e42218cf PS	74
	75	static void rtnl_tab_initialize(char file, char *tab, int size)
	76	{
fa271200 MM	77	diff -urN iproute2.orig/misc/arpd.c iproute2/misc/arpd.c
	78	--- iproute2.orig/misc/arpd.c 2002-01-10 04:02:26.000000000 +0000
	79	+++ iproute2/misc/arpd.c 2004-05-01 17:19:54.000000000 +0000
	80	@@ -16,7 +16,7 @@
e42218cf	81	#include <unistd.h>
fa271200 MM	82	#include <stdlib.h>
	83	#include <netdb.h>
	84	-#include <db.h>
	85	+#include <db_185.h>
	86	#include <sys/ioctl.h>
	87	#include <sys/poll.h>
	88	#include <errno.h>
	89	@@ -28,6 +28,7 @@
	90	#include <signal.h>
	91	#include <linux/if.h>
	92	#include <linux/if_arp.h>
	93	+#include <linux/if_ether.h>
	94	#include <netinet/in.h>
	95	#include <arpa/inet.h>
	96	#include <linux/if_packet.h>