From 2c44e04f2c92c0a68c0f394ed4f533730ff6776b Mon Sep 17 00:00:00 2001 From: Stefan Paletta Date: Wed, 26 Jan 2005 16:16:50 +0000 Subject: [PATCH] Stefan Paletta: * update and fix iproute2 (2.6.10-ss050112). dance and rejoice! Index: package/base/iproute2/bdb_unavailable.diff =================================================================== [2005011423201315513] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5540 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/iproute2/bdb_unavailable.diff | 27 ++++--------- package/base/iproute2/dumpnetcfg.sh | 4 +- package/base/iproute2/fix_make_install.patch | 40 -------------------- package/base/iproute2/inc-order-fix.patch | 30 --------------- package/base/iproute2/iproute2.conf | 8 ++-- package/base/iproute2/iproute2.desc | 9 ++--- package/base/iproute2/libutil.patch | 30 --------------- package/base/iproute2/retypedef.patch | 32 ---------------- 8 files changed, 18 insertions(+), 162 deletions(-) delete mode 100644 package/base/iproute2/fix_make_install.patch delete mode 100644 package/base/iproute2/inc-order-fix.patch delete mode 100644 package/base/iproute2/libutil.patch delete mode 100644 package/base/iproute2/retypedef.patch diff --git a/package/base/iproute2/bdb_unavailable.diff b/package/base/iproute2/bdb_unavailable.diff index 210f2fcc8..aa364f13f 100644 --- a/package/base/iproute2/bdb_unavailable.diff +++ b/package/base/iproute2/bdb_unavailable.diff @@ -20,25 +20,14 @@ 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 +--- ./misc/Makefile.orig 2005-01-12 21:19:46.000000000 +0100 ++++ ./misc/Makefile 2005-01-14 15:43:06.914717452 +0100 +@@ -1,7 +1,7 @@ + SSOBJ=ss.o ssfilter.o + LNSTATOBJ=lnstat.o lnstat_util.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 +-TARGETS=ss nstat ifstat rtacct arpd lnstat ++TARGETS=ss nstat ifstat rtacct lnstat + include ../Config diff --git a/package/base/iproute2/dumpnetcfg.sh b/package/base/iproute2/dumpnetcfg.sh index c6ed90283..9f1c23c27 100644 --- a/package/base/iproute2/dumpnetcfg.sh +++ b/package/base/iproute2/dumpnetcfg.sh @@ -2,10 +2,10 @@ echo echo "# IP-Tables configuration" -while read line; do +iptables-save | while read line; do [ -z "${line##\**}" ] && table="${line#\*}" [ -z "${line##-A*}" ] && echo iptables -t $table $line -done < <( iptables-save ) +done echo echo "# Link Configuration" diff --git a/package/base/iproute2/fix_make_install.patch b/package/base/iproute2/fix_make_install.patch deleted file mode 100644 index 049e7bee1..000000000 --- a/package/base/iproute2/fix_make_install.patch +++ /dev/null @@ -1,40 +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/fix_make_install.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./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 '*~') diff --git a/package/base/iproute2/inc-order-fix.patch b/package/base/iproute2/inc-order-fix.patch deleted file mode 100644 index ac35b6d3a..000000000 --- a/package/base/iproute2/inc-order-fix.patch +++ /dev/null @@ -1,30 +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/inc-order-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- iproute2-ahu-20021020/Makefile.orig 2004-07-29 01:43:53.083827680 +0200 -+++ iproute2-ahu-20021020/Makefile 2004-07-29 01:44:27.182643872 +0200 -@@ -37,7 +37,7 @@ - - CC = gcc - CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g --CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES) -+CFLAGS = $(CCOPTS) $(GLIBCFIX) -I../include -I$(KERNEL_INCLUDE) $(DEFINES) - - LDLIBS += -L../lib -lnetlink -lutil - diff --git a/package/base/iproute2/iproute2.conf b/package/base/iproute2/iproute2.conf index bc8242401..94d54912b 100644 --- a/package/base/iproute2/iproute2.conf +++ b/package/base/iproute2/iproute2.conf @@ -34,12 +34,12 @@ ipr2_pm() { chmod +x $sbindir/dumpnetcfg } -makeopt="$makeopt KERNEL_INCLUDE=$root/usr/include" -makeopt="$makeopt LIBC_INCLUDE=$root/usr/include" -makeinstopt="$makeopt DESTDIR=$root install" +runconf=0 +makeopt="SBINDIR=/sbin KERNEL_INCLUDE=$root/usr/include" +makeinstopt="DESTDIR=$root install" postmake="ipr2_pm" -pkginstalled bdb33 && [ $stagelevel -gt 1 ] || \ +pkginstalled bdb=bdb.. && [ $stagelevel -gt 1 ] || \ var_append patchfiles ' ' $confdir/bdb_unavailable.diff diff --git a/package/base/iproute2/iproute2.desc b/package/base/iproute2/iproute2.desc index 027ff896f..2c0556df6 100644 --- a/package/base/iproute2/iproute2.desc +++ b/package/base/iproute2/iproute2.desc @@ -30,10 +30,10 @@ [T] the tools 'ip' and 'tc' from this package. Read the "Linux 2.4 Routing [T] and Traffic Control HOWTO" first! -[U] http://www.ds9a.nl/2.4Routing/ {Linux 2.4 Routing & Traffic Control HOWTO} +[U] http://developer.osdl.org/dev/iproute2/ {Iproute2 utilities homepage} +[A] Stephen Hemminger [A] Alexey Kuznetsov -[A] Bert Hubert [M] Clifford Wolf [C] base/system @@ -42,9 +42,8 @@ [L] GPL [S] Stable -[V] 2.4.7-ahu-20021020 +[V] 2.6.10-ss050112 [P] X -X---5---9 190.000 -#[D] 2034614161 iproute2-2.4.7-now-ss010824.tar.gz ftp://ftp.inr.ac.ru/ip-routing/ -[D] X iproute2-ahu-20021020.tar.bz2 cvs://pserver:anon:cvs@outpost.ds9a.nl:/var/cvsroot::iproute2-ahu/!2002-10-20/ +[D] 3100022774 iproute2-2.6.10-ss050112.tar.gz http://developer.osdl.org/dev/iproute2/download/ diff --git a/package/base/iproute2/libutil.patch b/package/base/iproute2/libutil.patch deleted file mode 100644 index c740f4001..000000000 --- a/package/base/iproute2/libutil.patch +++ /dev/null @@ -1,30 +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/libutil.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./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 - diff --git a/package/base/iproute2/retypedef.patch b/package/base/iproute2/retypedef.patch deleted file mode 100644 index 8ae5a28f5..000000000 --- a/package/base/iproute2/retypedef.patch +++ /dev/null @@ -1,32 +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/retypedef.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./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 @@ - - #include - --typedef __u16 in_port_t; --typedef __u32 in_addr_t; -+/* typedef __u16 in_port_t; */ -+/* typedef __u32 in_addr_t; */ - - #endif -