Update ja-squirrelmail to 1.4.9a.

pkgsrc change:

* separate ja-patch into ja-patch and lite-patch.

ChangLog:
Version 1.4.9a - 3 December 2006
--------------------------------
  - Security: Multiple IE cross site scripting issues related to the
    widely acceptation of the word expression and url by IE.
  - Security: Removing @import when sanitizing html mail.

Version 1.4.9 - 2 December 2006
-------------------------------
  - Drop obsolete script plugins/make_archive.pl.
  - Fixed Google translate form in translate plugin. Added new language
    pairs.
  - Added XMAGICTRASH extension tests in configtest utility. Removed code
    that handled 'inbox.trash' as special folder in courier (#1354393).
  - Allowed moving folders to trash in courier.
  - Fix misspelled constant PREG_SPLIT_NI_EMPTY in sqimap_get_message
    (#1543573).
  - Provide View Unsafe Images link on viewing a text/html attachment.
  - Fix variable typo in folders_create.php (#1545316).
  - Added Courier IMAP OUTBOX check to configtest utility.
  - If mailbox name starts with slash or contains ../, error message is
    generated. Safety check for insecure default UW IMAP setup (#1557078).
  - Ignore message copy errors when messages are deleted. Allows to delete
    messages when quota is exceeded (#614887, #646386, #1446026).
  - Fixed unintended literal fetching (#1562271).
  - Added global file based address book listing controls. Added line
    length configuration option for local_file address book backend
    (#1181561). Added address book data integrity checks in local_file
    address book backend. Fixed eregi and object notices in local_file
    and database address book backends. Added additional address book
    field support.
  - Fixed variable corruption in configtest utility.
  - Checked if configuration file is readable in configuration utility
    (#1568355).
  - Special mailboxes marked in special_mailbox hook are no longer listed
    in folder delete, rename and subscription options.
  - Translate plugin: prevent PHP notice when viewing empty message.
  - Add CEST and MEST (non-standard) timezone codes for +0200.
  - Add <label> to From field in message list.
  - Add support for parsing SpamAssassin's X-Spam-Status header (#1589520).
  - Fix in bodystructure parser code related to strings ending with an
    escape character.
  - Added "attachment */*" hook
  - Added third parameter $logout_link to logout_error hook that allows
    plugin control over login page URI displayed on login error page.
  - Security: close cross site scripting vulnerability in draft, compose
    and mailto functionality [CVE-2006-6142].
  - Security: work around an issue in Internet Explorer that would guess
    the mime type of a file based on contents, not Content-Type header.

4 files changed, 25 insertions, 21 deletions

diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index a1fa255f7cf..45802a120fc 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.34 2006/11/10 17:37:13 tv Exp $
+# $NetBSD: Makefile,v 1.35 2006/12/06 15:26:26 taca Exp $
 
-DISTNAME=	squirrelmail-1.4.8
+DISTNAME=	squirrelmail-1.4.9a
 PKGNAME=	ja-${DISTNAME}
-PKGREVISION=	1
 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.8-ja-20060812-patch
+PATCHFILES=	squirrelmail-1.4.9a-ja-patch \
+		squirrelmail-1.4.9a-lite.patch
 
 MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.squirrelmail.jp/
@@ -83,7 +83,7 @@ do-install:
 	${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
+	  ${PKGMANDIR}/man8/squirrelmail-conf.pl.8
 
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ja-squirrelmail/PLIST b/mail/ja-squirrelmail/PLIST
index 5e406fc96cf..5c169ef140e 100644
--- a/mail/ja-squirrelmail/PLIST
+++ b/mail/ja-squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/08/27 10:40:39 martti Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/12/06 15:26:26 taca Exp $
 man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
@@ -62,6 +62,8 @@ 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/ReleaseNotes/1.4/Notes-1.4.8.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.9.txt
 share/squirrelmail/doc/authentication.txt
 share/squirrelmail/doc/db-backend.txt
 share/squirrelmail/doc/ie_ssl.txt
@@ -251,7 +253,6 @@ share/squirrelmail/plugins/mail_fetch/functions.php
 share/squirrelmail/plugins/mail_fetch/index.php
 share/squirrelmail/plugins/mail_fetch/options.php
 share/squirrelmail/plugins/mail_fetch/setup.php
-share/squirrelmail/plugins/make_archive.pl
 share/squirrelmail/plugins/message_details/index.php
 share/squirrelmail/plugins/message_details/message_details_bottom.php
 share/squirrelmail/plugins/message_details/message_details_main.php
diff --git a/mail/ja-squirrelmail/distinfo b/mail/ja-squirrelmail/distinfo
index ca923871bde..aa86521dc39 100644
--- a/mail/ja-squirrelmail/distinfo
+++ b/mail/ja-squirrelmail/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.12 2006/08/17 13:24:46 taca Exp $
+$NetBSD: distinfo,v 1.13 2006/12/06 15:26:26 taca Exp $
 
-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 (squirrelmail-1.4.9a-ja-patch) = 3c03bd291a91e09955f50ea918d490b7390fb504
+RMD160 (squirrelmail-1.4.9a-ja-patch) = a4ea9a8f4d499e52bfd9422b7ea631b326da3aad
+Size (squirrelmail-1.4.9a-ja-patch) = 3211 bytes
+SHA1 (squirrelmail-1.4.9a-lite.patch) = acb933bde2d78dd4e2908414198c708246e03b3c
+RMD160 (squirrelmail-1.4.9a-lite.patch) = 48e4fe6eb20ec1f43e0634ba6215d9331c53bace
+Size (squirrelmail-1.4.9a-lite.patch) = 5136 bytes
+SHA1 (squirrelmail-1.4.9a.tar.bz2) = c9fc139c331cc99aa9bb54886106d2beccdd390a
+RMD160 (squirrelmail-1.4.9a.tar.bz2) = ccb4c0b4d74341862fecc4abe7f1fa63a4535984
+Size (squirrelmail-1.4.9a.tar.bz2) = 481601 bytes
+SHA1 (patch-aa) = 4dfcc0ae2c5088dd99974ff0d7ac5bb981eea134
diff --git a/mail/ja-squirrelmail/patches/patch-aa b/mail/ja-squirrelmail/patches/patch-aa
index bd6c82cbc0a..6253f460462 100644
--- a/mail/ja-squirrelmail/patches/patch-aa
+++ b/mail/ja-squirrelmail/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2005/12/05 09:28:44 martti Exp $
+$NetBSD: patch-aa,v 1.4 2006/12/06 15:26:26 taca Exp $
 
---- config/config_default.php.orig	2005-05-22 11:30:34.000000000 +0300
-+++ config/config_default.php	2005-12-05 09:24:45.000000000 +0200
-@@ -392,7 +392,7 @@
+--- config/config_default.php.orig	2006-12-05 00:29:29.000000000 +0900
++++ config/config_default.php
+@@ -414,7 +414,7 @@ $default_sub_of_inbox = true;
   * false. (Cyrus works fine whether it's true OR false).
   * @global bool $show_contain_subfolders_option
   */
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2005/12/05 09:28:44 martti Exp $
  
  /**
   * These next two options set the defaults for the way that the
-@@ -437,7 +437,7 @@
+@@ -459,7 +459,7 @@ $noselect_fix_enable = false;
   *   $data_dir = SM_PATH . 'data/';
   * @global string $data_dir
   */
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2005/12/05 09:28:44 martti Exp $
  
  /**
   * Attachments directory
-@@ -455,7 +455,7 @@
+@@ -477,7 +477,7 @@ $data_dir = SM_PATH . 'data/';
   *    + It should probably be another directory than data_dir.
   * @global string $attachment_dir
   */