diff -urk.orig iproute2.orig/doc/Makefile iproute2/doc/Makefile

--- iproute2.orig/doc/Makefile	2002-01-16 02:46:48 +0300

+++ iproute2/doc/Makefile	2003-10-13 21:48:39 +0400

@@ -42,9 +42,7 @@

 	done

 %.ps: %.dvi

-	$(DVIPS) $< -o $@.tmp

-	./do-psnup $@.tmp $@ $(PAGESIZE) $(PAGESPERPAGE)

-	rm -f $@.tmp

+	$(DVIPS) $< -o $@

 %.html: %.sgml

 	$(SGML2HTML) $<

diff -urk.orig iproute2.orig/include-glibc/glibc-bugs.h iproute2/include-glibc/glibc-bugs.h

--- iproute2.orig/include-glibc/glibc-bugs.h	2000-10-10 22:12:59 +0400

+++ iproute2/include-glibc/glibc-bugs.h	2003-10-13 21:48:39 +0400

@@ -12,9 +12,6 @@

 #include <linux/types.h>

-typedef __u16 in_port_t;

-typedef __u32 in_addr_t;

-

 #endif

 #endif

diff -urk.orig iproute2.orig/ip/ipaddress.c iproute2/ip/ipaddress.c

--- iproute2.orig/ip/ipaddress.c	2001-08-23 08:07:46 +0400

+++ iproute2/ip/ipaddress.c	2003-10-13 21:48:39 +0400

@@ -20,13 +20,13 @@

 #include <sys/ioctl.h>

 #include <sys/socket.h>

 #include <sys/ioctl.h>

-#include <linux/netdevice.h>

-#include <linux/if_arp.h>

-#include <linux/sockios.h>

 #include <netinet/in.h>

 #include <arpa/inet.h>

 #include <string.h>

 #include <fnmatch.h>

+#include <linux/netdevice.h>

+#include <linux/if_arp.h>

+#include <linux/sockios.h>

 #include "rt_names.h"

 #include "utils.h"

diff -urk.orig iproute2.orig/ip/iplink.c iproute2/ip/iplink.c

--- iproute2.orig/ip/iplink.c	2003-10-13 21:43:48 +0400

+++ iproute2/ip/iplink.c	2003-10-13 21:48:39 +0400

@@ -17,14 +17,14 @@

 #include <fcntl.h>

 #include <errno.h>

 #include <sys/socket.h>

-#include <linux/if.h>

-#include <linux/if_packet.h>

-#include <linux/if_ether.h>

-#include <linux/sockios.h>

 #include <netinet/in.h>

 #include <arpa/inet.h>

 #include <string.h>

 #include <sys/ioctl.h>

+#include <linux/if.h>

+#include <linux/if_packet.h>

+#include <linux/if_ether.h>

+#include <linux/sockios.h>

 #include <linux/sockios.h>

 #include "rt_names.h"

diff -urk.orig iproute2.orig/ip/ipmaddr.c iproute2/ip/ipmaddr.c

--- iproute2.orig/ip/ipmaddr.c	2001-12-25 01:33:02 +0300

+++ iproute2/ip/ipmaddr.c	2003-10-13 21:48:39 +0400

@@ -17,13 +17,13 @@

 #include <fcntl.h>

 #include <sys/ioctl.h>

 #include <sys/socket.h>

+#include <netinet/in.h>

+#include <arpa/inet.h>

+#include <string.h>

 #include <linux/netdevice.h>

 #include <linux/if.h>

 #include <linux/if_arp.h>

 #include <linux/sockios.h>

-#include <netinet/in.h>

-#include <arpa/inet.h>

-#include <string.h>

 #include "rt_names.h"

 #include "utils.h"

diff -urk.orig iproute2.orig/ip/ipmroute.c iproute2/ip/ipmroute.c

--- iproute2.orig/ip/ipmroute.c	2001-12-25 00:38:55 +0300

+++ iproute2/ip/ipmroute.c	2003-10-13 21:48:39 +0400

@@ -17,13 +17,13 @@

 #include <fcntl.h>

 #include <sys/ioctl.h>

 #include <sys/socket.h>

+#include <netinet/in.h>

+#include <arpa/inet.h>

+#include <string.h>

 #include <linux/netdevice.h>

 #include <linux/if.h>

 #include <linux/if_arp.h>

 #include <linux/sockios.h>

-#include <netinet/in.h>

-#include <arpa/inet.h>

-#include <string.h>

 #include "utils.h"

diff -urk.orig iproute2.orig/ip/iptunnel.c iproute2/ip/iptunnel.c

--- iproute2.orig/ip/iptunnel.c	2001-12-25 00:29:41 +0300

+++ iproute2/ip/iptunnel.c	2003-10-13 21:48:39 +0400

