From 0f89c2fcd9e67b2ff2597f59216596093c594c1b Mon Sep 17 00:00:00 2001 From: aanriot Date: Sat, 30 Dec 2006 16:36:09 +0000 Subject: [PATCH] - update to 0.9.8 . - advise another database location for SQLite, it doesn't affect existing setups. - remove patches merged upstream. "looks ok" msf@ --- security/prelude/prewikka/Makefile | 6 +++--- security/prelude/prewikka/distinfo | 8 ++++---- security/prelude/prewikka/files/README.OpenBSD | 4 +++- .../prewikka/patches/patch-conf_prewikka_conf | 12 ------------ .../patches/patch-database_mysql2sqlite_sh | 12 ------------ security/prelude/prewikka/pkg/PLIST | 15 +-------------- 6 files changed, 11 insertions(+), 46 deletions(-) delete mode 100644 security/prelude/prewikka/patches/patch-conf_prewikka_conf delete mode 100644 security/prelude/prewikka/patches/patch-database_mysql2sqlite_sh diff --git a/security/prelude/prewikka/Makefile b/security/prelude/prewikka/Makefile index 6284eb88c75..997a2673ae7 100644 --- a/security/prelude/prewikka/Makefile +++ b/security/prelude/prewikka/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2006/11/27 13:28:56 msf Exp $ +# $OpenBSD: Makefile,v 1.9 2006/12/30 16:36:09 aanriot Exp $ COMMENT= "Prelude Management Console" -DISTNAME= prewikka-0.9.7.1 -PKGNAME= prelude-${DISTNAME}p3 +DISTNAME= prewikka-0.9.8 +PKGNAME= prelude-${DISTNAME} MODULES= lang/python diff --git a/security/prelude/prewikka/distinfo b/security/prelude/prewikka/distinfo index 17a97da2a47..79aaa0ab756 100644 --- a/security/prelude/prewikka/distinfo +++ b/security/prelude/prewikka/distinfo @@ -1,4 +1,4 @@ -MD5 (prewikka-0.9.7.1.tar.gz) = 9870683231b3b76651d48b7fec76e3eb -RMD160 (prewikka-0.9.7.1.tar.gz) = 961f6e7a2ac5603fa971e50111feb538bf1ff931 -SHA1 (prewikka-0.9.7.1.tar.gz) = 008f4b262c99e0b902c37d9e7a1c28fdb47aa2ba -SIZE (prewikka-0.9.7.1.tar.gz) = 180851 +MD5 (prewikka-0.9.8.tar.gz) = bc269aeb9c3570b76b668f0242daef76 +RMD160 (prewikka-0.9.8.tar.gz) = 15efbe3075941067e51de53267b728dd15bbd623 +SHA1 (prewikka-0.9.8.tar.gz) = e56d63cc1a71173d21ec5bc0e20d8246d995a3c6 +SIZE (prewikka-0.9.8.tar.gz) = 180553 diff --git a/security/prelude/prewikka/files/README.OpenBSD b/security/prelude/prewikka/files/README.OpenBSD index 08648fedb94..0e008f50c9f 100644 --- a/security/prelude/prewikka/files/README.OpenBSD +++ b/security/prelude/prewikka/files/README.OpenBSD @@ -26,8 +26,9 @@ Instructions for MySQL: Instructions for SQLite: - # cd /var/prelude/prewikka/ + # cd /var/prelude/ # sqlite3 prewikka.db < ${PREFIX}/share/prewikka/database/sqlite.sql + # chmod 700 prewikka.db Then, fill-in prewikka.conf, sections [idmef_database] and [database] to use this/these database file(s), thanks to the "file" keyword @@ -42,3 +43,4 @@ fi The default user is "admin", with "admin" as password and should be changed. + diff --git a/security/prelude/prewikka/patches/patch-conf_prewikka_conf b/security/prelude/prewikka/patches/patch-conf_prewikka_conf deleted file mode 100644 index b12ef43c4cb..00000000000 --- a/security/prelude/prewikka/patches/patch-conf_prewikka_conf +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-conf_prewikka_conf,v 1.4 2006/11/11 19:33:57 aanriot Exp $ ---- conf/prewikka.conf.orig Sun Nov 5 01:36:37 2006 -+++ conf/prewikka.conf Sun Nov 5 01:37:03 2006 -@@ -31,7 +31,7 @@ user: prelude - pass: prelude - name: prewikka - --[log stderr] -+#[log stderr] - - [auth loginpassword] - expiration: 60 diff --git a/security/prelude/prewikka/patches/patch-database_mysql2sqlite_sh b/security/prelude/prewikka/patches/patch-database_mysql2sqlite_sh deleted file mode 100644 index 50e7462eb7f..00000000000 --- a/security/prelude/prewikka/patches/patch-database_mysql2sqlite_sh +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-database_mysql2sqlite_sh,v 1.2 2006/11/11 19:33:57 aanriot Exp $ ---- database/mysql2sqlite.sh.orig Tue Jan 10 09:22:21 2006 -+++ database/mysql2sqlite.sh Thu Oct 5 15:59:49 2006 -@@ -2,7 +2,7 @@ - sed \ - -e 's/#.*//' \ - -e '/^DROP /d' \ -- -e 's/\w*INT /INTEGER /' \ -+ -e 's/[a-zA-Z]*INT /INTEGER /' \ - -e 's/UNSIGNED //' \ - -e 's/ENUM([^)]\+)/TEXT/' \ - -e 's/VARCHAR([^)]\+)/TEXT/' \ diff --git a/security/prelude/prewikka/pkg/PLIST b/security/prelude/prewikka/pkg/PLIST index 74f6438e63e..9e3afcadbf3 100644 --- a/security/prelude/prewikka/pkg/PLIST +++ b/security/prelude/prewikka/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.4 2006/10/06 08:04:23 aanriot Exp $ +@comment $OpenBSD: PLIST,v 1.5 2006/12/30 16:36:09 aanriot Exp $ bin/prewikka-httpd lib/python${MODPY_VERSION}/site-packages/prewikka/ lib/python${MODPY_VERSION}/site-packages/prewikka/Auth.py @@ -49,14 +49,6 @@ lib/python${MODPY_VERSION}/site-packages/prewikka/modules/auth/loginpassword/__i 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/modules/log/ -lib/python${MODPY_VERSION}/site-packages/prewikka/modules/log/__init__.py -lib/python${MODPY_VERSION}/site-packages/prewikka/modules/log/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/prewikka/modules/log/stderr/ -lib/python${MODPY_VERSION}/site-packages/prewikka/modules/log/stderr/__init__.py -lib/python${MODPY_VERSION}/site-packages/prewikka/modules/log/stderr/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/prewikka/modules/log/stderr/stderr.py -lib/python${MODPY_VERSION}/site-packages/prewikka/modules/log/stderr/stderr.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/ @@ -72,8 +64,6 @@ lib/python${MODPY_VERSION}/site-packages/prewikka/templates/ErrorTemplate.py lib/python${MODPY_VERSION}/site-packages/prewikka/templates/ErrorTemplate.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/templates/FilterEdition.py lib/python${MODPY_VERSION}/site-packages/prewikka/templates/FilterEdition.pyc -lib/python${MODPY_VERSION}/site-packages/prewikka/templates/FilterListing.py -lib/python${MODPY_VERSION}/site-packages/prewikka/templates/FilterListing.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/templates/HTMLDocument.py lib/python${MODPY_VERSION}/site-packages/prewikka/templates/HTMLDocument.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/templates/HeartbeatAnalyze.py @@ -162,6 +152,3 @@ share/prewikka/htdocs/images/table_order_down.gif share/prewikka/htdocs/images/table_order_up.gif share/prewikka/htdocs/js/ share/prewikka/htdocs/js/functions.js -@sample /var/prelude/prewikka/ -@extraunexec rm -rf /var/prelude/prewikka/* -@extraunexec rm -rf %D/lib/python${MODPY_VERSION}/site-packages/prewikka/*