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

[Bartłomiej Piotrowski]

    Date: Wednesday, August 1, 2018 @ 09:05:56
  Author: bpiotrowski
Revision: 329952

1.9.0-1

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

---------------------+
 PKGBUILD            |   15 +++++----------
 disable-remote.diff |   29 -----------------------------
 2 files changed, 5 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-01 09:05:45 UTC (rev 329951)
+++ PKGBUILD	2018-08-01 09:05:56 UTC (rev 329952)
@@ -3,8 +3,8 @@
 # Contributor: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=libpcap
-pkgver=1.8.1
-pkgrel=2
+pkgver=1.9.0
+pkgrel=1
 pkgdesc='A system-independent interface for user-level packet capture'
 arch=('x86_64')
 url='http://www.tcpdump.org/'
@@ -12,20 +12,15 @@
 depends=('glibc' 'libnl' 'sh' 'libusbx' 'dbus')
 makedepends=('flex' 'bluez-libs')
 source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig}
-        mgmt.h
-        disable-remote.diff)
+        mgmt.h)
 validpgpkeys=('1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D') # The Tcpdump Group
-sha256sums=('673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e'
+sha256sums=('2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019'
             'SKIP'
-            '7c85da5330ce7ecb6934795c02c652b9e344461302cf74804a4692c3e2e1e7e2'
-            'dd67dbc3d1fbbbc42c500b9640418e9156c63609800f43cb1ad9c71aa2177ec9')
+            '7c85da5330ce7ecb6934795c02c652b9e344461302cf74804a4692c3e2e1e7e2')
 
 prepare() {
   mkdir -p include/bluetooth
   cp mgmt.h include/bluetooth/
-
-  cd $pkgname-$pkgver
-  patch -p1 -i "$srcdir"/disable-remote.diff
 }
 
 build() {

Deleted: disable-remote.diff
===================================================================
--- disable-remote.diff	2018-08-01 09:05:45 UTC (rev 329951)
+++ disable-remote.diff	2018-08-01 09:05:56 UTC (rev 329952)
@@ -1,29 +0,0 @@
-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