[packages/libpcap] - up to 1.6.1

[arekm]

commit a5bec829d2c2b0932e41a815b3dc3223e688a178
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Jul 20 16:56:02 2014 +0200

    - up to 1.6.1

 libpcap-bluetooth.patch | 28 ++++++++++++++++++++++++++++
 libpcap-bonding.patch   | 11 -----------
 libpcap.spec            |  4 ++--
 3 files changed, 30 insertions(+), 13 deletions(-)
---
diff --git a/libpcap.spec b/libpcap.spec
index 0f530fe..d625df9 100644
--- a/libpcap.spec
+++ b/libpcap.spec
@@ -10,14 +10,14 @@ 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.5.3
+Version:	1.6.1
 Release:	1
 Epoch:		2
 License:	BSD
 Group:		Libraries
 Source0:	http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 # Source0-md5:	7e7321fb3aff2f2bb05c8229f3795d4a
-Patch0:		%{name}-bonding.patch
+Patch0:		%{name}-bluetooth.patch
 Patch1:		%{name}-usb.patch
 Patch2:		%{name}-pf_ring.patch
 URL:		http://www.tcpdump.org/
diff --git a/libpcap-bluetooth.patch b/libpcap-bluetooth.patch
new file mode 100644
index 0000000..6bb89fd
--- /dev/null
+++ b/libpcap-bluetooth.patch
@@ -0,0 +1,28 @@
+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-bonding.patch b/libpcap-bonding.patch
deleted file mode 100644
index fe5ed86..0000000
--- a/libpcap-bonding.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpcap-1.1.1/pcap-linux.c.orig	2010-03-12 02:56:54.000000000 +0100
-+++ libpcap-1.1.1/pcap-linux.c	2011-07-12 13:40:43.906538548 +0200
-@@ -1883,7 +1883,7 @@
- 		 */
- 		strncpy(ifrflags.ifr_name, name, sizeof(ifrflags.ifr_name));
- 		if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifrflags) < 0) {
--			if (errno == ENXIO)
-+			if (errno == ENXIO || errno == ENODEV)
- 				continue;
- 			(void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
- 			    "SIOCGIFFLAGS: %.*s: %s",
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libpcap.git/commitdiff/a5bec829d2c2b0932e41a815b3dc3223e688a178