From 49c3263a83b31cd260ccaa19a6c79dcf1a96491d Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Feb 13 2014 09:09:23 +0000 Subject: import libpcap-1.5.3-3.el7.src.rpm --- diff --git a/.libpcap.metadata b/.libpcap.metadata index 5352b56..fa998b7 100644 --- a/.libpcap.metadata +++ b/.libpcap.metadata @@ -1 +1 @@ -6573ecf2ec4d4382321ef83aaea59c55e5e8e9ab SOURCES/libpcap-1.5.0-20131108git459712e.tar.gz +0d1502d1e46f088f5432d9d16e7fc2619cc33380 SOURCES/libpcap-1.5.3.tar.gz diff --git a/SOURCES/0001-NFLOG-don-t-crash-trying-to-filter-at-link-layer.patch b/SOURCES/0001-NFLOG-don-t-crash-trying-to-filter-at-link-layer.patch new file mode 100644 index 0000000..28ac26f --- /dev/null +++ b/SOURCES/0001-NFLOG-don-t-crash-trying-to-filter-at-link-layer.patch @@ -0,0 +1,41 @@ +From 676cf8a61ed240d0a86d471ef419f45ba35dba80 Mon Sep 17 00:00:00 2001 +From: Denis Ovsienko +Date: Thu, 5 Dec 2013 14:54:14 +0400 +Subject: [PATCH] NFLOG: don't crash trying to filter at link layer + +Before: + +@ tcpdump -i nflog icmp +tcpdump: WARNING: SIOCGIFADDR: nflog: No such device +Aborted (core dumped) + +After: + +@ tcpdump -i nflog icmp +tcpdump: WARNING: SIOCGIFADDR: nflog: No such device +tcpdump: NFLOG link-layer type filtering not implemented +--- + gencode.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/gencode.c b/gencode.c +index 7bb07fb..d58ea30 100644 +--- a/gencode.c ++++ b/gencode.c +@@ -3410,6 +3410,13 @@ gen_linktype(proto) + + case DLT_AX25_KISS: + bpf_error("AX.25 link-layer type filtering not implemented"); ++ ++ case DLT_NFLOG: ++ /* Using the fixed-size NFLOG header it is possible to tell only ++ * the address family of the packet, other meaningful data is ++ * either missing or behind TLVs. ++ */ ++ bpf_error("NFLOG link-layer type filtering not implemented"); + } + + /* +-- +1.8.4.2 + diff --git a/SPECS/libpcap.spec b/SPECS/libpcap.spec index 63f7bc9..9f8c7cf 100644 --- a/SPECS/libpcap.spec +++ b/SPECS/libpcap.spec @@ -1,17 +1,18 @@ Name: libpcap Epoch: 14 -Version: 1.5.0 -Release: 1.20131108git459712e%{?dist} +Version: 1.5.3 +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 +BuildRequires: glibc-kernheaders >= 2.2.0 bison flex bluez-libs-devel git -Source: libpcap-1.5.0-20131108git459712e.tar.gz +Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz 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 %description Libpcap provides a portable framework for low-level network @@ -43,11 +44,7 @@ This package provides the libraries, include files, and other resources needed for developing libpcap applications. %prep -%setup -q - -%patch1 -p1 -b .man -%patch2 -p1 -b .multilib -%patch3 -p1 -b .s390 +%autosetup -S git #sparc needs -fPIC %ifarch %{sparc} @@ -84,6 +81,18 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libpcap.a %{_mandir}/man5/pcap*.5* %changelog +* Thu Feb 13 2014 Michal Sekletar - 14:1.5.3-3 +- don't crash when trying to filter on interface with NFLOG link layer type (#1062511) + +* Fri Jan 24 2014 Daniel Mach - 14:1.5.3-2 +- Mass rebuild 2014-01-24 + +* Wed Jan 15 2014 Michal Sekletar - 14:1.5.3-1 +- update to 1.5.3 + +* Fri Dec 27 2013 Daniel Mach - 14:1.5.0-2.20131108git459712e +- Mass rebuild 2013-12-27 + * Fri Nov 08 2013 Michal Sekletar - 14:1.5.0-1.20131108git459712e - update to snapshot 20131108git459712e (#1026856)