- up to 1.10.0

diff --git a/libpcap-usb.patch b/libpcap-usb.patch
index 93dbd6e6ab07cf7e4dc9c7f4298cfcd89b2c6362..90a3118520f60849c26bb12f904a0d6152ad7d5b 100644 (file)
--- a/libpcap-usb.patch
+++ b/libpcap-usb.patch
@@ -1,15 +1,14 @@
 --- 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
-       AC_MSG_RESULT(yes)
--      ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null`
--      if test $? -ne 0 ; then
--        ac_usb_dev_name="usbmon"
--      fi
-+      ac_usb_dev_name="usbmon"
-       AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing])
-       AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name)
-       #
-
+       AC_DEFINE(PCAP_SUPPORT_LINUX_USBMON, 1, [target host supports Linux usbmon for USB sniffing])
+       MODULE_C_SRC="$MODULE_C_SRC pcap-usb-linux.c"
+       AC_MSG_RESULT(yes)
+-      ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null`
+-      if test $? -ne 0 ; then
+-        ac_usb_dev_name="usbmon"
+-      fi
++      ac_usb_dev_name="usbmon"
+       AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing])
+       AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name)
+       #

diff --git a/libpcap.spec b/libpcap.spec
index cdfb5ca008aeaeb9b63df4773229352a47161c92..3044c7eecb7a3dcda0bb5bf498ccd2296d202c56 100644 (file)
--- a/libpcap.spec
+++ b/libpcap.spec
@@ -11,13 +11,13 @@ 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.9.1
-Release:       2
+Version:       1.10.0
+Release:       1
 Epoch:         2
 License:       BSD
 Group:         Libraries
 Source0:       http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: 21af603d9a591c7d96a6457021d84e6c
+# Source0-md5: 8c12dc19dd7e0d02d2bb6596eb5a71c7
 Patch0:                %{name}-usb.patch
 Patch1:                %{name}-config-no-L.patch
 Patch2:                %{name}-pf_ring.patch