Date: Monday, October 15, 2012 @ 14:55:23 Author: ronald Revision: 168760
archrelease: copy trunk to testing-i686, testing-x86_64 Added: iproute2/repos/testing-i686/ iproute2/repos/testing-i686/PKGBUILD (from rev 168759, iproute2/trunk/PKGBUILD) iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 168759, iproute2/trunk/iproute2-fhs.patch) iproute2/repos/testing-x86_64/ iproute2/repos/testing-x86_64/PKGBUILD (from rev 168759, iproute2/trunk/PKGBUILD) iproute2/repos/testing-x86_64/iproute2-fhs.patch (from rev 168759, iproute2/trunk/iproute2-fhs.patch) -----------------------------------+ testing-i686/PKGBUILD | 50 ++++++++++++++++++++++++ testing-i686/iproute2-fhs.patch | 75 ++++++++++++++++++++++++++++++++++++ testing-x86_64/PKGBUILD | 50 ++++++++++++++++++++++++ testing-x86_64/iproute2-fhs.patch | 75 ++++++++++++++++++++++++++++++++++++ 4 files changed, 250 insertions(+) Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 168759, iproute2/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2012-10-15 18:55:23 UTC (rev 168760) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Judd Vinet <jvi...@zeroflux.org> + +pkgname=iproute2 +pkgver=3.6.0 +pkgrel=1 +pkgdesc="IP Routing Utilities" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" +depends=('glibc' 'db' 'iptables') +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) +sha1sums=('6fa16fd2158d0f289ef454cad46555ead1c33c2d' + '35b8cf2dc94b73eccad427235c07596146cd6f6c') + +build() { + cd $srcdir/$pkgname-$pkgver + + # set correct fhs structure + patch -Np1 -i "$srcdir/iproute2-fhs.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" +} Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 168759, iproute2/trunk/iproute2-fhs.patch) =================================================================== --- testing-i686/iproute2-fhs.patch (rev 0) +++ testing-i686/iproute2-fhs.patch 2012-10-15 18:55:23 UTC (rev 168760) @@ -0,0 +1,75 @@ +diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile +--- iproute2-3.4.0/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/Makefile 2012-06-18 10:23:53.896760158 +0200 +@@ -1,7 +1,8 @@ + ROOTDIR=$(DESTDIR) + PREFIX=/usr + LIBDIR=$(PREFIX)/lib +-SBINDIR=/sbin ++SBINDIR=/usr/sbin ++SHAREDIR=/usr/share + CONFDIR=/etc/iproute2 + DATADIR=$(PREFIX)/share + DOCDIR=$(DATADIR)/doc/iproute2 +diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile +--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +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-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile +--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200 +@@ -105,18 +105,11 @@ + $(AR) rcs $@ $(TCLIB) + + install: all +- mkdir -p $(MODDESTDIR) ++ mkdir -p $(DESTDIR)$(LIBDIR)/tc + install -m 0755 tc $(DESTDIR)$(SBINDIR) + for i in $(TCSO); \ +- do install -m 755 $$i $(MODDESTDIR); \ ++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ + 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 + + clean: + rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ +diff -Naur iproute2-3.4.0/tc/tc_util.c iproute2-3.4.0.new/tc/tc_util.c +--- iproute2-3.4.0/tc/tc_util.c 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/tc/tc_util.c 2012-06-18 10:23:53.893426840 +0200 +@@ -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; + } Copied: iproute2/repos/testing-x86_64/PKGBUILD (from rev 168759, iproute2/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2012-10-15 18:55:23 UTC (rev 168760) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Judd Vinet <jvi...@zeroflux.org> + +pkgname=iproute2 +pkgver=3.6.0 +pkgrel=1 +pkgdesc="IP Routing Utilities" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" +depends=('glibc' 'db' 'iptables') +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) +sha1sums=('6fa16fd2158d0f289ef454cad46555ead1c33c2d' + '35b8cf2dc94b73eccad427235c07596146cd6f6c') + +build() { + cd $srcdir/$pkgname-$pkgver + + # set correct fhs structure + patch -Np1 -i "$srcdir/iproute2-fhs.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" +} Copied: iproute2/repos/testing-x86_64/iproute2-fhs.patch (from rev 168759, iproute2/trunk/iproute2-fhs.patch) =================================================================== --- testing-x86_64/iproute2-fhs.patch (rev 0) +++ testing-x86_64/iproute2-fhs.patch 2012-10-15 18:55:23 UTC (rev 168760) @@ -0,0 +1,75 @@ +diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile +--- iproute2-3.4.0/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/Makefile 2012-06-18 10:23:53.896760158 +0200 +@@ -1,7 +1,8 @@ + ROOTDIR=$(DESTDIR) + PREFIX=/usr + LIBDIR=$(PREFIX)/lib +-SBINDIR=/sbin ++SBINDIR=/usr/sbin ++SHAREDIR=/usr/share + CONFDIR=/etc/iproute2 + DATADIR=$(PREFIX)/share + DOCDIR=$(DATADIR)/doc/iproute2 +diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile +--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +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-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile +--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200 +@@ -105,18 +105,11 @@ + $(AR) rcs $@ $(TCLIB) + + install: all +- mkdir -p $(MODDESTDIR) ++ mkdir -p $(DESTDIR)$(LIBDIR)/tc + install -m 0755 tc $(DESTDIR)$(SBINDIR) + for i in $(TCSO); \ +- do install -m 755 $$i $(MODDESTDIR); \ ++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ + 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 + + clean: + rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ +diff -Naur iproute2-3.4.0/tc/tc_util.c iproute2-3.4.0.new/tc/tc_util.c +--- iproute2-3.4.0/tc/tc_util.c 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/tc/tc_util.c 2012-06-18 10:23:53.893426840 +0200 +@@ -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; + }