[arch-commits] Commit in libpcap/trunk (PKGBUILD disable-remote.diff)

[Bartłomiej Piotrowski]

    Date: Wednesday, November 9, 2016 @ 16:19:26
  Author: bpiotrowski
Revision: 280256

upgpkg: libpcap 1.8.1-2

apply Debian patch to fix missing header errors (FS#51734)

Added:
  libpcap/trunk/disable-remote.diff
Modified:
  libpcap/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   44 ++++++++++++++++++++++++--------------------
 disable-remote.diff |   29 +++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-09 08:59:35 UTC (rev 280255)
+++ PKGBUILD	2016-11-09 16:19:26 UTC (rev 280256)
@@ -1,29 +1,35 @@
 # $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at mirantis.com>
+# Contributor: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=libpcap
 pkgver=1.8.1
-pkgrel=1
-pkgdesc="A system-independent interface for user-level packet capture"
+pkgrel=2
+pkgdesc='A system-independent interface for user-level packet capture'
 arch=('i686' 'x86_64')
-url="http://www.tcpdump.org/"
+url='http://www.tcpdump.org/'
 license=('BSD')
-depends=('glibc' 'libnl' 'sh' 'libusbx')
+depends=('glibc' 'libnl' 'sh' 'libusbx' 'dbus')
 makedepends=('flex' 'bluez-libs')
 source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig}
-        mgmt.h)
+        mgmt.h
+        disable-remote.diff)
+validpgpkeys=('1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D') # The Tcpdump Group
 sha256sums=('673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e'
             'SKIP'
-            '7c85da5330ce7ecb6934795c02c652b9e344461302cf74804a4692c3e2e1e7e2')
-validpgpkeys=('1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D')  # The Tcpdump Group
+            '7c85da5330ce7ecb6934795c02c652b9e344461302cf74804a4692c3e2e1e7e2'
+            'dd67dbc3d1fbbbc42c500b9640418e9156c63609800f43cb1ad9c71aa2177ec9')
 
 prepare() {
-  mkdir -p ${srcdir}/include/bluetooth
-  cp ${srcdir}/mgmt.h ${srcdir}/include/bluetooth/
+  mkdir -p include/bluetooth
+  cp mgmt.h include/bluetooth/
+
+  cd $pkgname-$pkgver
+  patch -p1 -i "$srcdir"/disable-remote.diff
 }
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   CFLAGS="$CFLAGS -I${srcdir}/include $(pkg-config libnl-genl-3.0 --cflags)" \
   ./configure --prefix=/usr \
     --enable-ipv6 \
@@ -33,15 +39,13 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -d -m755 ${pkgdir}/usr/bin
-  make DESTDIR=${pkgdir} install
-  
+  cd $pkgname-$pkgver
+  install -d -m755 "$pkgdir"/usr/bin
+  make DESTDIR="$pkgdir" install
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
   # backwards compatibility, programs often look for net/bpf.h
-  mkdir -p ${pkgdir}/usr/include/net
-  cd ${pkgdir}/usr/include/net
+  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
 }

Added: disable-remote.diff
===================================================================
--- disable-remote.diff	                        (rev 0)
+++ disable-remote.diff	2016-11-09 16:19:26 UTC (rev 280256)
@@ -0,0 +1,29 @@
+Disable bits of remote capture support inherited from the WinPCAP merge
+which cause applications to FTBFS if they define HAVE_REMOTE (#843384).
+
+--- a/pcap/pcap.h
++++ b/pcap/pcap.h
+@@ -506,6 +506,11 @@
+   #define MODE_STAT 1
+   #define MODE_MON 2
+ 
++#ifdef HAVE_REMOTE
++  /* Includes most of the public stuff that is needed for the remote capture */
++  #include <remote-ext.h>
++#endif	 /* HAVE_REMOTE */
++
+ #elif defined(MSDOS)
+ 
+   /*
+@@ -526,11 +531,6 @@
+ 
+ #endif /* _WIN32/MSDOS/UN*X */
+ 
+-#ifdef HAVE_REMOTE
+-  /* Includes most of the public stuff that is needed for the remote capture */
+-  #include <remote-ext.h>
+-#endif	 /* HAVE_REMOTE */
+-
+ #ifdef __cplusplus
+ }
+ #endif