please test and comment. thanks.
Index: Makefile.inc =================================================================== RCS file: /cvs/ports/security/prelude/Makefile.inc,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Makefile.inc --- Makefile.inc 26 Jun 2006 18:04:24 -0000 1.1.1.1 +++ Makefile.inc 16 Aug 2009 17:03:50 -0000 @@ -6,7 +6,7 @@ HOMEPAGE= http://www.prelude-ids.org/ -MAINTAINER= Alexandre Anriot <aanr...@openbsd.org> +MAINTAINER= Rui Reis <r...@openbsd.org> # GPL PERMIT_DISTFILES_CDROM= Yes @@ -14,9 +14,6 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes -MASTER_SITES= http://www.prelude-ids.org/download/releases/ \ - http://www.prelude-ids.org/download/releases/old/ +USE_GMAKE= Yes CONFIGURE_ARGS+=--localstatedir=/var - -USE_LIBTOOL= Yes Index: libprelude/Makefile =================================================================== RCS file: /cvs/ports/security/prelude/libprelude/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- libprelude/Makefile 19 May 2009 11:03:31 -0000 1.22 +++ libprelude/Makefile 16 Aug 2009 17:03:50 -0000 @@ -2,19 +2,20 @@ COMMENT= Prelude framework library -DISTNAME= libprelude-0.9.15.1 -PKGNAME= prelude-${DISTNAME}p5 +MODPY_EGG_VERSION=0.9.24.1 +DISTNAME= libprelude-${MODPY_EGG_VERSION} +PKGNAME= prelude-${DISTNAME} -MODPY_EGG_VERSION=0.0.0 +MASTER_SITES= http://www.prelude-ids.com/download/releases/libprelude/ -SHARED_LIBS= prelude 13.1 # .13.1 +SHARED_LIBS= prelude 20.1 MODULES= devel/gettext \ lang/python CONFIGURE_STYLE=gnu -WANTLIB= c gcrypt pthread tasn1 z +WANTLIB= c gcrypt tasn1 z LIB_DEPENDS= gpg-error.>=1::security/libgpg-error \ gnutls.>=12::security/gnutls Index: libprelude/distinfo =================================================================== RCS file: /cvs/ports/security/prelude/libprelude/distinfo,v retrieving revision 1.13 diff -u -r1.13 distinfo --- libprelude/distinfo 31 Aug 2007 19:26:01 -0000 1.13 +++ libprelude/distinfo 16 Aug 2009 17:03:50 -0000 @@ -1,5 +1,5 @@ -MD5 (libprelude-0.9.15.1.tar.gz) = xN6oWevnW5nbeLNpKL4uow== -RMD160 (libprelude-0.9.15.1.tar.gz) = EtJvjRM9YG587zn98YjlZpmfJq8= -SHA1 (libprelude-0.9.15.1.tar.gz) = pGSuIeQSzs+8YM0TL0y8u2p41Lc= -SHA256 (libprelude-0.9.15.1.tar.gz) = 3CnIntugDsgcwUBjawBPLso4SLO58dvkSKs5nbdix+g= -SIZE (libprelude-0.9.15.1.tar.gz) = 1944953 +MD5 (libprelude-0.9.24.1.tar.gz) = B4aLPVT6gkNFWifaa4cjnA== +RMD160 (libprelude-0.9.24.1.tar.gz) = CiaIz1xE6DTAfqujbTMxVbLKIm0= +SHA1 (libprelude-0.9.24.1.tar.gz) = uMDEPvsz89p0H+rFm3pUgq31YoI= +SHA256 (libprelude-0.9.24.1.tar.gz) = h3ODul5RcJqtIqZUfclLJFP++SpJI2Ybb9mKKGmHXa8= +SIZE (libprelude-0.9.24.1.tar.gz) = 2582719 Index: libprelude/patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/security/prelude/libprelude/patches/patch-Makefile_in,v retrieving revision 1.5 diff -u -r1.5 patch-Makefile_in --- libprelude/patches/patch-Makefile_in 27 Aug 2007 17:45:39 -0000 1.5 +++ libprelude/patches/patch-Makefile_in 16 Aug 2009 17:03:50 -0000 @@ -1,20 +1,85 @@ -$OpenBSD: patch-Makefile_in,v 1.5 2007/08/27 17:45:39 aanriot Exp $ ---- Makefile.in.orig Thu Aug 23 17:54:22 2007 -+++ Makefile.in Thu Aug 23 21:59:50 2007 -@@ -498,7 +498,7 @@ oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - prefix = @prefix@ - prelude_admin_libs = @prelude_admin_libs@ --prelude_config_dir = @prelude_config_dir@ -+prelude_config_dir = @prefix@/share/examples/libprelude - prelude_ident_file = @prelude_ident_file@ - prelude_spool_dir = @prelude_spool_dir@ - program_transform_name = @program_transform_name@ -@@ -1034,7 +1034,6 @@ prelude-config.h: $(top_builddir)/config.h +$OpenBSD$ +--- Makefile.in.orig Tue Aug 11 16:05:56 2009 ++++ Makefile.in Thu Aug 13 16:49:58 2009 +@@ -708,7 +708,7 @@ POLL_H = @POLL_H@ + PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ + PRELUDE_ADMIN_CFLAGS = @PRELUDE_ADMIN_CFLAGS@ + PRELUDE_ADMIN_LIBS = @PRELUDE_ADMIN_LIBS@ +-PRELUDE_CONFIG_DIR = @PRELUDE_CONFIG_DIR@ ++PRELUDE_CONFIG_DIR = @prefix@/share/examples/libprelude + PRELUDE_SPOOL_DIR = @PRELUDE_SPOOL_DIR@ + PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ + PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@ +@@ -1525,65 +1525,13 @@ prelude-config.h: $(top_builddir)/config.h # Spool directory for report saving is mode install-data-local: -- $(INSTALL) -d -m 711 $(DESTDIR)$(prelude_spool_dir); - $(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir); - $(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir)/default; - $(INSTALL) -d -m 711 $(DESTDIR)$(prelude_config_dir)/profile; +- $(INSTALL) -d -m 711 $(DESTDIR)$(PRELUDE_SPOOL_DIR); +- $(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR); +- $(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; +- $(INSTALL) -d -m 711 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/profile; +- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf; then \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ +- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf already exist..."; \ +- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist"; \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ +- $(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist; \ +- else \ +- $(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \ +- fi +- +- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf; then \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ +- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf already exist..."; \ +- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist"; \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ +- $(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist; \ +- else \ +- $(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \ +- fi +- +- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf; then \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ +- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf already exist..."; \ +- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist"; \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ +- $(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist;\ +- else \ +- $(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \ +- fi +- +- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf; then \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ +- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf already exist..."; \ +- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist"; \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ +- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist; \ +- else \ +- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \ +- fi ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PRELUDE_CONFIG_DIR) ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PRELUDE_CONFIG_DIR)/profile ++ $(BSD_INSTALL_DATA) $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default ++ $(BSD_INSTALL_DATA) $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default ++ $(BSD_INSTALL_DATA) $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default ++ $(BSD_INSTALL_DATA) $(top_builddir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default + + uninstall-local: + rm -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf Index: libprelude/pkg/PLIST =================================================================== RCS file: /cvs/ports/security/prelude/libprelude/pkg/PLIST,v retrieving revision 1.8 diff -u -r1.8 PLIST --- libprelude/pkg/PLIST 4 Jun 2008 09:37:38 -0000 1.8 +++ libprelude/pkg/PLIST 16 Aug 2009 17:03:50 -0000 @@ -4,7 +4,7 @@ %%SHARED%% bin/libprelude-config bin/prelude-adduser -bin/prelude-admin +...@bin bin/prelude-admin include/libprelude/ include/libprelude/common.h include/libprelude/daemonize.h @@ -13,6 +13,7 @@ include/libprelude/idmef-criteria.h include/libprelude/idmef-criterion-value.h include/libprelude/idmef-data.h +include/libprelude/idmef-message-helpers.h include/libprelude/idmef-message-id.h include/libprelude/idmef-message-print.h include/libprelude/idmef-message-read.h @@ -50,10 +51,9 @@ include/libprelude/prelude-thread.h include/libprelude/prelude-timer.h include/libprelude/prelude.h -include/libprelude/variable.h @comment lib/charset.alias -lib/libprelude.a lib/libprelude.la +lib/pkgconfig/libprelude.pc lib/python${MODPY_VERSION}/site-packages/prelude-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info lib/python${MODPY_VERSION}/site-packages/prelude.py lib/python${MODPY_VERSION}/site-packages/prelude.pyc Index: libpreludedb/Makefile =================================================================== RCS file: /cvs/ports/security/prelude/libpreludedb/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- libpreludedb/Makefile 19 May 2009 11:03:31 -0000 1.21 +++ libpreludedb/Makefile 16 Aug 2009 17:03:50 -0000 @@ -5,23 +5,25 @@ COMMENT-mysql= MySQL module for libpreludedb COMMENT-sqlite= SQLite3 module for libpreludedb -VERSION= 0.9.13 +VERSION= 0.9.15.3 DISTNAME= libpreludedb-${VERSION} +PKGNAME-main= prelude-libpreludedb-${VERSION} +PKGNAME-pgsql= prelude-libpreludedb-pgsql-${VERSION} +PKGNAME-mysql= prelude-libpreludedb-mysql-${VERSION} +PKGNAME-sqlite= prelude-libpreludedb-sqlite-${VERSION} + MODPY_EGG_VERSION=0.0.0 -PKGNAME-main= prelude-libpreludedb-${VERSION}p4 -PKGNAME-pgsql= prelude-libpreludedb-pgsql-${VERSION}p2 -PKGNAME-mysql= prelude-libpreludedb-mysql-${VERSION}p2 -PKGNAME-sqlite= prelude-libpreludedb-sqlite-${VERSION}p2 +MASTER_SITES= http://www.prelude-ids.com/download/releases/libpreludedb/ MODULES= lang/python \ devel/gettext -SHARED_LIBS= preludedb 4.7 # .4.5 +SHARED_LIBS= preludedb 4.9 WANTLIB= tasn1 z -WANTLIB-main= ${WANTLIB} c pthread +WANTLIB-main= ${WANTLIB} c WANTLIB-mysql= ${WANTLIB} crypto m ssl LIB_DEPENDS= gcrypt.>=12::security/libgcrypt \ @@ -49,9 +51,9 @@ .if empty(FLAVOR:L:Mno_pgsql) MULTI_PACKAGES+=-pgsql -CONFIGURE_ARGS+=--with-pgsql +CONFIGURE_ARGS+=--with-postgresql .else -CONFIGURE_ARGS+=--without-pgsql +CONFIGURE_ARGS+=--without-postgresql .endif .if empty(FLAVOR:L:Mno_mysql) Index: libpreludedb/distinfo =================================================================== RCS file: /cvs/ports/security/prelude/libpreludedb/distinfo,v retrieving revision 1.11 diff -u -r1.11 distinfo --- libpreludedb/distinfo 27 Aug 2007 17:46:47 -0000 1.11 +++ libpreludedb/distinfo 16 Aug 2009 17:03:50 -0000 @@ -1,5 +1,5 @@ -MD5 (libpreludedb-0.9.13.tar.gz) = bbZRuoipDIwjyusPGIG0ZQ== -RMD160 (libpreludedb-0.9.13.tar.gz) = M1/rFy6GERq5PX39j9RzZD/81t4= -SHA1 (libpreludedb-0.9.13.tar.gz) = 6Nyy5aGcrfoP32/u2bpcCc6gJ0U= -SHA256 (libpreludedb-0.9.13.tar.gz) = Fj0bBQY5csOYiuqz/XGt5yLDnI46FB6j8DGZXNUHOGw= -SIZE (libpreludedb-0.9.13.tar.gz) = 699987 +MD5 (libpreludedb-0.9.15.3.tar.gz) = cKeKCSsyRJ4yauOyjlfpsw== +RMD160 (libpreludedb-0.9.15.3.tar.gz) = cK8WkpZqazHUsYojQqdJkdPov+0= +SHA1 (libpreludedb-0.9.15.3.tar.gz) = YXyjZkAfRhOAzv9d4Dfvp3Q8oew= +SHA256 (libpreludedb-0.9.15.3.tar.gz) = 3nLoak5lFJmOB2DlUCTtPGc9ek0eI9hMSG7OBkPsJpQ= +SIZE (libpreludedb-0.9.15.3.tar.gz) = 935457 Index: libpreludedb/patches/patch-configure =================================================================== RCS file: libpreludedb/patches/patch-configure diff -N libpreludedb/patches/patch-configure --- libpreludedb/patches/patch-configure 15 Apr 2007 11:38:10 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -$OpenBSD: patch-configure,v 1.3 2007/04/15 11:38:10 aanriot Exp $ ---- configure.orig Sat Mar 17 15:49:27 2007 -+++ configure Sat Apr 7 18:24:58 2007 -@@ -27838,9 +27838,9 @@ if test x$with_sqlite3 != xno; then - with_sqlite3=no - - for dir in $default_path; do -- as_ac_File=`echo "ac_cv_file_$dir/lib/libsqlite3.so" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $dir/lib/libsqlite3.so" >&5 --echo $ECHO_N "checking for $dir/lib/libsqlite3.so... $ECHO_C" >&6; } -+ as_ac_File=`echo "ac_cv_file_$dir/include/sqlite3.h" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $dir/include/sqlite3.h" >&5 -+echo $ECHO_N "checking for $dir/include/sqlite3.h... $ECHO_C" >&6; } - if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -27848,7 +27848,7 @@ else - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 - echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } --if test -r "$dir/lib/libsqlite3.so"; then -+if test -r "$dir/include/sqlite3.h"; then - eval "$as_ac_File=yes" - else - eval "$as_ac_File=no" Index: libpreludedb/patches/patch-src_preludedb-plugin-sql_c =================================================================== RCS file: /cvs/ports/security/prelude/libpreludedb/patches/patch-src_preludedb-plugin-sql_c,v retrieving revision 1.1 diff -u -r1.1 patch-src_preludedb-plugin-sql_c --- libpreludedb/patches/patch-src_preludedb-plugin-sql_c 15 Apr 2007 11:38:10 -0000 1.1 +++ libpreludedb/patches/patch-src_preludedb-plugin-sql_c 16 Aug 2009 17:03:51 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_preludedb-plugin-sql_c,v 1.1 2007/04/15 11:38:10 aanriot Exp $ ---- src/preludedb-plugin-sql.c.orig Sat Apr 7 18:27:54 2007 -+++ src/preludedb-plugin-sql.c Sat Apr 7 18:28:12 2007 -@@ -29,7 +29,7 @@ - #include "preludedb-plugin-sql.h" - +$OpenBSD$ +--- src/preludedb-plugin-sql.c.orig Thu Aug 13 18:09:07 2009 ++++ src/preludedb-plugin-sql.c Thu Aug 13 18:09:46 2009 +@@ -33,7 +33,7 @@ + # define ENOTSUP EOPNOTSUPP + #endif -#define PRELUDEDB_ENOTSUP(x) preludedb_error_verbose(prelude_error_code_from_errno(ENOTSUP), "Database backend does not support '%s' operation", x) +#define PRELUDEDB_ENOTSUP(x) preludedb_error_verbose(prelude_error_code_from_errno(EOPNOTSUPP), "Database backend does not support '%s' operation", x) + struct preludedb_plugin_sql { - PRELUDE_PLUGIN_GENERIC; Index: libpreludedb/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/security/prelude/libpreludedb/pkg/PLIST-main,v retrieving revision 1.3 diff -u -r1.3 PLIST-main --- libpreludedb/pkg/PLIST-main 4 Jun 2008 09:37:38 -0000 1.3 +++ libpreludedb/pkg/PLIST-main 16 Aug 2009 17:03:51 -0000 @@ -1,7 +1,7 @@ @comment $OpenBSD: PLIST-main,v 1.3 2008/06/04 09:37:38 ajacoutot Exp $ @pkgpath security/prelude/libpreludedb bin/libpreludedb-config -bin/preludedb-admin +...@bin bin/preludedb-admin include/libpreludedb/ include/libpreludedb/preludedb-error.h include/libpreludedb/preludedb-path-selection.h @@ -12,12 +12,10 @@ include/libpreludedb/preludedb-version.h include/libpreludedb/preludedb.h lib/libpreludedb/ -lib/libpreludedb.a lib/libpreludedb.la @lib lib/libpreludedb.so.${LIBpreludedb_VERSION} lib/libpreludedb/plugins/ lib/libpreludedb/plugins/formats/ -lib/libpreludedb/plugins/formats/classic.a lib/libpreludedb/plugins/formats/classic.la lib/libpreludedb/plugins/formats/classic.so lib/libpreludedb/plugins/sql/ @@ -60,6 +58,7 @@ share/libpreludedb/classic/mysql-update-14-4.sql share/libpreludedb/classic/mysql-update-14-5.sql share/libpreludedb/classic/mysql-update-14-6.sql +share/libpreludedb/classic/mysql-update-14-7.sql share/libpreludedb/classic/mysql.sql share/libpreludedb/classic/mysql2pgsql.sh share/libpreludedb/classic/mysql2sqlite.sh @@ -69,8 +68,10 @@ share/libpreludedb/classic/pgsql-update-14-4.sql share/libpreludedb/classic/pgsql-update-14-5.sql share/libpreludedb/classic/pgsql-update-14-6.sql +share/libpreludedb/classic/pgsql-update-14-7.sql share/libpreludedb/classic/pgsql.sql share/libpreludedb/classic/sqlite-update-14-4.sql share/libpreludedb/classic/sqlite-update-14-5.sql share/libpreludedb/classic/sqlite-update-14-6.sql +share/libpreludedb/classic/sqlite-update-14-7.sql share/libpreludedb/classic/sqlite.sql Index: libpreludedb/pkg/PLIST-mysql =================================================================== RCS file: /cvs/ports/security/prelude/libpreludedb/pkg/PLIST-mysql,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST-mysql --- libpreludedb/pkg/PLIST-mysql 26 Jun 2006 18:04:26 -0000 1.1.1.1 +++ libpreludedb/pkg/PLIST-mysql 16 Aug 2009 17:03:51 -0000 @@ -1,4 +1,3 @@ @comment $OpenBSD: PLIST-mysql,v 1.1.1.1 2006/06/26 18:04:26 aanriot Exp $ -lib/libpreludedb/plugins/sql/mysql.a lib/libpreludedb/plugins/sql/mysql.la lib/libpreludedb/plugins/sql/mysql.so Index: libpreludedb/pkg/PLIST-pgsql =================================================================== RCS file: /cvs/ports/security/prelude/libpreludedb/pkg/PLIST-pgsql,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST-pgsql --- libpreludedb/pkg/PLIST-pgsql 26 Jun 2006 18:04:26 -0000 1.1.1.1 +++ libpreludedb/pkg/PLIST-pgsql 16 Aug 2009 17:03:51 -0000 @@ -1,4 +1,3 @@ @comment $OpenBSD: PLIST-pgsql,v 1.1.1.1 2006/06/26 18:04:26 aanriot Exp $ -lib/libpreludedb/plugins/sql/pgsql.a lib/libpreludedb/plugins/sql/pgsql.la lib/libpreludedb/plugins/sql/pgsql.so Index: libpreludedb/pkg/PLIST-sqlite =================================================================== RCS file: /cvs/ports/security/prelude/libpreludedb/pkg/PLIST-sqlite,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST-sqlite --- libpreludedb/pkg/PLIST-sqlite 26 Jun 2006 18:04:26 -0000 1.1.1.1 +++ libpreludedb/pkg/PLIST-sqlite 16 Aug 2009 17:03:51 -0000 @@ -1,4 +1,3 @@ @comment $OpenBSD: PLIST-sqlite,v 1.1.1.1 2006/06/26 18:04:26 aanriot Exp $ -lib/libpreludedb/plugins/sql/sqlite3.a lib/libpreludedb/plugins/sql/sqlite3.la lib/libpreludedb/plugins/sql/sqlite3.so Index: lml/Makefile =================================================================== RCS file: /cvs/ports/security/prelude/lml/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- lml/Makefile 19 May 2009 11:03:31 -0000 1.14 +++ lml/Makefile 16 Aug 2009 17:03:51 -0000 @@ -2,11 +2,12 @@ COMMENT= Prelude log analyzer -DISTNAME= prelude-lml-0.9.10 -PKGNAME= ${DISTNAME}p0 +DISTNAME= prelude-lml-0.9.15 -WANTLIB= c gcrypt gnutls gpg-error pthread tasn1 z +WANTLIB= c gcrypt gnutls gpg-error m tasn1 z MODULES= devel/gettext + +MASTER_SITES= http://www.prelude-ids.com/download/releases/prelude-lml/ CONFIGURE_STYLE=gnu Index: lml/distinfo =================================================================== RCS file: /cvs/ports/security/prelude/lml/distinfo,v retrieving revision 1.8 diff -u -r1.8 distinfo --- lml/distinfo 1 Jun 2007 05:02:23 -0000 1.8 +++ lml/distinfo 16 Aug 2009 17:03:51 -0000 @@ -1,5 +1,5 @@ -MD5 (prelude-lml-0.9.10.tar.gz) = iAK822+uVRGDCzNDOZdR+A== -RMD160 (prelude-lml-0.9.10.tar.gz) = 6c8ferH1nB0oyzWfzaZ60t9BRVk= -SHA1 (prelude-lml-0.9.10.tar.gz) = +8Q7Kvmpm87/ua3032Esw1dzfXA= -SHA256 (prelude-lml-0.9.10.tar.gz) = SBj3gQ+8NkJJXeaxVDmgeYKwPa7RZocQ7uFm348mhsI= -SIZE (prelude-lml-0.9.10.tar.gz) = 649064 +MD5 (prelude-lml-0.9.15.tar.gz) = eikh+nN98mBfc5znNMFMLA== +RMD160 (prelude-lml-0.9.15.tar.gz) = Lf/Pb0Rw54+gz5EcatgBB0qx55M= +SHA1 (prelude-lml-0.9.15.tar.gz) = lvLw0CnddcoEe8CDnxRBjdwbWXU= +SHA256 (prelude-lml-0.9.15.tar.gz) = sya7v/Pwhzp54mBnoIzE93/Mz/rpnIbEl3mLSw4UXSY= +SIZE (prelude-lml-0.9.15.tar.gz) = 1018513 Index: lml/patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/security/prelude/lml/patches/patch-Makefile_in,v retrieving revision 1.5 diff -u -r1.5 patch-Makefile_in --- lml/patches/patch-Makefile_in 26 May 2007 01:14:33 -0000 1.5 +++ lml/patches/patch-Makefile_in 16 Aug 2009 17:03:51 -0000 @@ -1,20 +1,45 @@ -$OpenBSD: patch-Makefile_in,v 1.5 2007/05/26 01:14:33 aanriot Exp $ ---- Makefile.in.orig Wed May 2 11:19:41 2007 -+++ Makefile.in Thu May 17 13:16:32 2007 -@@ -364,7 +364,7 @@ build_alias = @build_alias@ - build_cpu = @build_cpu@ +$OpenBSD$ +--- Makefile.in.orig Thu Jul 16 14:46:12 2009 ++++ Makefile.in Thu Aug 13 21:07:21 2009 +@@ -710,7 +710,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ + builddir = @builddir@ -configdir = @configdir@ +configdir = @prefix@/share/examples/prelude-lml datadir = @datadir@ datarootdir = @datarootdir@ - defined = @defined@ -@@ -854,7 +854,6 @@ uninstall-info: uninstall-info-recursive + docdir = @docdir@ +@@ -1285,29 +1285,9 @@ uninstall-am: uninstall-local install-data-local: - $(INSTALL) -m 700 -d $(DESTDIR)$(metadata_dir) - @if test -f $(DESTDIR)$(configdir)/prelude-lml.conf; then \ - echo "********************************************************************************"; \ - echo; \ +- @if test -f $(DESTDIR)$(configdir)/prelude-lml.conf; then \ +- echo "********************************************************************************"; \ +- echo; \ +- echo "$(DESTDIR)$(configdir)/prelude-lml.conf already exist..."; \ +- echo "Installing default configuration in $(DESTDIR)$(configdir)/prelude-lml.conf-dist"; \ +- echo; \ +- echo "********************************************************************************"; \ +- $(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/prelude-lml.conf-dist; \ +- else \ +- $(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/; \ +- fi +- @if test -f $(DESTDIR)$(configdir)/plugins.rules; then \ +- echo "********************************************************************************"; \ +- echo; \ +- echo "$(DESTDIR)$(configdir)/plugins.rules already exist..."; \ +- echo "Installing default configuration in $(DESTDIR)$(configdir)/plugins.rules-dist"; \ +- echo; \ +- echo "********************************************************************************"; \ +- $(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/plugins.rules-dist; \ +- else \ +- $(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/; \ +- fi ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(configdir) ++ $(BSD_INSTALL_DATA) $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir) ++ $(BSD_INSTALL_DATA) $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir) + + uninstall-local: + rm -f $(DESTDIR)$(configdir)/prelude-lml.conf; \ Index: lml/patches/patch-configure =================================================================== RCS file: /cvs/ports/security/prelude/lml/patches/patch-configure,v retrieving revision 1.5 diff -u -r1.5 patch-configure --- lml/patches/patch-configure 26 May 2007 01:14:33 -0000 1.5 +++ lml/patches/patch-configure 16 Aug 2009 17:03:51 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-configure,v 1.5 2007/05/26 01:14:33 aanriot Exp $ ---- configure.orig Wed May 2 11:19:35 2007 -+++ configure Thu May 17 13:16:33 2007 -@@ -32322,7 +32322,7 @@ _ACEOF - configdir=$sysconfdir/prelude-lml +$OpenBSD$ +--- configure.orig Thu Aug 13 20:07:02 2009 ++++ configure Thu Aug 13 20:07:27 2009 +@@ -43051,7 +43051,7 @@ fi + configdir=$SYSCONFDIR/prelude-lml 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 + Index: lml/patches/patch-plugins_pcre_Makefile_in =================================================================== RCS file: lml/patches/patch-plugins_pcre_Makefile_in diff -N lml/patches/patch-plugins_pcre_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lml/patches/patch-plugins_pcre_Makefile_in 16 Aug 2009 17:03:51 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- plugins/pcre/Makefile.in.orig Thu Aug 13 20:07:59 2009 ++++ plugins/pcre/Makefile.in Thu Aug 13 20:08:29 2009 +@@ -741,7 +741,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ +-configdir = @configdir@ ++configdir = @prefix@/share/examples/prelude-lml + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ Index: lml/patches/patch-plugins_pcre_ruleset_Makefile_in =================================================================== RCS file: /cvs/ports/security/prelude/lml/patches/patch-plugins_pcre_ruleset_Makefile_in,v retrieving revision 1.5 diff -u -r1.5 patch-plugins_pcre_ruleset_Makefile_in --- lml/patches/patch-plugins_pcre_ruleset_Makefile_in 26 May 2007 01:14:33 -0000 1.5 +++ lml/patches/patch-plugins_pcre_ruleset_Makefile_in 16 Aug 2009 17:03:51 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-plugins_pcre_ruleset_Makefile_in,v 1.5 2007/05/26 01:14:33 aanriot Exp $ ---- plugins/pcre/ruleset/Makefile.in.orig Wed May 2 11:19:40 2007 -+++ plugins/pcre/ruleset/Makefile.in Thu May 17 13:16:34 2007 -@@ -358,7 +358,7 @@ build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --configdir = @configdir@ -+configdir = @prefix@/share/examples/prelude-lml - datadir = @datadir@ - datarootdir = @datarootdir@ - defined = @defined@ +$OpenBSD$ +--- plugins/pcre/ruleset/Makefile.in.orig Thu Aug 13 21:22:21 2009 ++++ plugins/pcre/ruleset/Makefile.in Thu Aug 13 21:22:48 2009 +@@ -824,7 +824,7 @@ ruleset_DATA = \ + webmin.rules \ + wu-ftp.rules + +-rulesetdir = $(configdir)/ruleset ++rulesetdir = $(prefix)/share/examples/prelude-lml/ruleset + EXTRA_DIST = $(ruleset_DATA) + all: all-recursive + Index: lml/patches/patch-plugins_pcre_ruleset_unsupported_Makefile_in =================================================================== RCS file: lml/patches/patch-plugins_pcre_ruleset_unsupported_Makefile_in diff -N lml/patches/patch-plugins_pcre_ruleset_unsupported_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lml/patches/patch-plugins_pcre_ruleset_unsupported_Makefile_in 16 Aug 2009 17:03:51 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- plugins/pcre/ruleset/unsupported/Makefile.in.orig Thu Aug 13 21:20:53 2009 ++++ plugins/pcre/ruleset/unsupported/Makefile.in Thu Aug 13 21:21:43 2009 +@@ -728,7 +728,7 @@ top_srcdir = @top_srcdir@ + @ENABLE_UNSUPPORTED_RULESETS_TRUE@ zywall.rules \ + @ENABLE_UNSUPPORTED_RULESETS_TRUE@ zyxel.rules + +...@enable_unsupported_rulesets_true@rulesetdir = $(configdir)/ruleset +...@enable_unsupported_rulesets_true@rulesetdir = $(prefix)/share/examples/prelude-lml/ruleset + @enable_unsupported_rulesets_t...@extra_dist = $(ruleset_DATA) + all: all-am + Index: lml/patches/patch-prelude-lml_conf =================================================================== RCS file: lml/patches/patch-prelude-lml_conf diff -N lml/patches/patch-prelude-lml_conf --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lml/patches/patch-prelude-lml_conf 16 Aug 2009 17:03:51 -0000 @@ -0,0 +1,65 @@ +$OpenBSD$ +--- prelude-lml.conf.orig Thu Aug 13 20:09:53 2009 ++++ prelude-lml.conf Thu Aug 13 20:13:55 2009 +@@ -63,10 +63,27 @@ include = /home/yoann/dev/prelude/bin/etc/prelude/defa + # already set. Use 'idmef-alter-force' if this is what you intend to do. + # + ++[format=syslog] ++time-format = "%b %d %H:%M:%S" ++prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?" ++file = /var/log/authlog ++# udp-server = 0.0.0.0 + + [format=syslog] + time-format = "%b %d %H:%M:%S" + prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?" ++file = /var/log/daemon ++# udp-server = 0.0.0.0 ++ ++[format=syslog] ++time-format = "%b %d %H:%M:%S" ++prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?" ++file = /var/log/maillog ++# udp-server = 0.0.0.0 ++ ++[format=syslog] ++time-format = "%b %d %H:%M:%S" ++prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?" + file = /var/log/messages + # udp-server = 0.0.0.0 + +@@ -74,10 +91,10 @@ file = /var/log/messages + # + # Sample configuration for metalog: + # +-[format=metalog] +-prefix-regex = "^(?P<timestamp>.{15}) \[(?P<process>\S+)\] " +-time-format = "%b %d %H:%M:%S" +-file = /var/log/everything/current ++# [format=metalog] ++# prefix-regex = "^(?P<timestamp>.{15}) \[(?P<process>\S+)\] " ++# time-format = "%b %d %H:%M:%S" ++# file = /var/log/everything/current + # udp-server = 0.0.0.0 + + +@@ -87,15 +104,12 @@ file = /var/log/everything/current + [format=apache] + time-format = "%d/%b/%Y:%H:%M:%S" + prefix-regex = "(?P<hostname>\S+) \S+ \S+ \[(?P<timestamp>.{20}) [+-].{4}\] " +-file = /var/log/httpd/access_log +-file = /var/log/apache2/access_log ++file = /var/www/logs/access_log + + [format=apache-error] + time-format = "%a %b %d %H:%M:%S %Y" +-prefix-regex = "^\[(?P<timestamp>.{24})\] \S+ (\[client (?P<hostname>\S+)\] )?" +-file = /var/log/httpd/error_log +-file = /var/log/apache2/error_log +- ++prefix-regex = "^\[(?P<timestamp>.{24})\]" ++file = /var/www/logs/error_log + + + # Index: lml/patches/patch-prelude-lml_conf_in =================================================================== RCS file: lml/patches/patch-prelude-lml_conf_in diff -N lml/patches/patch-prelude-lml_conf_in --- lml/patches/patch-prelude-lml_conf_in 26 May 2007 01:14:33 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,61 +0,0 @@ -$OpenBSD: patch-prelude-lml_conf_in,v 1.5 2007/05/26 01:14:33 aanriot Exp $ ---- prelude-lml.conf.in.orig Thu May 17 13:26:01 2007 -+++ prelude-lml.conf.in Thu May 17 13:30:09 2007 -@@ -49,11 +49,27 @@ include = @LIBPRELUDE_CONFIG_PREFIX@/default/idmef-cli - # - # Example: file = /var/log/*/*.log - -+[format=syslog] -+time-format = "%b %d %H:%M:%S" -+prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?" -+file = /var/log/authlog -+# udp-server = 0.0.0.0 - -+[format=syslog] -+time-format = "%b %d %H:%M:%S" -+prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?" -+file = /var/log/daemon -+# udp-server = 0.0.0.0 - - [format=syslog] --time-format = "%b %d %H:%M:%S" -+time-format = "%b %d %H:%M:%S" - prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?" -+file = /var/log/maillog -+# udp-server = 0.0.0.0 -+ -+[format=syslog] -+time-format = "%b %d %H:%M:%S" -+prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?" - file = /var/log/messages - # udp-server = 0.0.0.0 - -@@ -61,10 +77,10 @@ file = /var/log/messages - # - # Sample configuration for metalog: - # --[format=metalog] --prefix-regex = "^(?P<timestamp>.{15}) \[(?P<process>\S+)\] " --time-format = "%b %d %H:%M:%S" --file = /var/log/everything/current -+# [format=metalog] -+# prefix-regex = "^(?P<timestamp>.{15}) \[(?P<process>\S+)\] " -+# time-format = "%b %d %H:%M:%S" -+# file = /var/log/everything/current - # udp-server = 0.0.0.0 - - -@@ -74,8 +90,12 @@ file = /var/log/everything/current - [format=apache] - time-format = "%d/%b/%Y:%H:%M:%S" - prefix-regex = "^(?P<hostname>\S+) - - \[(?P<timestamp>.{20}) \[+-].{4}\] " --file = /var/log/apache2/access_log -+file = /var/www/logs/access_log - -+[format=apache-error] -+time-format = "%a %b %d %H:%M:%S %Y" -+prefix-regex = "^\[(?P<timestamp>.{24})\]" -+file = /var/www/logs/error_log - - # - # Specifies the maximum difference, in seconds, between Index: lml/pkg/PLIST =================================================================== RCS file: /cvs/ports/security/prelude/lml/pkg/PLIST,v retrieving revision 1.7 diff -u -r1.7 PLIST --- lml/pkg/PLIST 26 May 2007 01:14:33 -0000 1.7 +++ lml/pkg/PLIST 16 Aug 2009 17:03:51 -0000 @@ -1,12 +1,11 @@ @comment $OpenBSD: PLIST,v 1.7 2007/05/26 01:14:33 aanriot Exp $ %%SHARED%% -bin/prelude-lml +...@bin bin/prelude-lml include/prelude-lml/ include/prelude-lml/prelude-lml.h +...@comment lib/charset.alias lib/prelude-lml/ -lib/prelude-lml/debug.a lib/prelude-lml/debug.la -lib/prelude-lml/pcre.a lib/prelude-lml/pcre.la share/doc/prelude-lml/ share/doc/prelude-lml/README.OpenBSD @@ -24,6 +23,8 @@ @sample ${SYSCONFDIR}/prelude-lml/ruleset/arbor.rules share/examples/prelude-lml/ruleset/arpwatch.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/arpwatch.rules +share/examples/prelude-lml/ruleset/asterisk.rules +...@sample ${SYSCONFDIR}/prelude-lml/ruleset/asterisk.rules share/examples/prelude-lml/ruleset/bonding.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/bonding.rules share/examples/prelude-lml/ruleset/cacti-thold.rules @@ -52,12 +53,16 @@ @sample ${SYSCONFDIR}/prelude-lml/ruleset/grsecurity.rules share/examples/prelude-lml/ruleset/honeyd.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/honeyd.rules +share/examples/prelude-lml/ruleset/honeytrap.rules +...@sample ${SYSCONFDIR}/prelude-lml/ruleset/honeytrap.rules share/examples/prelude-lml/ruleset/httpd.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/httpd.rules share/examples/prelude-lml/ruleset/ipchains.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/ipchains.rules share/examples/prelude-lml/ruleset/ipfw.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/ipfw.rules +share/examples/prelude-lml/ruleset/kojoney.rules +...@sample ${SYSCONFDIR}/prelude-lml/ruleset/kojoney.rules share/examples/prelude-lml/ruleset/linksys-wap11.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/linksys-wap11.rules share/examples/prelude-lml/ruleset/modsecurity.rules @@ -90,10 +95,14 @@ @sample ${SYSCONFDIR}/prelude-lml/ruleset/portsentry.rules share/examples/prelude-lml/ruleset/postfix.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/postfix.rules +share/examples/prelude-lml/ruleset/ppp.rules +...@sample ${SYSCONFDIR}/prelude-lml/ruleset/ppp.rules share/examples/prelude-lml/ruleset/proftpd.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/proftpd.rules share/examples/prelude-lml/ruleset/qpopper.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/qpopper.rules +share/examples/prelude-lml/ruleset/rishi.rules +...@sample ${SYSCONFDIR}/prelude-lml/ruleset/rishi.rules share/examples/prelude-lml/ruleset/selinux.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/selinux.rules share/examples/prelude-lml/ruleset/sendmail.rules @@ -110,8 +119,12 @@ @sample ${SYSCONFDIR}/prelude-lml/ruleset/squid.rules share/examples/prelude-lml/ruleset/ssh.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/ssh.rules +share/examples/prelude-lml/ruleset/su.rules +...@sample ${SYSCONFDIR}/prelude-lml/ruleset/su.rules share/examples/prelude-lml/ruleset/sudo.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/sudo.rules +share/examples/prelude-lml/ruleset/suhosin.rules +...@sample ${SYSCONFDIR}/prelude-lml/ruleset/suhosin.rules share/examples/prelude-lml/ruleset/tripwire.rules @sample ${SYSCONFDIR}/prelude-lml/ruleset/tripwire.rules share/examples/prelude-lml/ruleset/vigor.rules Index: manager/Makefile =================================================================== RCS file: /cvs/ports/security/prelude/manager/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- manager/Makefile 19 May 2009 11:03:31 -0000 1.16 +++ manager/Makefile 16 Aug 2009 17:03:51 -0000 @@ -2,8 +2,9 @@ COMMENT= Prelude manager -DISTNAME= prelude-manager-0.9.9 -PKGNAME= ${DISTNAME}p0 +DISTNAME= prelude-manager-0.9.15 + +MASTER_SITES= http://www.prelude-ids.com/download/releases/prelude-manager/ WANTLIB= c gcrypt gnutls gpg-error m prelude preludedb pthread tasn1 z MODULES= devel/gettext Index: manager/distinfo =================================================================== RCS file: /cvs/ports/security/prelude/manager/distinfo,v retrieving revision 1.9 diff -u -r1.9 distinfo --- manager/distinfo 27 Aug 2007 17:49:59 -0000 1.9 +++ manager/distinfo 16 Aug 2009 17:03:51 -0000 @@ -1,5 +1,5 @@ -MD5 (prelude-manager-0.9.9.tar.gz) = ypJY+q23MGhj3/6sj4VRYQ== -RMD160 (prelude-manager-0.9.9.tar.gz) = 44chvskFGHxOOLAXp6IHDZdfHCw= -SHA1 (prelude-manager-0.9.9.tar.gz) = mlZIu14kS5qddIj9U+JdU/9CuJc= -SHA256 (prelude-manager-0.9.9.tar.gz) = c0vYRN9OM3y5ieqXANYMotDq4DpbDpelVZs63bJJjsY= -SIZE (prelude-manager-0.9.9.tar.gz) = 647696 +MD5 (prelude-manager-0.9.15.tar.gz) = cHyMG+mXbvE3SNrWgOdyTA== +RMD160 (prelude-manager-0.9.15.tar.gz) = rVmyfv64sFvhifb7CHpXQpHpxHA= +SHA1 (prelude-manager-0.9.15.tar.gz) = PLkGxkfY+/IWcdjkOzCzJEr0mbE= +SHA256 (prelude-manager-0.9.15.tar.gz) = LuIWDgSfmaTt46drGmhyxYTxonZIFjlGcao6vV5xHOI= +SIZE (prelude-manager-0.9.15.tar.gz) = 1008163 Index: manager/patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/security/prelude/manager/patches/patch-Makefile_in,v retrieving revision 1.6 diff -u -r1.6 patch-Makefile_in --- manager/patches/patch-Makefile_in 27 Aug 2007 17:49:59 -0000 1.6 +++ manager/patches/patch-Makefile_in 16 Aug 2009 17:03:51 -0000 @@ -1,22 +1,22 @@ -$OpenBSD: patch-Makefile_in,v 1.6 2007/08/27 17:49:59 aanriot Exp $ ---- Makefile.in.orig Fri Aug 3 16:15:40 2007 -+++ Makefile.in Fri Aug 24 19:07:38 2007 -@@ -356,7 +356,7 @@ build_alias = @build_alias@ - build_cpu = @build_cpu@ +$OpenBSD$ +--- Makefile.in.orig Thu Aug 13 21:51:41 2009 ++++ Makefile.in Thu Aug 13 21:53:14 2009 +@@ -637,7 +637,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ + builddir = @builddir@ -configdir = @configdir@ +configdir = @prefix@/share/examples/prelude-manager datadir = @datadir@ datarootdir = @datarootdir@ - decode_plugin_dir = @decode_plugin_dir@ -@@ -847,9 +847,6 @@ uninstall-info: uninstall-info-recursive + docdir = @docdir@ +@@ -1209,9 +1209,6 @@ uninstall-am: install-data-local: $(INSTALL) -d -m 700 $(DESTDIR)$(configdir); - $(INSTALL) -d -m 700 $(DESTDIR)$(manager_run_dir); - $(INSTALL) -d -m 700 $(DESTDIR)$(manager_scheduler_dir); - $(INSTALL) -d -m 700 $(DESTDIR)$(manager_failover_dir); - @if test -f $(DESTDIR)$(configdir)/prelude-manager.conf; then \ - $(INSTALL) -m 600 $(top_srcdir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist; \ - echo "********************************************************************************"; \ + @if test -f $(DESTDIR)$(configdir)/prelude-manager.conf; then \ + $(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist; \ + echo "********************************************************************************"; \ Index: manager/patches/patch-prelude-manager_conf_in =================================================================== RCS file: /cvs/ports/security/prelude/manager/patches/patch-prelude-manager_conf_in,v retrieving revision 1.6 diff -u -r1.6 patch-prelude-manager_conf_in --- manager/patches/patch-prelude-manager_conf_in 27 Aug 2007 17:49:59 -0000 1.6 +++ manager/patches/patch-prelude-manager_conf_in 16 Aug 2009 17:03:51 -0000 @@ -1,14 +1,15 @@ -$OpenBSD: patch-prelude-manager_conf_in,v 1.6 2007/08/27 17:49:59 aanriot Exp $ ---- prelude-manager.conf.in.orig Mon Jun 18 09:34:13 2007 -+++ prelude-manager.conf.in Fri Aug 24 19:07:38 2007 -@@ -28,8 +28,8 @@ listen = 127.0.0.1 - # Sets the user/group ID as which prelude-manager will run. - # In order to use this option, prelude-manager must be run initially as root +$OpenBSD$ +--- prelude-manager.conf.in.orig Thu Aug 13 21:53:39 2009 ++++ prelude-manager.conf.in Thu Aug 13 21:54:04 2009 +@@ -29,9 +29,8 @@ listen = 127.0.0.1 + # In order to use this option, prelude-manager must be run initially as + # root # -# user = prelude -# group = prelude +- +user = _prelude +group = _prelude - - # Number of bits of the prime used in the Diffie Hellman key exchange. + # Number of second prelude-manager wait for an incoming client to + # successfully authenticate before droping the connection. Index: manager/pkg/PLIST =================================================================== RCS file: /cvs/ports/security/prelude/manager/pkg/PLIST,v retrieving revision 1.8 diff -u -r1.8 PLIST --- manager/pkg/PLIST 27 Aug 2007 17:49:59 -0000 1.8 +++ manager/pkg/PLIST 16 Aug 2009 17:03:51 -0000 @@ -1,32 +1,28 @@ @comment $OpenBSD: PLIST,v 1.8 2007/08/27 17:49:59 aanriot Exp $ %%SHARED%% -bin/prelude-manager +...@bin bin/prelude-manager include/prelude-manager/ include/prelude-manager/prelude-manager.h lib/prelude-manager/ lib/prelude-manager/decodes/ -lib/prelude-manager/decodes/normalize.a lib/prelude-manager/decodes/normalize.la lib/prelude-manager/filters/ -lib/prelude-manager/filters/idmef-criteria.a lib/prelude-manager/filters/idmef-criteria.la -lib/prelude-manager/filters/thresholding.a lib/prelude-manager/filters/thresholding.la lib/prelude-manager/filters/thresholding.so lib/prelude-manager/reports/ -lib/prelude-manager/reports/db.a lib/prelude-manager/reports/db.la -lib/prelude-manager/reports/debug.a lib/prelude-manager/reports/debug.la -lib/prelude-manager/reports/relaying.a lib/prelude-manager/reports/relaying.la -lib/prelude-manager/reports/textmod.a +lib/prelude-manager/reports/smtp.la +lib/prelude-manager/reports/smtp.so lib/prelude-manager/reports/textmod.la -lib/prelude-manager/reports/xmlmod.a lib/prelude-manager/reports/xmlmod.la @man man/man1/prelude-manager.1 share/doc/prelude-manager/ share/doc/prelude-manager/README.OpenBSD +share/doc/prelude-manager/smtp/ +share/doc/prelude-manager/smtp/template.example share/examples/prelude-manager/ @sample ${SYSCONFDIR}/prelude-manager/ share/examples/prelude-manager/prelude-manager.conf Index: prewikka/Makefile =================================================================== RCS file: /cvs/ports/security/prelude/prewikka/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- prewikka/Makefile 23 Mar 2009 19:37:02 -0000 1.16 +++ prewikka/Makefile 16 Aug 2009 17:03:51 -0000 @@ -2,10 +2,13 @@ COMMENT= Prelude Management Console -DISTNAME= prewikka-0.9.12.1 -PKGNAME= prelude-${DISTNAME}p1 +MODPY_EGG_VERSION=0.9.17 +DISTNAME= prewikka-0.9.17 +PKGNAME= prelude-${DISTNAME} MODULES= lang/python + +MASTER_SITES= http://www.prelude-ids.com/download/releases/prewikka/ BUILD_DEPENDS= :gettext->=0.17:devel/gettext \ :py-cheetah-*:devel/py-cheetah Index: prewikka/distinfo =================================================================== RCS file: /cvs/ports/security/prelude/prewikka/distinfo,v retrieving revision 1.8 diff -u -r1.8 distinfo --- prewikka/distinfo 27 Aug 2007 17:52:23 -0000 1.8 +++ prewikka/distinfo 16 Aug 2009 17:03:51 -0000 @@ -1,5 +1,5 @@ -MD5 (prewikka-0.9.12.1.tar.gz) = 0c/qAec1cOmNbcZugkWFzQ== -RMD160 (prewikka-0.9.12.1.tar.gz) = 61O0+DgjPdQCYnsA2imTXGrbz4w= -SHA1 (prewikka-0.9.12.1.tar.gz) = FDjDrHd+inBFnfnNlhRxMMbdPJQ= -SHA256 (prewikka-0.9.12.1.tar.gz) = Qdlea8SF0yc7mMpMu1MYfj28IOWwpkRzlOJEqbAHhU0= -SIZE (prewikka-0.9.12.1.tar.gz) = 238691 +MD5 (prewikka-0.9.17.tar.gz) = g2y1mGHV75vviMotoXC4zQ== +RMD160 (prewikka-0.9.17.tar.gz) = UB1Ry3R1WkPzZtrYJJMUYS6uK0c= +SHA1 (prewikka-0.9.17.tar.gz) = PSj/Xoex/K82GXDtbAyeR35OsAw= +SHA256 (prewikka-0.9.17.tar.gz) = kkwXlIE/dk3jRKSKfNQxtm/xh1xswxRVR7sxyp9NsSU= +SIZE (prewikka-0.9.17.tar.gz) = 277834 Index: prewikka/files/siteconfig.py =================================================================== RCS file: /cvs/ports/security/prelude/prewikka/files/siteconfig.py,v retrieving revision 1.1 diff -u -r1.1 siteconfig.py --- prewikka/files/siteconfig.py 26 May 2007 01:16:13 -0000 1.1 +++ prewikka/files/siteconfig.py 16 Aug 2009 17:03:51 -0000 @@ -3,3 +3,5 @@ locale_dir = '%%PREFIX%%/share/locale/' conf_dir = '%%SYSCONFDIR%%/prewikka' version = '%%VERSION%%' +libprelude_required_version = '0.9.24.1' +libpreludedb_required_version = '0.9.15.3' Index: prewikka/pkg/PLIST =================================================================== RCS file: /cvs/ports/security/prelude/prewikka/pkg/PLIST,v retrieving revision 1.8 diff -u -r1.8 PLIST --- prewikka/pkg/PLIST 27 Aug 2007 17:52:23 -0000 1.8 +++ prewikka/pkg/PLIST 16 Aug 2009 17:03:51 -0000 @@ -1,6 +1,7 @@ @comment $OpenBSD: PLIST,v 1.8 2007/08/27 17:52:23 aanriot Exp $ bin/prewikka-httpd lib/python${MODPY_VERSION}/site-packages/prewikka/ +lib/python${MODPY_VERSION}/site-packages/prewikka-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info lib/python${MODPY_VERSION}/site-packages/prewikka/Auth.py lib/python${MODPY_VERSION}/site-packages/prewikka/Auth.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/CheetahFilters.py @@ -31,6 +32,8 @@ lib/python${MODPY_VERSION}/site-packages/prewikka/User.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/__init__.py lib/python${MODPY_VERSION}/site-packages/prewikka/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/prewikka/_threading_local.py +lib/python${MODPY_VERSION}/site-packages/prewikka/_threading_local.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/localization.py lib/python${MODPY_VERSION}/site-packages/prewikka/localization.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/modules/ @@ -39,6 +42,11 @@ lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/ lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/__init__.py lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/anonymous/ +lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/anonymous/__init__.py +lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/anonymous/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/anonymous/anonymous.py +lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/anonymous/anonymous.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/cgi/ lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/cgi/__init__.py lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/cgi/__init__.pyc @@ -49,6 +57,8 @@ lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/loginpassword/__init__.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/loginpassword/loginpassword.py lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/loginpassword/loginpassword.pyc +lib/python${MODPY_VERSION}/site-packages/prewikka/resolve.py +lib/python${MODPY_VERSION}/site-packages/prewikka/resolve.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/siteconfig.py lib/python${MODPY_VERSION}/site-packages/prewikka/siteconfig.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/templates/ @@ -70,6 +80,8 @@ lib/python${MODPY_VERSION}/site-packages/prewikka/templates/HeartbeatAnalyze.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/templates/HeartbeatListing.py lib/python${MODPY_VERSION}/site-packages/prewikka/templates/HeartbeatListing.pyc +lib/python${MODPY_VERSION}/site-packages/prewikka/templates/IDMEFBrowser.py +lib/python${MODPY_VERSION}/site-packages/prewikka/templates/IDMEFBrowser.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/templates/LoginPasswordForm.py lib/python${MODPY_VERSION}/site-packages/prewikka/templates/LoginPasswordForm.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/templates/MessageDetails.py @@ -128,6 +140,7 @@ share/locale/de/LC_MESSAGES/prewikka.mo share/locale/es/LC_MESSAGES/prewikka.mo share/locale/fr/LC_MESSAGES/prewikka.mo +share/locale/pl/LC_MESSAGES/prewikka.mo share/locale/pt_BR/LC_MESSAGES/prewikka.mo share/locale/ru/LC_MESSAGES/prewikka.mo share/prewikka/ @@ -167,3 +180,4 @@ share/prewikka/htdocs/images/table_order_up.gif share/prewikka/htdocs/js/ share/prewikka/htdocs/js/functions.js +share/prewikka/htdocs/js/jquery.js
