* security/libprelude: [1]

  - Update to 0.9.7
  - Bump libprelude.so version

* security/libpreludedb: [2]
  - Update to 0.9.6
  - Chase libprelude.so version

* security/prelude-lml: [3]
  - Update to 0.9.4
  - Chase libprelude.so version
  - Add a rc.d startup script

* security/prelude-manager: [4]
  - Update to 0.9.4
  - Chase libprelude.so version
  - Add a rc.d startup script

PR:		ports/94402 [1], ports/94403 [2],
		ports/94404 [3], ports/94405 [4]
Submitted by:	maintainer [1] [2] [3] [4]

13 files changed, 92 insertions, 43 deletions

diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 90d135932dcf..1cb2c3786602 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -4,8 +4,7 @@
 # $FreeBSD$
 
 PORTNAME=	libprelude
-PORTVERSION=	0.9.5
-PORTREVISION=	3
+PORTVERSION=	0.9.7
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
 		http://www.prelude-ids.org/download/releases/old/
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo
index 614f1e4037ba..41f46219c534 100644
--- a/security/libprelude/distinfo
+++ b/security/libprelude/distinfo
@@ -1,6 +1,3 @@
-MD5 (libprelude-0.9.5.tar.gz) = a639937bf3596794ab5004bfe64859b4
-SHA256 (libprelude-0.9.5.tar.gz) = e7a6c86b85a801fc4f0642633b350a67ee141f99da714440e7048c08fe8eb7bd
-SIZE (libprelude-0.9.5.tar.gz) = 1714089
-MD5 (libprelude-0.9.5.tar.gz.sig) = 1a736c8fe1d154837b0e54409a3dd371
-SHA256 (libprelude-0.9.5.tar.gz.sig) = cae9e4b4d0da9d327975f70cc5e569afaf272f82409113eb33b81181df720ebe
-SIZE (libprelude-0.9.5.tar.gz.sig) = 827
+MD5 (libprelude-0.9.7.tar.gz) = f7d355dccc1878f4f842087ad1125c5a
+SHA256 (libprelude-0.9.7.tar.gz) = 072c3d429a0259ad31db100b2794f15018b28e55555fd7fb9caf1ac7848a2806
+SIZE (libprelude-0.9.7.tar.gz) = 1732925
diff --git a/security/libprelude/pkg-plist b/security/libprelude/pkg-plist
index 5864b8bd828b..dd3396ae7bd0 100644
--- a/security/libprelude/pkg-plist
+++ b/security/libprelude/pkg-plist
@@ -52,7 +52,7 @@ include/libprelude/prelude.h
 include/libprelude/variable.h
 lib/libprelude.la
 lib/libprelude.so
-lib/libprelude.so.6
+lib/libprelude.so.7
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/.packlist
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.bs
diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index cea00203604c..2181db98208b 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 
 PORTNAME=	libpreludedb
-PORTVERSION=	0.9.5.1
+PORTVERSION=	0.9.6
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
 		http://www.prelude-ids.org/download/releases/old/
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
 MAINTAINER=	r.gruyters@yirdis.nl
 COMMENT=	Framework library for access to Prelude NIDS database
 
-LIB_DEPENDS=	prelude.6:${PORTSDIR}/security/libprelude
+LIB_DEPENDS=	prelude.7:${PORTSDIR}/security/libprelude
 
 USE_GPG=		yes
 SIG_SUFFIX=		.sig
diff --git a/security/libpreludedb/distinfo b/security/libpreludedb/distinfo
index 3977a9548e17..790181095674 100644
--- a/security/libpreludedb/distinfo
+++ b/security/libpreludedb/distinfo
@@ -1,6 +1,3 @@
-MD5 (libpreludedb-0.9.5.1.tar.gz) = 58d55ae8dae468682b5872fbdabf2542
-SHA256 (libpreludedb-0.9.5.1.tar.gz) = 762322a1f7ccfaa653b27d049e06ab97f0516d116c804f1c950dab298054ba04
-SIZE (libpreludedb-0.9.5.1.tar.gz) = 709292
-MD5 (libpreludedb-0.9.5.1.tar.gz.sig) = e9faa447b6918f4470652c837a0b828a
-SHA256 (libpreludedb-0.9.5.1.tar.gz.sig) = 4fdaeee9cc0dc62d7a6cae7bd4df5d52508fb376d179eeeffb908a533e8554b8
-SIZE (libpreludedb-0.9.5.1.tar.gz.sig) = 829
+MD5 (libpreludedb-0.9.6.tar.gz) = 7cc373cce2166a32b6867eefdf6e3b26
+SHA256 (libpreludedb-0.9.6.tar.gz) = db1a385435b8a584d2139318054fe0eb5134fe13e8aaaae58cee069fe6dabddf
+SIZE (libpreludedb-0.9.6.tar.gz) = 711009
diff --git a/security/libpreludedb/pkg-plist b/security/libpreludedb/pkg-plist
index 034aed2ceda1..5458f02499b4 100644
--- a/security/libpreludedb/pkg-plist
+++ b/security/libpreludedb/pkg-plist
@@ -34,12 +34,15 @@ share/aclocal/libpreludedb.m4
 %%DATADIR%%/classic/mysql-update-14-1.sql
 %%DATADIR%%/classic/mysql-update-14-2.sql
 %%DATADIR%%/classic/mysql-update-14-3.sql
