Updated mail/squirrelmail to 1.4.18

The SquirrelMail Team is pleased to announce the release of
SquirrelMail version 1.4.18.  The most notable changes for this
version are several security fixes, including a couple XSS exploits, a
session fixation issue, and an obscure but dangerous server-side code
execution hole.  However, this version also includes three new
languages and more than a few enhancements to things such as the
filters plugin, the address book system and other things under the
hood.  For more complete details, see the ReleaseNotes and ChangeLog
files included in this release (they have moved to the doc/
directory).  We advise all users of SquirrelMail software to upgrade.

4 files changed, 71 insertions, 62 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index dfe59e03b08..e7c26261699 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.102 2009/05/12 12:27:19 martti Exp $
+# $NetBSD: Makefile,v 1.103 2009/05/14 06:54:38 martti Exp $
 
-DISTNAME=	squirrelmail-1.4.17
+DISTNAME=	squirrelmail-1.4.18
 #PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
@@ -27,6 +27,7 @@ PKG_GROUPS_VARS+=	APACHE_GROUP
 PKG_USERS_VARS+=	APACHE_USER
 BUILD_DEFS+=		VARBASE
 
+.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
 PKG_SYSCONFSUBDIR?=	httpd
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index 1d3fd0862d4..419bb0426c9 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,13 +1,8 @@
-@comment $NetBSD: PLIST,v 1.28 2008/12/04 07:18:46 martti Exp $
+@comment $NetBSD: PLIST,v 1.29 2009/05/14 06:54:39 martti Exp $
 man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/squirrelmail.conf
-share/squirrelmail/AUTHORS
-share/squirrelmail/COPYING
-share/squirrelmail/ChangeLog
-share/squirrelmail/INSTALL
 share/squirrelmail/README
-share/squirrelmail/ReleaseNotes
-share/squirrelmail/UPGRADE
+share/squirrelmail/class/.htaccess
 share/squirrelmail/class/deliver/Deliver.class.php
 share/squirrelmail/class/deliver/Deliver_IMAP.class.php
 share/squirrelmail/class/deliver/Deliver_SMTP.class.php
@@ -27,11 +22,13 @@ share/squirrelmail/class/mime/MessageHeader.class.php
 share/squirrelmail/class/mime/Rfc822Header.class.php
 share/squirrelmail/class/mime/SMimeMessage.class.php
 share/squirrelmail/class/mime/index.php
+share/squirrelmail/config/.htaccess
 share/squirrelmail/config/conf.pl
 share/squirrelmail/config/config_default.php
 share/squirrelmail/config/config_local.php
 share/squirrelmail/config/index.php
 share/squirrelmail/configure
+share/squirrelmail/contrib/.htaccess
 share/squirrelmail/contrib/RPM/config.php.redhat
 share/squirrelmail/contrib/RPM/squirrelmail.conf
 share/squirrelmail/contrib/RPM/squirrelmail.cron
@@ -42,43 +39,54 @@ share/squirrelmail/contrib/squirrelmail.mailto.Win9x.reg
 share/squirrelmail/data/.htaccess
 share/squirrelmail/data/default_pref
 share/squirrelmail/data/index.php
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.0.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.1.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.2.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.3.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.4.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.5.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.6.txt
-share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.0.txt
-share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.1.txt
-share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.2.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.0.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.1.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.10.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.10a.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.11.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.12.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.13.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.15.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.16.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.2.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3a.txt
-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/ReleaseNotes/1.4/Notes-1.4.9a.txt
+share/squirrelmail/doc/.htaccess
+share/squirrelmail/doc/AUTHORS
+share/squirrelmail/doc/COPYING
+share/squirrelmail/doc/ChangeLog
+share/squirrelmail/doc/INSTALL
+share/squirrelmail/doc/README
+share/squirrelmail/doc/ReleaseNotes
+share/squirrelmail/doc/UPGRADE
 share/squirrelmail/doc/authentication.txt
 share/squirrelmail/doc/ie_ssl.txt
 share/squirrelmail/doc/index.html
