This commit was manufactured by cvs2git to create branch 'AC-branch'.

[packages/tcpdump.git] / tcpdump.spec

diff --git a/tcpdump.spec b/tcpdump.spec
index 7557b11b891b997e27dce9d06be5710644cfd9f0..5c19d23da0aff60758fd9dc157543d4e5a63421f 100644 (file)
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_without libsmi  # Build without SMI support
+#
 Summary:       dumps packets that are sent or received over a network interface
 Summary(de):   deponiert Pakete, die über eine Netzwerkschnittstelle gesandt oder empfangen werden
 Summary(es):   Enseña los paquetes que son enviados o recibidos a través de una interface de red
@@ -8,18 +12,22 @@ Summary(ru): 
 Summary(tr):   Bir að arabirimi üzerinden gelen ya da giden paketleri listeler
 Summary(uk):   ¶ÎÓÔÒÕÍÅÎÔ ÄÌÑ ÍÏΦÔÏÒÉÎÇÕ ÍÅÒÅÖÅ×ÏÇÏ ÔÒÁƦËÕ
 Name:          tcpdump
-Version:       3.7.2
+Version:       3.9.6
 Release:       1
 Epoch:         1
 License:       BSD
 Group:         Applications/Networking
 Source0:       http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
+# Source0-md5: f564e46e595603ce908b54074e3709d3
+Patch0:                %{name}-CVE-2007-3798.patch
 URL:           http://www.tcpdump.org/
-Patch0:                %{name}-ssl.patch
-Patch1:                %{name}-no-libsmi.patch
-BuildRequires: libpcap-devel >= 2:0.6.1
-%{!?_without_libsmi:BuildRequires:     libsmi-devel}
-BuildRequires: openssl-devel >= 0.9.7
+BuildRequires: automake
+BuildRequires: libpcap-devel >= 2:0.9.4
+%{?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.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -64,18 +72,17 @@ Tcpdump 
 ÂÅÚÐÅËÉ.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1
-%{!?_without_libsmi:#}%patch1 -p1
 
 %build
-%configure2_13 \
+cp -f /usr/share/automake/config.* .
+%configure \
        --enable-ipv6
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man1}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -85,5 +92,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc CHANGES CREDITS LICENSE README TODO
 %attr(755,root,root) %{_sbindir}/tcpdump
 %{_mandir}/man1/*