From eb2497bed90c5ad8c7ba02bc2410c3226541c36d Mon Sep 17 00:00:00 2001
From: Simone Rota <sip@crux.nu>
Date: Wed, 1 Oct 2008 19:38:39 +0000
Subject: [PATCH] iproute2: updated to 2.6.26

---
 iproute2/.footprint           | 12 +++---------
 iproute2/.md5sum              |  3 +--
 iproute2/Pkgfile              | 10 ++++------
 iproute2/iproute2-netem.patch | 11 -----------
 4 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 iproute2/iproute2-netem.patch

diff --git a/iproute2/.footprint b/iproute2/.footprint
index ad41db3b..91a4a6c3 100644
--- a/iproute2/.footprint
+++ b/iproute2/.footprint
@@ -37,22 +37,16 @@ drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/libnetlink.3.gz
 drwxr-xr-x	root/root	usr/man/man8/
--rw-r--r--	root/root	usr/man/man8/arpd.8.gz
-lrwxrwxrwx	root/root	usr/man/man8/ctstat.8.gz -> lnstat.8.gz
 -rw-r--r--	root/root	usr/man/man8/ip.8.gz
 -rw-r--r--	root/root	usr/man/man8/lnstat.8.gz
-lrwxrwxrwx	root/root	usr/man/man8/nstat.8.gz -> rtacct.8.gz
-lrwxrwxrwx	root/root	usr/man/man8/routef.8.gz -> routel.8.gz
--rw-r--r--	root/root	usr/man/man8/routel.8.gz
--rw-r--r--	root/root	usr/man/man8/rtacct.8.gz
 -rw-r--r--	root/root	usr/man/man8/rtmon.8.gz
-lrwxrwxrwx	root/root	usr/man/man8/rtstat.8.gz -> lnstat.8.gz
 -rw-r--r--	root/root	usr/man/man8/ss.8.gz
--rw-r--r--	root/root	usr/man/man8/tc-bfifo.8.gz
+lrwxrwxrwx	root/root	usr/man/man8/tc-bfifo.8.gz -> tc-pbfifo.8.gz
 -rw-r--r--	root/root	usr/man/man8/tc-cbq-details.8.gz
 -rw-r--r--	root/root	usr/man/man8/tc-cbq.8.gz
 -rw-r--r--	root/root	usr/man/man8/tc-htb.8.gz
-lrwxrwxrwx	root/root	usr/man/man8/tc-pfifo.8.gz -> tc-bfifo.8.gz
+-rw-r--r--	root/root	usr/man/man8/tc-pbfifo.8.gz
+lrwxrwxrwx	root/root	usr/man/man8/tc-pfifo.8.gz -> tc-pbfifo.8.gz
 -rw-r--r--	root/root	usr/man/man8/tc-pfifo_fast.8.gz
 -rw-r--r--	root/root	usr/man/man8/tc-prio.8.gz
 -rw-r--r--	root/root	usr/man/man8/tc-red.8.gz
diff --git a/iproute2/.md5sum b/iproute2/.md5sum
index 3021074e..1be19534 100644
--- a/iproute2/.md5sum
+++ b/iproute2/.md5sum
@@ -1,3 +1,2 @@
-7d221e735cba05709341cd46401c4ecd  iproute2-2.6.26.tar.bz2
-ebea778def07e2ca13495117f6e0910e  iproute2-netem.patch
+a8fbe5f37e2db79b34f817d43d4cbf8d  iproute2-2.6.19-061214.tar.gz
 0b01b0404718d043adf55cfa314c80bd  net.iproute2
diff --git a/iproute2/Pkgfile b/iproute2/Pkgfile
index 201b4d63..1cf818fd 100644
--- a/iproute2/Pkgfile
+++ b/iproute2/Pkgfile
@@ -4,17 +4,15 @@
 # Packager: Mikhail Kolesnik, mike at openbunker dot org
 
 name=iproute2
-version=2.6.26
+version=2.6.19-061214
 release=1
-source=(http://devresources.linux-foundation.org/dev/iproute2/download/$name-$version.tar.bz2 \
-	net.iproute2 $name-netem.patch)
+source=(http://developer.osdl.org/dev/iproute2/download/$name-$version.tar.gz \
+	net.iproute2)
 
 build() {
 	cd $name-$version
-	patch -p1 < ../$name-netem.patch
 	make KERNEL_INCLUDE="/lib/modules/`uname -r`/source/include"
 	make SBINDIR=/sbin MANDIR=/usr/man DESTDIR=$PKG install
-	rm -rf $PKG/share
+	rm -rf $PKG/usr/share
 	install -D -o root -g root -m 0755 $SRC/net.iproute2 $PKG/etc/rc.d/net
-	mv $PKG/lib $PKG/usr
 }
diff --git a/iproute2/iproute2-netem.patch b/iproute2/iproute2-netem.patch
deleted file mode 100644
index 6b8e593d..00000000
--- a/iproute2/iproute2-netem.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru netem.orig/tc/Makefile netem/tc/Makefile
---- netem.orig/tc/Makefile	2007-10-11 23:56:11.348686771 +0200
-+++ netem/tc/Makefile	2007-10-11 23:58:27.436441970 +0200
-@@ -46,6 +46,7 @@
- CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB
- 
- TCSO :=
-+TCSO += q_netem.so
- ifeq ($(TC_CONFIG_ATM),y)
-   TCSO += q_atm.so
- endif