From f03fe8f91a3aace79cd5e410499947cf3e6ff352 Mon Sep 17 00:00:00 2001 From: Martin Sehnoutka Date: Thu, 18 May 2017 13:54:34 +0200 Subject: [PATCH] Drop TPACKET_V3 patch as it should be fixed in kernel by now --- ...-use-TPACKETV3-for-memory-mmapped-ca.patch | 35 ------------------- libpcap.spec | 30 +++++++++------- 2 files changed, 18 insertions(+), 47 deletions(-) delete mode 100644 0004-pcap-linux-don-t-use-TPACKETV3-for-memory-mmapped-ca.patch diff --git a/0004-pcap-linux-don-t-use-TPACKETV3-for-memory-mmapped-ca.patch b/0004-pcap-linux-don-t-use-TPACKETV3-for-memory-mmapped-ca.patch deleted file mode 100644 index 469e5c8..0000000 --- a/0004-pcap-linux-don-t-use-TPACKETV3-for-memory-mmapped-ca.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1ce0a55f93bdddb4bdf0956f094f4198f714a42c Mon Sep 17 00:00:00 2001 -From: Michal Sekletar -Date: Mon, 29 Sep 2014 09:25:52 +0200 -Subject: [PATCH 4/4] 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: #1131500 ---- - pcap-linux.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/pcap-linux.c b/pcap-linux.c -index 939717f..f3b4ef4 100644 ---- a/pcap-linux.c -+++ b/pcap-linux.c -@@ -194,9 +194,6 @@ - # ifdef PCAP_SUPPORT_PACKET_RING - # 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/libpcap.spec b/libpcap.spec index 18c8283..97edc50 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -1,19 +1,23 @@ -Name: libpcap -Epoch: 14 -Version: 1.8.1 -Release: 3%{?dist} -Summary: A system-independent interface for user-level packet capture -Group: Development/Libraries -License: BSD with advertising -URL: http://www.tcpdump.org -BuildRequires: glibc-kernheaders >= 2.2.0 bison flex bluez-libs-devel +Name: libpcap +Epoch: 14 +Version: 1.8.1 +Release: 4%{?dist} +Summary: A system-independent interface for user-level packet capture +Group: Development/Libraries +License: BSD with advertising +URL: http://www.tcpdump.org + +BuildRequires: bison +BuildRequires: bluez-libs-devel +BuildRequires: flex +BuildRequires: git +BuildRequires: glibc-kernheaders >= 2.2.0 Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz Patch0001: 0001-man-tcpdump-and-tcpslice-have-manpages-in-man8.patch Patch0002: 0002-pcap-config-mitigate-multilib-conflict.patch Patch0003: 0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch -Patch0004: 0004-pcap-linux-don-t-use-TPACKETV3-for-memory-mmapped-ca.patch %description Libpcap provides a portable framework for low-level network @@ -45,8 +49,7 @@ This package provides the libraries, include files, and other resources needed for developing libpcap applications. %prep -%setup -q -%autopatch -p1 +%autosetup -S git #sparc needs -fPIC %ifarch %{sparc} @@ -84,6 +87,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libpcap.a %{_mandir}/man5/pcap*.5* %changelog +* Thu May 18 2017 Martin Sehnoutka - 14:1.8.1-4 +- Drop TPACKET_V3 patch as it should be fixed in kernel by now + * Fri Feb 10 2017 Fedora Release Engineering - 14:1.8.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild