From 70fe503e13234cd06390a23f4b893b87694faf30 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@fedoraproject.org>
Date: Oct 12 2004 15:20:23 +0000
Subject: - fixed nfs protocol parsing for 64 bit architectures (bug 132781)


---

diff --git a/.cvsignore b/.cvsignore
index 33a21a0..f0bb2db 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ arpwatch-2.1a13.tar.gz
 libpcap-0.8.3.tar.gz
 tcpdump-3.8.2.tar.gz
 tcpslice-CVS.20010207.tar.gz
+rpc.tar.gz
diff --git a/sources b/sources
index b8fc76c..a6cf810 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@ b9ff9739cdd2c0e9807b2d05860e4811  arpwatch-2.1a13.tar.gz
 56a9d4615d8354fcfe8cff8c8443c77b  libpcap-0.8.3.tar.gz
 1e2b2c862564c1b43101a75519525215  tcpdump-3.8.2.tar.gz
 97cc59ddb3202f74d22261e49aa07115  tcpslice-CVS.20010207.tar.gz
+6e65ea04ab6773c937986098028c8f21  rpc.tar.gz
diff --git a/tcpdump.spec b/tcpdump.spec
index e3dfa9f..3930d79 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -2,7 +2,7 @@
 %define PCAP_UID 77
 %define PCAP_GID 77
 
-%define releaseno 6
+%define releaseno 7
 %define arpwatch_release %{releaseno}
 %define pcap_release %{releaseno}
 %define tcpdump_release %{releaseno}
@@ -33,6 +33,7 @@ Source2: ftp://ftp.ee.lbl.gov/arpwatch-2.1a13.tar.gz
 Source3: arpwatch.init
 Source4: tcpslice-CVS.20010207.tar.gz
 Source5: arpwatch.sysconfig
+Source6: rpc.tar.gz
 
 Patch5: tcpdump-3.6.2-tcpslice-time.patch
 Patch7: tcpdump-3.8.1-redhat.patch
@@ -130,6 +131,7 @@ pushd %tcpdump_dir
 %patch16 -p1 -b .sctp
 %patch17 -p1 -b .sctpdef
 %patch18 -p1 -b .gcc34
+tar xzf %{SOURCE6}
 popd
 
 pushd %arpwatch_dir
@@ -147,7 +149,7 @@ popd
 
 %build
 pushd %libpcap_dir
-
+unset CFLAGS
 %configure --enable-ipv6
 
 DEFS="-g -D_U_=\"\" -fPIC -DHAVE_CONFIG_H"
@@ -167,7 +169,8 @@ make
 popd
 
 pushd %tcpdump_dir
-%define	optflags $RPM_OPT_FLAGS -DIP_MAX_MEMBERSHIPS=20
+unset CFLAGS
+%define	optflags $RPM_OPT_FLAGS -DIP_MAX_MEMBERSHIPS=20 
 %configure --enable-ipv6 --with-user=pcap
 %undefine optflags
 
@@ -183,6 +186,7 @@ make DEFS="$DEFS"
 popd
 
 pushd %arpwatch_dir
+unset CFLAGS
 %configure
 make ARPDIR=%{_vararpwatch}
 popd
@@ -304,6 +308,9 @@ exit 0
 %{_vararpwatch}/massagevendor-old
 
 %changelog
+* Wed Oct 12 2004 Harald Hoyer <harald@redhat.com> - 14:3.8.2-7
+- fixed nfs protocol parsing for 64 bit architectures (bug 132781)
+
 * Wed Sep 15 2004 Harald Hoyer <harald@redhat.com> - 14:3.8.2-6
 - added libpcap-0.8.3-ppp.patch for ppp (bug 128053)