diff --git a/.gitignore b/.gitignore index b152d8d..8934ff8 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ libpcap-1.1.1.tar.gz /libpcap-1.8.1.tar.gz /libpcap-1.9.0.tar.gz /libpcap-1.9.1.tar.gz +/libpcap-1.10.0.tar.gz diff --git a/0001-Fix-building-Bluetooth-Linux-Monitor-support-with-Bl.patch b/0001-Fix-building-Bluetooth-Linux-Monitor-support-with-Bl.patch deleted file mode 100644 index 8d88368..0000000 --- a/0001-Fix-building-Bluetooth-Linux-Monitor-support-with-Bl.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 661a9057b123e794897c8957c29530a5f428ec7b Mon Sep 17 00:00:00 2001 -From: Jakub Sitnicki -Date: Thu, 26 Mar 2015 22:35:29 +0100 -Subject: [PATCH] Fix building Bluetooth Linux Monitor support with BlueZ 5.1+ - -Starting from version 5.1 BlueZ no longer exports the mgmt.h header -or any other header that declares the structure of packets passed -over HCI sockets set to use the HCI monitor channel. - -Declare the structure locally and give it the same name as in the -Linux kernel 3.4+. ---- - pcap-bt-monitor-linux.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/pcap-bt-monitor-linux.c b/pcap-bt-monitor-linux.c -index f193e26..b18bdca 100644 ---- a/pcap-bt-monitor-linux.c -+++ b/pcap-bt-monitor-linux.c -@@ -34,12 +34,12 @@ - #endif - - #include -+#include - #include - #include - - #include - #include --#include - - #include "pcap/bluetooth.h" - #include "pcap-int.h" -@@ -49,6 +49,16 @@ - #define BT_CONTROL_SIZE 32 - #define INTERFACE_NAME "bluetooth-monitor" - -+/* -+ * Fields and alignment must match the declaration in the Linux kernel 3.4+. -+ * See struct hci_mon_hdr in include/net/bluetooth/hci_mon.h. -+ */ -+struct hci_mon_hdr { -+ uint16_t opcode; -+ uint16_t index; -+ uint16_t len; -+} __attribute__((packed)); -+ - int - bt_monitor_findalldevs(pcap_if_t **alldevsp, char *err_str) - { -@@ -72,12 +82,12 @@ bt_monitor_read(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_ch - ssize_t ret; - struct pcap_pkthdr pkth; - pcap_bluetooth_linux_monitor_header *bthdr; -- struct mgmt_hdr hdr; -+ struct hci_mon_hdr hdr; - - bthdr = (pcap_bluetooth_linux_monitor_header*) &handle->buffer[handle->offset]; - - iv[0].iov_base = &hdr; -- iv[0].iov_len = MGMT_HDR_SIZE; -+ iv[0].iov_len = sizeof(hdr); - iv[1].iov_base = &handle->buffer[handle->offset + sizeof(pcap_bluetooth_linux_monitor_header)]; - iv[1].iov_len = handle->snapshot; - -@@ -103,7 +113,7 @@ bt_monitor_read(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_ch - return -1; - } - -- pkth.caplen = ret - MGMT_HDR_SIZE + sizeof(pcap_bluetooth_linux_monitor_header); -+ pkth.caplen = ret - sizeof(hdr) + sizeof(pcap_bluetooth_linux_monitor_header); - pkth.len = pkth.caplen; - - for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) { --- -2.4.0 - diff --git a/sources b/sources index 7d73e35..8c43098 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpcap-1.9.1.tar.gz) = ae0d6b0ad8253e7e059336c0f4ed3850d20d7d2f4dc1d942c2951f99a5443a690f0cc42c6f8fdc4a0ccb19e9e985192ba6f399c4bde2c7076e420f547fddfb08 +SHA512 (libpcap-1.10.0.tar.gz) = 007710386ff3435ef97fc99293076eae3c39b424e986141184c712b0285f8589357a1b25085f7eba28730de04312042c724d193934a399797e95a56f5301da7f