[arch-commits] Commit in libpcap/repos (4 files)

Allan McRae allan at archlinux.org
Thu Feb 23 08:54:09 EST 2012


    Date: Thursday, February 23, 2012 @ 08:54:08
  Author: allan
Revision: 150894

db-move: moved libpcap from [testing] to [core] (x86_64)

Added:
  libpcap/repos/core-x86_64/PKGBUILD
    (from rev 150886, libpcap/repos/testing-x86_64/PKGBUILD)
  libpcap/repos/core-x86_64/libnl32.patch
    (from rev 150886, libpcap/repos/testing-x86_64/libnl32.patch)
Deleted:
  libpcap/repos/core-x86_64/PKGBUILD
  libpcap/repos/testing-x86_64/

---------------+
 PKGBUILD      |   79 +++++++++++++++++++++++++++++---------------------------
 libnl32.patch |   19 +++++++++++++
 2 files changed, 60 insertions(+), 38 deletions(-)

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2012-02-23 13:54:05 UTC (rev 150893)
+++ core-x86_64/PKGBUILD	2012-02-23 13:54:08 UTC (rev 150894)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-pkgname=libpcap
-pkgver=1.2.1
-pkgrel=1
-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)
-sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd'
-            'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-ipv6
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -d -m755 ${pkgdir}/usr/bin
-  make DESTDIR=${pkgdir} install
-  # remove static library
-  rm -rf ${pkgdir}/usr/lib/libpcap.a
-  
-  # backwards compatibility, programs often look for net/bpf.h
-  mkdir -p ${pkgdir}/usr/include/net
-  cd ${pkgdir}/usr/include/net
-  ln -s ../pcap-bpf.h bpf.h
-
-  #install the license
-  install -D -m644 ${srcdir}/$pkgname-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}

Copied: libpcap/repos/core-x86_64/PKGBUILD (from rev 150886, libpcap/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2012-02-23 13:54:08 UTC (rev 150894)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=libpcap
+pkgver=1.2.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{,.sig}
+        libnl32.patch)
+sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd'
+            'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4'
+            '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i "${srcdir}/libnl32.patch"
+  autoreconf -f -i
+  ./configure --prefix=/usr --enable-ipv6 --with-libnl
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  install -d -m755 ${pkgdir}/usr/bin
+  make DESTDIR=${pkgdir} install
+  # remove static library
+  rm -rf ${pkgdir}/usr/lib/libpcap.a
+  
+  # backwards compatibility, programs often look for net/bpf.h
+  mkdir -p ${pkgdir}/usr/include/net
+  cd ${pkgdir}/usr/include/net
+  ln -s ../pcap-bpf.h bpf.h
+
+  #install the license
+  install -D -m644 ${srcdir}/$pkgname-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+}

Copied: libpcap/repos/core-x86_64/libnl32.patch (from rev 150886, libpcap/repos/testing-x86_64/libnl32.patch)
===================================================================
--- core-x86_64/libnl32.patch	                        (rev 0)
+++ core-x86_64/libnl32.patch	2012-02-23 13:54:08 UTC (rev 150894)
@@ -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])
+ 		],



More information about the arch-commits mailing list