Alejandro Mery:

updated iproute2 (ahu-20021020): includes man pages, arpd, and hotfixes


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2399 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

package/base/dietlibc/pkg_patch/pkg_iproute2.patch

@@ -28,19 +28,6 @@
  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);
---- ./include-glibc/netinet/in.h.orig	2003-04-06 17:20:23.000000000 +0200
-+++ ./include-glibc/netinet/in.h	2003-04-06 17:23:23.000000000 +0200
-@@ -1,3 +1,5 @@
-+#include_next <netinet/in.h>
-+#if 0
- #ifndef	_NETINET_IN_H
- #define	_NETINET_IN_H	1
- 
-@@ -12,3 +14,4 @@
- #define SOL_IP	0
- 
- #endif	/* netinet/in.h */
-+#endif
 --- ./include-glibc/netinet/ip.h.orig	2003-04-06 17:20:41.000000000 +0200
 +++ ./include-glibc/netinet/ip.h	2003-04-06 17:23:28.000000000 +0200
 @@ -1,3 +1,5 @@
@@ -231,7 +218,7 @@
  
  LDLIBS += -L../lib -lnetlink -lutil
  
--SUBDIRS=lib ip tc
+-SUBDIRS=lib ip tc misc
 +SUBDIRS=lib ip
  
  LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a

package/base/iproute2/bdb_unavailable.diff

@@ -0,0 +1,25 @@
+On stage 1 there is no libdb.so, then we can't build arpd.
+ - Alejandro Mery
+
+--- ./misc/Makefile.orig	2003-12-20 18:03:12.000000000 -0300
++++ ./misc/Makefile	2003-12-20 18:04:02.000000000 -0300
+@@ -6,7 +6,7 @@
+ RTSTATOBJ=rtstat.o
+ 
+ ALLOBJ=$(SSOBJ) $(NSTATOBJ) $(IFSTATOBJ) $(RTACCTOBJ) $(ARPDOBJ) $(RTSTATOBJ)
+-TARGETS=ss nstat ifstat rtacct arpd rtstat
++TARGETS=ss nstat ifstat rtacct rtstat
+ 
+ all: $(TARGETS)
+ 
+--- ./Makefile.orig	2002-10-19 15:06:45.000000000 -0300
++++ ./Makefile	2003-12-20 18:56:16.000000000 -0300
+@@ -31,7 +31,7 @@
+   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=-I../include-glibc -include ../include-glibc/glibc-bugs.h
+ endif
+ 
+ 

package/base/iproute2/fix_make_install.patch

@@ -0,0 +1,21 @@
+--- ./Makefile.orig	2004-02-18 23:26:26.000000000 -0300
++++ ./Makefile	2004-02-18 23:47:35.000000000 -0300
+@@ -65,14 +65,12 @@
+ 	install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
+ 	install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv
+ 	install -m 0644 README.iproute2+tc $(shell find examples -type f -maxdepth 1) $(DESTDIR)$(DOCDIR)/examples
+-	@for i in $(ls -1 examples/diffserv/ | grep -v CVS); do \
+-		install -m 0644 $i $(DESTDIR)$(DOCDIR)/examples/diffserv ;\
+-		done
++	install -m 0644 $(shell find examples/diffserv/ -type f -maxdepth 1 | grep -v CVS) $(DESTDIR)$(DOCDIR)/examples/diffserv
+ 	@for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done
+-	@cd etc/iproute2; for i in $(ls -1 | grep -v CVS); do \
++	@for i in $(shell ls -1 etc/iproute2 | grep -v CVS); do \
+ 		if [ ! -e $(DESTDIR)$(CONFDIR)/$$i ]; then \
+-			echo install -m 0644 $$i $(DESTDIR)$(CONFDIR); \
+-			install -m 0644 $$i $(DESTDIR)$(CONFDIR); fi; done
++			echo install -m 0644 etc/iproute2/$$i $(DESTDIR)$(CONFDIR); \
++			install -m 0644 etc/iproute2/$$i $(DESTDIR)$(CONFDIR); fi; done
+ 
+ clean:
+ 	rm -f $(shell find . -name '*~')

package/base/iproute2/iproute2.conf