+share/squirrelmail/doc/index.php
 share/squirrelmail/doc/presets.txt
+share/squirrelmail/doc/release_notes_archive/1.2/Notes-1.2.0.txt
+share/squirrelmail/doc/release_notes_archive/1.2/Notes-1.2.1.txt
+share/squirrelmail/doc/release_notes_archive/1.2/Notes-1.2.2.txt
+share/squirrelmail/doc/release_notes_archive/1.2/Notes-1.2.3.txt
+share/squirrelmail/doc/release_notes_archive/1.2/Notes-1.2.4.txt
+share/squirrelmail/doc/release_notes_archive/1.2/Notes-1.2.5.txt
+share/squirrelmail/doc/release_notes_archive/1.2/Notes-1.2.6.txt
+share/squirrelmail/doc/release_notes_archive/1.3/Notes-1.3.0.txt
+share/squirrelmail/doc/release_notes_archive/1.3/Notes-1.3.1.txt
+share/squirrelmail/doc/release_notes_archive/1.3/Notes-1.3.2.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.0.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.1.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.10.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.10a.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.11.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.12.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.13.txt
+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.2.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
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.5.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.6.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.7.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.8.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.9.txt
+share/squirrelmail/doc/release_notes_archive/1.4/Notes-1.4.9a.txt
 share/squirrelmail/doc/russian_apache.txt
 share/squirrelmail/doc/security.txt
 share/squirrelmail/doc/translating.txt
 share/squirrelmail/doc/translating_help.txt
+share/squirrelmail/functions/.htaccess
 share/squirrelmail/functions/abook_database.php
 share/squirrelmail/functions/abook_ldap_server.php
 share/squirrelmail/functions/abook_local_file.php
@@ -160,6 +168,7 @@ share/squirrelmail/functions/prefs.php
 share/squirrelmail/functions/strings.php
 share/squirrelmail/functions/tree.php
 share/squirrelmail/functions/url_parser.php
+share/squirrelmail/help/.htaccess
 share/squirrelmail/help/en_US/FAQ.hlp
 share/squirrelmail/help/en_US/addresses.hlp
 share/squirrelmail/help/en_US/basic.hlp
@@ -184,6 +193,7 @@ share/squirrelmail/images/senti.png
 share/squirrelmail/images/sm_logo.png
 share/squirrelmail/images/sort_none.png
 share/squirrelmail/images/up_pointer.png
+share/squirrelmail/include/.htaccess
 share/squirrelmail/include/index.php
 share/squirrelmail/include/load_prefs.php
 share/squirrelmail/include/options/display.php
@@ -192,6 +202,7 @@ share/squirrelmail/include/options/index.php
 share/squirrelmail/include/options/personal.php
 share/squirrelmail/include/validate.php
 share/squirrelmail/index.php
+share/squirrelmail/locale/.htaccess
 share/squirrelmail/locale/README.locales
 share/squirrelmail/locale/index.php
 share/squirrelmail/locale/timezones.cfg
@@ -333,6 +344,7 @@ share/squirrelmail/plugins/translate/README
 share/squirrelmail/plugins/translate/index.php
 share/squirrelmail/plugins/translate/options.php
 share/squirrelmail/plugins/translate/setup.php
+share/squirrelmail/po/.htaccess
 share/squirrelmail/po/compilepo
 share/squirrelmail/po/independent_strings.txt
 share/squirrelmail/po/index.php
@@ -482,10 +494,10 @@ share/squirrelmail/themes/wood_theme.php
 @dirrm share/squirrelmail/functions/encode
 @dirrm share/squirrelmail/functions/decode
 @dirrm share/squirrelmail/functions
