- updated to 1.7.4

- added libnl patch (fixes libnl3 detection)

diff --git a/libpcap-libnl.patch b/libpcap-libnl.patch
new file mode 100644 (file)
index 0000000..f47cb11
--- /dev/null
+++ b/libpcap-libnl.patch
@@ -0,0 +1,15 @@
+--- 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
+@@ -458,9 +458,9 @@
+ 
+                 incdir=-I/usr/include/libnl3
+                 libnldir=
+-                if test x$withval != x ; then
+-                  libnldir=-L${withval}/lib/.libs
+-                  incdir=-I${withval}/include
++                if test x$with_libnl != x -a x$with_libnl != xyes; then
++                  libnldir=-L${with_libnl}/lib/.libs
++                  incdir=-I${with_libnl}/include
+                 fi
+ 
+               #

diff --git a/libpcap.spec b/libpcap.spec
index 9197858f02a907ae0d9e1af7988d4734e5108194..efab2e8f418e4c0c9f727e7e518e753309915eed 100644 (file)
--- a/libpcap.spec
+++ b/libpcap.spec
@@ -10,16 +10,17 @@ 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.6.2
-Release:       2
+Version:       1.7.4
+Release:       1
 Epoch:         2
 License:       BSD
 Group:         Libraries
 Source0:       http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: 5f14191c1a684a75532c739c2c4059fa
+# Source0-md5: b2e13142bbaba857ab1c6894aedaf547
 Patch0:                %{name}-bluetooth.patch
 Patch1:                %{name}-usb.patch
 Patch2:                %{name}-pf_ring.patch
+Patch3:                %{name}-libnl.patch
 URL:           http://www.tcpdump.org/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
@@ -27,7 +28,7 @@ BuildRequires:        bison
 %{?with_bluetooth:BuildRequires:       bluez-libs-devel}
 BuildRequires: dbus-devel
 BuildRequires: flex
-BuildRequires: libnl-devel
+BuildRequires: libnl-devel >= 3.2
 %{?with_pfring:BuildRequires:  libpfring-devel}
 BuildRequires: libusb-devel >= 1.0
 Obsoletes:     libpcap0
@@ -157,6 +158,7 @@ Biblioteka statyczna libpcap.
 %patch0 -p1
 %patch1 -p1
 %{?with_pfring:%patch2 -p0}
+%patch3 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .