Sun Feb 5 17:25:01 UTC 2012

3 files changed, 0 insertions, 166 deletions

diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD
deleted file mode 100644
index 1295549c3..000000000
--- a/testing/iproute2/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 147098 2012-01-21 22:46:26Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=iproute2
-pkgver=3.2.0
-pkgrel=2
-pkgdesc="IP Routing Utilities"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.linux-foundation.org/en/Net:Iproute2"
-depends=('glibc' 'db')
-makedepends=('linux-atm')
-optdepends=('linux-atm: ATM support')
-provides=('iproute')
-conflicts=('iproute')
-replaces=('iproute')
-options=('!makeflags')
-backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
-	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
-source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
-	iproute2-fhs.patch
-        fix-ip-l.patch)
-sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
-          '2416b11252364d7a6c742eabb4a6924a75637a46'
-          '2ec5513c44f89046438d65e2cda1a014010e3b73')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # set correct fhs structure
-  patch -Np1 -i "$srcdir/iproute2-fhs.patch"
-
-  #upstream fixes
-  patch -Np1 -i "$srcdir/fix-ip-l.patch"
-
-  ./configure
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-
-  # allow loopback to be started before /usr is mounted, this may not be supported in the future
-  mkdir -p "$pkgdir/sbin"
-  mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
-  ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
-
-  # libnetlink isn't installed, install it FS#19385
-  install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
-  install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
-}
diff --git a/testing/iproute2/fix-ip-l.patch b/testing/iproute2/fix-ip-l.patch
deleted file mode 100644
index 7f1749cbb..000000000
--- a/testing/iproute2/fix-ip-l.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <shemminger@vyatta.com>
-Date: Fri, 20 Jan 2012 08:16:02 -0800
-Subject: [PATCH] ip: make 'ip l' be 'ip link'
-
-Restore compatiablity for those lazy typists.
----
- ip/ip.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/ip/ip.c b/ip/ip.c
-index 7b4bacb..20dc3b5 100644
---- a/ip/ip.c
-+++ b/ip/ip.c
-@@ -72,8 +72,8 @@ static const struct cmd {
- 	{ "neighbour",	do_ipneigh },
- 	{ "ntable",	do_ipntable },
- 	{ "ntbl",	do_ipntable },
--	{ "l2tp",	do_ipl2tp },
- 	{ "link",	do_iplink },
-+	{ "l2tp",	do_ipl2tp },
- 	{ "tunnel",	do_iptunnel },
- 	{ "tunl",	do_iptunnel },
- 	{ "tuntap",	do_iptuntap },
--- 
-1.7.6.5
-
diff --git a/testing/iproute2/iproute2-fhs.patch b/testing/iproute2/iproute2-fhs.patch
deleted file mode 100644
index 2608414db..000000000
--- a/testing/iproute2/iproute2-fhs.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile
---- iproute2.old/Makefile	2009-11-11 22:05:21.251407668 +0100
-+++ iproute2-2.6.29/Makefile	2009-11-11 22:07:09.891833516 +0100
-@@ -1,11 +1,12 @@
- DESTDIR=/usr/
- ROOTDIR=$(DESTDIR)
- LIBDIR=/usr/lib/
--SBINDIR=/sbin
-+SBINDIR=/usr/sbin
- CONFDIR=/etc/iproute2
--DOCDIR=/share/doc/iproute2
--MANDIR=/share/man
-+DOCDIR=/usr/share/doc/iproute2
-+MANDIR=/usr/share/man
- ARPDDIR=/var/lib/arpd
-+SHAREDIR=/usr/share
-
- # Path to db_185.h include
- DBM_INCLUDE:=$(ROOTDIR)/usr/include
-diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c
---- iproute2.old/tc/tc_util.c	2009-11-11 22:05:21.298076943 +0100
-+++ iproute2-2.6.29/tc/tc_util.c	2009-11-11 22:09:32.865152646 +0100
-@@ -24,8 +24,8 @@
- #include "utils.h"
- #include "tc_util.h"
- 
--#ifndef LIBDIR
--#define LIBDIR "/usr/lib/"
-+#ifndef SHAREDIR
-+#define SHAREDIR "/usr/share"
- #endif
- 
- const char *get_tc_lib(void)
-@@ -34,7 +34,7 @@
- 
- 	lib_dir = getenv("TC_LIB_DIR");
- 	if (!lib_dir)
--		lib_dir = LIBDIR "/tc/";
-+		lib_dir = SHAREDIR "/tc/";
- 
- 	return lib_dir;
- }
-diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile
---- iproute2.old/netem/Makefile	2010-08-06 11:30:48.640940183 +0200
-+++ iproute2-2.6.35/netem/Makefile	2010-08-06 11:32:34.210908892 +0200
-@@ -20,9 +20,9 @@
- 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
- 
- install: all
--	mkdir -p $(DESTDIR)$(LIBDIR)/tc
-+	mkdir -p $(DESTDIR)$(SHAREDIR)/tc
- 	for i in $(DISTDATA); \
--	do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
-+	do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
- 	done
- 
- clean:
-diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile
---- iproute2.old/tc/Makefile	2010-08-06 11:48:35.607472252 +0200
-+++ iproute2-2.6.35/tc/Makefile	2010-08-06 11:49:36.977473380 +0200
-@@ -99,18 +99,11 @@
- 	$(AR) rcs $@ $(TCLIB)
- 
- install: all
--	mkdir -p $(MODDESTDIR)
--	install -m 0755 tc $(DESTDIR)$(SBINDIR)
--	for i in $(TCSO); \
--	do install -m 755 $$i $(MODDESTDIR); \
--	done
--	if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
--	if [ -f $(MODDESTDIR)/m_xt.so ]; \
--		then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
--	elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
--		then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
--	fi; \
--	fi
-+	mkdir -p $(DESTDIR)$(LIBDIR)/tc
-+	install -m 0755 tc $(DESTDIR)$(SBINDIR)
-+	for i in $(TCSO); \
-+	do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
-+	done
- 
- clean:
- 	rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \