Updated mail/squirrelmail to 1.4.12

NOTE: includes a critical bug fix in the attachment handling

  - Enabled user selection of address format when adding from address
    book during message composition.
  - Fixed issue with adding attachments in PHP 4.x environments (#1805471).
  - Backport size setting on "newmail" popup window.
  - Added a "short_open_tag" configuration test.
  - Undefined notice in error message box when no default folder prefix is set.
  - Undefined index error when downloading.  Possibly caused by using tabs and
    opening multiple mailboxes.
  - PAGE_NAME might not be defined in all plugins, which might cause a
    "not defined" error on session timeouts.
  - Fixed outgoing messages to allow addresses such as "0@..." or "000@...",
    etc. (#1818398).
  - Fixed issue with in-reply-to and reference headers not being retained on
    reply (#1810659).
  - Revived logout_error hook (#1800015).
  - Allow custom session handlers to work correctly (and be defined at the
    application level with SquirrelMail).
  - Fix off-by-one in bodystructure parsing triggered by servers sending
    a body location part (e.g. Sun Java System Messaging Server). Thanks
    John Callahan (#1808382).
  - Invalid initialization of To: header (#1772893).
  - Includes cleanup in include/validate.php.
  - Cleanup in multiple files to remove unneeded includes.
  - Added sort by size (#812233 and #159997, plus multiple list requests).
    Patch provided by Christopher E. Brown.
  - Fix bug in sitewide SMTP settings still using authenticated user, rather
    than configured settings (#1835942).
  - Fixed mailto: functionality.
  - Added mailto: link handling when viewing messages.
  - Handle PHP's insistence on setting the value to 'deleted' for destroyed
    sessions

5 files changed, 37 insertions, 42 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index a470b61807e..ee6b78b9e09 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.94 2007/10/30 19:31:40 martti Exp $
+# $NetBSD: Makefile,v 1.95 2007/12/05 07:11:28 martti Exp $
 
-DISTNAME=	squirrelmail-1.4.11
+DISTNAME=	squirrelmail-1.4.12
 #PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
@@ -30,7 +30,7 @@ BUILD_DEFS+=		VARBASE
 .include "options.mk"
 
 PKG_SYSCONFSUBDIR?=	httpd
-MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 EGDIR=			${PREFIX}/share/examples/squirrelmail
 SMDIR=			${PREFIX}/share/squirrelmail
@@ -38,24 +38,24 @@ DATADIR=		${VARBASE}/spool/squirrelmail
 ATTACHMENTS_DIR=	${DATADIR}/attachments
 USER_PREFS_DIR=		${DATADIR}/data
 
-MESSAGE_SUBST+=		SMDIR=${SMDIR:Q}
-FILES_SUBST+=		SMDIR=${SMDIR:Q}
+MESSAGE_SUBST+=		SMDIR=${SMDIR}
+FILES_SUBST+=		SMDIR=${SMDIR}
 
-CONF_FILES=		${SMDIR:Q}/config/config_default.php \
-			${SMDIR:Q}/config/config.php
-CONF_FILES+=		${SMDIR:Q}/data/default_pref \
-			${DATADIR:Q}/data/default_pref
-CONF_FILES+=		${EGDIR:Q}/squirrelmail.conf \
-			${PKG_SYSCONFDIR:Q}/squirrelmail.conf
+CONF_FILES=		${SMDIR}/config/config_default.php \
+			${SMDIR}/config/config.php
+CONF_FILES+=		${SMDIR}/data/default_pref \
+			${DATADIR}/data/default_pref
+CONF_FILES+=		${EGDIR}/squirrelmail.conf \
+			${PKG_SYSCONFDIR}/squirrelmail.conf
 
-REQD_DIRS+=		${SMDIR:Q} ${SMDIR:Q}/config
+REQD_DIRS+=		${SMDIR} ${SMDIR}/config
 
 OWN_DIRS=		${DATADIR}
 OWN_DIRS_PERMS=		${ATTACHMENTS_DIR} ${ROOT_USER} ${APACHE_GROUP} 730
 OWN_DIRS_PERMS+=	${USER_PREFS_DIR} ${APACHE_USER} ${APACHE_GROUP} 755
 
 SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	${WRKDIR:Q}/squirrelmail.conf.dist
+SUBST_FILES.paths=	${WRKDIR}/squirrelmail.conf.dist
 SUBST_FILES.paths+=	config/config_default.php
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@ATTACHMENTS_DIR@,${ATTACHMENTS_DIR},g'
@@ -68,25 +68,25 @@ INSTALLATION_DIRS+=	share/examples/squirrelmail
 INSTALLATION_DIRS+=	share/squirrelmail
 
 post-extract:
-	cp ${FILESDIR:Q}/squirrelmail.conf.dist \
-		${WRKDIR:Q}/squirrelmail.conf.dist
+	cp ${FILESDIR}/squirrelmail.conf.dist \
+		${WRKDIR}/squirrelmail.conf.dist
 
 pre-configure:
-	find ${WRKSRC:Q} \( -name '*.orig*' -o -name '.cvsignore' \) \
+	find ${WRKSRC} \( -name '*.orig*' -o -name '.cvsignore' \) \
 		-exec rm -f {} \;
 # currently, we use iso_2022_jp.php in squirrelmail-decode package.
 #
 	rm -f ${WRKSRC}/functions/decode/iso_2022_jp.php
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR:Q}/squirrelmail.conf.dist ${EGDIR:Q}/squirrelmail.conf
-	cp -R ${WRKSRC:Q}/* ${SMDIR:Q}
+	${INSTALL_DATA} ${WRKDIR}/squirrelmail.conf.dist ${EGDIR}/squirrelmail.conf
+	cp -R ${WRKSRC}/* ${SMDIR}
 	chown -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
 	find ${SMDIR} -type d -exec chmod ${PKGDIRMODE} {} \;
 	find ${SMDIR} -type f -exec chmod ${SHAREMODE} {} \;
-	chmod a+x ${SMDIR:Q}/config/conf.pl
-	${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/
-	${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/
+	chmod a+x ${SMDIR}/config/conf.pl
+	${INSTALL_DATA} ${WRKSRC}/data/index.php ${USER_PREFS_DIR}/
+	${INSTALL_DATA} ${WRKSRC}/data/.htaccess ${USER_PREFS_DIR}/
 	mv ${PREFIX}/share/squirrelmail/contrib/conf.pl.8 \
 	  ${PREFIX}/${PKGMANDIR}/man8/squirrelmail-conf.pl.8
 
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index 6d83cc91819..df48941dfcb 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2007/10/02 05:28:19 martti Exp $
+@comment $NetBSD: PLIST,v 1.24 2007/12/05 07:11:28 martti Exp $
 man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
@@ -39,7 +39,6 @@ share/squirrelmail/contrib/RPM/squirrelmail.spec
 share/squirrelmail/contrib/decrypt_headers.php
 share/squirrelmail/contrib/squirrelmail.mailto.NT2KXP.reg
 share/squirrelmail/contrib/squirrelmail.mailto.Win9x.reg
-share/squirrelmail/contrib/squirrelmail.mailto.reg
 share/squirrelmail/data/.htaccess
 share/squirrelmail/data/default_pref
 share/squirrelmail/data/index.php
@@ -57,6 +56,8 @@ 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.2.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3a.txt
diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk
index 17232f6605c..038e9e6d3fb 100644
--- a/mail/squirrelmail/buildlink3.mk
+++ b/mail/squirrelmail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/10/02 05:28:19 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/12/05 07:11:28 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.11
+BUILDLINK_API_DEPENDS.squirrelmail+=	squirrelmail>=1.4.12
 BUILDLINK_PKGSRCDIR.squirrelmail?=	../../mail/squirrelmail
 .endif	# SQUIRRELMAIL_BUILDLINK3_MK
 
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index 0618ee5a736..06d09728fb0 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.42 2007/10/03 10:11:23 taca Exp $
+$NetBSD: distinfo,v 1.43 2007/12/05 07:11:28 martti Exp $
 
-SHA1 (squirrelmail-1.4.11-ja-20071002-patch.gz) = 7450c245d50dd67a114808691b5237dada8b98e8
-RMD160 (squirrelmail-1.4.11-ja-20071002-patch.gz) = 170498ecbb6342e6c2b2716e6d074d25df13f61e
-Size (squirrelmail-1.4.11-ja-20071002-patch.gz) = 7749 bytes
-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.11.tar.bz2) = f07ff0d2a963f591ee10847f8330bc1023af6353
-RMD160 (squirrelmail-1.4.11.tar.bz2) = c43f8f35665d4c40eb0fbcd40a2a52f3b881e334
-Size (squirrelmail-1.4.11.tar.bz2) = 496370 bytes
-SHA1 (patch-aa) = 17f0957068ab2dc54871aa3746f58babe46d85cc
+SHA1 (squirrelmail-1.4.12.tar.bz2) = cf5c716fe2b356bafa0aa10ebdb9980339c3a0cb
+RMD160 (squirrelmail-1.4.12.tar.bz2) = a25130f4eab2a84914f021a7baa432383f7ef551
+Size (squirrelmail-1.4.12.tar.bz2) = 496632 bytes
+SHA1 (patch-aa) = 6f48193a3b4ee86e85afcc66e2299ecbfe375796
diff --git a/mail/squirrelmail/patches/patch-aa b/mail/squirrelmail/patches/patch-aa
index e8340430c6b..657e61c48f3 100644
--- a/mail/squirrelmail/patches/patch-aa
+++ b/mail/squirrelmail/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2007/05/10 06:48:28 martti Exp $
+$NetBSD: patch-aa,v 1.14 2007/12/05 07:11:28 martti Exp $
 
---- config/config_default.php.orig	2007-03-04 04:07:59.000000000 +0200
-+++ config/config_default.php	2007-05-10 09:21:01.000000000 +0300
-@@ -414,7 +414,7 @@
+--- 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 @@
   * false. (Cyrus works fine whether it's true OR false).
   * @global bool $show_contain_subfolders_option
   */
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.13 2007/05/10 06:48:28 martti Exp $
  
  /**
   * These next two options set the defaults for the way that the
-@@ -464,7 +464,7 @@
+@@ -484,7 +484,7 @@
   *
   * @global string $data_dir
   */
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.13 2007/05/10 06:48:28 martti Exp $
  
  /**
   * Attachments directory
-@@ -482,7 +482,7 @@
+@@ -502,7 +502,7 @@
   *    + It should probably be another directory than data_dir.
   * @global string $attachment_dir
   */