+%%DATADIR%%/classic/mysql-update-14-4.sql
 %%DATADIR%%/classic/mysql.sql
 %%DATADIR%%/classic/mysql2sqlite.sh
 %%DATADIR%%/classic/pgsql-update-14-1.sql
 %%DATADIR%%/classic/pgsql-update-14-2.sql
 %%DATADIR%%/classic/pgsql-update-14-3.sql
+%%DATADIR%%/classic/pgsql-update-14-4.sql
 %%DATADIR%%/classic/pgsql.sql
+%%DATADIR%%/classic/sqlite-update-14-4.sql
 %%DATADIR%%/classic/sqlite.sql
 %%PORTDOCS%%%%DOCSDIR%%/ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/home.png
@@ -59,8 +62,8 @@ share/aclocal/libpreludedb.m4
 %%PORTDOCS%%%%DOCSDIR%%/style.css
 %%PORTDOCS%%%%DOCSDIR%%/up.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/classic
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%/classic
+@dirrmtry %%DATADIR%%
 @dirrm lib/libpreludedb/plugins/formats
 @dirrm lib/libpreludedb/plugins
 @dirrm lib/libpreludedb
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index df0d05a441fc..84a6a09e5243 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	prelude-lml
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.4
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
 		http://www.prelude-ids.org/download/releases/old/
@@ -13,13 +13,14 @@ MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
 MAINTAINER=	r.gruyters@yirdis.nl
 COMMENT=	Prelude Network Intrusion Detection System Log Monitoring Lackey
 
-LIB_DEPENDS+=	prelude.6:${PORTSDIR}/security/libprelude \
+LIB_DEPENDS+=	prelude.7:${PORTSDIR}/security/libprelude \
 		pcre.0:${PORTSDIR}/devel/pcre
 
 USE_GPG=	yes
 SIG_SUFFIX=	.sig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_RC_SUBR=	prelude-lml.sh
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
diff --git a/security/prelude-lml/distinfo b/security/prelude-lml/distinfo
index ad78f8e1876f..3b53b38c9610 100644
--- a/security/prelude-lml/distinfo
+++ b/security/prelude-lml/distinfo
@@ -1,6 +1,3 @@
-MD5 (prelude-lml-0.9.3.tar.gz) = 514115e4e4e4197bc68808e489c367f3
-SHA256 (prelude-lml-0.9.3.tar.gz) = f22ef7920393fd0bdae641be7050255d1f070174c589b7e8d3ca8d02fc135386
-SIZE (prelude-lml-0.9.3.tar.gz) = 536431
-MD5 (prelude-lml-0.9.3.tar.gz.sig) = 829dbb9702853fe6d36e4299a84838e8
-SHA256 (prelude-lml-0.9.3.tar.gz.sig) = e9a55a55fcf7061b260fc0295db09a3a3c9ac65e9cce4e4e80e0f1c91abb853d
-SIZE (prelude-lml-0.9.3.tar.gz.sig) = 829
+MD5 (prelude-lml-0.9.4.tar.gz) = 33ed8f9428df64778041e4d8fe41c479
+SHA256 (prelude-lml-0.9.4.tar.gz) = 28d64d42f3a454fafad3ac974e76d2cd83183881453b2dfc69f3c0ad955b76aa
+SIZE (prelude-lml-0.9.4.tar.gz) = 537936
diff --git a/security/prelude-lml/files/prelude-lml.sh.in b/security/prelude-lml/files/prelude-lml.sh.in
new file mode 100644
index 000000000000..252be5d71e4a
--- /dev/null
+++ b/security/prelude-lml/files/prelude-lml.sh.in
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# PROVIDE: prelude_lml
+# REQUIRE: NETWORKING SERVERS
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# prelude_lml_enable (bool):   Set to NO by default.
+#                              Set it to YES to enable Prelude LML.
+# prelude_lml_flags  (flags):  Set arguments to use with Prelude LML
+#
+
+. %%RC_SUBR%%
+
+name="prelude_lml"
+rcvar=${name}_enable
+
+command=%%PREFIX%%/bin/prelude-lml
+pidfile=/var/run/prelude-lml.pid
+
+load_rc_config $name
+
+: ${prelude_lml_enable="NO"}
+: ${prelude_lml_flags:-"-d -P ${pidfile}"}
+
+run_rc_command "$1"
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 3dad41ec3ec9..949fd6fc467f 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -5,15 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=	prelude-manager
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTVERSION=	0.9.4
 CATEGORIES=	security
