Update "squirrelmail" and "squirrelmail-locales" package to version 1.4.8.

Changes since version 1.4.7:
- A security fix for CVE-2006-4019
- A collection of bugfixes

4 files changed, 13 insertions, 17 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 73e3fa8b5e3..1ecc568bd3c 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2006/07/13 07:59:34 martti Exp $
+# $NetBSD: Makefile,v 1.75 2006/08/14 15:57:40 tron Exp $
 
-DISTNAME=	squirrelmail-1.4.7
+DISTNAME=	squirrelmail-1.4.8
 #PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
@@ -76,6 +76,8 @@ do-install:
 	${CHMOD} a+x ${SMDIR:Q}/config/conf.pl
 	${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/
 	${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/
+	${MV} ${PREFIX}/share/squirrelmail/contrib/conf.pl.8 \
+	  ${PREFIX}/man/man8/squirrelmail-conf.pl.8
 
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index fcc9e95f056..8ddc2b62bd0 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.18 2006/07/13 07:59:34 martti Exp $
+@comment $NetBSD: PLIST,v 1.19 2006/08/14 15:57:40 tron Exp $
+man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
 share/squirrelmail/COPYING
@@ -42,12 +43,6 @@ share/squirrelmail/contrib/squirrelmail.mailto.reg
 share/squirrelmail/data/.htaccess
 share/squirrelmail/data/default_pref
 share/squirrelmail/data/index.php
-share/squirrelmail/doc/Development/addressbook.txt
-share/squirrelmail/doc/Development/index.html
-share/squirrelmail/doc/Development/mime.txt
-share/squirrelmail/doc/Development/plugin.txt
-share/squirrelmail/doc/Development/rfc_documents.txt
-share/squirrelmail/doc/Development/tree.txt
 share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.0.txt
 share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.1.txt
 share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.2.txt
@@ -66,6 +61,7 @@ share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3a.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.4.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.5.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.6.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.7.txt
 share/squirrelmail/doc/authentication.txt
 share/squirrelmail/doc/db-backend.txt
 share/squirrelmail/doc/ie_ssl.txt
@@ -318,7 +314,6 @@ share/squirrelmail/plugins/translate/README
 share/squirrelmail/plugins/translate/index.php
 share/squirrelmail/plugins/translate/options.php
 share/squirrelmail/plugins/translate/setup.php
-share/squirrelmail/po/charsetconvert.pl
 share/squirrelmail/po/compilepo
 share/squirrelmail/po/independent_strings.txt
 share/squirrelmail/po/index.php
@@ -471,7 +466,6 @@ share/squirrelmail/themes/wood_theme.php
 @dirrm share/squirrelmail/doc/ReleaseNotes/1.3
 @dirrm share/squirrelmail/doc/ReleaseNotes/1.2
 @dirrm share/squirrelmail/doc/ReleaseNotes
-@dirrm share/squirrelmail/doc/Development
 @dirrm share/squirrelmail/doc
 @dirrm share/squirrelmail/data
 @dirrm share/squirrelmail/contrib/RPM
diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk
index a79c94a1518..5a7f607a90e 100644
--- a/mail/squirrelmail/buildlink3.mk
+++ b/mail/squirrelmail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/13 07:59:34 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/08/14 15:57:40 tron Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SQUIRRELMAIL_BUILDLINK3_MK:=	${SQUIRRELMAIL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	squirrelmail
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}squirrelmail
 
 .if ${SQUIRRELMAIL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.squirrelmail+=	squirrelmail>=1.4.7
+BUILDLINK_API_DEPENDS.squirrelmail+=	squirrelmail>=1.4.8
 BUILDLINK_PKGSRCDIR.squirrelmail?=	../../mail/squirrelmail
 .endif	# SQUIRRELMAIL_BUILDLINK3_MK
 
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index b58a70f8075..d9c5ddad762 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.33 2006/07/13 07:59:34 martti Exp $
+$NetBSD: distinfo,v 1.34 2006/08/14 15:57:40 tron Exp $
 
-SHA1 (squirrelmail-1.4.7.tar.bz2) = 746080b2c536487ea7cfc5031668cd8092413b51
-RMD160 (squirrelmail-1.4.7.tar.bz2) = 65bc9492429006dd9fb75291990e8692f6f05ba0
-Size (squirrelmail-1.4.7.tar.bz2) = 496925 bytes
+SHA1 (squirrelmail-1.4.8.tar.bz2) = 45bab996b68b60647e668070466c15a20e991d52
+RMD160 (squirrelmail-1.4.8.tar.bz2) = 7ef716a1b34d477a77157b56a71feb7e0a1c41cb
+Size (squirrelmail-1.4.8.tar.bz2) = 474528 bytes
 SHA1 (patch-aa) = bc81f7c216fb7e372422991511eb6b89cd6b5e5f