commit fee49fbc841089e2a9d92711666f9a5cd2a7b243
Author: Jakub Bogusz <[email protected]>
Date: Sun Jul 5 14:54:14 2015 +0200
- updated to 4.7.4
- removed obsolete libpcap-m4 patch
libpcap-m4.patch | 28 ----------------------------
tcpdump.spec | 10 ++++------
2 files changed, 4 insertions(+), 34 deletions(-)
---
diff --git a/tcpdump.spec b/tcpdump.spec
index 498d90a..18f5e54 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -13,22 +13,21 @@ 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.2
+Version: 4.7.4
Release: 1
Epoch: 1
License: BSD
Group: Networking/Utilities
Source0: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: 74d0d3728b3cdc60db872d842e7f1598
-Patch0: libpcap-m4.patch
+# Source0-md5: 58af728de36f499341918fc4b8e827c3
URL: http://www.tcpdump.org/
BuildRequires: autoconf >= 2.61
BuildRequires: libcap-ng-devel
-BuildRequires: libpcap-devel >= 2:1.6.2
+BuildRequires: libpcap-devel >= 2:1.7.4
%{?with_libsmi:BuildRequires: libsmi-devel}
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: rpmbuild(macros) >= 1.202
-Requires: libpcap >= 2:1.6.2
+Requires: libpcap >= 2:1.7.4
%if %{with drop_priv}
Provides: user(tcpdump)
Requires(pre): /bin/id
@@ -80,7 +79,6 @@ безпеки.
%prep
%setup -q
-%patch0 -p1
%build
%{__autoconf}
diff --git a/libpcap-m4.patch b/libpcap-m4.patch
deleted file mode 100644
index a9ab3fb..0000000
--- a/libpcap-m4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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)?$'`
-- 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
-- dnl skip alphas when an actual release is present
-- continue;
-- fi
-- lastdir=$dir
-- if test -r $dir/libpcap.a ; then
-- libpcap=$dir/libpcap.a
-- d=$dir
-- dnl continue and select the last one that exists
-- fi
-- done
- if test $libpcap = FAIL ; then
- AC_MSG_RESULT(not found)
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tcpdump.git/commitdiff/fee49fbc841089e2a9d92711666f9a5cd2a7b243
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
