From c00fd389fe5b1ecf8f00c0f372f3c99691da5a65 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 31 2020 09:36:31 +0000
Subject: import libpcap-1.5.3-12.el7


---

diff --git a/SOURCES/0001-pcap-linux-don-t-use-TPACKETV3-for-memory-mmapped-ca.patch b/SOURCES/0001-pcap-linux-don-t-use-TPACKETV3-for-memory-mmapped-ca.patch
deleted file mode 100644
index ced452a..0000000
--- a/SOURCES/0001-pcap-linux-don-t-use-TPACKETV3-for-memory-mmapped-ca.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b298835b3e4e918f00315f3a4e33e73c031ce98e Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Wed, 5 Nov 2014 07:41:11 +0100
-Subject: [PATCH] pcap-linux: don't use TPACKETV3 for memory mmapped capture
-
-There has been numerous reports from users complaining about changes in behavior
-of libpcap when using libpcap compiled with TPACKETV3 support. Back out and
-disable it.
-
-See: https://github.com/the-tcpdump-group/libpcap/issues/380
-See: https://github.com/the-tcpdump-group/libpcap/issues/364
-
-Resolves: #1085096
----
- pcap-linux.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/pcap-linux.c b/pcap-linux.c
-index 83bb107..117405b 100644
---- a/pcap-linux.c
-+++ b/pcap-linux.c
-@@ -198,9 +198,6 @@ static const char rcsid[] _U_ =
-   * uses many ring related structs and macros */
- # ifdef TPACKET_HDRLEN
- #  define HAVE_PACKET_RING
--#  ifdef TPACKET3_HDRLEN
--#   define HAVE_TPACKET3
--#  endif /* TPACKET3_HDRLEN */
- #  ifdef TPACKET2_HDRLEN
- #   define HAVE_TPACKET2
- #  else  /* TPACKET2_HDRLEN */
--- 
-1.8.3.1
-
diff --git a/SPECS/libpcap.spec b/SPECS/libpcap.spec
index 0a61424..7867da5 100644
--- a/SPECS/libpcap.spec
+++ b/SPECS/libpcap.spec
@@ -1,7 +1,7 @@
 Name: libpcap
 Epoch: 14
 Version: 1.5.3
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: A system-independent interface for user-level packet capture
 Group: Development/Libraries
 License: BSD with advertising
@@ -13,7 +13,6 @@ Patch1:  libpcap-man.patch
 Patch2:  libpcap-multilib.patch
 Patch3:  libpcap-s390.patch
 Patch4:  0001-NFLOG-don-t-crash-trying-to-filter-at-link-layer.patch
-Patch5:  0001-pcap-linux-don-t-use-TPACKETV3-for-memory-mmapped-ca.patch
 Patch6:  0001-Make-sure-the-userland-filtering-happens-correctly-o.patch
 Patch7:  0001-bpf-increase-snaplen-if-doing-cooked-mode-userspace-.patch
 Patch8:  0001-linktype-add-netlink-link-dlt-type.patch
@@ -98,6 +97,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libpcap.a
 %{_mandir}/man5/pcap*.5*
 
 %changelog
+* Wed Jul 24 2019 Michal Ruprich <mruprich@redhat.com> - 14:1.5.3-12
+- Resolves: #1596834 - Re-enable TPACKET_V3 to fix silent packet drops
+
 * Tue Oct 17 2017 Michal Ruprich - 14:1.5.3-11
 - Resolves: #1427251 - tcpdump incorrectly shows 0x8100 tag for 802.1ad frames