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).

3 files changed, 6 insertions, 84 deletions

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
-+?>