Pullup ticket 296 - requested by Lubomir Sedlacik

security fix for tcpdump

Revisions pulled up:
- pkgsrc/net/tcpdump/Makefile		1.13
- pkgsrc/net/tcpdump/distinfo		1.5
- pkgsrc/net/tcpdump/patches/patch-aa	removed
- pkgsrc/net/tcpdump/patches/patch-ab	removed

   Module Name:    pkgsrc
   Committed By:   reed
   Date:		Tue Jan 25 18:55:43 UTC 2005

   Modified Files:
           pkgsrc/net/tcpdump: Makefile distinfo
   Removed Files:
           pkgsrc/net/tcpdump/patches: patch-aa patch-ab

   Log Message:
   Update to tcpdump-3.8.3 (as prompted by Chris Ross on tech-pkg list).

   Changes include:

           Fixes for print-isakmp.c      CVE:    CAN-2004-0183, CAN-2004-0184
                                http://www.rapid7.com/advisories/R7-0017.html
           IP-over-IEEE1394 printing.
           some MINGW32 changes.
           updates for autoconf 2.5
           fixes for print-aodv.c - check for too short packets
           formatting changes to print-ascii for hex output.
           check for too short packets: print-bgp.c, print-bootp.c, print-cdp.c,
                   print-chdlc.c, print-domain.c, print-icmp.c, print-icmp6.c,
                   print-ip.c, print-lwres.c, print-ospf.c, print-pim.c,
                   print-ppp.c,print-pppoe.c, print-rsvp.c, print-wb.c
           print-ether.c - better handling of unknown types.
           print-isoclns.c - additional decoding of types.
           print-llc.c - strings for LLC names added.
           print-pfloc.c - various enhancements
           print-radius.c - better decoding to strings.

           changed syntax of -E argument so that multiple SAs can be decrypted
           fixes for Digital Unix headers and Documentation
           __attribute__ fixes
           CDP changes from Terry Kennedy <terry@tmk.com>.
           IPv6 mobility updates from Kazushi Sugyo <sugyo@pb.jp.nec.com>
           Fixes for ASN.1 decoder for 2.100.3 forms.
           Added a count of packets received and processed to clarify numbers.
           Incorporated WinDUMP patches for Win32 builds.
           PPPoE payload length headers.
           Fixes for HP C compiler builds.
           Use new pcap_breakloop() and pcap_findalldevs() if we can.
           BGP output split into multiple lines.
           Fixes to 802.11 decoding.
           Fixes to PIM decoder.
           SuperH is a CPU that can't handle unaligned access. Many fixes for
                   unaligned access work.
           Fixes to Frame-Relay decoder for Q.933/922 frames.
           Clarified when Solaris can do captures as non-root.
           Added tests/ subdir for examples/regression tests.
           New -U flag.    -flush stdout after every packet
           New -A flag     -print ascii only
           support for decoding IS-IS inside Cisco HDLC Frames
           more verbosity for tftp decoder
           mDNS decoder
           new BFD decoder
           cross compilation patches
           RFC 3561 AODV support.
           UDP/TCP pseudo-checksum properly for source-route options.
           sanitized all files to modified BSD license
           Add support for RFC 2625 IP-over-Fibre Channel.
           fixes for DECnet support.
           Support RFC 2684 bridging of Ethernet, 802.5 Token Ring, and FDDI.
           RFC 2684 encapsulation of BPDUs.

   This is a security fix update.

4 files changed, 5 insertions, 52 deletions

diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index 56b11810bc2..1dcc2d1ec63 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2004/11/27 08:03:37 tron Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2005/02/19 21:38:04 snj Exp $
 
-DISTNAME=		tcpdump-3.7.2
-PKGREVISION=		3
+DISTNAME=		tcpdump-3.8.3
 CATEGORIES=		net
 MASTER_SITES= 		http://www.tcpdump.org/release/
 
diff --git a/net/tcpdump/distinfo b/net/tcpdump/distinfo
index 7782de40991..df2788bc702 100644
--- a/net/tcpdump/distinfo
+++ b/net/tcpdump/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/03/25 11:02:56 wiz Exp $
+$NetBSD: distinfo,v 1.4.10.1 2005/02/19 21:38:04 snj Exp $
 
-SHA1 (tcpdump-3.7.2.tar.gz) = 080a5360360047adee6e78b8d8c690e864092710
-Size (tcpdump-3.7.2.tar.gz) = 427223 bytes
-SHA1 (patch-aa) = 7ccc4b926069df4fb36729f099cd442f019b83b4
-SHA1 (patch-ab) = 41d6949dea26b60393bc3b2fba0aa7b405393b24
+SHA1 (tcpdump-3.8.3.tar.gz) = 7ae3c29fe843fc23ae89acd8b1b1e513213f6042
+Size (tcpdump-3.8.3.tar.gz) = 567116 bytes
diff --git a/net/tcpdump/patches/patch-aa b/net/tcpdump/patches/patch-aa
deleted file mode 100644
index 83a25a7918b..00000000000
--- a/net/tcpdump/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/02/13 15:50:36 seb Exp $
-
---- configure.in.orig	Thu Jan 17 06:00:16 2002
-+++ configure.in
-@@ -568,6 +568,8 @@
- 
- AC_VAR_H_ERRNO
- 
-+# configure's patch is hand-trimmed after regen from patched configure.in
-+
- AC_ARG_WITH(crypto, [  --without-crypto        disable crypto support],
- 	[], [
- AC_MSG_CHECKING(for SSLeay)
-@@ -589,8 +591,6 @@
- done
- AC_MSG_RESULT($ac_cv_ssleay_path)
- if test "$ac_cv_ssleay_path" != no; then
--	V_INCLS="$V_INCLS $incdir"
--	LDFLAGS="-L$dir/lib $LDFLAGS"
- 	if test -f $ac_cv_ssleay_path/lib/libRSAglue.a; then
- 		LIBS="$LIBS -lRSAglue"
- 	fi
diff --git a/net/tcpdump/patches/patch-ab b/net/tcpdump/patches/patch-ab
deleted file mode 100644
index 9a980d1cc1e..00000000000
--- a/net/tcpdump/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/02/13 15:50:36 seb Exp $
-
---- configure.orig	Wed Feb 13 12:30:44 2002
-+++ configure
-@@ -4296,6 +4296,8 @@
- 	fi
- 
- 
-+# configure's patch is hand-trimmed after regen from patched configure.in
-+
- # Check whether --with-crypto or --without-crypto was given.
- if test "${with_crypto+set}" = set; then
-   withval="$with_crypto"
-@@ -4322,8 +4324,6 @@
- done
- echo "$ac_t""$ac_cv_ssleay_path" 1>&6
- if test "$ac_cv_ssleay_path" != no; then
--	V_INCLS="$V_INCLS $incdir"
--	LDFLAGS="-L$dir/lib $LDFLAGS"
- 	if test -f $ac_cv_ssleay_path/lib/libRSAglue.a; then
- 		LIBS="$LIBS -lRSAglue"
- 	fi