commit 9a91aa943e9ffd3deb61df2882b6be9e9bd3c87c
Author: Jakub Bogusz <[email protected]>
Date: Mon Sep 8 20:24:15 2014 +0200
- updated to 4.6.2
- updated libpcap-m4 patch
libpcap-m4.patch | 10 ++++++----
tcpdump.spec | 8 ++++----
2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/tcpdump.spec b/tcpdump.spec
index afd14a7..498d90a 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -13,22 +13,22 @@ Summary(ru.UTF-8): Инструмент для мониторинга сетев
Summary(tr.UTF-8): Bir ağ arabirimi üzerinden gelen ya da giden paketleri
listeler
Summary(uk.UTF-8): Інструмент для моніторингу мережевого трафіку
Name: tcpdump
-Version: 4.6.1
+Version: 4.6.2
Release: 1
Epoch: 1
License: BSD
Group: Networking/Utilities
Source0: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: dab267ec30216a069747d10314079ec7
+# Source0-md5: 74d0d3728b3cdc60db872d842e7f1598
Patch0: libpcap-m4.patch
URL: http://www.tcpdump.org/
BuildRequires: autoconf >= 2.61
BuildRequires: libcap-ng-devel
-BuildRequires: libpcap-devel >= 2:1.6.1
+BuildRequires: libpcap-devel >= 2:1.6.2
%{?with_libsmi:BuildRequires: libsmi-devel}
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: rpmbuild(macros) >= 1.202
-Requires: libpcap >= 2:1.6.1
+Requires: libpcap >= 2:1.6.2
%if %{with drop_priv}
Provides: user(tcpdump)
Requires(pre): /bin/id
diff --git a/libpcap-m4.patch b/libpcap-m4.patch
index e04275d..a9ab3fb 100644
--- a/libpcap-m4.patch
+++ b/libpcap-m4.patch
@@ -1,13 +1,15 @@
---- tcpdump-4.2.0/aclocal.m4~ 2011-07-24 22:58:55.000000000 +0200
-+++ tcpdump-4.2.0/aclocal.m4 2011-11-28 18:41:29.227895655 +0100
-@@ -286,23 +286,6 @@
+--- tcpdump-4.6.2/aclocal.m4.orig 2014-09-08 20:03:01.007141908 +0200
++++ tcpdump-4.6.2/aclocal.m4 2014-09-08 20:06:33.077133032 +0200
+@@ -440,25 +440,6 @@
fi
AC_MSG_CHECKING(for local pcap library)
libpcap=FAIL
- lastdir=FAIL
- places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
- egrep
'/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'`
-- for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do
+- places2=`ls .. | sed -e 's,/$,,' -e "s,^,../," | \
+- egrep
'/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'`
+- for dir in $places $srcdir/../libpcap ../libpcap $srcdir/libpcap $places2
; do
- basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//' | \
- sed -e 's/-PRE-GIT$//' `
- if test $lastdir = $basedir ; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tcpdump.git/commitdiff/9a91aa943e9ffd3deb61df2882b6be9e9bd3c87c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