@@ -20,32 +20,26 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-ipr2_pm() {
-	# install the package (doesn't have a make install ...)
-	[ -f tc/tc ] && cp -v tc/tc $root/sbin/
-	cp -v ip/ifcfg ip/ip ip/routef ip/routel \
-		ip/rtacct ip/rtmon ip/rtpr $root/sbin/
-	cp -rv etc/iproute2 $root/etc
-	# install docs
-
-	mkdir -p $root/etc/iproute2
-	for x in etc/iproute2/* ; do
-		[ -f $root/$x ] || cp -v $x $root/$x
-	done
+prefix=''
+set_confopt
 
+ipr2_pm() {
 	cp -v $confdir/rocknet_iproute2.sh \
 		$root/etc/network/modules/iproute2.sh
 
         install_init netfs $confdir/netfs.init
 
-        $CC -O2 $confdir/ipnm2nwbc.c -o $root/sbin/ipnm2nwbc
-	cp $confdir/dumpnetcfg.sh $root/sbin/dumpnetcfg
-	chmod +x $root/sbin/dumpnetcfg
+        $CC -O2 $confdir/ipnm2nwbc.c -o $sbindir/ipnm2nwbc
+	cp $confdir/dumpnetcfg.sh $sbindir/dumpnetcfg
+	chmod +x $sbindir/dumpnetcfg
 }
 
 makeopt="$makeopt KERNEL_INCLUDE=$root/usr/include"
 makeopt="$makeopt LIBC_INCLUDE=$root/usr/include"
+makeinstopt="$makeopt DESTDIR=$root install"
 
-makeinstopt=""
 postmake="ipr2_pm"
 
+if [ $stagelevel -le 1 ]; then
+	var_append patchfiles ' ' $confdir/bdb_unavailable.diff
+fi

package/base/iproute2/iproute2.desc

@@ -33,6 +33,7 @@
 [U] http://www.ds9a.nl/2.4Routing/ {Linux 2.4 Routing & Traffic Control HOWTO}
 
 [A] Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
+[A] Bert Hubert <ahu@ds9a.nl>
 [M] Clifford Wolf <clifford@clifford.at>
 
 [C] base/system
@@ -40,8 +41,9 @@
 
 [L] GPL
 [S] Stable
-[V] 2.4.7-now-ss010824
+[V] 2.4.7-ahu-20021020
 [P] X -1---5---9 787.000
 
-[D] 2034614161 iproute2-2.4.7-now-ss010824.tar.gz ftp://ftp.inr.ac.ru/ip-routing/
+#[D] 2034614161 iproute2-2.4.7-now-ss010824.tar.gz ftp://ftp.inr.ac.ru/ip-routing/
+[D] 4247771885 iproute2-ahu-20021020.tar.bz2 cvs://pserver:anon:cvs@outpost.ds9a.nl:/var/cvsroot::iproute2-ahu/!2002-10-20/
 

package/base/iproute2/lib_ar.patch

@@ -1,37 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/iproute2/lib_ar.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- iproute2/lib/Makefile	2002-10-31 10:58:30.000000000 +0100
-+++ iproute2/lib/Makefile	2000-04-16 19:42:52.000000000 +0200
-@@ -6,10 +6,10 @@
- all: libnetlink.a libutil.a
- 
- libnetlink.a: $(NLOBJ)
--	ar rcs $@ $(NLOBJ)
-+	$(AR) rcs $@ $(NLOBJ)
- 
- libutil.a: $(UTILOBJ) $(ADDLIB)
--	ar rcs $@ $(UTILOBJ) $(ADDLIB)
-+	$(AR) rcs $@ $(UTILOBJ) $(ADDLIB)
- 
- clean:
- 	rm -f $(NLOBJ) $(UTILOBJ) $(ADDLIB) libnetlink.a libutil.a

package/base/iproute2/libutil.patch

@@ -0,0 +1,11 @@
+--- ./Makefile.orig	2003-12-20 17:08:44.000000000 -0300
++++ ./Makefile	2003-12-20 17:09:05.000000000 -0300
+@@ -39,7 +39,7 @@
+ CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
+ CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)
+ 
+-LDLIBS += -L../lib -lnetlink -lutil
++LDLIBS += -L../lib -lnetlink ../lib/libutil.a
+ 
+ SUBDIRS=lib ip tc misc
+ 

package/base/iproute2/makefile-adaptions.patch

@@ -1,39 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/iproute2/makefile-adaptions.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-The include order need to be changed since a usr/include/utils.h might
-exist (cdparanoia). With new gcc the source yields some warnings so
--Werror needs to be stripped ...
-
---- ./Makefile.orig	2001-08-02 08:37:03.000000000 +0200
-+++ ./Makefile	2003-08-28 22:29:43.000000000 +0200
-@@ -28,8 +28,8 @@
- endif
- 
- CC = gcc
--CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -Werror -g
--CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)
-+CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
-+CFLAGS = $(CCOPTS) -I../include $(GLIBCFIX) -I$(KERNEL_INCLUDE) $(DEFINES)
- 
- LDLIBS += -L../lib -lnetlink -lutil
- 

package/base/iproute2/makedeps.patch → package/base/iproute2/retypedef.patch

@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/base/iproute2/makedeps.patch
+# ROCK Linux: rock-src/package/base/iproute2/hotfix.patch.disabled
 # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
@@ -20,14 +20,16 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
---- ./ip/Makefile.orig	2002-09-03 00:16:38.000000000 +0200
-+++ ./ip/Makefile	2002-09-03 00:18:41.000000000 +0200
-@@ -14,7 +14,7 @@
+--- ./include-glibc/glibc-bugs.h.orig	2003-11-01 21:41:57.000000000 -0300
++++ ./include-glibc/glibc-bugs.h	2003-11-01 21:48:48.000000000 -0300
+@@ -12,8 +12,8 @@
  
- rtmon: $(RTMONOBJ) $(LIBNETLINK)
+ #include <linux/types.h>
  
--rtacct: $(RTACCTOBJ)
-+rtacct: $(RTACCTOBJ) $(LIBNETLINK)
+-typedef __u16 in_port_t;
+-typedef __u32 in_addr_t;
++/* typedef __u16 in_port_t; */
++/* typedef __u32 in_addr_t; */
+ 
+ #endif
  
- clean:
- 	rm -f $(IPOBJ) $(RTMONOBJ) $(RTACCTOBJ) ip rtmon rtacct

package/base/iproute2/tc_ar.patch

@@ -1,33 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/iproute2/tc_ar.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- iproute2/tc/Makefile	2000-04-16 19:42:53.000000000 +0200
-+++ iproute2/tc/Makefile	2002-10-31 11:02:44.000000000 +0100
-@@ -43,7 +43,7 @@
- tc: $(TCOBJ) $(LIBNETLINK) $(LIBUTIL) $(TCLIB)
- 
- libtc.a: $(TCLIB)
--	ar rcs $@ $(TCLIB)
-+	$(AR) rcs $@ $(TCLIB)
- 
- clean:
- 	rm -f $(TCOBJ) $(TCLIB) libtc.a tc