- up to 1.4.0

diff --git a/libpcap-usb.patch b/libpcap-usb.patch
index 1150fc2418f5a983004c6daf5246605c962cbd4d..41b26bbb7a0a6de3b70273157ff8d7c6375e8f10 100644 (file)
--- a/libpcap-usb.patch
+++ b/libpcap-usb.patch
@@ -12,12 +12,4 @@
        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)
        #
-@@ -1406,7 +1403,7 @@
-               [
-                   AC_DEFINE(PCAP_SUPPORT_CANUSB, 1, [target host supports canusb])
-                   CANUSB_SRC=pcap-canusb-linux.c
--                  LIBS="-lusb-1.0 $LIBS"
-+                  LIBS="-lusb-1.0 -lpthread $LIBS"
-                   AC_MSG_NOTICE(canusb sniffing is supported)
-               ],
-               AC_MSG_NOTICE(canusb sniffing is not supported; install libusb1.0 lib devel to enable it)
+

diff --git a/libpcap.spec b/libpcap.spec
index 00761e42b41c38fff72154614eb5a5d17c88acb3..fb09bf3183b768752c2289c0733872fdf15e1aa6 100644 (file)
--- a/libpcap.spec
+++ b/libpcap.spec
@@ -10,13 +10,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.3.0
+Version:       1.4.0
 Release:       1
 Epoch:         2
 License:       BSD
 Group:         Libraries
 Source0:       http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: f78455a92622b7a3c05c58b6ad1cec7e
+# Source0-md5: 56e88a5aabdd1e04414985ac24f7e76c
 Patch0:                %{name}-bonding.patch
 Patch1:                %{name}-usb.patch
 Patch2:                %{name}-pf_ring.patch
@@ -26,7 +26,7 @@ BuildRequires:        automake
 BuildRequires: bison
 %{?with_bluetooth:BuildRequires:       bluez-libs-devel}
 BuildRequires: flex
-BuildRequires: libnl1-devel >= 1.0
+BuildRequires: libnl-devel
 %{?with_pfring:BuildRequires:  libpfring-devel}
 BuildRequires: libusb-devel >= 1.0
 Obsoletes:     libpcap0
@@ -162,7 +162,10 @@ cp -f /usr/share/automake/config.sub .
 %{__autoconf}
 %configure \
        --with-pcap=linux \
-       --enable-ipv6
+       --enable-ipv6 \
+       --enable-bluetooth \
+       --enable-canusb \
+       --enable-can
 %{__make} \
        %{?with_pfring:CCOPT="%{rpmcflags} -O0"}