X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=tcpdump.spec;h=e61ab018011aac74f9c5e6ed3716b0c52ef248a6;hb=5a57556;hp=a469c0ac4472f531c8ccc2f0e960c79b049a6df6;hpb=34f331d045b8e7f959ec300d545de2971ac60955;p=packages%2Ftcpdump.git

diff --git a/tcpdump.spec b/tcpdump.spec
index a469c0a..e61ab01 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -1,32 +1,38 @@
 #
 # Conditional build:
-%bcond_without	libsmi	# Build without SMI support
+%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
-Summary(fr.UTF-8):   vide les paquets émis ou reçus sur une interface réseau
-Summary(pl.UTF-8):   Pokazuje pakiety przechodzące przez interfejsy sieciowe
-Summary(pt_BR.UTF-8):   Mostra os pacotes que são enviados ou recebidos através de uma interface de rede
-Summary(ru.UTF-8):   Инструмент для мониторинга сетевого траффика
-Summary(tr.UTF-8):   Bir ağ arabirimi üzerinden gelen ya da giden paketleri listeler
-Summary(uk.UTF-8):   Інструмент для моніторингу мережевого трафіку
+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
+Summary(fr.UTF-8):	vide les paquets émis ou reçus sur une interface réseau
+Summary(pl.UTF-8):	Pokazuje pakiety przechodzące przez interfejsy sieciowe
+Summary(pt_BR.UTF-8):	Mostra os pacotes que são enviados ou recebidos através de uma interface de rede
+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:	3.9.5
+Version:	4.5.1
 Release:	1
 Epoch:		1
 License:	BSD
-Group:		Applications/Networking
+Group:		Networking/Utilities
 Source0:	http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5:	2135e7b1f09af0eaf66d2af822bed44a
+# Source0-md5:	973a2513d0076e34aa9da7e15ed98e1b
+Patch0:		libpcap-m4.patch
 URL:		http://www.tcpdump.org/
-BuildRequires:	automake
-BuildRequires:	libpcap-devel >= 2:0.9.5
+BuildRequires:	autoconf >= 2.61
+BuildRequires:	libcap-ng-devel
+BuildRequires:	libpcap-devel >= 2:1.5.1
 %{?with_libsmi:BuildRequires:	libsmi-devel}
 BuildRequires:	openssl-devel >= 0.9.7d
-# beware of tar 1.13.9[12] madness (tarball contains tcpdump-3.8.3/./* paths)
-BuildRequires:	tar >= 1:1.13.93
-Requires:	libpcap >= 2:0.9.5
+BuildRequires:	rpmbuild(macros) >= 1.202
+Requires:	libpcap >= 2:1.5.1
+Provides:	user(tcpdump)
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/sbin/useradd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -72,24 +78,41 @@ Tcpdump виводить хедери пакетів, що проходять ч
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-cp -f /usr/share/automake/config.* .
+%{__autoconf}
 %configure \
-	--enable-ipv6
+	CFLAGS="-I. %{rpmcflags} %{rpmcppflags}" \
+	%{?with_smi:--with-smi} \
+%if %{with drop_priv}
+	--with-user=tcpdump \
+	--with-chroot=/usr/share/empty \
+%endif
+	--enable-ipv6 \
+	--with-crypto
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_sbindir}/tcpdump.%{version}
+
+%pre
+%useradd -u 273 -r -d /usr/share/empty -s /bin/false -c "tcpdump User" -g nobody tcpdump
+
+%postun
+if [ "$1" = "0" ]; then
+	%userremove tcpdump
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES CREDITS LICENSE README TODO
+%doc CHANGES CREDITS LICENSE README.md
 %attr(755,root,root) %{_sbindir}/tcpdump
-%{_mandir}/man1/*
+%{_mandir}/man1/tcpdump.1*