Update "squirremail" package to version 1.4.21. Changes since 1.4.20:

- Now allow more than one plugin to control the compose form submit action.
- When sorting by received date, the received date is now shown on the
  message list.
- Explicitly disable browser caching for left_main and right_main pages
  (#2983134).
- Fix error with SpamCop reporting plugin not being able to send report as
  emails (#1795310).
- Fix typo in SpamCop plugin.
- Reduced default time security tokens stay valid from 30 days to 2 days
  (reduces chances of session data growing too large)
- Several speed enhancements for recent fixes regarding the display of
  encoded subjects, including a fix for messages with invalid subject
  encoding (includes #2987016 amongst several other issues reported via
  mailing list, etc.) (Many thanks to Zdenek Pytela for the untiring help
  diagnosing and testing.)
- Fixed minor vulnerability in Mail Fetch plugin.
  [CVE-2010-1637/TEHTRI-SA-2010-009]
- Now properly quote personal part of encoded addresses when replying.
- Now fill in default subject when forwarding as attachment (#2936541).
- Implement header folding that doesn't add extraneous spaces so unfolding
  is less ambiguous (#1951776).
- Fixed issues caused by use of PostgreSQL keyword "user" in SquirrelMail's
  default preferences database schema (#2943483).
- Fixed attachment filename decoding problems (#2994865).
- Now default search criteria to the TO header when searching the sent folder.
- Fixed literal processing of 8-bit usernames/passwords during login.
  [CVE-2010-2813]

3 files changed, 9 insertions, 7 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 3b40b1d9036..b0a802480c8 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.114 2010/03/07 03:41:49 taca Exp $
+# $NetBSD: Makefile,v 1.115 2010/07/24 12:20:33 tron Exp $
 
-DISTNAME=	squirrelmail-1.4.20
+DISTNAME=	squirrelmail-1.4.21
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index bf94b0f7592..ac93944fc89 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2010/03/07 03:41:49 taca Exp $
+@comment $NetBSD: PLIST,v 1.37 2010/07/24 12:20:33 tron Exp $
 man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/data/.htaccess
 share/examples/squirrelmail/data/index.php
@@ -76,6 +76,7 @@ share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.16.txt
 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.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
@@ -275,6 +276,7 @@ share/squirrelmail/plugins/listcommands/mailout.php
 share/squirrelmail/plugins/listcommands/setup.php
 share/squirrelmail/plugins/mail_fetch/README
 share/squirrelmail/plugins/mail_fetch/class.POP3.php
+share/squirrelmail/plugins/mail_fetch/config_example.php
 share/squirrelmail/plugins/mail_fetch/fetch.php
 share/squirrelmail/plugins/mail_fetch/functions.php
 share/squirrelmail/plugins/mail_fetch/index.php
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index 0f08ae00eb5..dc1957f032f 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.59 2010/03/07 03:41:49 taca Exp $
+$NetBSD: distinfo,v 1.60 2010/07/24 12:20:33 tron Exp $
 
-SHA1 (squirrelmail-1.4.20.tar.bz2) = ea1f8911961685393da2872739a060e0cf1f03f3
-RMD160 (squirrelmail-1.4.20.tar.bz2) = aa4e7f97a0f9eddc207d0f390c6f25dd1e69c16a
-Size (squirrelmail-1.4.20.tar.bz2) = 521070 bytes
+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 (patch-aa) = 4c5556c804c1b728eec87322272abb06edcfcc2a
 SHA1 (patch-ab) = 30bf68c730f20e817fbe81d18bc2a95899ee3fd0
 SHA1 (patch-ai) = 1c08904ecf074ff3ba7e6042becc0f0771388b9f