X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=tcpdump.spec;h=cb7a23ac75f75a68283e5ff6b4535b3928edae5c;hb=c5d27d0;hp=d52ca1685fb0993b1c86ae4ba319bba2e8707401;hpb=6a895ecb0c4e3072e6164a84b033dbd94b2cdedd;p=packages%2Ftcpdump.git

diff --git a/tcpdump.spec b/tcpdump.spec
index d52ca16..cb7a23a 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -1,8 +1,8 @@
 #
 # Conditional build:
-%bcond_without	libsmi	# Build without SMI support
-%bcond_with	drop_priv # Breaks "-w" option
-
+%bcond_without	libsmi		# Build without SMI support
+%bcond_with	drop_priv	# Breaks "-w" option
+#
 Summary:	dumps packets that are sent or received over a network interface
 Summary(de.UTF-8):	deponiert Pakete, die über eine Netzwerkschnittstelle gesandt oder empfangen werden
 Summary(es.UTF-8):	Enseña los paquetes que son enviados o recibidos a través de una interface de red
@@ -13,25 +13,27 @@ 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.2.1
+Version:	4.8.1
 Release:	1
 Epoch:		1
 License:	BSD
 Group:		Networking/Utilities
 Source0:	http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5:	c202878c6db054767b52651041b9e60e
-Patch0:		libpcap-m4.patch
+# Source0-md5:	32f57943649f276e09236ba66622bb0c
 URL:		http://www.tcpdump.org/
-BuildRequires:	autoconf
-BuildRequires:	libpcap-devel >= 2:1.2.1
+BuildRequires:	autoconf >= 2.61
+BuildRequires:	libcap-ng-devel
+BuildRequires:	libpcap-devel >= 2:1.8.1
 %{?with_libsmi:BuildRequires:	libsmi-devel}
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	rpmbuild(macros) >= 1.202
-Requires:	libpcap >= 2:1.2.0
+Requires:	libpcap >= 2:1.8.1
+%if %{with drop_priv}
 Provides:	user(tcpdump)
-Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/useradd
+%endif
+Requires(postun):	/usr/sbin/userdel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -77,7 +79,6 @@ Tcpdump виводить хедери пакетів, що проходять ч
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__autoconf}
@@ -88,7 +89,7 @@ Tcpdump виводить хедери пакетів, що проходять ч
 	--with-user=tcpdump \
 	--with-chroot=/usr/share/empty \
 %endif
-	--enable-ipv6
+	--with-crypto
 %{__make}
 
 %install
@@ -98,8 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_sbindir}/tcpdump.%{version}
 
+%if %{with drop_priv}
 %pre
 %useradd -u 273 -r -d /usr/share/empty -s /bin/false -c "tcpdump User" -g nobody tcpdump
+%endif
 
 %postun
 if [ "$1" = "0" ]; then
@@ -111,6 +114,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES CREDITS LICENSE README
+%doc CHANGES CREDITS LICENSE README.md
 %attr(755,root,root) %{_sbindir}/tcpdump
 %{_mandir}/man1/tcpdump.1*