Update ja-squirrelmail package to 1.4.8.

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

Changes from 1.4.6:
- Fixed URL for Read Receipts being incorrect in some cases (#1177518).
- Fixed endless loop when trying to parse "From: )(" (#1517867).
- Using is_file() instead of file_exists() in fortune plugin (#1499134).
- Add manual page for conf.pl under contrib.
- Don't allow selecting INBOX as Sent, Draft or Trash folder (#1242346).

Todo:
Make squirrelmail-decode and squirrelmail-locale depend on ja-squirrelmail
as well as squirrelmail.

5 files changed, 20 insertions, 92 deletions

diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index 6ae9dcac5b7..5fec7e6776e 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.30 2006/06/04 12:31:31 tron Exp $
+# $NetBSD: Makefile,v 1.31 2006/08/17 13:24:45 taca Exp $
 
-DISTNAME=	squirrelmail-1.4.6
+DISTNAME=	squirrelmail-1.4.8
 PKGNAME=	ja-${DISTNAME}
-PKGREVISION=	3
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
 
 #PATCH_SITES=	http://www.yamaai-tech.com/~masato/Download/
 PATCH_SITES=	ftp://ftp.back-street.net/pub/squirrelmail/
-PATCHFILES=	squirrelmail-1.4.6-ja-20060504-patch
+PATCHFILES=	squirrelmail-1.4.8-ja-20060812-patch
 
 MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.squirrelmail.jp/
diff --git a/mail/ja-squirrelmail/PLIST b/mail/ja-squirrelmail/PLIST
index 3e8f2b2970b..b7357c2ee69 100644
--- a/mail/ja-squirrelmail/PLIST
+++ b/mail/ja-squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/05/05 05:32:36 martti Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/08/17 13:24:46 taca Exp $
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
 share/squirrelmail/COPYING
@@ -65,6 +65,7 @@ share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3.txt
 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/authentication.txt
 share/squirrelmail/doc/db-backend.txt
 share/squirrelmail/doc/ie_ssl.txt
@@ -364,12 +365,17 @@ share/squirrelmail/src/view_text.php
 share/squirrelmail/src/webmail.php
 share/squirrelmail/themes/README.themes
 share/squirrelmail/themes/alien_glow.php
+share/squirrelmail/themes/autumn.php
+share/squirrelmail/themes/autumn2.php
 share/squirrelmail/themes/black_bean_burrito_theme.php
 share/squirrelmail/themes/blue_grey_theme.php
+share/squirrelmail/themes/blue_on_blue.php
 share/squirrelmail/themes/bluesnews_theme.php
 share/squirrelmail/themes/bluesome.php
 share/squirrelmail/themes/bluesteel_theme.php
 share/squirrelmail/themes/christmas.php
+share/squirrelmail/themes/classic_blue.php
+share/squirrelmail/themes/classic_blue2.php
 share/squirrelmail/themes/css/comic-sans-08.css
 share/squirrelmail/themes/css/comic-sans-10.css
 share/squirrelmail/themes/css/comic-sans-12.css
@@ -407,6 +413,7 @@ share/squirrelmail/themes/monostochastic.php
 share/squirrelmail/themes/netstyle_theme.php
 share/squirrelmail/themes/penguin.php
 share/squirrelmail/themes/plain_blue_theme.php
+share/squirrelmail/themes/powder_blue.php
 share/squirrelmail/themes/purple_theme.php
 share/squirrelmail/themes/random.php
 share/squirrelmail/themes/redmond.php
@@ -422,6 +429,8 @@ share/squirrelmail/themes/slashdot_theme.php
 share/squirrelmail/themes/spice_of_life.php
 share/squirrelmail/themes/spice_of_life_dark.php
 share/squirrelmail/themes/spice_of_life_lite.php
+share/squirrelmail/themes/techno_blue.php
+share/squirrelmail/themes/turquoise.php
 share/squirrelmail/themes/wood_theme.php
 @dirrm share/squirrelmail/themes/css
 @dirrm share/squirrelmail/themes
diff --git a/mail/ja-squirrelmail/distinfo b/mail/ja-squirrelmail/distinfo
index aa2fe9cc254..ca923871bde 100644
--- a/mail/ja-squirrelmail/distinfo
+++ b/mail/ja-squirrelmail/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.11 2006/06/04 12:31:31 tron Exp $
+$NetBSD: distinfo,v 1.12 2006/08/17 13:24:46 taca Exp $
 
-SHA1 (squirrelmail-1.4.6.tar.bz2) = b813aa9f736b4b6c41d1afd35bcbd01604e85cf7
-RMD160 (squirrelmail-1.4.6.tar.bz2) = 3cee894b392620af3e35ef1d00e35775559dd4f7
-Size (squirrelmail-1.4.6.tar.bz2) = 484099 bytes
-SHA1 (squirrelmail-1.4.6-ja-20060504-patch) = 15b17d2f1b8d9c19b01cc23bf6148ac7ee0e77ce
-RMD160 (squirrelmail-1.4.6-ja-20060504-patch) = 7cb0a584afaffe73176edd75886fe7536363aefe
-Size (squirrelmail-1.4.6-ja-20060504-patch) = 29808 bytes
+SHA1 (squirrelmail-1.4.8-ja-20060812-patch) = 98e33681ff6275097f08648291ac9685d55d636a
+RMD160 (squirrelmail-1.4.8-ja-20060812-patch) = 01dd26fe7769528d37fc4c853b16b7af81ebd84f
+Size (squirrelmail-1.4.8-ja-20060812-patch) = 8341 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) = c96e85a28464c414bef744f9d1398fc9dd49549a
-SHA1 (patch-ab) = a7648438c9764e432e5d040e8e3aebb0ab48730e
-SHA1 (patch-ac) = 393579f9276169d2c765726fb1249160a270e983
diff --git a/mail/ja-squirrelmail/patches/patch-ab b/mail/ja-squirrelmail/patches/patch-ab
deleted file mode 100644
index 1802e18974b..00000000000
--- a/mail/ja-squirrelmail/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/05/05 05:32:36 martti Exp $
-
---- functions/i18n.php.orig	2006-02-10 22:30:31.000000000 +0200
-+++ functions/i18n.php	2006-04-11 08:15:24.000000000 +0300
-@@ -834,11 +834,11 @@
- $languages['zh_CN']['LOCALE']  = 'zh_CN.GB2312';
- $languages['cn']['ALIAS']      = 'zh_CN';
- 
--/*
- $languages['uk_UA']['NAME']    = 'Ukrainian';
--$languages['uk_UA']['CHARSET'] = 'koi8-u';
-+$languages['uk_UA']['CHARSET'] = 'utf-8';
-+$languages['uk_UA']['LOCALE']  = array('uk_UA.UTF-8','uk_UA','uk');
- $languages['uk']['ALIAS'] = 'uk_UA';
--*/
-+
- /*
- $languages['vi_VN']['NAME']    = 'Vietnamese';
- $languages['vi_VN']['CHARSET'] = 'utf-8';
diff --git a/mail/ja-squirrelmail/patches/patch-ac b/mail/ja-squirrelmail/patches/patch-ac
deleted file mode 100644
index d02c29b17d7..00000000000
--- a/mail/ja-squirrelmail/patches/patch-ac
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/06/04 12:31:31 tron Exp $
-
---- functions/global.php.orig	2006-02-03 22:27:47.000000000 +0000
-+++ functions/global.php	2006-06-04 13:22:14.000000000 +0100
-@@ -62,6 +62,47 @@
-     sqstripslashes($_POST);
- }
- 
-+/**
-+ * If register_globals are on, unregister globals.
-+ * Code requires PHP 4.1.0 or newer.
-+ * Second test covers boolean set as string (php_value register_globals off).
-+ */
-+if ((bool) @ini_get('register_globals') &&
-+    strtolower(ini_get('register_globals'))!='off') {
-+    /**
-+     * Remove all globals from $_GET, $_POST, and $_COOKIE.
-+     */
-+    foreach ($_REQUEST as $key => $value) {
-+        unset($GLOBALS[$key]);
-+    }
-+    /**
-+     * Remove globalized $_FILES variables
-+     * Before 4.3.0 $_FILES are included in $_REQUEST.
-+     * Unglobalize them in separate call in order to remove dependency
-+     * on PHP version.
-+     */
-+    foreach ($_FILES as $key => $value) {
-+        unset($GLOBALS[$key]);
-+        // there are three undocumented $_FILES globals.
-+        unset($GLOBALS[$key.'_type']);
-+        unset($GLOBALS[$key.'_name']);
-+        unset($GLOBALS[$key.'_size']);
-+    }
-+    /**
-+     * Remove globalized environment variables.
-+     */
-+    foreach ($_ENV as $key => $value) {
-+        unset($GLOBALS[$key]);
-+    }
-+    /**
-+     * Remove globalized server variables.
-+     */
-+    foreach ($_SERVER as $key => $value) {
-+        unset($GLOBALS[$key]);
-+    }
-+}
-+
-+
- /* strip any tags added to the url from PHP_SELF.
-    This fixes hand crafted url XXS expoits for any
-    page that uses PHP_SELF as the FORM action */
-@@ -336,4 +377,4 @@
- }
- 
- // vim: et ts=4
--?>
-\ No newline at end of file
-+?>