Index: tches/inetutils-1.4.2-gcc4_fixes-3.patch
===================================================================
--- patches/inetutils-1.4.2-gcc4_fixes-3.patch	(revision 099d37d92473cb71f662107fc4d8c2306c587e6a)
+++ 	(revision )
@@ -1,37 +1,0 @@
-Submitted By: Matthew Burgess <matthew@linuxfromscratch.org>
-Date: 2005-08-30
-Initial Package Version: 1.4.2
-Upstream Status: From upstream
-Origin: Greg Schafer <gschafer@zip.com.au> (http://www.diy-linux.org/downloads/patches/GCC4/inetutils-1.4.2-gcc4-fixes-1.patch)
-Description: Fix compilation issues with gcc4
-
-diff -Naur inetutils-1.4.2.orig/ftp/ftp_var.h inetutils-1.4.2/ftp/ftp_var.h
---- inetutils-1.4.2.orig/ftp/ftp_var.h	2000-07-08 01:00:53.000000000 +0000
-+++ inetutils-1.4.2/ftp/ftp_var.h	2005-08-30 20:25:27.205932304 +0000
-@@ -36,8 +36,6 @@
- #include <sys/param.h>
- #include <setjmp.h>
- 
--#include "extern.h"
--
- #ifndef FTP_EXTERN
- #define FTP_EXTERN extern
- #endif
-@@ -129,3 +127,5 @@
- FTP_EXTERN int macnum;			/* number of defined macros */
- FTP_EXTERN struct macel macros[16];
- FTP_EXTERN char macbuf[4096];
-+
-+#include "extern.h"
-diff -Naur inetutils-1.4.2.orig/libinetutils/ttymsg.c inetutils-1.4.2/libinetutils/ttymsg.c
---- inetutils-1.4.2.orig/libinetutils/ttymsg.c	2001-11-01 15:52:19.000000000 +0000
-+++ inetutils-1.4.2/libinetutils/ttymsg.c	2005-08-30 20:24:27.168059448 +0000
-@@ -132,7 +132,7 @@
- 	    }
- 	  if (wret)
- 	    {
--	      (char *)iov->iov_base += wret;
-+	      iov->iov_base = (char *)iov->iov_base + wret;
- 	      iov->iov_len -= wret;
- 	    }
- 	  continue;
Index: tches/inetutils-1.4.2-inet_addr_fix-1.patch
===================================================================
--- patches/inetutils-1.4.2-inet_addr_fix-1.patch	(revision 099d37d92473cb71f662107fc4d8c2306c587e6a)
+++ 	(revision )
@@ -1,70 +1,0 @@
-Submitted By: Jim Gifford <jim@linuxfromscratch.org>
-Date: 2006-09-09
-Initial Package Version: 1.4.2
-Upstream Status: Unknown
-Origin: http://linuxfromscratch.org/pipermail/lfs-support/2005-January/025868.html
-Description: Updates to use newer GLIBC standards
-
-diff -Naur inetutils-1.4.2.orig/ftp/ftp.c inetutils-1.4.2/ftp/ftp.c
---- inetutils-1.4.2.orig/ftp/ftp.c	2002-06-25 20:15:05.000000000 -0700
-+++ inetutils-1.4.2/ftp/ftp.c	2006-09-10 10:12:53.000000000 -0700
-@@ -119,8 +119,8 @@
- 	static char hostnamebuf[80];
- 
- 	memset((char *)&hisctladdr, 0, sizeof (hisctladdr));
--	hisctladdr.sin_addr.s_addr = inet_addr(host);
--	if (hisctladdr.sin_addr.s_addr != -1) {
-+
-+	if (inet_aton(host, &hisctladdr.sin_addr) != 0) {
- 		hisctladdr.sin_family = AF_INET;
- 		(void) strncpy(hostnamebuf, host, sizeof(hostnamebuf));
- 	} else {
-diff -Naur inetutils-1.4.2.orig/libinetutils/iruserok.c inetutils-1.4.2/libinetutils/iruserok.c
---- inetutils-1.4.2.orig/libinetutils/iruserok.c	2002-12-11 04:38:00.000000000 -0800
-+++ inetutils-1.4.2/libinetutils/iruserok.c	2006-09-10 10:12:52.000000000 -0700
-@@ -260,7 +260,7 @@
-   register char **pp;
- 
-   /* Try for raw ip address first. */
--  if (isdigit (*lhost) && (long)(laddr = inet_addr (lhost)) != -1)
-+  if (isdigit (*lhost) && (laddr = inet_addr (lhost)) != INADDR_NONE)
-     return (raddr == laddr);
- 
-   /* Better be a hostname. */
-diff -Naur inetutils-1.4.2.orig/telnet/commands.c inetutils-1.4.2/telnet/commands.c
---- inetutils-1.4.2.orig/telnet/commands.c	2002-06-25 20:15:06.000000000 -0700
-+++ inetutils-1.4.2/telnet/commands.c	2006-09-10 10:12:52.000000000 -0700
-@@ -2291,9 +2291,7 @@
- 	}
-     } else {
- #endif
--	temp = inet_addr(hostp);
--	if (temp != (unsigned long) -1) {
--	    sin.sin_addr.s_addr = temp;
-+	if(inet_aton(hostp, &sin.sin_addr) != 0) {
- 	    sin.sin_family = AF_INET;
- 
- 	    if (_hostname)
-@@ -2897,8 +2895,7 @@
- 		if (!c)
- 			cp2 = 0;
- 
--		if ((tmp = inet_addr(cp)) != -1) {
--			sin_addr.s_addr = tmp;
-+		if (inet_aton(cp, &sin_addr.s_addr) != 0) {
- 		} else if (host = gethostbyname(cp)) {
- #if	defined(h_addr)
- 			memmove((caddr_t)&sin_addr,
-diff -Naur inetutils-1.4.2.orig/tftp/main.c inetutils-1.4.2/tftp/main.c
---- inetutils-1.4.2.orig/tftp/main.c	2001-11-02 13:50:13.000000000 -0800
-+++ inetutils-1.4.2/tftp/main.c	2006-09-10 10:12:53.000000000 -0700
-@@ -228,8 +228,7 @@
- 		strcpy(hostname, host->h_name);
- 	} else {
- 		peeraddr.sin_family = AF_INET;
--		peeraddr.sin_addr.s_addr = inet_addr(argv[1]);
--		if (peeraddr.sin_addr.s_addr == -1) {
-+		if (inet_aton(argv[1], &peeraddr.sin_addr) == 0) {
- 			connected = 0;
- 			printf("%s: unknown host\n", argv[1]);
- 			return;
Index: tches/inetutils-1.4.2-no_server_man_pages-1.patch
===================================================================
--- patches/inetutils-1.4.2-no_server_man_pages-1.patch	(revision 099d37d92473cb71f662107fc4d8c2306c587e6a)
+++ 	(revision )
@@ -1,116 +1,0 @@
-Submitted By: Greg Schafer <gschafer at zip dot com dot au>
-Date: 2003-12-11
-Initial Package Version: 1.4.2
-Origin: Greg Schafer
-Description: Prevent installation of unwanted server man pages.
-
-diff -Naur inetutils-1.4.2.orig/ftpd/Makefile.in inetutils-1.4.2/ftpd/Makefile.in
---- inetutils-1.4.2.orig/ftpd/Makefile.in	2002-12-23 04:30:12.000000000 +0000
-+++ inetutils-1.4.2/ftpd/Makefile.in	2003-12-11 02:21:24.222010104 +0000
-@@ -177,7 +177,6 @@
- 
- noinst_HEADERS = extern.h
- 
--man_MANS = ftpd.8
- 
- INCLUDES = $(PATHDEF_FTPWELCOME) $(PATHDEF_FTPUSERS) \
-            $(PATHDEF_FTPLOGINMESG) $(PATHDEF_FTPCHROOT) $(PATHDEF_FTPDPID) \
-diff -Naur inetutils-1.4.2.orig/inetd/Makefile.in inetutils-1.4.2/inetd/Makefile.in
---- inetutils-1.4.2.orig/inetd/Makefile.in	2002-12-23 04:30:13.000000000 +0000
-+++ inetutils-1.4.2/inetd/Makefile.in	2003-12-11 02:21:24.223009952 +0000
-@@ -172,7 +172,6 @@
- 
- inetd_SOURCES = inetd.c
- 
--man_MANS = inetd.8
- 
- INCLUDES = $(PATHDEF_INETDCONF) $(PATHDEF_INETDDIR) -I$(top_builddir)/include
- 
-diff -Naur inetutils-1.4.2.orig/logger/Makefile.in inetutils-1.4.2/logger/Makefile.in
---- inetutils-1.4.2.orig/logger/Makefile.in	2002-12-23 04:30:16.000000000 +0000
-+++ inetutils-1.4.2/logger/Makefile.in	2003-12-11 02:21:24.224009800 +0000
-@@ -175,7 +175,6 @@
- 
- logger_SOURCES = logger.c
- 
--man_MANS = logger.1
- 
- EXTRA_DIST = $(man_MANS)
- subdir = logger
-diff -Naur inetutils-1.4.2.orig/rexecd/Makefile.in inetutils-1.4.2/rexecd/Makefile.in
---- inetutils-1.4.2.orig/rexecd/Makefile.in	2002-12-23 04:30:17.000000000 +0000
-+++ inetutils-1.4.2/rexecd/Makefile.in	2003-12-11 02:21:24.225009648 +0000
-@@ -173,7 +173,6 @@
- 
- rexecd_SOURCES = rexecd.c
- 
--man_MANS = rexecd.8
- 
- INCLUDES = $(PATHDEF_DEFPATH) $(PATHDEF_BSHELL) -I$(top_builddir)/include
- 
-diff -Naur inetutils-1.4.2.orig/rlogind/Makefile.in inetutils-1.4.2/rlogind/Makefile.in
---- inetutils-1.4.2.orig/rlogind/Makefile.in	2002-12-23 04:30:18.000000000 +0000
-+++ inetutils-1.4.2/rlogind/Makefile.in	2003-12-11 02:21:24.225009648 +0000
-@@ -173,7 +173,6 @@
- 
- rlogind_SOURCES = rlogind.c
- 
--man_MANS = rlogind.8
- 
- INCLUDES = $(PATHDEF_DEV) $(PATHDEF_LOGIN) -I$(top_builddir)/include
- 
-diff -Naur inetutils-1.4.2.orig/rshd/Makefile.in inetutils-1.4.2/rshd/Makefile.in
---- inetutils-1.4.2.orig/rshd/Makefile.in	2002-12-23 04:30:19.000000000 +0000
-+++ inetutils-1.4.2/rshd/Makefile.in	2003-12-11 02:21:24.226009496 +0000
-@@ -172,7 +172,6 @@
- 
- rshd_SOURCES = rshd.c
- 
--man_MANS = rshd.8
- 
- INCLUDES = $(PATHDEF_BSHELL) $(PATHDEF_NOLOGIN) $(PATHDEF_DEFPATH) -I$(top_builddir)/include
- 
-diff -Naur inetutils-1.4.2.orig/syslogd/Makefile.in inetutils-1.4.2/syslogd/Makefile.in
---- inetutils-1.4.2.orig/syslogd/Makefile.in	2002-12-23 04:30:19.000000000 +0000
-+++ inetutils-1.4.2/syslogd/Makefile.in	2003-12-11 02:21:24.226009496 +0000
-@@ -172,7 +172,6 @@
- 
- syslogd_SOURCES = syslogd.c
- 
--man_MANS = syslog.conf.5 syslogd.8
- 
- INCLUDES = $(PATHDEF_LOG) $(PATHDEF_LOGCONF) $(PATHDEF_LOGPID) \
- 	$(PATHDEF_CONSOLE) -I$(top_builddir)/include
-diff -Naur inetutils-1.4.2.orig/talkd/Makefile.in inetutils-1.4.2/talkd/Makefile.in
---- inetutils-1.4.2.orig/talkd/Makefile.in	2002-12-23 04:30:20.000000000 +0000
-+++ inetutils-1.4.2/talkd/Makefile.in	2003-12-11 02:21:24.227009344 +0000
-@@ -180,7 +180,6 @@
-  intalkd.h
- 
- 
--man_MANS = talkd.8
- 
- INCLUDES = $(PATHDEF_DEV) -I${top_srcdir}/libinetutils -I$(top_builddir)/include
- 
-diff -Naur inetutils-1.4.2.orig/telnetd/Makefile.in inetutils-1.4.2/telnetd/Makefile.in
---- inetutils-1.4.2.orig/telnetd/Makefile.in	2002-12-23 04:30:21.000000000 +0000
-+++ inetutils-1.4.2/telnetd/Makefile.in	2003-12-11 02:21:24.228009192 +0000
-@@ -176,7 +176,6 @@
- 
- noinst_HEADERS = telnetd.h
- 
--man_MANS = telnetd.8
- 
- INCLUDES = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN) -I$(top_builddir)/include \
-  -I$(top_srcdir) @INCAUTH@
-diff -Naur inetutils-1.4.2.orig/tftpd/Makefile.in inetutils-1.4.2/tftpd/Makefile.in
---- inetutils-1.4.2.orig/tftpd/Makefile.in	2002-12-23 04:30:22.000000000 +0000
-+++ inetutils-1.4.2/tftpd/Makefile.in	2003-12-11 02:21:24.229009040 +0000
-@@ -174,7 +174,6 @@
- 
- tftpd_SOURCES = tftpd.c
- 
--man_MANS = tftpd.8
- 
- LDADD = -L../libinetutils -linetutils
- 
Index: tches/iproute2-2.6.16-060323-libdir-1.patch
===================================================================
--- patches/iproute2-2.6.16-060323-libdir-1.patch	(revision 099d37d92473cb71f662107fc4d8c2306c587e6a)
+++ 	(revision )
@@ -1,98 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
-Date: 2006-09-04
-Upstream Status: Unknown
-Origin: Joe Ciccone
-Description: Changes the path of /usr/lib/tc to one defined in the Makefile.
-
-diff -Naur iproute2-2.6.16-060323.orig/Makefile iproute2-2.6.16-060323/Makefile
---- iproute2-2.6.16-060323.orig/Makefile	2005-07-08 18:08:47.000000000 -0400
-+++ iproute2-2.6.16-060323/Makefile	2006-09-08 20:18:32.000000000 -0400
-@@ -1,5 +1,6 @@
- DESTDIR=
- SBINDIR=/usr/sbin
-+LIBDIR=/usr/lib
- CONFDIR=/etc/iproute2
- DOCDIR=/usr/share/doc/iproute2
- MANDIR=/usr/share/man
-@@ -22,7 +23,7 @@
- CC = gcc
- HOSTCC = gcc
- CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
--CFLAGS = $(CCOPTS) -I../include $(DEFINES)
-+CFLAGS = -DLIBDIR=\"$(LIBDIR)\" $(CCOPTS) -I../include $(DEFINES)
- YACCFLAGS = -d -t -v
- 
- LDLIBS += -L../lib -lnetlink -lutil
-diff -Naur iproute2-2.6.16-060323.orig/netem/Makefile iproute2-2.6.16-060323/netem/Makefile
---- iproute2-2.6.16-060323.orig/netem/Makefile	2006-03-14 14:43:59.000000000 -0500
-+++ iproute2-2.6.16-060323/netem/Makefile	2006-09-08 20:15:25.000000000 -0400
-@@ -4,6 +4,8 @@
- HOSTCC ?= $(CC)
- LDLIBS += -lm 
- 
-+LIBDIR = /usr/lib
-+
- all: $(DISTGEN) $(DISTDATA)
- 
- $(DISTGEN):
-@@ -16,9 +18,9 @@
- 	./maketable experimental.dat > experimental.dist
- 
- install: all
--	mkdir -p $(DESTDIR)/usr/lib/tc
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/tc
- 	for i in $(DISTDATA); \
--	do install -m 755 $$i $(DESTDIR)/usr/lib/tc; \
-+	do install -m 755 $$i $(DESTDIR)/$(LIBDIR)/tc; \
- 	done
- 
- clean:
-diff -Naur iproute2-2.6.16-060323.orig/tc/Makefile iproute2-2.6.16-060323/tc/Makefile
---- iproute2-2.6.16-060323.orig/tc/Makefile	2005-07-05 18:11:37.000000000 -0400
-+++ iproute2-2.6.16-060323/tc/Makefile	2006-09-08 20:16:15.000000000 -0400
-@@ -69,10 +69,10 @@
- 	$(AR) rcs $@ $(TCLIB)
- 
- install: all
--	mkdir -p $(DESTDIR)/usr/lib/tc
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/tc
- 	install -m 0755 -s tc $(DESTDIR)$(SBINDIR)
- 	for i in $(TCSO); \
--	do install -m 755 -s $$i $(DESTDIR)/usr/lib/tc; \
-+	do install -m 755 -s $$i $(DESTDIR)/$(LIBDIR)/tc; \
- 	done
- 
- clean:
-diff -Naur iproute2-2.6.16-060323.orig/tc/q_netem.c iproute2-2.6.16-060323/tc/q_netem.c
---- iproute2-2.6.16-060323.orig/tc/q_netem.c	2005-12-09 19:01:02.000000000 -0500
-+++ iproute2-2.6.16-060323/tc/q_netem.c	2006-09-08 20:16:50.000000000 -0400
-@@ -60,7 +60,7 @@
- 	char *line = NULL;
- 	char name[128];
- 
--	snprintf(name, sizeof(name), "/usr/lib/tc/%s.dist", type);
-+	snprintf(name, sizeof(name), LIBDIR "/tc/%s.dist", type);
- 	if ((f = fopen(name, "r")) == NULL) {
- 		fprintf(stderr, "No distribution data for %s (%s: %s)\n", 
- 			type, name, strerror(errno));
-diff -Naur iproute2-2.6.16-060323.orig/tc/tc.c iproute2-2.6.16-060323/tc/tc.c
---- iproute2-2.6.16-060323.orig/tc/tc.c	2005-10-07 12:33:21.000000000 -0400
-+++ iproute2-2.6.16-060323/tc/tc.c	2006-09-08 20:17:29.000000000 -0400
-@@ -99,7 +99,7 @@
- 		if (strcmp(q->id, str) == 0)
- 			return q;
- 
--	snprintf(buf, sizeof(buf), "/usr/lib/tc/q_%s.so", str);
-+	snprintf(buf, sizeof(buf), LIBDIR "/tc/q_%s.so", str);
- 	dlh = dlopen(buf, RTLD_LAZY);
- 	if (!dlh) {
- 		/* look in current binary, only open once */
-@@ -145,7 +145,7 @@
- 		if (strcmp(q->id, str) == 0)
- 			return q;
- 
--	snprintf(buf, sizeof(buf), "/usr/lib/tc/f_%s.so", str);
-+	snprintf(buf, sizeof(buf), LIBDIR "/tc/f_%s.so", str);
- 	dlh = dlopen(buf, RTLD_LAZY);
- 	if (dlh == NULL) {
- 		dlh = BODY;
Index: patches/iproute2-2.6.18-061002-libdir-1.patch
===================================================================
--- patches/iproute2-2.6.18-061002-libdir-1.patch	(revision ad01a6ac24869aa9e44e200fb9978d83dab5bfcd)
+++ patches/iproute2-2.6.18-061002-libdir-1.patch	(revision ad01a6ac24869aa9e44e200fb9978d83dab5bfcd)
@@ -0,0 +1,110 @@
+Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
+Date: 2006-09-28
+Upstream Status: Unknown
+Origin: Joe Ciccone
+Description: Changes the path of /usr/lib/tc to one defined in the Makefile.
+
+diff -Naur iproute2-2.6.16-060323.orig/Makefile iproute2-2.6.16-060323/Makefile
+--- iproute2-2.6.16-060323.orig/Makefile	2005-07-08 15:08:47.000000000 -0700
++++ iproute2-2.6.16-060323/Makefile	2006-09-28 22:07:52.059261910 -0700
+@@ -1,5 +1,6 @@
+ DESTDIR=
+ SBINDIR=/usr/sbin
++LIBDIR=/usr/lib
+ CONFDIR=/etc/iproute2
+ DOCDIR=/usr/share/doc/iproute2
+ MANDIR=/usr/share/man
+@@ -22,7 +23,7 @@
+ CC = gcc
+ HOSTCC = gcc
+ CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
+-CFLAGS = $(CCOPTS) -I../include $(DEFINES)
++CFLAGS = -DLIBDIR=\"$(LIBDIR)\" $(CCOPTS) -I../include $(DEFINES)
+ YACCFLAGS = -d -t -v
+ 
+ LDLIBS += -L../lib -lnetlink -lutil
+diff -Naur iproute2-2.6.16-060323.orig/netem/Makefile iproute2-2.6.16-060323/netem/Makefile
+--- iproute2-2.6.16-060323.orig/netem/Makefile	2006-03-14 11:43:59.000000000 -0800
++++ iproute2-2.6.16-060323/netem/Makefile	2006-09-28 22:07:52.059261910 -0700
+@@ -4,6 +4,8 @@
+ HOSTCC ?= $(CC)
+ LDLIBS += -lm 
+ 
++LIBDIR = /usr/lib
++
+ all: $(DISTGEN) $(DISTDATA)
+ 
+ $(DISTGEN):
+@@ -16,9 +18,9 @@
+ 	./maketable experimental.dat > experimental.dist
+ 
+ install: all
+-	mkdir -p $(DESTDIR)/usr/lib/tc
++	mkdir -p $(DESTDIR)/$(LIBDIR)/tc
+ 	for i in $(DISTDATA); \
+-	do install -m 755 $$i $(DESTDIR)/usr/lib/tc; \
++	do install -m 755 $$i $(DESTDIR)/$(LIBDIR)/tc; \
+ 	done
+ 
+ clean:
+diff -Naur iproute2-2.6.16-060323.orig/tc/Makefile iproute2-2.6.16-060323/tc/Makefile
+--- iproute2-2.6.16-060323.orig/tc/Makefile	2005-07-05 15:11:37.000000000 -0700
++++ iproute2-2.6.16-060323/tc/Makefile	2006-09-28 22:07:52.059261910 -0700
+@@ -69,10 +69,10 @@
+ 	$(AR) rcs $@ $(TCLIB)
+ 
+ install: all
+-	mkdir -p $(DESTDIR)/usr/lib/tc
++	mkdir -p $(DESTDIR)/$(LIBDIR)/tc
+ 	install -m 0755 -s tc $(DESTDIR)$(SBINDIR)
+ 	for i in $(TCSO); \
+-	do install -m 755 -s $$i $(DESTDIR)/usr/lib/tc; \
++	do install -m 755 -s $$i $(DESTDIR)/$(LIBDIR)/tc; \
+ 	done
+ 
+ clean:
+diff -Naur iproute2-2.6.16-060323.orig/tc/m_ipt.c iproute2-2.6.16-060323/tc/m_ipt.c
+--- iproute2-2.6.16-060323.orig/tc/m_ipt.c	2005-06-23 10:36:38.000000000 -0700
++++ iproute2-2.6.16-060323/tc/m_ipt.c	2006-09-28 22:08:49.337332801 -0700
+@@ -48,7 +48,7 @@
+ #endif
+ 
+ #ifndef IPT_LIB_DIR
+-#define IPT_LIB_DIR "/usr/local/lib/iptables"
++#define IPT_LIB_DIR LIBDIR
+ #endif
+ 
+ #ifndef PROC_SYS_MODPROBE
+diff -Naur iproute2-2.6.16-060323.orig/tc/q_netem.c iproute2-2.6.16-060323/tc/q_netem.c
+--- iproute2-2.6.16-060323.orig/tc/q_netem.c	2005-12-09 16:01:02.000000000 -0800
++++ iproute2-2.6.16-060323/tc/q_netem.c	2006-09-28 22:07:52.059261910 -0700
+@@ -60,7 +60,7 @@
+ 	char *line = NULL;
+ 	char name[128];
+ 
+-	snprintf(name, sizeof(name), "/usr/lib/tc/%s.dist", type);
++	snprintf(name, sizeof(name), LIBDIR "/tc/%s.dist", type);
+ 	if ((f = fopen(name, "r")) == NULL) {
+ 		fprintf(stderr, "No distribution data for %s (%s: %s)\n", 
+ 			type, name, strerror(errno));
+diff -Naur iproute2-2.6.16-060323.orig/tc/tc.c iproute2-2.6.16-060323/tc/tc.c
+--- iproute2-2.6.16-060323.orig/tc/tc.c	2005-10-07 09:33:21.000000000 -0700
++++ iproute2-2.6.16-060323/tc/tc.c	2006-09-28 22:07:52.059261910 -0700
+@@ -99,7 +99,7 @@
+ 		if (strcmp(q->id, str) == 0)
+ 			return q;
+ 
+-	snprintf(buf, sizeof(buf), "/usr/lib/tc/q_%s.so", str);
++	snprintf(buf, sizeof(buf), LIBDIR "/tc/q_%s.so", str);
+ 	dlh = dlopen(buf, RTLD_LAZY);
+ 	if (!dlh) {
+ 		/* look in current binary, only open once */
+@@ -145,7 +145,7 @@
+ 		if (strcmp(q->id, str) == 0)
+ 			return q;
+ 
+-	snprintf(buf, sizeof(buf), "/usr/lib/tc/f_%s.so", str);
++	snprintf(buf, sizeof(buf), LIBDIR "/tc/f_%s.so", str);
+ 	dlh = dlopen(buf, RTLD_LAZY);
+ 	if (dlh == NULL) {
+ 		dlh = BODY;
