1) Update to 0.9.5

2) Changed permissions on plugins.rules and prelude-lml.conf so that
   prelude-lml can run unpriviledged
3) Changed confdir in configure so that plugins.rules and prelude-lml.conf
   are found.
Changes in 0.9.5:
- Experimental context support (ala SEC): we now handle
  multiline log matching.
- Update PAX rules so that it use the new context feature.
- Don't exit on statistics signal, improve statistics precision,
  make them easier to read.
- Fix some problem with user & group options.
- text-output argument is optional.
- New experimental ruleset: Sonicwall and Spamassassin. These
  need to be manually hooked to pcre.rules if you plan to use
  them.
- Fix FAM activation switches.

3 files changed, 26 insertions, 14 deletions

diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index a5ed2a0e043..c77421f8cd3 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/05/21 15:50:18 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2006/05/22 11:49:51 shannonjr Exp $
 #
 
-DISTNAME=		prelude-lml-0.9.4
-PKGREVISION=		1
+DISTNAME=		prelude-lml-0.9.5
 CATEGORIES=		security
 MASTER_SITES=		http://www.prelude-ids.org/download/releases/
 
@@ -48,9 +47,9 @@ SUBST_SED.code+=	-e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
 PKG_SYSCONFSUBDIR=	prelude-lml
 EGDIR=		share/examples/prelude-lml/
 CONF_FILES_PERMS+=	${EGDIR}/plugins.rules ${PKG_SYSCONFDIR}/plugins.rules \
-			${ROOT_USER} ${ROOT_GROUP} 0600
+			${ROOT_USER} ${ROOT_GROUP} 0644
 CONF_FILES_PERMS+=	${EGDIR}/prelude-lml.conf ${PKG_SYSCONFDIR}/prelude-lml.conf \
-			${ROOT_USER} ${ROOT_GROUP} 0600
+			${ROOT_USER} ${ROOT_GROUP} 0644
 .for f in apc-emu.rules arbor.rules arpwatch.rules checkpoint.rules \
 	cisco-pix.rules cisco-router.rules cisco-vpn.rules clamav.rules \
 	dell-om.rules f5-bigip.rules grsecurity.rules honeyd.rules \
diff --git a/security/prelude-lml/distinfo b/security/prelude-lml/distinfo
index a89758ed813..8334d9f4b19 100644
--- a/security/prelude-lml/distinfo
+++ b/security/prelude-lml/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2006/05/21 14:58:33 joerg Exp $
+$NetBSD: distinfo,v 1.6 2006/05/22 11:49:51 shannonjr Exp $
 
-SHA1 (prelude-lml-0.9.4.tar.gz) = 8ca87f35d5966155dd224c40d75173cd4e68f808
-RMD160 (prelude-lml-0.9.4.tar.gz) = 2b6d0e7c228b71cdf20a436542bf15fafa1792f9
-Size (prelude-lml-0.9.4.tar.gz) = 537936 bytes
-SHA1 (patch-aa) = 6ed3c426d1b18ff748a3777527fbf0046caaf97f
+SHA1 (prelude-lml-0.9.5.tar.gz) = 731b011dc0715df448cf6dd2d8176f66bb3a6d9d
+RMD160 (prelude-lml-0.9.5.tar.gz) = d6afa4d4576bbca3ec51548b96e275060c16a983
+Size (prelude-lml-0.9.5.tar.gz) = 543280 bytes
+SHA1 (patch-aa) = ca44ab4c176b0f87878805fd6b528d669dc30219
 SHA1 (patch-ab) = 6cfb8e41b822be4bc616f217da85e0f1af458b5b
 SHA1 (patch-ac) = 0980dcf3d203ad759997bd3d1efb36ea6722a4af
 SHA1 (patch-ad) = 971e0360ff3732c2fc0e5fce33946d6060c54713
diff --git a/security/prelude-lml/patches/patch-aa b/security/prelude-lml/patches/patch-aa
index 1894abc1aea..5efc4af5d40 100644
--- a/security/prelude-lml/patches/patch-aa
+++ b/security/prelude-lml/patches/patch-aa
@@ -1,9 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/01/29 15:56:42 shannonjr Exp $
+$NetBSD: patch-aa,v 1.2 2006/05/22 11:49:51 shannonjr Exp $
 
---- configure.orig	2005-11-24 04:46:20.000000000 -0700
+--- configure.orig	2006-05-17 08:14:52.000000000 -0600
 +++ configure
-@@ -30610,7 +30610,7 @@ _ACEOF
- configdir=$sysconfdir/prelude-lml
+@@ -30584,10 +30584,10 @@ _ACEOF
+ 
+ 
+ 
+-configdir=$sysconfdir/prelude-lml
++configdir=$sysconfdir
  prelude_lml_conf=$configdir/prelude-lml.conf
  regex_conf=$configdir/plugins.rules
 -metadata_dir=$localstatedir/lib/prelude-lml
@@ -11,3 +15,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/01/29 15:56:42 shannonjr Exp $
  plugindir=$libdir/prelude-lml
  log_plugin_dir=$plugindir
  
+@@ -31971,6 +31971,8 @@ do
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    # Avoid regenerating for rechecks on pkgsrc
++    exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;