Update "squirremail" package to version 1.4.20rc2. Changes since 1.4.19:

- Protect message deletion with security token system.
  (Secunia Advisory SA346)
- Removed the shut down DSBL blocklists (#2796734).
- Fixed broken RFC1918 reference in contrib/.htaccess and doc/.htaccess
  (#2798839).
- Updated INSTALL doc to remove possible bad system admin typos (#2827153).
- PHP 5.3 deprecates ereg functions (#2820952).
- Filters plugin uses badly formatted literals request (#2805201).
- Provide option for complete removal of usernames and user IP addresses
  from message headers, and remove personal data from Message ID seed.
  (#880029/847107)
- Implemented page referal verification mechanism.
  (Secunia Advisory SA34627)
- Implemented security token system. (Secunia Advisory SA34627)

Approved by Martti Kuparinen.

3 files changed, 10 insertions, 14 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 410cad640a9..aed980d1c62 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2009/05/22 08:50:19 taca Exp $
+# $NetBSD: Makefile,v 1.108 2009/08/26 12:47:17 tron Exp $
 
-DISTNAME=	squirrelmail-1.4.19
-PKGREVISION=	1
+DISTNAME=	squirrelmail-1.4.20-RC2
+PKGNAME=	${DISTNAME:S/-RC2/rc2/}
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index b2f996803bf..ee5ecb1bad5 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2009/06/14 18:04:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.33 2009/08/26 12:47:17 tron Exp $
 ${PLIST.japanese}share/squirrelmail/functions/decode/iso_2022_jp.php
 man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/squirrelmail.conf
@@ -74,7 +74,9 @@ share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.15.txt
 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.2.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.20RC1.txt
 share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.3.txt
 share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.3a.txt
 share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.4.txt
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index d365cf3d7c1..20ef781c86a 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.54 2009/05/22 08:50:19 taca Exp $
+$NetBSD: distinfo,v 1.55 2009/08/26 12:47:17 tron Exp $
 
-SHA1 (squirrelmail-1.4.18-lite-20090512-patch.bz2) = f7d47c237636922cf7d81249018b023d2914bf1e
-RMD160 (squirrelmail-1.4.18-lite-20090512-patch.bz2) = 3f379c0ba2fd5d3b4296a1ca051ee9b5d890e878
-Size (squirrelmail-1.4.18-lite-20090512-patch.bz2) = 1793 bytes
-SHA1 (squirrelmail-1.4.19-ja-20090522-patch.gz) = 2968017d6b4a2ed817c329a74678cf6e5ea2640f
-RMD160 (squirrelmail-1.4.19-ja-20090522-patch.gz) = 1c26738ad156ec6bdd6e1d916a7c0c6b1fde2b5b
-Size (squirrelmail-1.4.19-ja-20090522-patch.gz) = 7696 bytes
-SHA1 (squirrelmail-1.4.19.tar.bz2) = 14b66bd470a36750ed4d4a0c8bfc27523639dd5d
-RMD160 (squirrelmail-1.4.19.tar.bz2) = 63a0447838e3c0aee1fca83ff8cd3f91599183d5
-Size (squirrelmail-1.4.19.tar.bz2) = 516956 bytes
+SHA1 (squirrelmail-1.4.20-RC2.tar.bz2) = f1cdccfdd17d8974adc0b79aba44b62f98f78f64
+RMD160 (squirrelmail-1.4.20-RC2.tar.bz2) = f736e33af6f7b5a4c49f96968ed3fdeb2d42f06f
+Size (squirrelmail-1.4.20-RC2.tar.bz2) = 516825 bytes
 SHA1 (patch-aa) = 4c5556c804c1b728eec87322272abb06edcfcc2a