X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=tcpdump.spec;h=4bc9e2d0f2589d6758f1832e371fc2126caa2873;hb=3b7ed1b;hp=18bcbdcc05c7580bedf4c2c682bd44b6eaf8c042;hpb=43ce8e30eb4ad6fe75d0faf5e55f8fbf4712eab1;p=packages%2Ftcpdump.git

diff --git a/tcpdump.spec b/tcpdump.spec
index 18bcbdc..4bc9e2d 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -1,6 +1,7 @@
 #
 # 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
@@ -12,21 +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:	3.9.8
+Version:	4.9.2
 Release:	1
 Epoch:		1
 License:	BSD
-Group:		Applications/Networking
+Group:		Networking/Utilities
 Source0:	http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5:	c491a78c52fe73f1f7271aa5d8c6ab2e
+# Source0-md5:	9bbc1ee33dab61302411b02dd0515576
 URL:		http://www.tcpdump.org/
-BuildRequires:	automake
-BuildRequires:	libpcap-devel >= 2:0.9.8
+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
-# 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.8
+BuildRequires:	rpmbuild(macros) >= 1.202
+Requires:	libpcap >= 2:1.8.1
+%if %{with drop_priv}
+Provides:	user(tcpdump)
+Requires(pre):	/bin/id
+Requires(pre):	/usr/sbin/useradd
+%endif
+Requires(postun):	/usr/sbin/userdel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -74,22 +81,39 @@ Tcpdump виводить хедери пакетів, що проходять ч
 %setup -q
 
 %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
+	--with-crypto
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$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
+	%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*