Update to 1.4.1

Some highlights:
Bug #1680965 sans lookup fails -- Jordan Wiens
Fixed index.php redirect -- Kevin Johnson for Terry Burton
Added Worldmap feature -- Juergen Leising
Added Vendor MAC Map -- Juergen Leising
Increased memory limit from 50 to 128 MB in base_graph_common.php
Fixed "Select Signature from List" in the query form -- Juergen Leising
Newly generated coordinates file world_map6.txt. -- Juergen Leising

See docs/CHANGELOG for all the details

3 files changed, 21 insertions, 19 deletions

diff --git a/security/base/Makefile b/security/base/Makefile
index 17bff903f74..95d47476424 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:33 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2008/11/05 22:47:13 adrianp Exp $
 #
 
-DISTNAME=	base-1.3.9
+DISTNAME=	base-1.4.1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=secureideas/}
 
@@ -26,25 +26,26 @@ DEPENDS+=	${PHP_PKG_PREFIX}-pear-Image_Graph-[0-9]*:../../graphics/pear-Image_Gr
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.0.4:../../www/ap-php
 
 NO_BUILD=	YES
+WRKSRC=		${WRKDIR}/base-php4
 
 .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
-MESSAGE_SUBST+= EGDIR=${EGDIR:Q} BASE_DIR=${BASE_DIR:Q}
-PAX_DIRS=	admin help images includes languages scripts setup sql styles
-WWW_USER?=	${APACHE_USER}
-WWW_GROUP?=	${APACHE_GROUP}
-USE_TOOLS+=	pax perl:run
-REPLACE_PERL+=	scripts/base_maintenance.pl
-
-# SKIP_PORTABILITY_CHECK=	YES
+DOC_FILES=		CHANGELOG CREDITS README README.mssql TODO \
+			UPGRADE base_faq.rtf
+BASE_DIR=		${PREFIX}/share/base
+EGDIR=			${PREFIX}/share/examples/base
+MESSAGE_SUBST+= 	EGDIR=${EGDIR:Q} BASE_DIR=${BASE_DIR:Q}
+PAX_DIRS=		admin help images includes languages scripts setup \
+			sql styles
+WWW_USER?=		${APACHE_USER}
+WWW_GROUP?=		${APACHE_GROUP}
+USE_TOOLS+=		pax perl:run
+REPLACE_PERL+=		scripts/base_maintenance.pl
 
 PKG_GROUPS_VARS+=	WWW_GROUP
 PKG_USERS_VARS+=	WWW_USER
 
-CONF_FILES=	${EGDIR}/base.conf ${PKG_SYSCONFDIR}/base.conf
+CONF_FILES=		${EGDIR}/base.conf ${PKG_SYSCONFDIR}/base.conf
 
 CONF_FILES_PERMS=	${EGDIR}/base_conf.php ${BASE_DIR}/base_conf.php \
 			${WWW_USER} ${WWW_GROUP} 0600
diff --git a/security/base/PLIST b/security/base/PLIST
index 49ad206ea0c..b09ca2b59a3 100644
--- a/security/base/PLIST
+++ b/security/base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/10/20 23:22:09 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/11/05 22:47:13 adrianp Exp $
 share/base/admin/base_roleadmin.php
 share/base/admin/base_useradmin.php
 share/base/admin/index.php
@@ -50,6 +50,7 @@ share/base/includes/base_capabilities.php
 share/base/includes/base_constants.inc.php
 share/base/includes/base_db.inc.php
 share/base/includes/base_include.inc.php
+share/base/includes/base_iso3166.inc.php
 share/base/includes/base_log_error.inc.php
 share/base/includes/base_log_timing.inc.php
 share/base/includes/base_net.inc.php
diff --git a/security/base/distinfo b/security/base/distinfo
index cc195bb0590..53137b5f2ea 100644
--- a/security/base/distinfo
+++ b/security/base/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2007/11/25 18:09:53 adrianp Exp $
+$NetBSD: distinfo,v 1.10 2008/11/05 22:47:13 adrianp Exp $
 
-SHA1 (base-1.3.9.tar.gz) = 916115e3f2e68abfed1a6fa305778508bbe38db4
-RMD160 (base-1.3.9.tar.gz) = 2581be05a11a9800aa3ad96dac74fa47103ebca0
-Size (base-1.3.9.tar.gz) = 487292 bytes
+SHA1 (base-1.4.1.tar.gz) = cc779ac3fea50d9b5bbb806cd7f6aa5a09b39b9a
+RMD160 (base-1.4.1.tar.gz) = dec378e107843baba75545d161607f8506740b2a
+Size (base-1.4.1.tar.gz) = 954823 bytes
 SHA1 (patch-aa) = 71c95cbf0bfe45ee818c409bfe9d57753b71689d