-@dirrm share/squirrelmail/doc/ReleaseNotes/1.4
-@dirrm share/squirrelmail/doc/ReleaseNotes/1.3
-@dirrm share/squirrelmail/doc/ReleaseNotes/1.2
-@dirrm share/squirrelmail/doc/ReleaseNotes
+@dirrm share/squirrelmail/doc/release_notes_archive/1.4
+@dirrm share/squirrelmail/doc/release_notes_archive/1.3
+@dirrm share/squirrelmail/doc/release_notes_archive/1.2
+@dirrm share/squirrelmail/doc/release_notes_archive
 @dirrm share/squirrelmail/doc
 @dirrm share/squirrelmail/data
 @dirrm share/squirrelmail/contrib/RPM
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index cb7e35f4826..4c375519ad7 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.50 2008/12/04 07:18:46 martti Exp $
+$NetBSD: distinfo,v 1.51 2009/05/14 06:54:39 martti Exp $
 
-SHA1 (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 8823810ca00ab5510a48db78826112a9482d1895
-RMD160 (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 98649a1639567bb6669e9cfc0ca8b0743ebfb46e
-Size (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 1800 bytes
-SHA1 (squirrelmail-1.4.16-ja-20081013-patch.gz) = 6e89e77416aeb478005963aecc814ae9d7b4eebd
-RMD160 (squirrelmail-1.4.16-ja-20081013-patch.gz) = e38ae26051bb2a617b570d8f4721ffd2576a4bed
-Size (squirrelmail-1.4.16-ja-20081013-patch.gz) = 7989 bytes
-SHA1 (squirrelmail-1.4.17.tar.bz2) = da21a447ada4e120b82210e93a737bb4c4509c34
-RMD160 (squirrelmail-1.4.17.tar.bz2) = 41ecb9367f72785ee402d239cd62b225f17e270c
-Size (squirrelmail-1.4.17.tar.bz2) = 507158 bytes
+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.18.tar.bz2) = 18872d8ad72f3415672344318901beb9d4d8a860
+RMD160 (squirrelmail-1.4.18.tar.bz2) = 292d0f4123a8e8db84d9ff766a440848f1684b4b
+Size (squirrelmail-1.4.18.tar.bz2) = 509216 bytes
 SHA1 (patch-aa) = 4c5556c804c1b728eec87322272abb06edcfcc2a
diff --git a/mail/squirrelmail/options.mk b/mail/squirrelmail/options.mk
index 404d3dfb296..06968ff5e1b 100644
--- a/mail/squirrelmail/options.mk
+++ b/mail/squirrelmail/options.mk
@@ -1,21 +1,20 @@
-# $NetBSD: options.mk,v 1.9 2008/11/19 14:47:51 taca Exp $
+# $NetBSD: options.mk,v 1.10 2009/05/14 06:54:39 martti Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.squirrelmail
 PKG_SUPPORTED_OPTIONS=	squirrelmail-japanese squirrelmail-lite
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Msquirrelmail-japanese)
-PATCHFILES+=		squirrelmail-1.4.16-ja-20081013-patch.gz
-SITES.squirrelmail-1.4.16-ja-20081013-patch.gz= \
-			http://www.yamaai-tech.com/~masato/Download/
-PATCH_DIST_STRIP.squirrelmail-1.4.16-ja-20081013-patch.gz=	-p1
-
-.endif
+#.if !empty(PKG_OPTIONS:Msquirrelmail-japanese)
+#PATCHFILES+=		squirrelmail-1.4.16-ja-20081013-patch.gz
+#SITES.squirrelmail-1.4.16-ja-20081013-patch.gz= \
+#			http://www.yamaai-tech.com/~masato/Download/
+#PATCH_DIST_STRIP.squirrelmail-1.4.16-ja-20081013-patch.gz=	-p1
+#.endif
 
 .if !empty(PKG_OPTIONS:Msquirrelmail-lite)
-PATCHFILES+=		squirrelmail-1.4.11-lite-20071003-patch.bz2
-SITES.squirrelmail-1.4.11-lite-20071003-patch.bz2= \
+PATCHFILES+=		squirrelmail-1.4.18-lite-20090512-patch.bz2
+SITES.squirrelmail-1.4.18-lite-20090512-patch.bz2= \
 			ftp://ftp.back-street.net/pub/squirrelmail/
 
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring