Update logsurfer to 1.6.2(1.6b), requested in PR 33892.

ChangeLog:
Version 1.6b (logsurfer+)
	+ fixed -t option in getopts()

Version 1.6a (logsurfer+)
	Kerry Thompson kerry_at_crypt.gen.nz:
	+ corrected off-by-one in min_lines checking
	+ added min_lines context arg to logsurfer.conf man page

Version 1.6 (logsurfer+)
	Kerry Thompson kerry_at_crypt.gen.nz:
	+ added an optional parameter at the end of context definition
	  (just before action) specifying the minimum number of lines
	  collected which needs to be satisfied before performing action
	+ added -t option to explicity timeout contexts when exiting
	  default=off so contexts don't all trigger when we shut down
	+ only add lines to a context if the context has an action of
	  'pipe' or 'report'. In other words, don't store lines in
	  memory which won't ever be used. The number of matching
	  lines in the context is still incremented. This allows contexts
	  to be created which can notify if we _don't_ see an event, such
	  as regular "syslog pings" from hosts.

4 files changed, 23 insertions, 12 deletions

diff --git a/misc/logsurfer/Makefile b/misc/logsurfer/Makefile
index b0b78d19d12..28e829a5d9e 100644
--- a/misc/logsurfer/Makefile
+++ b/misc/logsurfer/Makefile
@@ -1,15 +1,23 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:11 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/12/07 12:51:36 obache Exp $
 
 DISTNAME=	logsurfer-1.5b
-PKGNAME=	logsurfer-1.5.2
+PKGNAME=	logsurfer-1.6.2
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cert.dfn.de/pub/tools/audit/logsurfer/
 
+PATCH_SITES=	http://www.crypt.gen.nz/logsurfer/
+PATCHFILES=	logsurfer-15b-16b.patch
+
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cert.dfn.de/eng/logsurf/
 COMMENT=	Processes logfiles and performs certain actions
 
+PATCH_DIST_STRIP.logsurfer-15b-16b.patch=	-p2
+
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--with-etcdir=${PREFIX}/etc
+CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+
+BUILD_DEFS+=	VARBASE
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/logsurfer/PLIST b/misc/logsurfer/PLIST
index daea8100018..3d0274f31ac 100644
--- a/misc/logsurfer/PLIST
+++ b/misc/logsurfer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:28:48 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/12/07 12:51:36 obache Exp $
 bin/logsurfer
-man/man1/logsurfer.1.gz
-man/man4/logsurfer.conf.4.gz
+man/man1/logsurfer.1
+man/man4/logsurfer.conf.4
diff --git a/misc/logsurfer/distinfo b/misc/logsurfer/distinfo
index fbcc3d738ac..1c44be92e81 100644
--- a/misc/logsurfer/distinfo
+++ b/misc/logsurfer/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 11:02:55 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/12/07 12:51:36 obache Exp $
 
 SHA1 (logsurfer-1.5b.tar.gz) = a0c0f7e81278fb1bf4dd6bfd1c36b980c65aa1f4
 RMD160 (logsurfer-1.5b.tar.gz) = db1b5d63573a228465561e5f76c773ff527e602a
 Size (logsurfer-1.5b.tar.gz) = 193000 bytes
+SHA1 (logsurfer-15b-16b.patch) = 7077def1e45b8b27cb76df3504a4b497ff80cb46
+RMD160 (logsurfer-15b-16b.patch) = 66744f87ab1cea8f5a267108c943fd36ae4797ed
+Size (logsurfer-15b-16b.patch) = 9697 bytes
 SHA1 (patch-aa) = 4c4f4e2f8093d38b08c5a119e9c84ba32b7a7648
-SHA1 (patch-ab) = 65289a445b062fabee11064d00aa8bb44caf89c8
+SHA1 (patch-ab) = e1cabe243a690d9166dc8e0d5ac4861b37e1e980
diff --git a/misc/logsurfer/patches/patch-ab b/misc/logsurfer/patches/patch-ab
index a18a6219596..60055b35875 100644
--- a/misc/logsurfer/patches/patch-ab
+++ b/misc/logsurfer/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2000/08/08 23:21:23 cjones Exp $
---- src/context.c.orig	Tue Aug  8 17:07:45 2000
-+++ src/context.c	Tue Aug  8 17:07:55 2000
-@@ -551,7 +551,6 @@
+$NetBSD: patch-ab,v 1.5 2006/12/07 12:51:36 obache Exp $
+--- src/context.c.orig	2006-12-07 12:14:47.000000000 +0000
++++ src/context.c
+@@ -534,7 +534,6 @@ check_context_timeout()
  {
  	struct context	*this_context, *next_context;