- update to 4.1.1

- add %%check

tcpdump-4.1.1-testsuite.patch

@@ -0,0 +1,49 @@
+diff -up tcpdump-4.1.1/tests/TESTLIST.testsuite tcpdump-4.1.1/tests/TESTLIST
+--- tcpdump-4.1.1/tests/TESTLIST.testsuite	2010-03-12 02:56:44.000000000 +0100
++++ tcpdump-4.1.1/tests/TESTLIST	2010-04-06 14:33:20.000000000 +0200
+@@ -11,7 +11,7 @@ esp2 08-sunrise-sunset-esp2.pcap esp2.ou
+ esp3 02-sunrise-sunset-esp.pcap esp1.out -t -E "3des-cbc-hmac96:0x4043434545464649494a4a4c4c4f4f515152525454575758"
+ esp4 08-sunrise-sunset-esp2.pcap esp2.out -t -E "file esp-secrets.txt"
+ esp5 08-sunrise-sunset-aes.pcap esp5.out -t -E "file esp-secrets.txt"
+-espudp1 espudp1.pcap espudp1.out -t -E "file esp-secrets.txt"
++#espudp1 espudp1.pcap espudp1.out -t -E "file esp-secrets.txt"
+ 
+ # ISAKMP tests
+ isakmp1 isakmp-delete-segfault.pcap isakmp1.out -t 
+diff -up tcpdump-4.1.1/tests/TESTonce.testsuite tcpdump-4.1.1/tests/TESTonce
+--- tcpdump-4.1.1/tests/TESTonce.testsuite	2010-03-12 02:56:44.000000000 +0100
++++ tcpdump-4.1.1/tests/TESTonce	2010-04-06 14:31:12.000000000 +0200
+@@ -40,7 +40,7 @@ if (! -f $input) {
+ }
+ 
+ print "    ";
+-exec("../tcpdump -n -r $input $options | tee NEW/$output | diff -w - $output >DIFF/$output.diff");
++exec("../tcpdump -nn -r $input $options | tee NEW/$output | diff -w - $output >DIFF/$output.diff");
+ @cores = glob("core*");
+ exit 10 if (@cores > 0);
+ exit 0;
+diff -up tcpdump-4.1.1/tests/espudp1.out.testsuite tcpdump-4.1.1/tests/espudp1.out
+diff -up tcpdump-4.1.1/tests/lmp.sh.testsuite tcpdump-4.1.1/tests/lmp.sh
+--- tcpdump-4.1.1/tests/lmp.sh.testsuite	2010-03-12 02:56:45.000000000 +0100
++++ tcpdump-4.1.1/tests/lmp.sh	2010-04-06 14:31:29.000000000 +0200
+@@ -3,7 +3,7 @@
+ uudecode lmp.puu
+ 
+ echo -n test lmp ...
+-../tcpdump -t -n -v -v -v -r lmp.pcap >lmp.new
++../tcpdump -t -nn -v -v -v -r lmp.pcap >lmp.new
+ if diff lmp.new lmp.out
+ then
+ 	echo passed.
+diff -up tcpdump-4.1.1/tests/print-flags.sh.testsuite tcpdump-4.1.1/tests/print-flags.sh
+--- tcpdump-4.1.1/tests/print-flags.sh.testsuite	2010-03-12 02:56:45.000000000 +0100
++++ tcpdump-4.1.1/tests/print-flags.sh	2010-04-06 14:38:15.000000000 +0200
+@@ -3,7 +3,7 @@
+ uudecode print-flags.puu
+ 
+ for i in x xx X XX A AA; do
+-	if (../tcpdump -$i -s0 -nr print-flags.pcap | tee NEW/print-$i.new | diff - print-$i.out >DIFF/print-$i.out.diff )
++	if (TZ=UTC+5 ../tcpdump -$i -s0 -nnr print-flags.pcap | tee NEW/print-$i.new | diff - print-$i.out >DIFF/print-$i.out.diff )
+ 	then
+ 		echo print-$i passed.
+ 	else

tcpdump.spec

@@ -1,8 +1,8 @@
 Summary: A network traffic monitoring tool
 Name: tcpdump
 Epoch: 14
-Version: 4.0.0
+Version: 4.1.1
-Release: 3.20090921gitdf3cb4%{?dist}
+Release: 1%{?dist}
 License: BSD with advertising
 URL: http://www.tcpdump.org
 Group: Applications/Internet
@@ -11,13 +11,12 @@ BuildRequires: openssl-devel libpcap-devel
 BuildRequires: automake
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
+Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
-# git snapshot from git://bpf.tcpdump.org/tcpdump
-Source0: tcpdump-4.0.0-20090921gitdf3cb4.tar.bz2
 Source1: ftp://ftp.ee.lbl.gov/tcpslice-1.2a3.tar.gz
 Patch1: tcpdump-4.0.0-droproot.patch
 Patch2: tcpdump-4.0.0-portnumbers.patch
 Patch3: tcpdump-4.0.0-icmp6msec.patch
+Patch4: tcpdump-4.1.1-testsuite.patch
 Patch5: tcpslice-1.2a3-time.patch
 Patch6: tcpslice-CVS.20010207-bpf.patch
 Patch7: tcpdump-3.9.8-gethostby.patch
@@ -33,11 +32,12 @@ the packet headers, or just the ones that match particular criteria.
 Install tcpdump if you need a program to monitor network traffic.
 
 %prep
-%setup -q -a 1 -n tcpdump
+%setup -q -a 1
 
 %patch1 -p1 -b .droproot
 %patch2 -p1 -b .portnumbers
 %patch3 -p1 -b .icmp6msec
+%patch4 -p1 -b .testsuite
 %patch7 -p1 -b .gethostby
 
 pushd %{tcpslice_dir}
@@ -60,6 +60,9 @@ popd
 %configure --with-crypto --with-user=tcpdump --without-smi
 make %{?_smp_mflags}
 
+%check
+make check
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
@@ -96,6 +99,10 @@ exit 0
 %{_mandir}/man8/tcpdump.8*
 
 %changelog
+* Tue Apr 06 2010 Miroslav Lichvar <mlichvar@redhat.com> - 14:4.1.1-1
+- update to 4.1.1
+- add %%check
+
 * Wed Sep 23 2009 Miroslav Lichvar <mlichvar@redhat.com> - 14:4.0.0-3.20090921gitdf3cb4
 - update to snapshot 20090921gitdf3cb4