[arch-commits] Commit in libpcap/trunk (PKGBUILD libnl32.patch)

[Jan Steffens]

    Date: Thursday, February 9, 2012 @ 13:31:43
  Author: heftig
Revision: 149716

libnl3

Added:
  libpcap/trunk/libnl32.patch
Modified:
  libpcap/trunk/PKGBUILD

---------------+
 PKGBUILD      |   13 ++++++++-----
 libnl32.patch |   19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-09 18:09:11 UTC (rev 149715)
+++ PKGBUILD	2012-02-09 18:31:43 UTC (rev 149716)
@@ -3,21 +3,24 @@
 
 pkgname=libpcap
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A system-independent interface for user-level packet capture"
 arch=('i686' 'x86_64')
 url="http://www.tcpdump.org/"
 license=('BSD')
 depends=('glibc' 'libnl' 'sh')
 makedepends=('flex')
-source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz
-        http://www.tcpdump.org/release/libpcap-1.2.1.tar.gz.sig)
+source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig}
+        libnl32.patch)
 sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd'
-            'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4')
+            'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4'
+            '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-ipv6
+  patch -Np1 -i "${srcdir}/libnl32.patch"
+  autoreconf -f -i
+  ./configure --prefix=/usr --enable-ipv6 --with-libnl
   make
 }
 

Added: libnl32.patch
===================================================================
--- libnl32.patch	                        (rev 0)
+++ libnl32.patch	2012-02-09 18:31:43 UTC (rev 149716)
@@ -0,0 +1,19 @@
+diff -u -r libpcap-1.2.1/configure.in libpcap-1.2.1-libnl32/configure.in
+--- libpcap-1.2.1/configure.in	2012-01-02 01:47:37.000000000 +0100
++++ libpcap-1.2.1-libnl32/configure.in	2012-02-09 19:29:29.405603749 +0100
+@@ -433,12 +433,13 @@
+ 		#
+ 		# Try libnl 2.x first.
+ 		#
+-		AC_CHECK_LIB(nl, nl_socket_alloc,
++		AC_CHECK_LIB(nl-3, nl_socket_alloc,
+ 		[
+ 			#
+ 			# Yes, we have libnl 2.x.
+ 			#
+-			LIBS="-lnl-genl -lnl $LIBS"
++			LIBS="$(pkg-config --libs libnl-genl-3.0 libnl-3.0) $LIBS"
++			V_INCLS="$V_INCLS $(pkg-config --cflags libnl-genl-3.0 libnl-3.0)"
+ 			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
+ 			AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x])
+ 		],