From 40b65a01421d04acc55eb898775bf9db894d1cda Mon Sep 17 00:00:00 2001 From: aanriot Date: Wed, 26 Jul 2006 07:07:16 +0000 Subject: [PATCH] - make the instructions less specific to postgresql. - move the database creation instructions to the correct place. - regen patches. - bump PKGNAMEs. "looks ok" alek@ --- security/prelude/libpreludedb/Makefile | 10 ++--- security/prelude/libpreludedb/pkg/MESSAGE | 8 ++++ security/prelude/lml/Makefile | 4 +- security/prelude/lml/pkg/MESSAGE | 3 +- security/prelude/manager/Makefile | 5 ++- .../prelude/manager/patches/patch-Makefile_in | 10 ++--- .../prelude/manager/patches/patch-configure | 8 ++-- .../patches/patch-prelude-manager_conf_in | 40 ++++++++++++------- security/prelude/manager/pkg/MESSAGE | 12 +----- security/prelude/pflogger/Makefile | 4 +- security/prelude/pflogger/pkg/MESSAGE | 3 +- security/prelude/prewikka/Makefile | 4 +- .../prewikka/patches/patch-conf_prewikka_conf | 20 ---------- security/prelude/prewikka/pkg/MESSAGE | 9 ++++- 14 files changed, 70 insertions(+), 70 deletions(-) diff --git a/security/prelude/libpreludedb/Makefile b/security/prelude/libpreludedb/Makefile index e33a6cf70d1..7b1a17b541e 100644 --- a/security/prelude/libpreludedb/Makefile +++ b/security/prelude/libpreludedb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2006/07/05 12:06:45 aanriot Exp $ +# $OpenBSD: Makefile,v 1.4 2006/07/26 07:07:16 aanriot Exp $ COMMENT= "Prelude framework database-access library" COMMENT-pgsql= "PostgreSQL module for libpreludedb" @@ -8,10 +8,10 @@ COMMENT-sqlite= "SQLite3 module for libpreludedb" VERSION= 0.9.8.1 DISTNAME= libpreludedb-${VERSION} -PKGNAME= prelude-${DISTNAME} -PKGNAME-pgsql= prelude-libpreludedb-pgsql-${VERSION} -PKGNAME-mysql= prelude-libpreludedb-mysql-${VERSION} -PKGNAME-sqlite= prelude-libpreludedb-sqlite-${VERSION} +PKGNAME= prelude-${DISTNAME}p0 +PKGNAME-pgsql= prelude-libpreludedb-pgsql-${VERSION}p0 +PKGNAME-mysql= prelude-libpreludedb-mysql-${VERSION}p0 +PKGNAME-sqlite= prelude-libpreludedb-sqlite-${VERSION}p0 MODULES= lang/python devel/gettext diff --git a/security/prelude/libpreludedb/pkg/MESSAGE b/security/prelude/libpreludedb/pkg/MESSAGE index 2ad38c9c1d3..1057d79ced5 100644 --- a/security/prelude/libpreludedb/pkg/MESSAGE +++ b/security/prelude/libpreludedb/pkg/MESSAGE @@ -1,2 +1,10 @@ To start with prelude, you have to install at least one DBMS module for libpreludedb, e.g. prelude-libpreludedb-pgsql . + +Then, install the database. Here is the instructions for PotsgreSQL: + +# su - _postgresql +$ createuser --pwprompt prelude (default password "prelude" / n,n,n) +$ createdb -O prelude prelude +$ cd ${PREFIX}/share/libpreludedb/classic/ +$ psql -U prelude -W prelude < pgsql.sql diff --git a/security/prelude/lml/Makefile b/security/prelude/lml/Makefile index d4b65d2aec8..6a8f02f68ce 100644 --- a/security/prelude/lml/Makefile +++ b/security/prelude/lml/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.4 2006/07/16 00:41:24 aanriot Exp $ +# $OpenBSD: Makefile,v 1.5 2006/07/26 07:07:16 aanriot Exp $ COMMENT= "Prelude log analyzer" DISTNAME= prelude-lml-0.9.6 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 WANTLIB= c pthread z gcrypt gpg-error gnutls MODULES= devel/gettext diff --git a/security/prelude/lml/pkg/MESSAGE b/security/prelude/lml/pkg/MESSAGE index 47f563f5c73..e0391abaa10 100644 --- a/security/prelude/lml/pkg/MESSAGE +++ b/security/prelude/lml/pkg/MESSAGE @@ -1,7 +1,8 @@ To start with prelude-lml, you have to create a starting profile, e.g. "prelude-lml" by running on the manager side: -# prelude-adduser registration-server prelude-manager --uid=564 --gid=564 +# prelude-adduser registration-server prelude-manager \ + --uid=564 --gid=564 and on the sensor side: diff --git a/security/prelude/manager/Makefile b/security/prelude/manager/Makefile index c61bc320f42..3b849c4bf96 100644 --- a/security/prelude/manager/Makefile +++ b/security/prelude/manager/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2006/07/01 10:45:31 aanriot Exp $ +# $OpenBSD: Makefile,v 1.3 2006/07/26 07:07:16 aanriot Exp $ COMMENT= "Prelude manager" DISTNAME= prelude-manager-0.9.5 +PKGNAME= ${DISTNAME}p0 -WANTLIB= c gpg-error gcrypt gnutls m preludedb pthread z prelude +WANTLIB= c gcrypt gnutls gpg-error m prelude preludedb pthread z MODULES= devel/gettext CONFIGURE_STYLE=gnu diff --git a/security/prelude/manager/patches/patch-Makefile_in b/security/prelude/manager/patches/patch-Makefile_in index 788c428dfc8..4cc4eb72742 100644 --- a/security/prelude/manager/patches/patch-Makefile_in +++ b/security/prelude/manager/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/06/26 18:04:25 aanriot Exp $ ---- Makefile.in.orig Tue Mar 28 19:04:43 2006 -+++ Makefile.in Tue May 30 21:47:33 2006 -@@ -225,7 +225,7 @@ build_alias = @build_alias@ +$OpenBSD: patch-Makefile_in,v 1.2 2006/07/26 07:07:16 aanriot Exp $ +--- Makefile.in.orig Wed Jun 14 10:47:37 2006 ++++ Makefile.in Tue Jul 25 19:07:32 2006 +@@ -223,7 +223,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ @@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/06/26 18:04:25 aanriot Exp $ datadir = @datadir@ decode_plugin_dir = @decode_plugin_dir@ defined = @defined@ -@@ -707,9 +707,6 @@ uninstall-info: uninstall-info-recursive +@@ -705,9 +705,6 @@ uninstall-info: uninstall-info-recursive install-data-local: $(INSTALL) -d -m 700 $(DESTDIR)$(configdir); diff --git a/security/prelude/manager/patches/patch-configure b/security/prelude/manager/patches/patch-configure index 03741660a39..ad29dd59917 100644 --- a/security/prelude/manager/patches/patch-configure +++ b/security/prelude/manager/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2006/06/26 18:04:25 aanriot Exp $ ---- configure.orig Thu Jun 1 18:22:30 2006 -+++ configure Thu Jun 1 18:22:46 2006 -@@ -32569,7 +32569,7 @@ manager_failover_dir=$localstatedir/spoo +$OpenBSD: patch-configure,v 1.2 2006/07/26 07:07:16 aanriot Exp $ +--- configure.orig Wed Jun 14 10:47:28 2006 ++++ configure Tue Jul 25 19:07:32 2006 +@@ -32642,7 +32642,7 @@ manager_failover_dir=$localstatedir/spoo manager_scheduler_dir=$localstatedir/spool/prelude-manager/scheduler manager_data_dir=$datadir/prelude-manager diff --git a/security/prelude/manager/patches/patch-prelude-manager_conf_in b/security/prelude/manager/patches/patch-prelude-manager_conf_in index ebbd0459fc0..f89b01a6f46 100644 --- a/security/prelude/manager/patches/patch-prelude-manager_conf_in +++ b/security/prelude/manager/patches/patch-prelude-manager_conf_in @@ -1,18 +1,28 @@ -$OpenBSD: patch-prelude-manager_conf_in,v 1.1.1.1 2006/06/26 18:04:25 aanriot Exp $ ---- prelude-manager.conf.in.orig Wed May 31 01:17:46 2006 -+++ prelude-manager.conf.in Wed May 31 01:19:20 2006 -@@ -103,7 +103,13 @@ listen = 127.0.0.1 +$OpenBSD: patch-prelude-manager_conf_in,v 1.2 2006/07/26 07:07:16 aanriot Exp $ +--- prelude-manager.conf.in.orig Tue Dec 13 13:39:58 2005 ++++ prelude-manager.conf.in Tue Jul 25 19:12:19 2006 +@@ -85,13 +85,13 @@ listen = 127.0.0.1 + + # [db] + +-# The type of database (mysql/pgsql). ++# The type of database (mysql/pgsql/sqlite). + # type = mysql + + # Host the database is listening on. + # host = localhost + +-# Port the database is listening on. ++# Port the database is listening on (3306/5432/x). + # port = 3306 + + # Name of the database. +@@ -101,7 +101,7 @@ listen = 127.0.0.1 + # user = prelude + # Password used to connect the database. - # pass = xxxxxx +-# pass = xxxxxx ++# pass = prelude + -- -+[db] -+type = pgsql -+host = localhost -+port = 5432 -+name = prelude -+user = prelude -+pass = prelude - # - # The Textmod plugin allow to report alert as text diff --git a/security/prelude/manager/pkg/MESSAGE b/security/prelude/manager/pkg/MESSAGE index 63dd8a59d0c..d9fd68c8b88 100644 --- a/security/prelude/manager/pkg/MESSAGE +++ b/security/prelude/manager/pkg/MESSAGE @@ -3,13 +3,5 @@ e.g. "prelude-manager" by running: # prelude-adduser add prelude-manager --uid=564 --gid=564 -You have to create the "prelude" database (e.g. with postgresql): - -# su - _postgresql -$ createuser --pwprompt prelude (default password "prelude" / n,n,n) -$ createdb -O prelude prelude -$ cd ${PREFIX}/share/libpreludedb/classic/ -$ psql -U prelude -W prelude < pgsql.sql - -Eventually, update ${SYSCONFDIR}/prelude-manager/prelude-manager.conf -with your database settings. +Then, update ${SYSCONFDIR}/prelude-manager/prelude-manager.conf with +your database settings. diff --git a/security/prelude/pflogger/Makefile b/security/prelude/pflogger/Makefile index 8ca196ac303..1346c1fe5a9 100644 --- a/security/prelude/pflogger/Makefile +++ b/security/prelude/pflogger/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2006/06/26 18:04:26 aanriot Exp $ +# $OpenBSD: Makefile,v 1.2 2006/07/26 07:07:16 aanriot Exp $ COMMENT= "Prelude sensors for Packet Filter" DISTNAME= prelude-pflogger-0.9.0-rc2 -PKGNAME= prelude-pflogger-0.9.0rc2 +PKGNAME= prelude-pflogger-0.9.0rc2p0 MODULES= devel/gettext WANTLIB= c gcrypt gnutls gpg-error pcap pthread z diff --git a/security/prelude/pflogger/pkg/MESSAGE b/security/prelude/pflogger/pkg/MESSAGE index b8722523c90..51a6e199a08 100644 --- a/security/prelude/pflogger/pkg/MESSAGE +++ b/security/prelude/pflogger/pkg/MESSAGE @@ -1,7 +1,8 @@ To start with prelude-pflogger, you have to create a starting profile, e.g. "prelude-pflogger" by running on the manager side: -# prelude-adduser registration-server prelude-manager --uid=564 --gid=564 +# prelude-adduser registration-server prelude-manager \ + --uid=564 --gid=564 and on the sensor side: diff --git a/security/prelude/prewikka/Makefile b/security/prelude/prewikka/Makefile index 5fa3974e5f3..d571cf95a9a 100644 --- a/security/prelude/prewikka/Makefile +++ b/security/prelude/prewikka/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2006/06/26 18:04:24 aanriot Exp $ +# $OpenBSD: Makefile,v 1.2 2006/07/26 07:07:16 aanriot Exp $ COMMENT= "Prelude Management Console" DISTNAME= prewikka-0.9.5 -PKGNAME= prelude-${DISTNAME} +PKGNAME= prelude-${DISTNAME}p0 # only postgresql support for now diff --git a/security/prelude/prewikka/patches/patch-conf_prewikka_conf b/security/prelude/prewikka/patches/patch-conf_prewikka_conf index 8329e6aa81c..e69de29bb2d 100644 --- a/security/prelude/prewikka/patches/patch-conf_prewikka_conf +++ b/security/prelude/prewikka/patches/patch-conf_prewikka_conf @@ -1,20 +0,0 @@ -$OpenBSD: patch-conf_prewikka_conf,v 1.1.1.1 2006/06/26 18:04:25 aanriot Exp $ ---- conf/prewikka.conf.orig Mon May 29 20:52:23 2006 -+++ conf/prewikka.conf Mon May 29 20:52:47 2006 -@@ -14,14 +14,14 @@ whois: /usr/bin/whois - traceroute: /usr/sbin/traceroute - - [idmef_database] --type: mysql -+type: pgsql - host: localhost - user: prelude - pass: prelude - name: prelude - - [database] --type: mysql -+type: pgsql - host: localhost - user: prelude - pass: prelude diff --git a/security/prelude/prewikka/pkg/MESSAGE b/security/prelude/prewikka/pkg/MESSAGE index b89cf630445..02e0c11a09e 100644 --- a/security/prelude/prewikka/pkg/MESSAGE +++ b/security/prelude/prewikka/pkg/MESSAGE @@ -1,11 +1,18 @@ To start with prelude-prewikka, you have to create the "prewikka" -database by running: +database. + +Here is the instructions for PotsgreSQL: # su - _postgresql $ createdb -O prelude prewikka $ cd ${PREFIX}/share/prewikka/database/ $ psql -U prelude -W prewikka < pgsql.sql + +Then, update ${SYSCONFDIR}/prewikka/prewikka.conf with your database +settings. + + Eventually, start prewikka's webserver (listening by default on 8000): # prewikka-httpd