@@ -24,11 +24,11 @@

 #include <fcntl.h>

 #include <sys/socket.h>

 #include <sys/ioctl.h>

-#include <linux/if.h>

-#include <linux/if_arp.h>

 #include <netinet/in.h>

 #include <netinet/ip.h>

 #include <arpa/inet.h>

+#include <linux/if.h>

+#include <linux/if_arp.h>

 #include <linux/if_tunnel.h>

 #include "rt_names.h"

diff -urk.orig iproute2.orig/lib/ll_addr.c iproute2/lib/ll_addr.c

--- iproute2.orig/lib/ll_addr.c	2000-04-16 21:42:52 +0400

+++ iproute2/lib/ll_addr.c	2003-10-13 21:48:39 +0400

@@ -17,12 +17,12 @@

 #include <sys/ioctl.h>

 #include <sys/socket.h>

 #include <sys/ioctl.h>

-#include <linux/netdevice.h>

-#include <linux/if_arp.h>

-#include <linux/sockios.h>

 #include <netinet/in.h>

 #include <arpa/inet.h>

 #include <string.h>

+#include <linux/netdevice.h>

+#include <linux/if_arp.h>

+#include <linux/sockios.h>

 #include "utils.h"

diff -urk.orig iproute2.orig/lib/ll_proto.c iproute2/lib/ll_proto.c

--- iproute2.orig/lib/ll_proto.c	2001-12-26 02:18:35 +0300

+++ iproute2/lib/ll_proto.c	2003-10-13 21:48:39 +0400

@@ -17,12 +17,12 @@

 #include <sys/ioctl.h>

 #include <sys/socket.h>

 #include <sys/ioctl.h>

-#include <linux/netdevice.h>

-#include <linux/if_arp.h>

-#include <linux/sockios.h>

 #include <netinet/in.h>

 #include <arpa/inet.h>

 #include <string.h>

+#include <linux/netdevice.h>

+#include <linux/if_arp.h>

+#include <linux/sockios.h>

 #include "utils.h"

diff -urk.orig iproute2.orig/lib/ll_types.c iproute2/lib/ll_types.c

--- iproute2.orig/lib/ll_types.c	2001-12-26 02:01:31 +0300

+++ iproute2/lib/ll_types.c	2003-10-13 21:48:39 +0400

@@ -17,12 +17,12 @@

 #include <sys/ioctl.h>

 #include <sys/socket.h>

 #include <sys/ioctl.h>

-#include <linux/netdevice.h>

-#include <linux/if_arp.h>

-#include <linux/sockios.h>

 #include <netinet/in.h>

 #include <arpa/inet.h>

 #include <string.h>

+#include <linux/netdevice.h>

+#include <linux/if_arp.h>

+#include <linux/sockios.h>

 char * ll_type_n2a(int type, char *buf, int len)

 {

diff -urk.orig iproute2.orig/Makefile iproute2/Makefile

--- iproute2.orig/Makefile	2002-01-16 02:30:32 +0300

+++ iproute2/Makefile	2003-10-13 21:49:03 +0400

@@ -4,7 +4,7 @@

 CONFDIR=/etc/iproute2

 DOCDIR=/usr/doc/iproute2

-KERNEL_INCLUDE=/usr/src/linux/include

+KERNEL_INCLUDE=/etc/sysconfig/kernel/include

 LIBC_INCLUDE=/usr/include

 DEFINES= -DRESOLVE_HOSTNAMES

@@ -25,16 +25,16 @@

 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

+    GLIBCFIX=-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

+  GLIBCFIX=-include ../include-glibc/glibc-bugs.h -I/usr/include/db4

 endif

 CC = gcc

-CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g

+CCOPTS = $(RPM_OPT_FLAGS) -Wstrict-prototypes -Werror -D_GNU_SOURCE

 CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)

 LDLIBS += -L../lib -lnetlink -lutil

diff -urk.orig iproute2.orig/misc/arpd.c iproute2/misc/arpd.c

--- iproute2.orig/misc/arpd.c	2002-01-10 07:02:26 +0300

+++ iproute2/misc/arpd.c	2003-10-13 21:48:39 +0400

@@ -16,7 +16,7 @@

 #include <unistd.h>

 #include <stdlib.h>

 #include <netdb.h>

-#include <db.h>

+#include <db4/db_185.h>

 #include <sys/ioctl.h>

 #include <sys/poll.h>

 #include <errno.h>

@@ -26,10 +26,10 @@

 #include <sys/time.h>

 #include <time.h>

 #include <signal.h>

-#include <linux/if.h>

-#include <linux/if_arp.h>

 #include <netinet/in.h>

 #include <arpa/inet.h>

+#include <linux/if.h>

+#include <linux/if_arp.h>

 #include <linux/if_packet.h>

 #include <linux/filter.h>