- updated to 1.10.4

diff --git a/libpcap-config-no-L.patch b/libpcap-config-no-L.patch
deleted file mode 100644 (file)
index bbd08b9..0000000
--- a/libpcap-config-no-L.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- libpcap-1.9.1/pcap-config.in.orig  2019-09-30 16:38:32.000000000 +0200
-+++ libpcap-1.9.1/pcap-config.in       2020-10-04 18:47:22.296076892 +0200
-@@ -59,16 +59,16 @@
-       #
-       if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
-       then
--              echo "-I$includedir -L$libdir -lpcap $LIBS"
-+              echo "-I$includedir -lpcap $LIBS"
-       elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
-       then
--              echo "-I$includedir -L$libdir $LIBS"
-+              echo "-I$includedir $LIBS"
-       elif [ "$show_cflags" = 1 ]
-       then
-               echo "-I$includedir"
-       elif [ "$show_libs" = 1 ]
-       then
--              echo "-L$libdir -lpcap $LIBS"
-+              echo "-lpcap $LIBS"
-       elif [ "$show_additional_libs" = 1 ]
-       then
-               echo "$LIBS"
-@@ -80,7 +80,7 @@
-       #
-       if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
-       then
--              echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
-+              echo "-I$includedir -l$PACKAGE_NAME"
-       elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
-       then
-               echo "-I$includedir"
-@@ -89,6 +89,6 @@
-               echo "-I$includedir"
-       elif [ "$show_libs" = 1 ]
-       then
--              echo "-L$libdir $RPATH -l$PACKAGE_NAME"
-+              echo "-l$PACKAGE_NAME"
-       fi
- fi

diff --git a/libpcap-usb.patch b/libpcap-usb.patch
deleted file mode 100644 (file)
index 90a3118..0000000
--- a/libpcap-usb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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_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 eebfbc5318a5dab43b4b10f383bcbb79d8e0a080..5214efa9de0d040848a86cdd5a90ceb23bd19f12 100644 (file)
--- a/libpcap.spec
+++ b/libpcap.spec
@@ -1,3 +1,9 @@
+# TODO:
+# - update pfring support (libpfring.spec, https://github.com/ntop/PF_RING)
+# - DAG card support (--with-dag, proprietary, https://support.endace.com/)
+# - SS7 card support (--with-septel, proprietary, requires Intel Septel API)
+# - Myricom SNF support (--with-snf, proprietary, from https://www.ariacybersecurity.com/support/downloads/)
+# - Riverbed TurboCap support (--with-turbocap, proprietary, from https://support.riverbed.com/ ?)
 #
 # Conditional build:
 %bcond_with    dpdk            # DPDK support
@@ -12,29 +18,27 @@ 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.10.1
+Version:       1.10.4
 Release:       1
 Epoch:         2
 License:       BSD
 Group:         Libraries
-Source0:       http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: 28e17495004036567c2cc884b51eba45
-Patch0:                %{name}-usb.patch
-Patch1:                %{name}-config-no-L.patch
-Patch2:                %{name}-pf_ring.patch
-URL:           http://www.tcpdump.org/
-BuildRequires: autoconf >= 2.64
+Source0:       https://www.tcpdump.org/release/%{name}-%{version}.tar.gz
+# Source0-md5: 0322e28dd76cda8066bb6d00fee5969b
+Patch0:                %{name}-pf_ring.patch
+URL:           https://www.tcpdump.org/
+BuildRequires: autoconf >= 2.69
 BuildRequires: automake
 BuildRequires: bison
 %{?with_bluetooth:BuildRequires:       bluez-libs-devel}
-%{?with_dpdk:BuildRequires:    dpdk-devel}
+%{?with_dpdk:BuildRequires:    dpdk-devel >= 18.02.2}
 BuildRequires: dbus-devel
-BuildRequires: flex
+BuildRequires: flex >= 2.5.31
 %{?with_ibverbs:BuildRequires: libibverbs-devel}
 BuildRequires: libnl-devel >= 3.2
 %{?with_pfring:BuildRequires:  libpfring-devel}
 BuildRequires: libusb-devel >= 1.0
-BuildRequires: pkgconfig
+BuildRequires: pkgconfig >= 1:0.17
 Obsoletes:     libpcap0 < 1.0
 Obsoletes:     libpcap_mmap < 0.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -164,9 +168,7 @@ Biblioteka statyczna libpcap.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%{?with_pfring:%patch2 -p0}
+%{?with_pfring:%patch0 -p0}
 
 %build
 cp -f /usr/share/automake/config.sub .