Updated squirrelmail to 1.4.7

  - Fixed URL for Read Receipts being incorrect in some cases (#1177518).
  - Fixed endless loop when trying to parse "From: )(" (#1517867).
  - Using is_file() instead of file_exists() in fortune plugin (#1499134).
  - Add manual page for conf.pl under contrib.
  - Don't allow selecting INBOX as Sent, Draft or Trash folder (#1242346).

7 files changed, 28 insertions, 100 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 0ed7d566406..73e3fa8b5e3 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2006/06/04 12:31:31 tron Exp $
+# $NetBSD: Makefile,v 1.74 2006/07/13 07:59:34 martti Exp $
 
-DISTNAME=	squirrelmail-1.4.6
-PKGREVISION=	3
+DISTNAME=	squirrelmail-1.4.7
+#PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index 9d9f341971f..fcc9e95f056 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2006/02/27 07:12:13 martti Exp $
+@comment $NetBSD: PLIST,v 1.18 2006/07/13 07:59:34 martti Exp $
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
 share/squirrelmail/COPYING
@@ -65,6 +65,7 @@ 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/authentication.txt
 share/squirrelmail/doc/db-backend.txt
 share/squirrelmail/doc/ie_ssl.txt
@@ -364,12 +365,17 @@ share/squirrelmail/src/view_text.php
 share/squirrelmail/src/webmail.php
 share/squirrelmail/themes/README.themes
 share/squirrelmail/themes/alien_glow.php
+share/squirrelmail/themes/autumn.php
+share/squirrelmail/themes/autumn2.php
 share/squirrelmail/themes/black_bean_burrito_theme.php
 share/squirrelmail/themes/blue_grey_theme.php
+share/squirrelmail/themes/blue_on_blue.php
 share/squirrelmail/themes/bluesnews_theme.php
 share/squirrelmail/themes/bluesome.php
 share/squirrelmail/themes/bluesteel_theme.php
 share/squirrelmail/themes/christmas.php
+share/squirrelmail/themes/classic_blue.php
+share/squirrelmail/themes/classic_blue2.php
 share/squirrelmail/themes/css/comic-sans-08.css
 share/squirrelmail/themes/css/comic-sans-10.css
 share/squirrelmail/themes/css/comic-sans-12.css
@@ -407,6 +413,7 @@ share/squirrelmail/themes/monostochastic.php
 share/squirrelmail/themes/netstyle_theme.php
 share/squirrelmail/themes/penguin.php
 share/squirrelmail/themes/plain_blue_theme.php
+share/squirrelmail/themes/powder_blue.php
 share/squirrelmail/themes/purple_theme.php
 share/squirrelmail/themes/random.php
 share/squirrelmail/themes/redmond.php
@@ -422,6 +429,8 @@ share/squirrelmail/themes/slashdot_theme.php
 share/squirrelmail/themes/spice_of_life.php
 share/squirrelmail/themes/spice_of_life_dark.php
 share/squirrelmail/themes/spice_of_life_lite.php
+share/squirrelmail/themes/techno_blue.php
+share/squirrelmail/themes/turquoise.php
 share/squirrelmail/themes/wood_theme.php
 @dirrm share/squirrelmail/themes/css
 @dirrm share/squirrelmail/themes
diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk
index aa2a6fb0387..a79c94a1518 100644
--- a/mail/squirrelmail/buildlink3.mk
+++ b/mail/squirrelmail/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:58 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/13 07:59:34 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SQUIRRELMAIL_BUILDLINK3_MK:=	${SQUIRRELMAIL_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	squirrelmail
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsquirrelmail}
 BUILDLINK_PACKAGES+=	squirrelmail
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}squirrelmail
 
-.if !empty(SQUIRRELMAIL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.squirrelmail+=	{ja-,}squirrelmail>=1.4.6
-BUILDLINK_ABI_DEPENDS.squirrelmail?=	squirrelmail>=1.4.6
+.if ${SQUIRRELMAIL_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.squirrelmail+=	squirrelmail>=1.4.7
 BUILDLINK_PKGSRCDIR.squirrelmail?=	../../mail/squirrelmail
 .endif	# SQUIRRELMAIL_BUILDLINK3_MK
 
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index 646004b6f70..b58a70f8075 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.32 2006/06/04 12:31:31 tron Exp $
+$NetBSD: distinfo,v 1.33 2006/07/13 07:59:34 martti Exp $
 
-SHA1 (squirrelmail-1.4.6.tar.bz2) = b813aa9f736b4b6c41d1afd35bcbd01604e85cf7
-RMD160 (squirrelmail-1.4.6.tar.bz2) = 3cee894b392620af3e35ef1d00e35775559dd4f7
-Size (squirrelmail-1.4.6.tar.bz2) = 484099 bytes
-SHA1 (patch-aa) = cafc171ab1de5e2e1e83caff39f3bfb810fe2ab5
-SHA1 (patch-ab) = a7648438c9764e432e5d040e8e3aebb0ab48730e
-SHA1 (patch-ac) = 393579f9276169d2c765726fb1249160a270e983
+SHA1 (squirrelmail-1.4.7.tar.bz2) = 746080b2c536487ea7cfc5031668cd8092413b51
+RMD160 (squirrelmail-1.4.7.tar.bz2) = 65bc9492429006dd9fb75291990e8692f6f05ba0
+Size (squirrelmail-1.4.7.tar.bz2) = 496925 bytes
+SHA1 (patch-aa) = bc81f7c216fb7e372422991511eb6b89cd6b5e5f
diff --git a/mail/squirrelmail/patches/patch-aa b/mail/squirrelmail/patches/patch-aa
index 496dd7189e6..935b945ab5e 100644
--- a/mail/squirrelmail/patches/patch-aa
+++ b/mail/squirrelmail/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2005/07/18 07:04:27 martti Exp $
+$NetBSD: patch-aa,v 1.11 2006/07/13 07:59:34 martti Exp $
 
---- config/config_default.php.orig	2005-05-22 11:30:34.000000000 +0300
-+++ config/config_default.php	2005-07-18 06:23:02.000000000 +0300
-@@ -392,7 +392,7 @@
+--- config/config_default.php.orig	2006-06-08 15:37:31.000000000 +0000
++++ config/config_default.php	2006-07-13 10:23:36.000000000 +0000
+@@ -400,7 +400,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.10 2005/07/18 07:04:27 martti Exp $
  
  /**
   * These next two options set the defaults for the way that the
-@@ -437,7 +437,7 @@
+@@ -445,7 +445,7 @@
   *   $data_dir = SM_PATH . 'data/';
   * @global string $data_dir
   */
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.10 2005/07/18 07:04:27 martti Exp $
  
  /**
   * Attachments directory
-@@ -455,7 +455,7 @@
+@@ -463,7 +463,7 @@
   *    + It should probably be another directory than data_dir.
   * @global string $attachment_dir
   */
diff --git a/mail/squirrelmail/patches/patch-ab b/mail/squirrelmail/patches/patch-ab
deleted file mode 100644
index e00b02ce445..00000000000
--- a/mail/squirrelmail/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2006/04/11 05:24:20 martti Exp $
-
---- functions/i18n.php.orig	2006-02-10 22:30:31.000000000 +0200
-+++ functions/i18n.php	2006-04-11 08:15:24.000000000 +0300
-@@ -834,11 +834,11 @@
- $languages['zh_CN']['LOCALE']  = 'zh_CN.GB2312';
- $languages['cn']['ALIAS']      = 'zh_CN';
- 
--/*
- $languages['uk_UA']['NAME']    = 'Ukrainian';
--$languages['uk_UA']['CHARSET'] = 'koi8-u';
-+$languages['uk_UA']['CHARSET'] = 'utf-8';
-+$languages['uk_UA']['LOCALE']  = array('uk_UA.UTF-8','uk_UA','uk');
- $languages['uk']['ALIAS'] = 'uk_UA';
--*/
-+
- /*
- $languages['vi_VN']['NAME']    = 'Vietnamese';
- $languages['vi_VN']['CHARSET'] = 'utf-8';
diff --git a/mail/squirrelmail/patches/patch-ac b/mail/squirrelmail/patches/patch-ac
deleted file mode 100644
index d02c29b17d7..00000000000
--- a/mail/squirrelmail/patches/patch-ac
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/06/04 12:31:31 tron Exp $
-
---- functions/global.php.orig	2006-02-03 22:27:47.000000000 +0000
-+++ functions/global.php	2006-06-04 13:22:14.000000000 +0100
-@@ -62,6 +62,47 @@
-     sqstripslashes($_POST);
- }
- 
-+/**
-+ * If register_globals are on, unregister globals.
-+ * Code requires PHP 4.1.0 or newer.
-+ * Second test covers boolean set as string (php_value register_globals off).
-+ */
-+if ((bool) @ini_get('register_globals') &&
-+    strtolower(ini_get('register_globals'))!='off') {
-+    /**
-+     * Remove all globals from $_GET, $_POST, and $_COOKIE.
-+     */
-+    foreach ($_REQUEST as $key => $value) {
-+        unset($GLOBALS[$key]);
-+    }
-+    /**
-+     * Remove globalized $_FILES variables
-+     * Before 4.3.0 $_FILES are included in $_REQUEST.
-+     * Unglobalize them in separate call in order to remove dependency
-+     * on PHP version.
-+     */
-+    foreach ($_FILES as $key => $value) {
-+        unset($GLOBALS[$key]);
-+        // there are three undocumented $_FILES globals.
-+        unset($GLOBALS[$key.'_type']);
-+        unset($GLOBALS[$key.'_name']);
-+        unset($GLOBALS[$key.'_size']);
-+    }
-+    /**
-+     * Remove globalized environment variables.
-+     */
-+    foreach ($_ENV as $key => $value) {
-+        unset($GLOBALS[$key]);
-+    }
-+    /**
-+     * Remove globalized server variables.
-+     */
-+    foreach ($_SERVER as $key => $value) {
-+        unset($GLOBALS[$key]);
-+    }
-+}
-+
-+
- /* strip any tags added to the url from PHP_SELF.
-    This fixes hand crafted url XXS expoits for any
-    page that uses PHP_SELF as the FORM action */
-@@ -336,4 +377,4 @@
- }
- 
- // vim: et ts=4
--?>
-\ No newline at end of file
-+?>