X-Git-Url: https://git.pld-linux.org/?p=packages%2Ftcpdump.git;a=blobdiff_plain;f=tcpdump.spec;h=d52ca1685fb0993b1c86ae4ba319bba2e8707401;hp=368cdbc1b560ec827d7a96a7864a9ce32c517b47;hb=6a895ec;hpb=e42cc0805b551937c0eeac58644e7b2042f4f62d

diff --git a/tcpdump.spec b/tcpdump.spec
index 368cdbc..d52ca16 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -1,7 +1,8 @@
 #
 # Conditional build:
 %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
@@ -12,19 +13,25 @@ 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.1.0
+Version:	4.2.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:	949d4661a7501cfedf7b1eb858302c9c
+# Source0-md5:	c202878c6db054767b52651041b9e60e
+Patch0:		libpcap-m4.patch
 URL:		http://www.tcpdump.org/
-BuildRequires:	automake
-BuildRequires:	libpcap-devel >= 2:1.1.0
+BuildRequires:	autoconf
+BuildRequires:	libpcap-devel >= 2:1.2.1
 %{?with_libsmi:BuildRequires:	libsmi-devel}
 BuildRequires:	openssl-devel >= 0.9.7d
-Requires:	libpcap >= 2:1.1.0
+BuildRequires:	rpmbuild(macros) >= 1.202
+Requires:	libpcap >= 2:1.2.0
+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
@@ -69,20 +76,36 @@ Tcpdump виводить хедери пакетів, що проходять ч
 безпеки.
 
 %prep
-%setup -q -n %{name}-4.1
+%setup -q
+%patch0 -p1
 
 %build
-cp -f /usr/share/automake/config.* .
+%{__autoconf}
 %configure \
+	CFLAGS="-I. %{rpmcflags} %{rpmcppflags}" \
+	%{?with_smi:--with-smi} \
+%if %{with drop_priv}
+	--with-user=tcpdump \
+	--with-chroot=/usr/share/empty \
+%endif
 	--enable-ipv6
 %{__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
 
@@ -90,4 +113,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc CHANGES CREDITS LICENSE README
 %attr(755,root,root) %{_sbindir}/tcpdump
-%{_mandir}/man1/*
+%{_mandir}/man1/tcpdump.1*