Changes 1.45:

        o fixed bug where setting the snaplen smaller than the minimum
          necessary to read the full headres would cause garbage to be
          fed into the pattern matcher
        o fixed unreported bug in IPv6/TCP packet length calculation
        o relocated the privilege-dropping routine to be invoked right
          before entering the packet processing loop, to prevent
          interference with necessary permissions to read or write
          dumpfiles/etc.
        o fixed integer overflow with the snaplen that resulted from
          an implicit signed/unsigned conversion
        o minor change to compensate for some broken compiler
          optimizers
        o fixed double-free race condition during ngrep termination
        o reworked packet length calculation in the main processing
          loop, improving performance and readability
        o simplified regex build logic in configure and Makefile
        o updated Win32 version to use config.h for preprocessor
          definitions instead of the Visual Studio project files,
          making manual tweaking and config of ngrep for Win32
          consistent with *NIX and more obvious
        o changed third-party Makefiles to properly clean up after
          themselves
        o added support for radiotap (IEEE802_11_RADIO)
        o changed ``-s 0'' invocation to mimic the equivalent of tcpdump

3 files changed, 12 insertions, 11 deletions

diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index 37edc1cd606..d3247ebb315 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2006/10/07 07:24:49 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2006/11/29 10:28:48 adam Exp $
 
-DISTNAME=	ngrep-1.44
+DISTNAME=	ngrep-1.45
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ngrep/}
 EXTRACT_SUFX=	.tar.bz2
@@ -9,6 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ngrep.sourceforge.net/
 COMMENT=	Network grep
 
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-pcre
 # ngrep's configure use --includedir/$includedir in a weird way!
diff --git a/net/ngrep/distinfo b/net/ngrep/distinfo
index 9289a201068..e047ff80658 100644
--- a/net/ngrep/distinfo
+++ b/net/ngrep/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2006/10/07 07:24:49 rillig Exp $
+$NetBSD: distinfo,v 1.14 2006/11/29 10:28:48 adam Exp $
 
-SHA1 (ngrep-1.44.tar.bz2) = ad17011d52abec29aaa876e5112114d00fe4a5e9
-RMD160 (ngrep-1.44.tar.bz2) = 837433d0e3909218b65c8ecef46e2dd45ff99eed
-Size (ngrep-1.44.tar.bz2) = 793871 bytes
-SHA1 (patch-aa) = 094e184213a401a67c7c409e8f7245fa27f9dcd3
+SHA1 (ngrep-1.45.tar.bz2) = f26090a6ac607db66df99c6fa9aef74968f3330f
+RMD160 (ngrep-1.45.tar.bz2) = d4b89dfa23f6a7c65d3ccefc846362054a46605f
+Size (ngrep-1.45.tar.bz2) = 463361 bytes
+SHA1 (patch-aa) = 7185b12af40ce9581e59c28086e4c0bfa481c804
 SHA1 (patch-ab) = c2ff90264a29fc18e16d2b43e7403d784a4ef584
 SHA1 (patch-ac) = 4b070c7f0e577cd5e9cbff17ee9bac1be7860581
 SHA1 (patch-ad) = d36cbf882976bbe6af98aa02fa0d0386741e0f87
diff --git a/net/ngrep/patches/patch-aa b/net/ngrep/patches/patch-aa
index a88556ba42d..b33110a8f45 100644
--- a/net/ngrep/patches/patch-aa
+++ b/net/ngrep/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2005/02/25 09:23:41 adam Exp $
+$NetBSD: patch-aa,v 1.8 2006/11/29 10:28:48 adam Exp $
 
---- configure.orig	2005-02-24 04:25:20.000000000 +0000
+--- configure.orig	2006-11-15 04:40:56.000000000 +0100
 +++ configure
-@@ -3231,16 +3231,8 @@ fi;
+@@ -4021,16 +4021,8 @@ fi
  pcap_dir=""
  for dir in $PCAP_DIR ; do
      if test -d $dir -a -r "$dir/pcap.h" ; then
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.7 2005/02/25 09:23:41 adam Exp $
      fi
  done
  
-@@ -3421,7 +3413,12 @@ if test "${ac_cv_lib_pcap_pcap_open_live
+@@ -4256,7 +4248,12 @@ if test "${ac_cv_lib_pcap_pcap_open_live
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS