Update to Prewikka 0.9.8. Changes:

- Save/load user configuration when using CGI authentication mode (#181).
- Show Prewikka version in the About page (#177).
- Use Python logging facility (available backend: stderr, file, smtp, syslog),
  multiple simultaneous handler supported (#113).
- Fix anonymous authentication.
- Fix external process going into zombie state (#178).
- Display correct alertident for invalid CorrelationAlert analyzerid/messageid pair.
- prewikka-httpd should now log the source address.
- Thread safety fixes.

4 files changed, 25 insertions, 50 deletions

diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile
index 0208f6e0525..e2fa9c1f77c 100644
--- a/security/py-prewikka/Makefile
+++ b/security/py-prewikka/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2006/10/23 14:38:14 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/11/24 11:45:30 shannonjr Exp $
 #
 
 DISTNAME=		prewikka-${VERSION}
 PKGNAME=		${PYPKGPREFIX}-prewikka-${VERSION}
-PKGREVISION=		3
+#PKGREVISION=		3
 CATEGORIES=		security
 MASTER_SITES=		http://www.prelude-ids.org/download/releases/ \
 			http://www.prelude-ids.org/download/releases/old/
 
-VERSION=		0.9.7
+VERSION=		0.9.8
 
 CONFLICTS=		prewikka-[0-9]*
 
diff --git a/security/py-prewikka/PLIST b/security/py-prewikka/PLIST
index 71702b64186..7f35d211060 100644
--- a/security/py-prewikka/PLIST
+++ b/security/py-prewikka/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/10/23 14:38:14 joerg Exp $
-bin/prewikka-httpd
+@comment $NetBSD: PLIST,v 1.7 2006/11/24 11:45:30 shannonjr Exp $
 ${PYSITELIB}/prewikka/Auth.py
 ${PYSITELIB}/prewikka/Auth.pyc
 ${PYSITELIB}/prewikka/Auth.pyo
@@ -54,27 +53,18 @@ ${PYSITELIB}/prewikka/modules/__init__.pyo
 ${PYSITELIB}/prewikka/modules/auth/__init__.py
 ${PYSITELIB}/prewikka/modules/auth/__init__.pyc
 ${PYSITELIB}/prewikka/modules/auth/__init__.pyo
-${PYSITELIB}/prewikka/modules/auth/loginpassword/__init__.py
-${PYSITELIB}/prewikka/modules/auth/loginpassword/__init__.pyc
-${PYSITELIB}/prewikka/modules/auth/loginpassword/__init__.pyo
-${PYSITELIB}/prewikka/modules/auth/loginpassword/loginpassword.py
-${PYSITELIB}/prewikka/modules/auth/loginpassword/loginpassword.pyc
-${PYSITELIB}/prewikka/modules/auth/loginpassword/loginpassword.pyo
 ${PYSITELIB}/prewikka/modules/auth/cgi/__init__.py
 ${PYSITELIB}/prewikka/modules/auth/cgi/__init__.pyc
 ${PYSITELIB}/prewikka/modules/auth/cgi/__init__.pyo
 ${PYSITELIB}/prewikka/modules/auth/cgi/cgi.py
 ${PYSITELIB}/prewikka/modules/auth/cgi/cgi.pyc
 ${PYSITELIB}/prewikka/modules/auth/cgi/cgi.pyo
-${PYSITELIB}/prewikka/modules/log/__init__.py
-${PYSITELIB}/prewikka/modules/log/__init__.pyc
-${PYSITELIB}/prewikka/modules/log/__init__.pyo
-${PYSITELIB}/prewikka/modules/log/stderr/__init__.py
-${PYSITELIB}/prewikka/modules/log/stderr/__init__.pyc
-${PYSITELIB}/prewikka/modules/log/stderr/__init__.pyo
-${PYSITELIB}/prewikka/modules/log/stderr/stderr.py
-${PYSITELIB}/prewikka/modules/log/stderr/stderr.pyc
-${PYSITELIB}/prewikka/modules/log/stderr/stderr.pyo
+${PYSITELIB}/prewikka/modules/auth/loginpassword/__init__.py
+${PYSITELIB}/prewikka/modules/auth/loginpassword/__init__.pyc
+${PYSITELIB}/prewikka/modules/auth/loginpassword/__init__.pyo
+${PYSITELIB}/prewikka/modules/auth/loginpassword/loginpassword.py
+${PYSITELIB}/prewikka/modules/auth/loginpassword/loginpassword.pyc
+${PYSITELIB}/prewikka/modules/auth/loginpassword/loginpassword.pyo
 ${PYSITELIB}/prewikka/siteconfig.py
 ${PYSITELIB}/prewikka/siteconfig.pyc
 ${PYSITELIB}/prewikka/siteconfig.pyo
@@ -96,9 +86,6 @@ ${PYSITELIB}/prewikka/templates/ErrorTemplate.pyo
 ${PYSITELIB}/prewikka/templates/FilterEdition.py
 ${PYSITELIB}/prewikka/templates/FilterEdition.pyc
 ${PYSITELIB}/prewikka/templates/FilterEdition.pyo
-${PYSITELIB}/prewikka/templates/FilterListing.py
-${PYSITELIB}/prewikka/templates/FilterListing.pyc
-${PYSITELIB}/prewikka/templates/FilterListing.pyo
 ${PYSITELIB}/prewikka/templates/HTMLDocument.py
 ${PYSITELIB}/prewikka/templates/HTMLDocument.pyc
 ${PYSITELIB}/prewikka/templates/HTMLDocument.pyo
@@ -180,8 +167,9 @@ ${PYSITELIB}/prewikka/views/sensor.pyo
 ${PYSITELIB}/prewikka/views/usermanagement.py
 ${PYSITELIB}/prewikka/views/usermanagement.pyc
 ${PYSITELIB}/prewikka/views/usermanagement.pyo
+bin/prewikka-httpd
 sbin/runPrewikka
-share/examples/${PKGBASE}/prewikka.conf
+share/examples/py24-prewikka/prewikka.conf
 share/examples/rc.d/prewikka
 share/prewikka/cgi-bin/prewikka.cgi
 share/prewikka/database/mysql-update-0.9.1.sql
@@ -203,18 +191,18 @@ share/prewikka/htdocs/images/search.png
 share/prewikka/htdocs/images/table_order_down.gif
 share/prewikka/htdocs/images/table_order_up.gif
 share/prewikka/htdocs/js/functions.js
+@dirrm ${PYSITELIB}/prewikka/modules/auth/cgi
+@dirrm ${PYSITELIB}/prewikka/modules/auth/loginpassword
+@dirrm ${PYSITELIB}/prewikka/modules/auth
+@dirrm ${PYSITELIB}/prewikka/modules
+@dirrm ${PYSITELIB}/prewikka/templates
+@dirrm ${PYSITELIB}/prewikka/views
+@dirrm ${PYSITELIB}/prewikka
+@dirrm share/examples/py24-prewikka
 @dirrm share/prewikka/cgi-bin
 @dirrm share/prewikka/database
 @dirrm share/prewikka/htdocs/css
 @dirrm share/prewikka/htdocs/images
 @dirrm share/prewikka/htdocs/js
 @dirrm share/prewikka/htdocs
-@dirrm ${PYSITELIB}/prewikka/views
-@dirrm ${PYSITELIB}/prewikka/templates
-@dirrm ${PYSITELIB}/prewikka/modules/log/stderr
-@dirrm ${PYSITELIB}/prewikka/modules/log
-@dirrm ${PYSITELIB}/prewikka/modules/auth/loginpassword
-@dirrm ${PYSITELIB}/prewikka/modules/auth/cgi
-@dirrm ${PYSITELIB}/prewikka/modules/auth
-@dirrm ${PYSITELIB}/prewikka/modules
-@dirrm ${PYSITELIB}/prewikka
+@dirrm share/prewikka
diff --git a/security/py-prewikka/distinfo b/security/py-prewikka/distinfo
index b6942e01533..8a3d7444d74 100644
--- a/security/py-prewikka/distinfo
+++ b/security/py-prewikka/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2006/10/10 15:05:14 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/11/24 11:45:30 shannonjr Exp $
 
-SHA1 (prewikka-0.9.7.tar.gz) = a11cd15a1290cd52553a824c61ab2c1e028435ff
-RMD160 (prewikka-0.9.7.tar.gz) = 29b1dfe7e81b9273ed7e59b37acb3ded85f5e836
-Size (prewikka-0.9.7.tar.gz) = 180802 bytes
+SHA1 (prewikka-0.9.8.tar.gz) = e56d63cc1a71173d21ec5bc0e20d8246d995a3c6
+RMD160 (prewikka-0.9.8.tar.gz) = 15efbe3075941067e51de53267b728dd15bbd623
+Size (prewikka-0.9.8.tar.gz) = 180553 bytes
 SHA1 (patch-aa) = a250840804edea0c8eeeb8608aa8c07375d0a3f2
 SHA1 (patch-ab) = 76fd7ee4f1c19336a8eaa98fa1513e88e1c4c070
diff --git a/security/py-prewikka/patches/patch-aa b/security/py-prewikka/patches/patch-aa
deleted file mode 100644
index df112dfea25..00000000000
--- a/security/py-prewikka/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/08/23 10:30:02 shannonjr Exp $
-
---- ./prewikka/Filter.py.orig	2006-08-16 03:40:13.000000000 -0600
-+++ ./prewikka/Filter.py
-@@ -85,7 +85,7 @@ class _Filter:
- 
- 
- 
--class AlertFilter:
-+class AlertFilter(_Filter):
-     _objects = CriteriaIDMEF(prelude.IDMEF_CLASS_ID_ALERT, "alert").CriteriaList
-     
-     def __iter__(self):