Update squirrelmail to 1.4.23pre14345, snap shot from squirrelmail's

repository.  Approved by wiz@.

* Now work well with PHP 5.4 and later.

Version 1.4.23 - SVN
--------------------
  - Added capability to issue SEARCH commands in literal format (so that
    non-ASCII search terms are handled RFC-correctly).
  - Fixed hook name clash: new "smtp_auth" hook added in version 1.4.22
    has been renamed to "smtp_authenticate"
  - Added SASL PLAIN mechanism for IMAP logins; backported from version
    1.5.2.
  - Prevent syslog warning in call_user_func_array() call when no
    arguments given.  Patch from Jean-Philippe Guerard (#3309935).
  - Changed the read_body_menu_top hook from concat_hook_function to
    do_hook_function (plugin authors please note)
  - Always ensure that the Reply-To header is a full email address in
    outgoing messages
  - Fixed issue with Noselect mailboxes being clickable in folder list
  - Made performance improvements in mailbox listing
  - Attachment filename extensions changed from ".msg" to ".eml"
  - Unified address book searches somewhat: file-backed address books now
    search in each field individually; database-backed address books now
    search in fields other than first/last name (nickname, email); LDAP-
    backed address books now search in common name fields as well as by
    email address (cn, sn, givenname, mail)
  - You may now enable LDAP-backed address books to be listed (using
    the "List all" button on the address search screen accessed via
    the "Addresses" button on the compose screen) by adding
    "$ldap_abook_allow_listing = TRUE;" (without quotes) to
    config/config_local.php (previously, this required editing of a
    file).
  - Added ability to control browser rendering mode (quirks versus
    standards) - see the $browser_rendering_mode setting in
    config/config.php or the "4. General Options ==> 19. Browser
    rendering mode" setting in the configuration tool (#3240356).
  - Added "search_index_before" hook (analog of the "mailbox_index_before"
    hook)
  - Made performance improvements in security token handling
  - Improvements for compatibility with PHP 5.4.
  - Added option that allows users to have replies to their own
    messages sent to the recipient of the previous message (#3520988).

5 files changed, 30 insertions, 18 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index f4deafd91aa..3f15ac7296d 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.121 2012/10/08 12:19:32 asau Exp $
+# $NetBSD: Makefile,v 1.122 2012/12/28 04:03:34 taca Exp $
 
-DISTNAME=	squirrelmail-webmail-1.4.22
+DISTNAME=	squirrelmail-webmail-1.4.23pre14345
 PKGNAME=	${DISTNAME:S/-webmail//}
-PKGREVISION=	2
 CATEGORIES=	mail www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	taca@NetBSD.org
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index c81bf5b3e2e..410821b747f 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2011/07/13 12:22:43 taca Exp $
+@comment $NetBSD: PLIST,v 1.39 2012/12/28 04:03:34 taca Exp $
 man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/data/.htaccess
 share/examples/squirrelmail/data/index.php
@@ -78,6 +78,7 @@ share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.18.txt
 share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.19.txt
 share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.20.txt
 share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.21.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.22.txt
 share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.2.txt
 share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.20-RC2.txt
 share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.20RC1.txt
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index f552c165a12..ebf81c17fdc 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.61 2011/07/13 12:22:44 taca Exp $
+$NetBSD: distinfo,v 1.62 2012/12/28 04:03:34 taca Exp $
 
-SHA1 (squirrelmail-webmail-1.4.22.tar.bz2) = 46819275be27e9119e9a2fd976d441cee261ea55
-RMD160 (squirrelmail-webmail-1.4.22.tar.bz2) = 08c2aff84a3750dc6f0704a0105bc42a74966eb0
-Size (squirrelmail-webmail-1.4.22.tar.bz2) = 531360 bytes
-SHA1 (patch-aa) = 4c5556c804c1b728eec87322272abb06edcfcc2a
+SHA1 (squirrelmail-webmail-1.4.23pre14345.tar.bz2) = 1bf1fe8852c7ca6f4a136954626b6eee83fcc359
+RMD160 (squirrelmail-webmail-1.4.23pre14345.tar.bz2) = 1eacf17f6920a8cb632260b977dee6b9e3a06317
+Size (squirrelmail-webmail-1.4.23pre14345.tar.bz2) = 541806 bytes
+SHA1 (patch-aa) = 4ba7ea0a85308816b9dc77c0af3c927359ed1275
 SHA1 (patch-ab) = 30bf68c730f20e817fbe81d18bc2a95899ee3fd0
 SHA1 (patch-ai) = 1c08904ecf074ff3ba7e6042becc0f0771388b9f
-SHA1 (patch-ca) = deaf791fd6eaf25001b369d505531ae065fe0801
+SHA1 (patch-ca) = d2e41316b8ecd97b49842eff548219e40e9b163a
diff --git a/mail/squirrelmail/patches/patch-aa b/mail/squirrelmail/patches/patch-aa
index d131b83af44..f512f15ed83 100644
--- a/mail/squirrelmail/patches/patch-aa
+++ b/mail/squirrelmail/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.16 2008/09/28 17:32:26 martti Exp $
+$NetBSD: patch-aa,v 1.17 2012/12/28 04:03:34 taca Exp $
 
 Make this pkgsrc friendly.
 
---- config/config_default.php.orig	2008-07-19 10:31:43.000000000 +0300
-+++ config/config_default.php	2008-09-28 20:26:03.000000000 +0300
-@@ -446,7 +446,7 @@
+--- config/config_default.php.orig	2012-12-24 15:11:12.000000000 +0000
++++ config/config_default.php
+@@ -446,7 +446,7 @@ $default_sub_of_inbox = true;
   * false. (Cyrus works fine whether it's true OR false).
   * @global bool $show_contain_subfolders_option
   */
@@ -13,7 +13,16 @@ Make this pkgsrc friendly.
  
  /**
   * These next two options set the defaults for the way that the
-@@ -496,7 +496,7 @@
+@@ -487,7 +487,7 @@ $noselect_fix_enable = false;
+  *   Here are two examples:
+  *
+  * Absolute:
+- *   $data_dir = '/var/local/squirrelmail/data/';
++ *   $data_dir = '@USER_PREFS_DIR@/';
+  *
+  * Relative (to main SM directory):
+  *   $data_dir = SM_PATH . 'data/';
+@@ -496,7 +496,7 @@ $noselect_fix_enable = false;
   *
   * @global string $data_dir
   */
@@ -22,7 +31,7 @@ Make this pkgsrc friendly.
  
  /**
   * Attachments directory
-@@ -514,7 +514,7 @@
+@@ -514,7 +514,7 @@ $data_dir = '/var/local/squirrelmail/dat
   *    + It should probably be another directory than data_dir.
   * @global string $attachment_dir
   */
diff --git a/mail/squirrelmail/patches/patch-ca b/mail/squirrelmail/patches/patch-ca
index 81fd1b0fc8e..3f297c91f5f 100644
--- a/mail/squirrelmail/patches/patch-ca
+++ b/mail/squirrelmail/patches/patch-ca
@@ -1,4 +1,7 @@
-$NetBSD: patch-ca,v 1.1 2010/03/04 16:00:37 taca Exp $
+$NetBSD: patch-ca,v 1.2 2012/12/28 04:03:35 taca Exp $
+
+* A care for Japanese language environment.
+* Limit exploding.
 
 --- plugins/filters/filters.php.orig	2009-07-27 10:40:44.000000000 +0900
 +++ plugins/filters/filters.php