Update squirrelmail package to 1.4.22.

Version 1.4.22 - 12 July 2011
-----------------------------
  - Backported default timezone fix from version 1.5.2; helps mitigate
    timezone errors in environments where a default has not been set
    by the administrator.
  - Fixed system lock-ups caused by a combination of certain rare,
    malformed message headers and buggy versions of PHP mbstring
    (#3053349).
  - Now allow multiple plugins to handle (add links for) a single
    attachment MIME type.
  - Now allow administrators to disable all plugins or enable just
    a select few plugins (overriding the active plugins in the normal
    configuration) by setting $temporary_plugins as an empty array
    (all disabled) or an array with one or more plugin directory names
    in config_local.php.
  - Backport fix for call_user_func_array not supporting NULL as empty
    array in PHP 5.3.3
  - Fixed sqauth_read_password() for plugins on the login_verified hook.
  - Added SMTP SASL PLAIN authentication option to configuration tool
    (core support for such is not new).
  - Gmail doens't support standard search commands; removed sort buttons.
  - Forced addition of a file suffix to attachments that lack a filename
    (helps forwarded messages avoid spam filters) (thanks to Petr
    Kletecka) (#3139004).
  - Fixed missing security token in listcommands plugin.
  - Added smtp_auth hook (thanks to Emmanuel Dreyfus).
  - Made speed enhancements to threaded message display (thanks to Siim
    Poder) (#3288123).
  - Allow administrators to configure subfolders of user INBOXes to be
    treated as special folders by adding $subfolders_of_inbox_are_special
    to config_local.php.
  - Fixed incorrect display of INBOX subfolders under some configurations.
    IMPORTANT: You may need to update your configuration so that
    $default_sub_of_inbox is TRUE if it was FALSE (e.g., Courier IMAP users)
    and after updating to this version, your special folders are no longer
    listed at the top of your folder list.  Also, if this change prevents
    users from logging in with an error such as "ERROR: Could not complete
    request.  Query: CREATE "Trash" Reason Given: Invalid mailbox name.",
    you will need to correct the user preference values for the problem
    folders.  You can do so with commands such as the following for file-
    based preferences (adjust the data directory location as needed):
        find /var/lib/squirrelmail/data/ -name *.pref -exec sed --in-place 's/trash_folder=Trash/trash_folder=INBOX.Trash/g' {} \;
        find /var/lib/squirrelmail/data/ -name *.pref -exec sed --in-place 's/trash_folder=Drafts/trash_folder=INBOX.Drafts/g' {} \;
        find /var/lib/squirrelmail/data/ -name *.pref -exec sed --in-place 's/trash_folder=Sent/trash_folder=INBOX.Sent/g' {} \;
    Or, for database-based preferences:
        UPDATE userprefs SET prefval = 'INBOX.Trash' WHERE prefkey = 'trash_folder' AND prefval = 'Trash';
        UPDATE userprefs SET prefval = 'INBOX.Drafts' WHERE prefkey = 'draft_folder' AND prefval = 'Drafts';
        UPDATE userprefs SET prefval = 'INBOX.Sent' WHERE prefkey = 'sent_folder' AND prefval = 'Sent';
    MAKE SURE to back up your user preferences first!
  - Optimized message highlighting rules; faster message list display
    and faster highlight rules management (thanks to C. Bensend for
    extensive effort helping diagnose)
  - New Mail plugin no longer removes normal organization title when
    putting the number of new messages in the browser title
  - Added clickjacking protection (thanks to Asbjorn Thorsen and Geir
    Hansen for bringing this to our attention). [CVE-2010-4554]
  - Fixed XSS holes in generic options inputs, XSS hole in the SquirrelSpell
    plugin, XSS hole in the Index Order page, and added anti-CSRF protection
    to the empty trash feature and the Index Order page (thanks to Nicholas
    Carlini for finding all these issues). [CVE-2010-4555]
  - Fixed XSS problem with unsanitized style tags in messages. [CVE-2011-2023]

4 files changed, 14 insertions, 8 deletions

diff --git a/mail/squirrelmail/MESSAGE b/mail/squirrelmail/MESSAGE
index dc62056b593..1ab68d684a2 100644
--- a/mail/squirrelmail/MESSAGE
+++ b/mail/squirrelmail/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2005/07/20 15:42:34 taca Exp $
+$NetBSD: MESSAGE,v 1.6 2011/07/13 12:22:43 taca Exp $
 
 Please run the SquirrelMail configuration script:
 
@@ -20,4 +20,8 @@ to make IMAP accounts accessible through:
 
 	http://www.example.com/squirrelmail/
 
+And please refer Release Notes for important changes:
+
+	http://www.example.com/squirrelmail/doc/ReleaseNotes
+
 ===========================================================================
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 040251c9269..788326aa0bb 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.117 2011/07/13 01:30:34 taca Exp $
+# $NetBSD: Makefile,v 1.118 2011/07/13 12:22:43 taca Exp $
 
-DISTNAME=	squirrelmail-1.4.21
+DISTNAME=	squirrelmail-webmail-1.4.22
+PKGNAME=	${DISTNAME:S/-webmail//}
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index ac93944fc89..c81bf5b3e2e 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2010/07/24 12:20:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.38 2011/07/13 12:22:43 taca Exp $
 man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/data/.htaccess
 share/examples/squirrelmail/data/index.php
@@ -77,6 +77,7 @@ share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.17.txt
 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.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 dc1957f032f..f552c165a12 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.60 2010/07/24 12:20:33 tron Exp $
+$NetBSD: distinfo,v 1.61 2011/07/13 12:22:44 taca Exp $
 
-SHA1 (squirrelmail-1.4.21.tar.bz2) = 8a125ceca939fd4dd957491d17263b1857ddff60
-RMD160 (squirrelmail-1.4.21.tar.bz2) = f4eeb97d85c76a037e848217d06aa13a15bfac04
-Size (squirrelmail-1.4.21.tar.bz2) = 526813 bytes
+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 (patch-ab) = 30bf68c730f20e817fbe81d18bc2a95899ee3fd0
 SHA1 (patch-ai) = 1c08904ecf074ff3ba7e6042becc0f0771388b9f