Updated mail/squirrelmail to 1.4.16

The SquirrelMail team is happy to announce the release 1.4.16. The most
notable change is that cookies are now sent with the secure attribute set for
HTTPS-connections, meaning that they cannot leak to an HTTP-connection on the
same SquirrelMail installation. For details see the included ReleaseNotes. We
advise users that offer their SquirrelMail both over HTTP and HTTPS to
upgrade.

5 files changed, 17 insertions, 21 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index f0cb6922bd4..e5efea95d40 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.98 2008/05/27 12:40:37 martti Exp $
+# $NetBSD: Makefile,v 1.99 2008/09/28 17:32:26 martti Exp $
 
-DISTNAME=	squirrelmail-1.4.15
+DISTNAME=	squirrelmail-1.4.16
 #PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index a0929b75bfb..f3429f26049 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2008/05/27 12:40:37 martti Exp $
+@comment $NetBSD: PLIST,v 1.27 2008/09/28 17:32:26 martti Exp $
 man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
@@ -59,6 +59,7 @@ 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.2.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3a.txt
@@ -194,10 +195,6 @@ share/squirrelmail/locale/README.locales
 share/squirrelmail/locale/index.php
 share/squirrelmail/locale/timezones.cfg
 share/squirrelmail/plugins/README.plugins
-share/squirrelmail/plugins/abook_take/README
-share/squirrelmail/plugins/abook_take/index.php
-share/squirrelmail/plugins/abook_take/setup.php
-share/squirrelmail/plugins/abook_take/take.php
 share/squirrelmail/plugins/administrator/INSTALL
 share/squirrelmail/plugins/administrator/auth.php
 share/squirrelmail/plugins/administrator/defines.php
@@ -474,7 +471,6 @@ share/squirrelmail/themes/wood_theme.php
 @dirrm share/squirrelmail/plugins/calendar
 @dirrm share/squirrelmail/plugins/bug_report
 @dirrm share/squirrelmail/plugins/administrator
-@dirrm share/squirrelmail/plugins/abook_take
 @dirrm share/squirrelmail/plugins
 @dirrm share/squirrelmail/locale
 @dirrm share/squirrelmail/include/options
diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk
index 703df19da12..6565a221a70 100644
--- a/mail/squirrelmail/buildlink3.mk
+++ b/mail/squirrelmail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2008/05/27 12:40:37 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2008/09/28 17:32:26 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SQUIRRELMAIL_BUILDLINK3_MK:=	${SQUIRRELMAIL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	squirrelmail
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}squirrelmail
 
 .if ${SQUIRRELMAIL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.squirrelmail+=	squirrelmail>=1.4.15
+BUILDLINK_API_DEPENDS.squirrelmail+=	squirrelmail>=1.4.16
 BUILDLINK_PKGSRCDIR.squirrelmail?=	../../mail/squirrelmail
 .endif	# SQUIRRELMAIL_BUILDLINK3_MK
 
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index 2a5602f49a6..3cb324756ae 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2008/05/27 12:40:37 martti Exp $
+$NetBSD: distinfo,v 1.48 2008/09/28 17:32:26 martti Exp $
 
 SHA1 (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 8823810ca00ab5510a48db78826112a9482d1895
 RMD160 (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 98649a1639567bb6669e9cfc0ca8b0743ebfb46e
@@ -6,7 +6,7 @@ Size (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 1800 bytes
 SHA1 (squirrelmail-1.4.15-ja-20080527-patch.gz) = c610ea923598086d6ba78121ce07620355126b53
 RMD160 (squirrelmail-1.4.15-ja-20080527-patch.gz) = a5dead7379935b195cfdd8ec8e87478a56a2f68f
 Size (squirrelmail-1.4.15-ja-20080527-patch.gz) = 7974 bytes
-SHA1 (squirrelmail-1.4.15.tar.bz2) = 5387e8647ada27d9850c5d2f6a5fdf7dbb6b5862
-RMD160 (squirrelmail-1.4.15.tar.bz2) = ef2878abae89ec8a5cb2464809f89d409c499732
-Size (squirrelmail-1.4.15.tar.bz2) = 506346 bytes
-SHA1 (patch-aa) = 04b104e7a9ae11a8e2c2b96953e9e5857049be3d
+SHA1 (squirrelmail-1.4.16.tar.bz2) = 61c6676c33209addfc2a33d5db26433ed2a3072a
+RMD160 (squirrelmail-1.4.16.tar.bz2) = c6bb4a1ec2951aefe2d56224d97428072cda7d28
+Size (squirrelmail-1.4.16.tar.bz2) = 509058 bytes
+SHA1 (patch-aa) = 4c5556c804c1b728eec87322272abb06edcfcc2a
diff --git a/mail/squirrelmail/patches/patch-aa b/mail/squirrelmail/patches/patch-aa
index 7c8d9a24a81..d131b83af44 100644
--- a/mail/squirrelmail/patches/patch-aa
+++ b/mail/squirrelmail/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.15 2008/05/27 12:40:37 martti Exp $
+$NetBSD: patch-aa,v 1.16 2008/09/28 17:32:26 martti Exp $
 
 Make this pkgsrc friendly.
 
---- config/config_default.php.orig	2007-07-10 17:52:53.000000000 +0300
-+++ config/config_default.php	2007-12-05 08:50:31.000000000 +0200
-@@ -434,7 +434,7 @@
+--- 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 @@
   * false. (Cyrus works fine whether it's true OR false).
   * @global bool $show_contain_subfolders_option
   */
@@ -13,7 +13,7 @@ Make this pkgsrc friendly.
  
  /**
   * These next two options set the defaults for the way that the
-@@ -484,7 +484,7 @@
+@@ -496,7 +496,7 @@
   *
   * @global string $data_dir
   */
@@ -22,7 +22,7 @@ Make this pkgsrc friendly.
  
  /**
   * Attachments directory
-@@ -502,7 +502,7 @@
+@@ -514,7 +514,7 @@
   *    + It should probably be another directory than data_dir.
   * @global string $attachment_dir
   */