-MASTER_SITES=	http://www.prelude-ids.org/download/releases/
+MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
+MASTER_SITES=	http://www.prelude-ids.org/download/releases/old/
 
 MAINTAINER=	r.gruyters@yirdis.nl
 COMMENT=	Prelude Network Intrusion Detection System central logging point
 
-LIB_DEPENDS+=	prelude.6:${PORTSDIR}/security/libprelude \
+LIB_DEPENDS+=	prelude.7:${PORTSDIR}/security/libprelude \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_GPG=	yes
@@ -21,6 +21,7 @@ SIG_SUFFIX=	.sig
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+USE_RC_SUBR=	prelude-manager.sh
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-html-dir=${PREFIX}/share/doc \
 			--localstatedir=/var
diff --git a/security/prelude-manager/distinfo b/security/prelude-manager/distinfo
index 03ab65a9ddac..3b754faf92e1 100644
--- a/security/prelude-manager/distinfo
+++ b/security/prelude-manager/distinfo
@@ -1,6 +1,3 @@
-MD5 (prelude-manager-0.9.3.tar.gz) = ca714e2b3e581f18954fa6b7285622ee
-SHA256 (prelude-manager-0.9.3.tar.gz) = 0eb448dcfb8c0982b952c989d290ae3e03af1a954e52faf8bbddacb16cfb6545
-SIZE (prelude-manager-0.9.3.tar.gz) = 567751
-MD5 (prelude-manager-0.9.3.tar.gz.sig) = 7aa7aee25ae678d2f9f423a1659de116
-SHA256 (prelude-manager-0.9.3.tar.gz.sig) = fa129eea1d399df60c6ec58f8c1de9f39b4b3fe8086251bb72c38198c0c1cbe4
-SIZE (prelude-manager-0.9.3.tar.gz.sig) = 827
+MD5 (prelude-manager-0.9.4.tar.gz) = ccde00b47f0bc8586aed23286162d0d0
+SHA256 (prelude-manager-0.9.4.tar.gz) = 3fd0fb4e07213fe9bd2fc2797d0f4f7ff7505dbbb73af4ea1cb8a829b057505c
+SIZE (prelude-manager-0.9.4.tar.gz) = 573436
diff --git a/security/prelude-manager/files/prelude-manager.sh.in b/security/prelude-manager/files/prelude-manager.sh.in
new file mode 100644
index 000000000000..b53ff959c5f6
--- /dev/null
+++ b/security/prelude-manager/files/prelude-manager.sh.in
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# PROVIDE: prelude_manager
+# REQUIRE: NETWORKING SERVERS
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# prelude_manager_enable (bool):   Set to NO by default.
+#                                  Set it to YES to enable Prelude Manager.
+# prelude_manager_flags  (flags):  Set arguments to use with Prelude Manager
+#
+
+. %%RC_SUBR%%
+
+name="prelude_manager"
+rcvar=${name}_enable
+
+command=%%PREFIX%%/bin/prelude-manager
+pidfile=/var/run/prelude-manager.pid
+
+load_rc_config $name
+
+: ${prelude_manager_enable="NO"}
+: ${prelude_manager_flags:-"-d -P ${pidfile}"}
+
+run_rc_command "$1"
diff --git a/security/prelude-manager/pkg-plist b/security/prelude-manager/pkg-plist
index 1991454e85e5..dd70dde7ae09 100644
--- a/security/prelude-manager/pkg-plist
+++ b/security/prelude-manager/pkg-plist
@@ -4,6 +4,8 @@ etc/prelude-manager/prelude-manager.conf-dist
 include/prelude-manager/prelude-manager.h
 lib/prelude-manager/filters/idmef-criteria.la
 lib/prelude-manager/filters/idmef-criteria.so
+lib/prelude-manager/decodes/normalize.so
+lib/prelude-manager/decodes/normalize.la
 %%WITH_DB%%lib/prelude-manager/reports/db.la
 %%WITH_DB%%lib/prelude-manager/reports/db.so
 lib/prelude-manager/reports/debug.la
@@ -15,12 +17,13 @@ lib/prelude-manager/reports/textmod.so
 lib/prelude-manager/reports/xmlmod.la
 lib/prelude-manager/reports/xmlmod.so
 %%DATADIR%%/xmlmod/idmef-message.dtd
-@dirrm %%DATADIR%%/xmlmod
-@dirrm %%DATADIR%%
-@dirrm lib/prelude-manager/reports
-@dirrm lib/prelude-manager/filters
-@dirrm lib/prelude-manager
-@dirrm include/prelude-manager
+@dirrmtry %%DATADIR%%/xmlmod
+@dirrmtry %%DATADIR%%
+@dirrmtry lib/prelude-manager/decodes
+@dirrmtry lib/prelude-manager/reports
+@dirrmtry lib/prelude-manager/filters
+@dirrmtry lib/prelude-manager
+@dirrmtry include/prelude-manager
 @dirrmtry etc/prelude-manager
 @dirrmtry /var/run/prelude-manager
 @dirrmtry /var/spool/prelude-manager