rpms/tcpdump/devel tcpdump-3.9.8-portnumbers.patch, NONE, 1.1 tcpdump.spec, 1.71, 1.72 tcpdump-3.6.1-portnumbers.patch, 1.1, NONE

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/tcpdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7573

Modified Files:
	tcpdump.spec 
Added Files:
	tcpdump-3.9.8-portnumbers.patch 
Removed Files:
	tcpdump-3.6.1-portnumbers.patch 
Log Message:
- rediff patches with fuzz
- add -fno-strict-aliasing to CFLAGS


tcpdump-3.9.8-portnumbers.patch:

--- NEW FILE tcpdump-3.9.8-portnumbers.patch ---
diff -up tcpdump-3.9.8/addrtoname.c.portnumbers tcpdump-3.9.8/addrtoname.c
--- tcpdump-3.9.8/addrtoname.c.portnumbers	2007-09-26 03:59:52.000000000 +0200
+++ tcpdump-3.9.8/addrtoname.c	2008-08-29 13:53:12.000000000 +0200
@@ -704,7 +704,7 @@ init_servarray(void)
 
 		while (table->name)
 			table = table->nxt;
-		if (nflag) {
+		if (nflag > 1) {
 			(void)snprintf(buf, sizeof(buf), "%d", port);
 			table->name = strdup(buf);
 		} else
@@ -1104,7 +1104,7 @@ init_addrtoname(u_int32_t localnet, u_in
 		f_localnet = localnet;
 		f_netmask = mask;
 	}
-	if (nflag)
+	if (nflag > 1)
 		/*
 		 * Simplest way to suppress names.
 		 */
diff -up tcpdump-3.9.8/tcpdump.1.portnumbers tcpdump-3.9.8/tcpdump.1
--- tcpdump-3.9.8/tcpdump.1.portnumbers	2008-08-29 13:53:12.000000000 +0200
+++ tcpdump-3.9.8/tcpdump.1	2008-08-29 13:53:12.000000000 +0200
@@ -403,7 +403,11 @@ Use \fIsecret\fP as a shared secret for 
 TCP segments with the TCP-MD5 option (RFC 2385), if present.
 .TP
 .B \-n
-Don't convert addresses (i.e., host addresses, port numbers, etc.) to names.
+Don't convert host addresses to names.  This can be used to avoid 
+DNS lookups.
+.TP
+.B \-nn
+Don't convert protocol and port numbers etc. to names either.  
 .TP
 .B \-N
 Don't print domain name qualification of host names.


Index: tcpdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpdump/devel/tcpdump.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- tcpdump.spec	2 Jun 2008 12:24:43 -0000	1.71
+++ tcpdump.spec	29 Aug 2008 12:30:41 -0000	1.72
@@ -2,7 +2,7 @@
 Name: tcpdump
 Epoch: 14
 Version: 3.9.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD with advertising
 URL: http://www.tcpdump.org
 Group: Applications/Internet
@@ -14,7 +14,7 @@
 Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
 Source1: ftp://ftp.ee.lbl.gov/tcpslice-1.2a3.tar.gz
 Patch1: tcpdump-3.9.7-droproot.patch
-Patch2: tcpdump-3.6.1-portnumbers.patch
+Patch2: tcpdump-3.9.8-portnumbers.patch
 Patch3: tcpdump-3.9.7-crypto.patch
 Patch4: tcpdump-3.9.8-ikev2.patch
 Patch5: tcpslice-1.2a3-time.patch
@@ -50,7 +50,7 @@
 find . -name '*.c' -o -name '*.h' | xargs chmod 644
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)"
+export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS) -fno-strict-aliasing"
 
 pushd %{tcpslice_dir}
 # update config.{guess,sub}
@@ -98,6 +98,10 @@
 %{_mandir}/man8/tcpdump.8*
 
 %changelog
+* Fri Aug 29 2008 Miroslav Lichvar <mlichvar at redhat.com> - 14:3.9.8-6
+- rediff patches with fuzz
+- add -fno-strict-aliasing to CFLAGS
+
 * Mon Jun 02 2008 Miroslav Lichvar <mlichvar at redhat.com> - 14:3.9.8-5
 - update config.{guess,sub} when building tcpslice
 - remove -D_GNU_SOURCE from CFLAGS


--- tcpdump-3.6.1-portnumbers.patch DELETED ---