summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2004-04-13 13:50:05 +0000
committeradam <adam@pkgsrc.org>2004-04-13 13:50:05 +0000
commite2505763548ca54ec3b0818a08b459f5757b1d55 (patch)
tree5f14540ef6817aba4a2ded2920b74e070d90a21a /net
parent9f50b532d924a5e3e508e55711b7b8b91493f958 (diff)
downloadpkgsrc-e2505763548ca54ec3b0818a08b459f5757b1d55.tar.gz
Changes 1.42:
* rewrote the entire configure.in/config.h.in to autoconf 2.57 to be more consistent with normal autoconf'd programs. corrects bugs around packaging impediments and typos. * improved privilege dropping code and added more options to configure to govern its behaviour * added flag to turn off privilege revocation logic * added multiline match as default and ability to enforce previous default single-line match (bugfix + feature) * added ability to read bpf filter expression from file * added ability to force the column width to a certain size * added two new output modes: ``byline'', whose output respects embedded carriage returns (useful for http dumps), and ``none'', which prints out each dump as a single line no matter what. * added ability to specify alternate nonprintable character (default is ``.''). * made ``-q'' effects more consistent and usable for scenarios where ``-I'' and/or ``-O'' are being employed * documentation updated
Diffstat (limited to 'net')
-rw-r--r--net/ngrep/Makefile8
-rw-r--r--net/ngrep/distinfo8
-rw-r--r--net/ngrep/patches/patch-aa34
3 files changed, 25 insertions, 25 deletions
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index fabdb8ae845..c146e06c0e0 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/01/30 14:36:09 adam Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/13 13:50:05 adam Exp $
#
-DISTNAME= ngrep-1.41
+DISTNAME= ngrep-1.42
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ngrep/}
EXTRACT_SUFX= .tar.bz2
@@ -10,7 +10,7 @@ MAINTAINER= hubertf@NetBSD.org
HOMEPAGE= http://ngrep.sourceforge.net/
COMMENT= Network grep
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-pcre
# ngrep's configure use --includedir/$includedir in a weird way!
@@ -24,5 +24,5 @@ do-configure:
cd ${WRKSRC}; ./configure --prefix=${PREFIX}
.endif
-.include "../../net/libpcap/buildlink2.mk"
+.include "../../net/libpcap/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ngrep/distinfo b/net/ngrep/distinfo
index 842090295c8..8f26e76d71e 100644
--- a/net/ngrep/distinfo
+++ b/net/ngrep/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2004/01/30 14:36:09 adam Exp $
+$NetBSD: distinfo,v 1.6 2004/04/13 13:50:05 adam Exp $
-SHA1 (ngrep-1.41.tar.bz2) = 3dddc79c56aaa5d7ab5d45c53d8353bbfa4f27f8
-Size (ngrep-1.41.tar.bz2) = 520209 bytes
-SHA1 (patch-aa) = 163483f02ea803077de20db17f4025ad62c79593
+SHA1 (ngrep-1.42.tar.bz2) = 03987bc4f6344ecd0d56313f42f2c254f37ac271
+Size (ngrep-1.42.tar.bz2) = 527699 bytes
+SHA1 (patch-aa) = cf3076ba4a0c471d429ae76bafe7dab46d20fa30
SHA1 (patch-ab) = 9522bd13976c850d109f91f6a5ec5a2aa7272d4e
diff --git a/net/ngrep/patches/patch-aa b/net/ngrep/patches/patch-aa
index be67937aa9b..0e0c2b644eb 100644
--- a/net/ngrep/patches/patch-aa
+++ b/net/ngrep/patches/patch-aa
@@ -1,37 +1,37 @@
-$NetBSD: patch-aa,v 1.5 2004/01/30 14:36:09 adam Exp $
+$NetBSD: patch-aa,v 1.6 2004/04/13 13:50:05 adam Exp $
---- configure.orig 2003-08-10 02:12:55.000000000 +0000
+--- configure.orig 2004-01-04 21:03:31.000000000 +0000
+++ configure
-@@ -1566,16 +1566,8 @@ pcap_dir=""
- for dir in $PCAP_DIR ; do
+@@ -3274,16 +3274,8 @@ pcap_dir=""
+ for dir in $PCAP_DIR ; do
if test -d $dir -a -r "$dir/pcap.h" -a \
- -r "$dir/net/bpf.h" ; then
+ -r "$dir/net/bpf.h" ; then
- if test -n "$pcap_dir" -a "$pcap_dir" != "$dir"; then
-- echo
+- echo
- echo; echo more than one set found in:
-- echo $pcap_dir
+- echo $pcap_dir
- echo $dir
- echo; echo please wipe out all unused pcap installations
- exit
-- else
+- else
- pcap_dir="$dir"
- fi
-+ pcap_dir="$dir"
-+ break
++ pcap_dir="$dir"
++ break
fi
done
-@@ -1968,7 +1960,12 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
- echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3309,7 +3301,12 @@ if test "${ac_cv_lib_pcap_pcap_open_live
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpcap $LIBS"
+case `uname -s` in
+SunOS)
+ LIBS="-lpcap -lxnet $LIBS" ;;
+*)
-+ LIBS="-lpcap $LIBS" ;;
++ LIBS="-lpcap $LIBS" ;;
+esac
- cat > conftest.$ac_ext <<EOF
- #line 1974 "configure"
- #include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */