diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-22 00:01:28 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-22 00:01:28 +0000 |
| commit | 39e662ccfbe62ae77d458159d192816171a22f43 (patch) | |
| tree | 2484a55934cd77dd33597ab2f214de5b7326cf69 /core/iproute2 | |
| parent | a3108a9a809c496e1f6a0e9caf0acebac3889bfb (diff) | |
Thu Mar 22 00:01:28 UTC 2012
Diffstat (limited to 'core/iproute2')
| -rw-r--r-- | core/iproute2/PKGBUILD | 15 | ||||
| -rw-r--r-- | core/iproute2/remove-libnl-headers.patch | 31 |
2 files changed, 40 insertions, 6 deletions
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index b017ba58b..6fde71628 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 147158 2012-01-23 15:27:38Z ibiru $ +# $Id: PKGBUILD 153932 2012-03-20 20:07:55Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 pkgver=3.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') -url="http://www.linux-foundation.org/en/Net:Iproute2" -depends=('glibc' 'db') +url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" +depends=('glibc' 'db' 'libnl') makedepends=('linux-atm') optdepends=('linux-atm: ATM support') provides=('iproute') @@ -20,10 +20,12 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro '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) + fix-ip-l.patch + remove-libnl-headers.patch) sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533' '2416b11252364d7a6c742eabb4a6924a75637a46' - '2ec5513c44f89046438d65e2cda1a014010e3b73') + '2ec5513c44f89046438d65e2cda1a014010e3b73' + '1cb89ea0945fd190e6943fa7b1c3a4f254d0c1b3') build() { cd $srcdir/$pkgname-$pkgver @@ -33,6 +35,7 @@ build() { #upstream fixes patch -Np1 -i "$srcdir/fix-ip-l.patch" + patch -Np1 -i "$srcdir/remove-libnl-headers.patch" ./configure diff --git a/core/iproute2/remove-libnl-headers.patch b/core/iproute2/remove-libnl-headers.patch new file mode 100644 index 000000000..921e1fa82 --- /dev/null +++ b/core/iproute2/remove-libnl-headers.patch @@ -0,0 +1,31 @@ +From 13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0 Mon Sep 17 00:00:00 2001 +From: Stephen Hemminger <shemminger@vyatta.com> +Date: Tue, 10 Jan 2012 08:50:49 -0800 +Subject: [PATCH] iplt2p: remove unused libnl headers + +Leftover from change to original code. +--- + ip/ipl2tp.c | 7 ------- + 1 files changed, 0 insertions(+), 7 deletions(-) + +diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c +index 042ddb4..97f98b6 100644 +--- a/ip/ipl2tp.c ++++ b/ip/ipl2tp.c +@@ -23,13 +23,6 @@ + #include <linux/if_arp.h> + #include <linux/ip.h> + +-#include <netlink/netlink.h> +-#include <netlink/genl/genl.h> +-#include <netlink/genl/family.h> +-#include <netlink/genl/mngt.h> +-#include <netlink/genl/ctrl.h> +-#include <netlink/utils.h> +- + #include <linux/genetlink.h> + #include <linux/l2tp.h> + +-- +1.7.6.5 + |