summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/base/Makefile12
-rw-r--r--security/base/PLIST7
-rw-r--r--security/base/distinfo10
-rw-r--r--security/base/patches/patch-aa32
4 files changed, 32 insertions, 29 deletions
diff --git a/security/base/Makefile b/security/base/Makefile
index 9591a660a40..95bc25215cc 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2006/03/14 20:43:23 jlam Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2006/06/07 00:14:26 salo Exp $
#
-DISTNAME= base-1.2.2
+DISTNAME= base-1.2.5
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=secureideas/}
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://secureideas.sourceforge.net/
+HOMEPAGE= http://secureideas.sourceforge.net/
COMMENT= Analysis engine to process a database of security events
DEPENDS+= adodb>=1.2:../../databases/adodb
@@ -22,6 +22,8 @@ DEPENDS+= pear-Image_Graph-[0-9]*:../../graphics/pear-Image_Graph
NO_BUILD= YES
+.include "../../mk/bsd.prefs.mk"
+
DOC_FILES= CHANGELOG CREDITS README README.mssql TODO UPGRADE base_faq.rtf
BASE_DIR= ${PREFIX}/share/base
EGDIR= ${PREFIX}/share/examples/base
@@ -61,11 +63,11 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/*.php ${BASE_DIR}
. for f in ${DOC_FILES}
- ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${PREFIX}/share/doc/base
+ ${INSTALL_DATA} ${WRKSRC}/docs/${f:Q} ${PREFIX}/share/doc/base
. endfor
. for i in ${PAX_DIRS}
- cd ${WRKSRC}/${i} && ${PAX} -rw . ${BASE_DIR}/${i}
+ cd ${WRKSRC}/${i:Q} && ${PAX} -rw . ${BASE_DIR}/${i:Q}
. endfor
@${CHOWN} ${WWW_USER} ${BASE_DIR}
diff --git a/security/base/PLIST b/security/base/PLIST
index c9e1d61318c..575a6157765 100644
--- a/security/base/PLIST
+++ b/security/base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/03/13 13:11:05 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2006/06/07 00:14:26 salo Exp $
share/base/admin/base_roleadmin.php
share/base/admin/base_useradmin.php
share/base/admin/index.php
@@ -62,8 +62,8 @@ share/base/includes/base_state_criteria.inc.php
share/base/includes/base_state_query.inc.php
share/base/includes/base_template.php
share/base/includes/base_user.inc.php
-share/base/includes/class.ezpdf.php
-share/base/includes/class.pdf.php
+share/base/includes/fpdf_class.php
+share/base/includes/fpdf_fonts.php
share/base/index.php
share/base/languages/chinese.lang.php
share/base/languages/czech.lang.php
@@ -88,6 +88,7 @@ share/base/languages/turkish.lang.php
share/base/scripts/base_maintenance.pl
share/base/setup/base_conf_contents.php
share/base/setup/index.php
+share/base/setup/setup_db.inc.php
share/base/setup/setup1.php
share/base/setup/setup2.php
share/base/setup/setup3.php
diff --git a/security/base/distinfo b/security/base/distinfo
index 636c9fa4ed9..83bef77f346 100644
--- a/security/base/distinfo
+++ b/security/base/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/03/13 13:11:05 adrianp Exp $
+$NetBSD: distinfo,v 1.2.2.1 2006/06/07 00:14:26 salo Exp $
-SHA1 (base-1.2.2.tar.gz) = 34d389aec22d7c99cfe344c3df8c1a488529a723
-RMD160 (base-1.2.2.tar.gz) = c3e22f216e6ab67e9ded3050692bdb4479a65130
-Size (base-1.2.2.tar.gz) = 346518 bytes
-SHA1 (patch-aa) = 643f22ba268bf712bfc969b6e3e5d086106f466f
+SHA1 (base-1.2.5.tar.gz) = ea53ea599e0fb52679ac04d6fae8151f84928732
+RMD160 (base-1.2.5.tar.gz) = 212a931d3c77aec6520e4eebce3fae3f8e1c1feb
+Size (base-1.2.5.tar.gz) = 335285 bytes
+SHA1 (patch-aa) = 71c95cbf0bfe45ee818c409bfe9d57753b71689d
diff --git a/security/base/patches/patch-aa b/security/base/patches/patch-aa
index fe5c81387ad..b9c9d2f92ef 100644
--- a/security/base/patches/patch-aa
+++ b/security/base/patches/patch-aa
@@ -1,31 +1,31 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/01/03 21:09:44 adrianp Exp $
+$NetBSD: patch-aa,v 1.1.1.1.2.1 2006/06/07 00:14:26 salo Exp $
---- base_conf.php.dist.orig 2005-10-31 11:33:27.000000000 +1100
+--- base_conf.php.dist.orig 2006-03-19 22:22:43.000000000 +0000
+++ base_conf.php.dist
-@@ -39,7 +39,7 @@ $Use_Auth_System = 0;
+@@ -40,7 +40,7 @@ $Use_Auth_System = 0;
But also put the preceding slash. e.g. Your URL is http://127.0.0.1/base
set this to /base
*/
--$BASE_urlpath = "";
-+$BASE_urlpath = "/base";
+-$BASE_urlpath = '';
++$BASE_urlpath = '/base';
/* Unique BASE ID. The below variable, if set, will append its value to the
* title bar of the browser. This is for people who manage multiple installs
-@@ -61,7 +61,7 @@ $base_custom_footer = "";
- * $foo = "c:\tmp" [OK]
- * $foo = "c:\tmp\" [WRONG]
+@@ -62,7 +62,7 @@ $base_custom_footer = '';
+ * $foo = 'c:\tmp' [OK]
+ * $foo = 'c:\tmp\' [WRONG]
*/
--$DBlib_path = "";
-+$DBlib_path = "@PREFIX@/share/adodb";
+-$DBlib_path = '';
++$DBlib_path = '@PREFIX@/share/adodb';
+
/* The type of underlying alert database
- *
-@@ -70,7 +70,7 @@ $DBlib_path = "";
- * MS SQL Server : "mssql"
- * Oracle : "oci8"
+@@ -72,7 +72,7 @@ $DBlib_path = '';
+ * MS SQL Server : 'mssql'
+ * Oracle : 'oci8'
*/
--$DBtype = "mysql";
-+$DBtype = "@DBTYPE@";
+-$DBtype = 'mysql';
++$DBtype = '@DBTYPE@';
/* Alert DB connection parameters
* - $alert_dbname : MySQL database name of Snort alert DB