diff options
| author | shannonjr <shannonjr@pkgsrc.org> | 2006-08-23 10:30:02 +0000 |
|---|---|---|
| committer | shannonjr <shannonjr@pkgsrc.org> | 2006-08-23 10:30:02 +0000 |
| commit | bbdaf76efe7d5fc7d414c3883a0e4e37085ab767 (patch) | |
| tree | 1797cd21b8459d11341f6b3911d59f984e2cb12c /security | |
| parent | 8c01a948c93293f3e3d52b5a439af50307656d89 (diff) | |
| download | pkgsrc-bbdaf76efe7d5fc7d414c3883a0e4e37085ab767.tar.gz | |
Fixed bug in 0.9.7 release that prevented filters from working.
Diffstat (limited to 'security')
| -rw-r--r-- | security/py-prewikka/Makefile | 12 | ||||
| -rw-r--r-- | security/py-prewikka/distinfo | 3 | ||||
| -rw-r--r-- | security/py-prewikka/files/runPrewikka.c | 10 | ||||
| -rw-r--r-- | security/py-prewikka/patches/patch-aa | 13 |
4 files changed, 29 insertions, 9 deletions
diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile index b2673d034a2..6f050109cc0 100644 --- a/security/py-prewikka/Makefile +++ b/security/py-prewikka/Makefile @@ -1,11 +1,14 @@ -# $NetBSD: Makefile,v 1.10 2006/08/17 11:35:20 shannonjr Exp $ +# $NetBSD: Makefile,v 1.11 2006/08/23 10:30:02 shannonjr Exp $ # -DISTNAME= prewikka-0.9.7 -PKGNAME= ${PYPKGPREFIX}-prewikka-0.9.7 +DISTNAME= prewikka-${VERSION} +PKGNAME= ${PYPKGPREFIX}-prewikka-${VERSION} +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= http://prelude-ids.org/download/releases/ +VERSION= 0.9.7 + CONFLICTS= prewikka-[0-9]* MAINTAINER= shannonjr@NetBSD.org @@ -19,7 +22,7 @@ DEPENDS+= ${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah PYDISTUTILSPKG= yes PYBINMODULE= yes PYSETUP= setup.py -PYTHON_VERSIONS_ACCEPTED= 24 23 22 +PYTHON_VERSIONS_ACCEPTED= 24 23 PYTHON_PATCH_SCRIPTS= scripts/prewikka-httpd PREWIKKA_USER?= prewikka PREWIKKA_GROUP?= prewikka @@ -37,6 +40,7 @@ SUBST_STAGE.code= post-patch SUBST_FILES.code= runPrewikka.c SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g' SUBST_SED.code+= -e 's,@PREWIKKA_USER@,${PREWIKKA_USER},g' +SUBST_SED.code+= -e 's,@PYTHONBIN@,${PYTHONBIN},g' FILES_SUBST+= PREWIKKA_USER=${PREWIKKA_USER:Q} pre-patch: diff --git a/security/py-prewikka/distinfo b/security/py-prewikka/distinfo index 208586f5d76..51f7e8d2eb3 100644 --- a/security/py-prewikka/distinfo +++ b/security/py-prewikka/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.4 2006/08/17 11:35:20 shannonjr Exp $ +$NetBSD: distinfo,v 1.5 2006/08/23 10:30:02 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 (patch-aa) = a250840804edea0c8eeeb8608aa8c07375d0a3f2 diff --git a/security/py-prewikka/files/runPrewikka.c b/security/py-prewikka/files/runPrewikka.c index 19741147146..fb27361f5d2 100644 --- a/security/py-prewikka/files/runPrewikka.c +++ b/security/py-prewikka/files/runPrewikka.c @@ -1,5 +1,6 @@ #define PREWIKKA_HTTPD_USER "@PREWIKKA_USER@" #define PREWIKKA_HTTPD_PATH "@PREFIX@/bin/prewikka-httpd" +#define PYTHON "@PYTHONBIN@" #include <unistd.h> #include <string.h> @@ -116,15 +117,16 @@ int main (int argc, char **argv ) } /* Build calling argv */ - args[0] = PREWIKKA_HTTPD_PATH; + args[0] = PYTHON; + args[1] = PREWIKKA_HTTPD_PATH; for (i=1;i<argc;i++) { - args[i] = argv[i]; + args[i+1] = argv[i]; + args[i+2] = NULL; } - args[i++] = NULL; /* Finally transform self into prewikka-httpd */ - if (execvp(PREWIKKA_HTTPD_PATH, args) < 0) + if (execvp(PYTHON, args) < 0) error_sys("execve error"); else ; /* avoid if-then ambiguity */ diff --git a/security/py-prewikka/patches/patch-aa b/security/py-prewikka/patches/patch-aa new file mode 100644 index 00000000000..df112dfea25 --- /dev/null +++ b/security/py-prewikka/patches/patch-aa @@ -0,0 +1,13 @@ +$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): |