- updated to 1.8.1

- updated usb,libnl patches
- removed obsolete bluetooth patch

diff --git a/libpcap-bluetooth.patch b/libpcap-bluetooth.patch
deleted file mode 100644 (file)
index 6bb89fd..0000000
--- a/libpcap-bluetooth.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN libpcap-1.6.1.org/pcap-bt-monitor-linux.c libpcap-1.6.1/pcap-bt-monitor-linux.c
---- libpcap-1.6.1.org/pcap-bt-monitor-linux.c  2014-07-03 00:12:49.000000000 +0200
-+++ libpcap-1.6.1/pcap-bt-monitor-linux.c      2014-07-20 16:53:44.000000000 +0200
-@@ -39,7 +39,6 @@
- 
- #include <bluetooth/bluetooth.h>
- #include <bluetooth/hci.h>
--#include <bluetooth/mgmt.h>
- 
- #include "pcap/bluetooth.h"
- #include "pcap-int.h"
-@@ -47,6 +46,16 @@
- #define BT_CONTROL_SIZE 32
- #define INTERFACE_NAME "bluetooth-monitor"
- 
-+#ifndef MGMT_HDR_SIZE
-+#define       MGMT_HDR_SIZE 6
-+
-+struct mgmt_hdr {
-+        uint16_t opcode;
-+        uint16_t index;
-+        uint16_t len;
-+} __packed;
-+#endif
-+
- int
- bt_monitor_findalldevs(pcap_if_t **alldevsp, char *err_str)
- {

diff --git a/libpcap-libnl.patch b/libpcap-libnl.patch
index f47cb11cd5a9f9813bd35930be4ef640ddee92ac..f025890e4bfedb91eb0121255cabca4184dff7a3 100644 (file)
--- a/libpcap-libnl.patch
+++ b/libpcap-libnl.patch
@@ -1,5 +1,5 @@
---- libpcap-1.7.4/configure.in.orig    2015-07-05 13:45:40.844741072 +0200
-+++ libpcap-1.7.4/configure.in 2015-07-05 14:14:49.988000998 +0200
+--- libpcap-1.8.1/configure.ac.orig    2015-07-05 13:45:40.844741072 +0200
++++ libpcap-1.8.1/configure.ac 2015-07-05 14:14:49.988000998 +0200
 @@ -458,9 +458,9 @@
  
                  incdir=-I/usr/include/libnl3

diff --git a/libpcap-usb.patch b/libpcap-usb.patch
index 41b26bbb7a0a6de3b70273157ff8d7c6375e8f10..93dbd6e6ab07cf7e4dc9c7f4298cfcd89b2c6362 100644 (file)
--- a/libpcap-usb.patch
+++ b/libpcap-usb.patch
@@ -1,5 +1,5 @@
---- libpcap-1.3.0/configure.in.orig    2012-03-29 15:42:04.000000000 +0200
-+++ libpcap-1.3.0/configure.in 2012-06-25 17:23:24.365976729 +0200
+--- libpcap-1.8.1/configure.ac.orig    2012-03-29 15:42:04.000000000 +0200
++++ libpcap-1.8.1/configure.ac 2012-06-25 17:23:24.365976729 +0200
 @@ -1275,10 +1275,7 @@
        AC_DEFINE(PCAP_SUPPORT_USB, 1, [target host supports USB sniffing])
        USB_SRC=pcap-usb-linux.c

diff --git a/libpcap.spec b/libpcap.spec
index efab2e8f418e4c0c9f727e7e518e753309915eed..24d319eedbb958c9fb2fa330559fa414cea7379a 100644 (file)
--- a/libpcap.spec
+++ b/libpcap.spec
@@ -10,17 +10,16 @@ Summary(pt_BR.UTF-8):       A libpcap fornece acesso ao modo promíscuo em interfaces
 Summary(ru.UTF-8):     Предоставляет доступ к сетевым интерфейсам в promiscuous-режиме
 Summary(uk.UTF-8):     Надає доступ до мережевих інтерфейсів в promiscuous-режимі
 Name:          libpcap
-Version:       1.7.4
+Version:       1.8.1
 Release:       1
 Epoch:         2
 License:       BSD
 Group:         Libraries
 Source0:       http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: b2e13142bbaba857ab1c6894aedaf547
-Patch0:                %{name}-bluetooth.patch
-Patch1:                %{name}-usb.patch
-Patch2:                %{name}-pf_ring.patch
-Patch3:                %{name}-libnl.patch
+# Source0-md5: 3d48f9cd171ff12b0efd9134b52f1447
+Patch0:                %{name}-usb.patch
+Patch1:                %{name}-pf_ring.patch
+Patch2:                %{name}-libnl.patch
 URL:           http://www.tcpdump.org/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
@@ -156,9 +155,8 @@ Biblioteka statyczna libpcap.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%{?with_pfring:%patch2 -p0}
-%patch3 -p1
+%{?with_pfring:%patch1 -p0}
+%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .