From 1a8ef4fe69a0a52531e80839016e64f47931f1cd Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Fri, 8 Nov 2013 08:12:32 +0100 Subject: [PATCH] spec: update to git snapshot 459712e --- .gitignore | 2 ++ libpcap-s390.patch | 12 ++++++------ libpcap.spec | 16 ++++++++++------ sources | 3 ++- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 78c976c..b5ded16 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ libpcap-1.1.1.tar.gz /libpcap-1.2.1.tar.gz /libpcap-1.3.0.tar.gz /libpcap-1.4.0.tar.gz +/libpcap-1.5.0-20131108git459712e.tar.gz +/generate-tarball.sh diff --git a/libpcap-s390.patch b/libpcap-s390.patch index 1048182..ee7c003 100644 --- a/libpcap-s390.patch +++ b/libpcap-s390.patch @@ -1,7 +1,7 @@ -diff -up libpcap/pcap-linux.c.s390 libpcap/pcap-linux.c ---- libpcap/pcap-linux.c.s390 2009-07-22 14:33:20.000000000 +0200 -+++ libpcap/pcap-linux.c 2009-07-22 15:22:34.000000000 +0200 -@@ -2377,6 +2377,10 @@ activate_new(pcap_t *handle) +diff -up libpcap-1.5.0/pcap-linux.c.s390 libpcap-1.5.0/pcap-linux.c +--- libpcap-1.5.0/pcap-linux.c.s390 2013-11-08 08:05:02.608387300 +0100 ++++ libpcap-1.5.0/pcap-linux.c 2013-11-08 08:08:49.597405024 +0100 +@@ -3181,6 +3181,10 @@ activate_new(pcap_t *handle) handle->linktype = DLT_LINUX_SLL; } @@ -9,6 +9,6 @@ diff -up libpcap/pcap-linux.c.s390 libpcap/pcap-linux.c + if (strncmp("ctc", device, 3) == 0) + handle->linktype = DLT_EN10MB; + - handle->md.ifindex = iface_get_id(sock_fd, device, + handlep->ifindex = iface_get_id(sock_fd, device, handle->errbuf); - if (handle->md.ifindex == -1) { + if (handlep->ifindex == -1) { diff --git a/libpcap.spec b/libpcap.spec index 29f8f3c..fbd49d8 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -1,17 +1,18 @@ Name: libpcap Epoch: 14 -Version: 1.4.0 -Release: 2%{?dist} +Version: 1.5.0 +Release: 1.20131108git459712e%{?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 -Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz -Patch1: libpcap-man.patch -Patch2: libpcap-multilib.patch -Patch3: libpcap-s390.patch +Source: libpcap-1.5.0-20131108git459712e.tar.gz +Source1: generate-tarball.sh +Patch1: libpcap-man.patch +Patch2: libpcap-multilib.patch +Patch3: libpcap-s390.patch %description Libpcap provides a portable framework for low-level network @@ -84,6 +85,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libpcap.a %{_mandir}/man5/pcap*.5* %changelog +* Fri Nov 08 2013 Michal Sekletar - 14:1.5.0-1.20131108git459712e +- update to snapshot 20131108git459712e + * Sat Aug 03 2013 Fedora Release Engineering - 14:1.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 53568b8..db6ecc0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -56e88a5aabdd1e04414985ac24f7e76c libpcap-1.4.0.tar.gz +53dfcbb87e79176f87ca81069691fbf1 libpcap-1.5.0-20131108git459712e.tar.gz +039346c7006dff3b52e58c7f337cf65b generate-tarball.sh