Update to 0.9.12.2. Changes:

- [rulesets]: Remove successful/failure keyword from classification
  (use IDMEF completion). Analyzer class sanitization.
- [nagios] Handle Nagios V2 log entry (fix #283).
- [spamassassin] Fix incorrect AdditionalData assignement.
- New Suhosin ruleset, by Sebastien Tricaud <toady@inl.fr>
- Fix invalid logfile inconsistency alert that could be triggered
  in a rare case, after a renaming detection. Alert improvement.
- On logfile inconsistency alert, do not re-analyze the whole file.
- Remove the 1024 bytes per PCRE reference limit.
- Minor bug fixes, build system cleanup.

5 files changed, 30 insertions, 26 deletions

diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index b3828b6f402..923ed57d469 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2008/03/06 14:53:53 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2008/04/28 10:54:08 shannonjr Exp $
 #
 
-DISTNAME=		prelude-lml-0.9.10.1
-PKGREVISION=		3
+DISTNAME=		prelude-lml-0.9.12.2
 CATEGORIES=		security
 MASTER_SITES=		http://www.prelude-ids.org/download/releases/ \
 			http://www.prelude-ids.org/download/releases/old/
diff --git a/security/prelude-lml/PLIST b/security/prelude-lml/PLIST
index 595c098c134..f725664fe38 100644
--- a/security/prelude-lml/PLIST
+++ b/security/prelude-lml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/10/29 21:53:24 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/04/28 10:54:08 shannonjr Exp $
 bin/prelude-lml
 include/prelude-lml/prelude-lml.h
 lib/prelude-lml/debug.la
@@ -62,6 +62,11 @@ share/examples/prelude-lml/ruleset/exim.rules
 share/examples/prelude-lml/ruleset/ms-cluster.rules
 share/examples/prelude-lml/ruleset/bonding.rules
 share/examples/prelude-lml/ruleset/cisco-common.rules
+share/examples/prelude-lml/ruleset/asterisk.rules
+share/examples/prelude-lml/ruleset/honeytrap.rules
+share/examples/prelude-lml/ruleset/kojoney.rules
+share/examples/prelude-lml/ruleset/rishi.rules
+share/examples/prelude-lml/ruleset/suhosin.rules
 share/examples/rc.d/preludelml
 @dirrm share/examples/prelude-lml/ruleset
 @dirrm share/examples/prelude-lml
diff --git a/security/prelude-lml/distinfo b/security/prelude-lml/distinfo
index b571ea7c144..f159102b2e6 100644
--- a/security/prelude-lml/distinfo
+++ b/security/prelude-lml/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2007/09/05 18:58:41 shannonjr Exp $
+$NetBSD: distinfo,v 1.13 2008/04/28 10:54:08 shannonjr Exp $
 
-SHA1 (prelude-lml-0.9.10.1.tar.gz) = 9edffdb2bcddd6ed03a6c1d1a8e8df347d7693d9
-RMD160 (prelude-lml-0.9.10.1.tar.gz) = 87700d74e9dc04b9344c38933b1d88d5a3e27a81
-Size (prelude-lml-0.9.10.1.tar.gz) = 658499 bytes
-SHA1 (patch-aa) = fbb7dcd864ea1bfc39e02c01a451a7992419dfcb
+SHA1 (prelude-lml-0.9.12.2.tar.gz) = 32ce278d51ea6def910f213d13901ab01c6f0ad6
+RMD160 (prelude-lml-0.9.12.2.tar.gz) = 44e8e803bd9a46fabc5748ee9621a55ed475d863
+Size (prelude-lml-0.9.12.2.tar.gz) = 699787 bytes
+SHA1 (patch-aa) = 634202846912919004df2dc0b47f3f23b5ed7363
 SHA1 (patch-ab) = 41ecade30abfb985c3dabfbb43b2cf0bd44a6d9d
 SHA1 (patch-ac) = 0980dcf3d203ad759997bd3d1efb36ea6722a4af
-SHA1 (patch-ad) = 971e0360ff3732c2fc0e5fce33946d6060c54713
+SHA1 (patch-ad) = ff6978d5975e4a410a8a9206d0a395ada5b4dbdf
diff --git a/security/prelude-lml/patches/patch-aa b/security/prelude-lml/patches/patch-aa
index 35a35f0a065..805ca2d788f 100644
--- a/security/prelude-lml/patches/patch-aa
+++ b/security/prelude-lml/patches/patch-aa
@@ -1,21 +1,21 @@
-$NetBSD: patch-aa,v 1.3 2006/07/11 09:41:33 shannonjr Exp $
+$NetBSD: patch-aa,v 1.4 2008/04/28 10:54:08 shannonjr Exp $
 
---- configure.orig	2006-07-10 07:49:57.000000000 -0600
+--- configure.orig	2008-04-24 11:48:16.000000000 -0600
 +++ configure
-@@ -33038,10 +33038,10 @@ _ACEOF
+@@ -34206,10 +34206,10 @@ fi
+   exec_prefix=$exec_prefix_save
  
  
- 
--configdir=$sysconfdir/prelude-lml
-+configdir=$sysconfdir
+-configdir=$SYSCONFDIR/prelude-lml
++configdir=$SYSCONFDIR
  prelude_lml_conf=$configdir/prelude-lml.conf
  regex_conf=$configdir/plugins.rules
--metadata_dir=$localstatedir/lib/prelude-lml
-+metadata_dir=$localstatedir/prelude-lml
- plugindir=$libdir/prelude-lml
- log_plugin_dir=$plugindir
+-metadata_dir=$LOCALSTATEDIR/lib/prelude-lml
++metadata_dir=$LOCALSTATEDIR/prelude-lml
+ plugindir=$LIBDIR/prelude-lml
+ 
  
-@@ -34549,6 +34549,8 @@ do
+@@ -34815,6 +34815,8 @@ do
    case $ac_option in
    # Handling of the options.
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
diff --git a/security/prelude-lml/patches/patch-ad b/security/prelude-lml/patches/patch-ad
index 30258551d26..56c5621e71a 100644
--- a/security/prelude-lml/patches/patch-ad
+++ b/security/prelude-lml/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.1 2006/05/20 19:12:59 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2008/04/28 10:54:08 shannonjr Exp $
 
---- plugins/pcre/ruleset/Makefile.in.orig	2006-05-20 18:45:48.000000000 +0000
-+++ plugins/pcre/ruleset/Makefile.in
-@@ -285,7 +285,7 @@ ruleset_DATA = \
+--- ./plugins/pcre/ruleset/Makefile.in.orig	2008-04-24 11:48:21.000000000 -0600
++++ ./plugins/pcre/ruleset/Makefile.in
+@@ -535,7 +535,7 @@ ruleset_DATA = \
  	webmin.rules		\
- 	wu-ftp.rules		
+ 	wu-ftp.rules
  
 -rulesetdir = $(configdir)/ruleset
 +rulesetdir = $(prefix)/share/examples/prelude-lml/ruleset