[arch-commits] Commit in iproute2/trunk (PKGBUILD remove-libnl-headers.patch)

[Ionut Biru]

    Date: Monday, March 12, 2012 @ 10:43:20
  Author: ibiru
Revision: 153249

fix compilation

Added:
  iproute2/trunk/remove-libnl-headers.patch
Modified:
  iproute2/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   13 ++++++++-----
 remove-libnl-headers.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-12 14:40:08 UTC (rev 153248)
+++ PKGBUILD	2012-03-12 14:43:20 UTC (rev 153249)
@@ -4,12 +4,12 @@
 
 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 @@
 	'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 @@
 
   #upstream fixes
   patch -Np1 -i "$srcdir/fix-ip-l.patch"
+  patch -Np1 -i "$srcdir/remove-libnl-headers.patch"
 
   ./configure
 

Added: remove-libnl-headers.patch
===================================================================
--- remove-libnl-headers.patch	                        (rev 0)
+++ remove-libnl-headers.patch	2012-03-12 14:43:20 UTC (rev 153249)
@@ -0,0 +1,31 @@
+From 13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <shemminger at 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
+