Cleanup and remove big files from (#248980)

(Portage version: 2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64)

13 files changed, 14 insertions, 1767 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index 913e13e0af99..a7c0f20133a2 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for mail-client/squirrelmail
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.125 2008/11/02 06:08:11 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.126 2008/11/29 16:40:19 dertobi123 Exp $
+
+  29 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/squirrelmail-1.5.1-CVE-2006-4019.patch,
+  -files/squirrelmail-1.5.1-CVE-2006-6142-draft_composesess.patch,
+  -files/squirrelmail-1.5.1-CVE-2006-6142-mailto.patch,
+  -files/squirrelmail-1.5.1-CVE-2006-6142-mime.patch,
+  -files/squirrelmail-1.5.1-CVE-2007-1262.patch,
+  -files/squirrelmail-1.5.1-ie-mime.patch,
+  -files/squirrelmail-1.5.1-sqimap_get_message.patch,
+  -files/squirrelmail-gpg-2.1-CVE-2005-1924.patch,
+  -squirrelmail-1.4.10a-r2.ebuild, -squirrelmail-1.4.13-r1.ebuild,
+  -squirrelmail-1.4.15.ebuild, -squirrelmail-1.5.1-r7.ebuild:
+  Cleanup and remove big files from  (#248980)
 
   02 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   squirrelmail-1.4.10a-r2.ebuild, squirrelmail-1.4.13-r1.ebuild,
diff --git a/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2006-4019.patch b/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2006-4019.patch
deleted file mode 100644
index c944bf30a1a0..000000000000
--- a/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2006-4019.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -Naurp squirrelmail-1.5.1.orig/functions/auth.php squirrelmail-1.5.1/functions/auth.php
---- squirrelmail-1.5.1.orig/functions/auth.php	2006-01-23 10:39:32.000000000 -0800
-+++ squirrelmail-1.5.1/functions/auth.php	2007-05-21 09:09:30.000000000 -0700
-@@ -59,6 +59,8 @@ function is_logged_in() {
-             sqsession_register($session_expired_location,'session_expired_location');
-         }
- 
-+        session_write_close();
-+
-         // signout page will deal with users who aren't logged
-         // in on its own; don't show error here
-         //
-@@ -330,4 +332,4 @@ function get_smtp_user(&$user, &$pass) {
-     }
- }
- 
--?>
-\ No newline at end of file
-+?>
-diff -Naurp squirrelmail-1.5.1.orig/src/compose.php squirrelmail-1.5.1/src/compose.php
---- squirrelmail-1.5.1.orig/src/compose.php	2006-02-11 07:14:31.000000000 -0800
-+++ squirrelmail-1.5.1/src/compose.php	2007-05-21 09:02:11.000000000 -0700
-@@ -299,13 +299,19 @@ if (sqsession_is_registered('session_exp
-         sqsession_unregister('session_expired_post');
-         session_write_close();
-     } else {
--        foreach ($session_expired_post as $postvar => $val) {
--            if (isset($val)) {
--                $$postvar = $val;
--            } else {
--                $$postvar = '';
-+        // these are the vars that we can set from the expired composed session   
-+        $compo_var_list = array ( 'send_to', 'send_to_cc','body','startMessage',
-+            'passed_body','use_signature','signature','attachments','subject','newmail',
-+            'send_to_bcc', 'passed_id', 'mailbox', 'from_htmladdr_search', 'identity',
-+            'draft_id', 'delete_draft', 'mailprio', 'edit_as_new', 'compose_messsages',
-+            'composesession', 'request_mdn', 'request_dr');
-+
-+        foreach ($compo_var_list as $var) {
-+            if ( isset($session_expired_post[$var]) && !isset($$var) ) {
-+	        $$var = $session_expired_post[$var];
-             }
-         }
-+
-         $compose_messages = unserialize(urldecode($restoremessages));
-         sqsession_register($compose_messages,'compose_messages');
-         sqsession_register($composesession,'composesession');
-diff -Naurp squirrelmail-1.5.1.orig/src/login.php squirrelmail-1.5.1/src/login.php
---- squirrelmail-1.5.1.orig/src/login.php	2006-02-12 01:03:11.000000000 -0800
-+++ squirrelmail-1.5.1/src/login.php	2007-05-21 09:11:11.000000000 -0700
-@@ -44,12 +44,24 @@ if (!function_exists('sqm_baseuri')){
- }
- $base_uri = sqm_baseuri();
- 
--/*
-+/**
-  * In case the last session was not terminated properly, make sure
-- * we get a new one.
-+ * we get a new one, but make sure we preserve session_expired_*
-  */
- 
--sqsession_destroy();
-+if ( !empty($_SESSION['session_expired_post']) && !empty($_SESSION['session_expired_location']) ) {
-+    $sep = $_SESSION['session_expired_post'];
-+    $sel = $_SESSION['session_expired_location'];
-+
-+    sqsession_destroy();
-+
-+    sqsession_is_active();
-+    sqsession_register($sep, 'session_expired_post');
-+    sqsession_register($sel, 'session_expired_location');
-+} else {
-+    sqsession_destroy();
-+}
-+
- /**
-  * PHP bug. http://bugs.php.net/11643 (warning, spammed bug tracker) and
-  * http://bugs.php.net/13834
-@@ -195,4 +207,4 @@ $oTemplate->assign('password_field', $pa
- $oTemplate->assign('submit_field', addSubmit(_("Login")));
- 
- $oTemplate->display('login.tpl');
--?>
-\ No newline at end of file
-+?>
-diff -Naurp squirrelmail-1.5.1.orig/src/redirect.php squirrelmail-1.5.1/src/redirect.php
---- squirrelmail-1.5.1.orig/src/redirect.php	2006-02-07 23:58:18.000000000 -0800
-+++ squirrelmail-1.5.1/src/redirect.php	2007-05-21 09:12:45.000000000 -0700
-@@ -140,13 +140,17 @@ $redirect_url = $location . '/webmail.ph
- 
- if ( sqgetGlobalVar('session_expired_location', $session_expired_location, SQ_SESSION) ) {
-     sqsession_unregister('session_expired_location');
--    $compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
--    if ($compose_new_win) {
--        // do not prefix $location here because $session_expired_location is set to PHP_SELF
--        // of the last page
--        $redirect_url = $session_expired_location;
--    } elseif ( strpos($session_expired_location, 'webmail.php') === FALSE ) {
--        $redirect_url = $location.'/webmail.php?right_frame='.urldecode($session_expired_location);
-+    if ( strpos($session_expired_location, 'compose.php') !== FALSE ) {
-+        $compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
-+        if ($compose_new_win) {
-+            // do not prefix $location here because $session_expired_location is set to PHP_SELF
-+            // of the last page
-+            $redirect_url = $session_expired_location;
-+        } elseif ( strpos($session_expired_location, 'webmail.php') === FALSE ) {
-+            $redirect_url = 'webmail.php?right_frame=compose.php';
-+        }
-+    } else {
-+        $redirect_url = 'webmail.php?right_frame=' . urldecode($session_expired_location);
-     }
-     unset($session_expired_location);
- }
-@@ -187,4 +191,4 @@ function attachment_common_parse($str, $
-     sqsession_register($attachment_common_types, 'attachment_common_types');
- }
- 
--?>
-\ No newline at end of file
-+?>
-diff -Naurp squirrelmail-1.5.1.orig/src/webmail.php squirrelmail-1.5.1/src/webmail.php
---- squirrelmail-1.5.1.orig/src/webmail.php	2006-02-13 10:20:06.000000000 -0800
-+++ squirrelmail-1.5.1/src/webmail.php	2007-05-21 09:13:29.000000000 -0700
-@@ -54,9 +54,6 @@ if (!sqgetGlobalVar('mailbox', $mailbox)
- 
- sqgetGlobalVar('right_frame', $right_frame, SQ_GET);
- 
--if ( isset($_SESSION['session_expired_post']) ) {
--    sqsession_unregister('session_expired_post');
--}
- if(!sqgetGlobalVar('mailto', $mailto)) {
-     $mailto = '';
- }
diff --git a/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2006-6142-draft_composesess.patch b/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2006-6142-draft_composesess.patch
deleted file mode 100644
index 096aa202f251..000000000000
--- a/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2006-6142-draft_composesess.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naurp squirrelmail-1.5.1.orig/src/compose.php squirrelmail-1.5.1/src/compose.php
---- squirrelmail-1.5.1.orig/src/compose.php	2007-05-21 09:54:44.000000000 -0700
-+++ squirrelmail-1.5.1/src/compose.php	2007-05-21 09:55:35.000000000 -0700
-@@ -80,7 +80,11 @@ sqgetGlobalVar('draft',$draft);
- sqgetGlobalVar('draft_id',$draft_id);
- sqgetGlobalVar('ent_num',$ent_num);
- sqgetGlobalVar('saved_draft',$saved_draft);
--sqgetGlobalVar('delete_draft',$delete_draft);
-+
-+if ( sqgetGlobalVar('delete_draft',$delete_draft) ) {
-+    $delete_draft = (int)$delete_draft;
-+}
-+
- if ( sqgetGlobalVar('startMessage',$startMessage) ) {
-     $startMessage = (int)$startMessage;
- } else {
-@@ -343,6 +347,8 @@ if (sqsession_is_registered('session_exp
- if (!isset($composesession)) {
-     $composesession = 0;
-     sqsession_register(0,'composesession');
-+} else {
-+    $composesession = (int)$composesession;
- }
- 
- if (!isset($session) || (isset($newmessage) && $newmessage)) {
diff --git a/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2006-6142-mailto.patch b/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2006-6142-mailto.patch
deleted file mode 100644
index a9ff6dced42c..000000000000
--- a/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2006-6142-mailto.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -Naurp squirrelmail-1.5.1.orig/src/compose.php squirrelmail-1.5.1/src/compose.php
---- squirrelmail-1.5.1.orig/src/compose.php	2007-05-21 09:14:13.000000000 -0700
-+++ squirrelmail-1.5.1/src/compose.php	2007-05-21 09:20:16.000000000 -0700
-@@ -120,6 +120,25 @@ if ( !sqgetGlobalVar('smaction',$action)
-     if ( sqgetGlobalVar('smaction_edit_new',$tmp) )   $action = 'edit_as_new';
- }
- 
-+/**
-+ * Here we decode the data passed in from mailto.php.
-+ */
-+if ( sqgetGlobalVar('mailtodata', $mailtodata, SQ_GET) ) {
-+    $trtable = array('to'       => 'send_to',
-+                 'cc'           => 'send_to_cc',
-+                 'bcc'          => 'send_to_bcc',
-+                 'body'         => 'body',
-+                 'subject'      => 'subject');
-+    $mtdata = unserialize($mailtodata);
-+    
-+    foreach ($trtable as $f => $t) {
-+        if ( !empty($mtdata[$f]) ) {
-+            $$t = $mtdata[$f];
-+        }
-+    }
-+    unset($mailtodata,$mtdata, $trtable);
-+}
-+
- /* Location (For HTTP 1.1 Header("Location: ...") redirects) */
- $location = get_location();
- /* Identities (fetch only once) */
-diff -Naurp squirrelmail-1.5.1.orig/src/login.php squirrelmail-1.5.1/src/login.php
---- squirrelmail-1.5.1.orig/src/login.php	2007-05-21 09:14:13.000000000 -0700
-+++ squirrelmail-1.5.1/src/login.php	2007-05-21 09:21:42.000000000 -0700
-@@ -187,15 +187,15 @@ if (isset($hide_sm_attributions) && !$hi
- $username_form_name = 'login_username';
- $password_form_name = 'secretkey';
- 
--if(sqgetGlobalVar('mailto', $mailto)) {
--    $rcptaddress = addHidden('mailto', $mailto);
-+if(sqgetGlobalVar('mailtodata', $mailtodata)) {
-+    $mailtofield = addHidden('mailtodata', $mailtodata);
- } else {
--    $rcptaddress = '';
-+    $mailtofield = '';
- }
- 
- $password_field = addPwField($password_form_name).
-                   addHidden('js_autodetect_results', SMPREF_JS_OFF).
--                  $rcptaddress .
-+                  $mailtofield .
-                   addHidden('just_logged_in', '1');
- 
- $oTemplate->assign('color', $color);
-diff -Naurp squirrelmail-1.5.1.orig/src/mailto.php squirrelmail-1.5.1/src/mailto.php
---- squirrelmail-1.5.1.orig/src/mailto.php	2006-01-23 10:43:28.000000000 -0800
-+++ squirrelmail-1.5.1/src/mailto.php	2007-05-21 09:24:07.000000000 -0700
-@@ -41,6 +41,8 @@ $trtable = array('cc'           => 'send
-                  'subject'      => 'subject');
- $url = '';
- 
-+$data = array();
-+
- if(sqgetGlobalVar('emailaddress', $emailaddress)) {
-     $emailaddress = trim($emailaddress);
-     if(stristr($emailaddress, 'mailto:')) {
-@@ -50,34 +52,33 @@ if(sqgetGlobalVar('emailaddress', $email
-         list($emailaddress, $a) = explode('?', $emailaddress, 2);
-         if(strlen(trim($a)) > 0) {
-             $a = explode('=', $a, 2);
--            $url .= $trtable[strtolower($a[0])] . '=' . urlencode($a[1]) . '&';
-+            $data[strtolower($a[0])] = $a[1];
-         }
-     }
--    $url = 'send_to=' . urlencode($emailaddress) . '&' . $url;
-+    $data['to'] = $emailaddress;
- 
-     /* CC, BCC, etc could be any case, so we'll fix them here */
-     foreach($_GET as $k=>$g) {
-         $k = strtolower($k);
-         if(isset($trtable[$k])) {
-             $k = $trtable[$k];
--            $url .= $k . '=' . urlencode($g) . '&';
-+            $data[$k] = $g;
-         }
-     }
--    $url = substr($url, 0, -1);
- }
- sqsession_is_active();
- 
- if($force_login == false && sqsession_is_registered('user_is_logged_in')) {
-     if($compose_only == true) {
--        $redirect = 'compose.php?' . $url;
-+        $redirect = 'compose.php?mailtodata=' . urlencode(serialize($data));
-     } else {
--        $redirect = 'webmail.php?right_frame=compose.php?' . urlencode($url);
-+        $redirect = 'webmail.php?mailtodata=' . urlencode(serialize($data));
-     }
- } else {
--    $redirect = 'login.php?mailto=' . urlencode($url);
-+    $redirect = 'login.php?mailtodata=' . urlencode(serialize($data));
- }
- 
- session_write_close();
- header('Location: ' . get_location() . '/' . $redirect);
- 
--?>
-\ No newline at end of file
-+?>
-diff -Naurp squirrelmail-1.5.1.orig/src/redirect.php squirrelmail-1.5.1/src/redirect.php
---- squirrelmail-1.5.1.orig/src/redirect.php	2007-05-21 09:14:13.000000000 -0700
-+++ squirrelmail-1.5.1/src/redirect.php	2007-05-21 09:25:34.000000000 -0700
-@@ -50,7 +50,7 @@ sqGetGlobalVar('secretkey', $secretkey);
- if(!sqGetGlobalVar('squirrelmail_language', $squirrelmail_language) || $squirrelmail_language == '') {
-     $squirrelmail_language = $squirrelmail_default_language;
- }
--if (!sqgetGlobalVar('mailto', $mailto)) {
-+if (!sqgetGlobalVar('mailtodata', $mailtodata)) {
-     $mailto = '';
- }
- 
-@@ -154,9 +154,9 @@ if ( sqgetGlobalVar('session_expired_loc
-     }
-     unset($session_expired_location);
- }
--if($mailto != '') {
--    $redirect_url  = $location . '/webmail.php?right_frame=compose.php&mailto=';
--    $redirect_url .= urlencode($mailto);
-+if($mailtodata != '') {
-+    $redirect_url  = $location . '/webmail.php?right_frame=compose.php&mailtodata=';
-+    $redirect_url .= urlencode($mailtodata);
- }
- 
- /* Write session data and send them off to the appropriate page. */
-diff -Naurp squirrelmail-1.5.1.orig/src/webmail.php squirrelmail-1.5.1/src/webmail.php
---- squirrelmail-1.5.1.orig/src/webmail.php	2007-05-21 09:14:13.000000000 -0700
-+++ squirrelmail-1.5.1/src/webmail.php	2007-05-21 09:26:37.000000000 -0700
-@@ -54,8 +54,10 @@ if (!sqgetGlobalVar('mailbox', $mailbox)
- 
- sqgetGlobalVar('right_frame', $right_frame, SQ_GET);
- 
--if(!sqgetGlobalVar('mailto', $mailto)) {
--    $mailto = '';
-+if(sqgetGlobalVar('mailtodata', $mailtodata)) {
-+    $mailtourl = 'mailtodata='.urlencode($mailtodata);
-+} else {
-+    $mailtourl = '';
- }
- 
- is_logged_in();
-@@ -166,7 +168,7 @@ switch($right_frame) {
-         $right_frame_url = 'folders.php';
-         break;
-     case 'compose.php':
--        $right_frame_url = 'compose.php?' . $mailto;
-+        $right_frame_url = 'compose.php?' . $mailtourl;
-         break;
-     case '':
-         $right_frame_url = 'right_main.php';
diff --git a/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2006-6142-mime.patch b/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2006-6142-mime.patch
deleted file mode 100644
index ff1aa74a1020..000000000000
--- a/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2006-6142-mime.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -Naurp squirrelmail-1.5.1.orig/functions/mime.php squirrelmail-1.5.1/functions/mime.php
---- squirrelmail-1.5.1.orig/functions/mime.php	2006-02-11 03:13:05.000000000 -0800
-+++ squirrelmail-1.5.1/functions/mime.php	2007-05-21 09:32:19.000000000 -0700
-@@ -1132,6 +1132,75 @@ function sq_unspace(&$attvalue){
- }
- 
- /**
-+ * Translate all dangerous Unicode or Shift_JIS characters which are acepted by
-+ * IE as regular characters.
-+ *
-+ * @param  attvalue  The attribute value before dangerous characters are translated.
-+ * @return attvalue  Nothing, modifies a reference value.
-+ * @author Marc Groot Koerkamp.
-+ */
-+function sq_fixIE_idiocy(&$attvalue) {
-+    // remove NUL
-+    $attvalue = str_replace("\0", "", $attvalue);
-+    // remove comments
-+    $attvalue = preg_replace("/(\/\*.*?\*\/)/","",$attvalue);
-+
-+    // IE has the evil habit of excepting every possible value for the attribute expression
-+    // The table below contain characters which are valid in IE if they are used in the "expression"
-+    // attribute value.
-+    $aDangerousCharsReplacementTable = array(
-+                        array('&#x029F;', '&#0671;' ,/* L UNICODE IPA Extension */
-+                              '&#x0280;', '&#0640;' ,/* R UNICODE IPA Extension */
-+                              '&#x0274;', '&#0628;' ,/* N UNICODE IPA Extension */
-+                              '&#xFF25;', '&#65317' ,/* Unicode FULLWIDTH LATIN CAPITAL LETTER E */
-+                              '&#xFF45;', '&#65349' ,/* Unicode FULLWIDTH LATIN SMALL LETTER E */
-+                              '&#xFF38;', '&#65336;',/* Unicode FULLWIDTH LATIN CAPITAL LETTER X */
-+                              '&#xFF58;', '&#65368;',/* Unicode FULLWIDTH LATIN SMALL LETTER X */
-+                              '&#xFF30;', '&#65328;',/* Unicode FULLWIDTH LATIN CAPITAL LETTER P */
-+                              '&#xFF50;', '&#65360;',/* Unicode FULLWIDTH LATIN SMALL LETTER P */
-+                              '&#xFF32;', '&#65330;',/* Unicode FULLWIDTH LATIN CAPITAL LETTER R */
-+                              '&#xFF52;', '&#65362;',/* Unicode FULLWIDTH LATIN SMALL LETTER R */
-+                              '&#xFF33;', '&#65331;',/* Unicode FULLWIDTH LATIN CAPITAL LETTER S */
-+                              '&#xFF53;', '&#65363;',/* Unicode FULLWIDTH LATIN SMALL LETTER S */
-+                              '&#xFF29;', '&#65321;',/* Unicode FULLWIDTH LATIN CAPITAL LETTER I */
-+                              '&#xFF49;', '&#65353;',/* Unicode FULLWIDTH LATIN SMALL LETTER I */
-+                              '&#xFF2F;', '&#65327;',/* Unicode FULLWIDTH LATIN CAPITAL LETTER O */
-+                              '&#xFF4F;', '&#65359;',/* Unicode FULLWIDTH LATIN SMALL LETTER O */
-+                              '&#xFF2E;', '&#65326;',/* Unicode FULLWIDTH LATIN CAPITAL LETTER N */
-+                              '&#xFF4E;', '&#65358;',/* Unicode FULLWIDTH LATIN SMALL LETTER N */
-+                              '&#xFF2C;', '&#65324;',/* Unicode FULLWIDTH LATIN CAPITAL LETTER L */
-+                              '&#xFF4C;', '&#65356;',/* Unicode FULLWIDTH LATIN SMALL LETTER L */
-+                              '&#xFF35;', '&#65333;',/* Unicode FULLWIDTH LATIN CAPITAL LETTER U */
-+                              '&#xFF55;', '&#65365;',/* Unicode FULLWIDTH LATIN SMALL LETTER U */
-+                              '&#x207F;', '&#8319;' ,/* Unicode SUPERSCRIPT LATIN SMALL LETTER N */
-+                              '&#x8264;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER E */   // in unicode this is some chinese char range
-+                              '&#x8285;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER E */
-+                              '&#x8277;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER X */
-+                              '&#x8298;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER X */
-+                              '&#x826F;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER P */
-+                              '&#x8290;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER P */
-+                              '&#x8271;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER R */
-+                              '&#x8292;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER R */
-+                              '&#x8272;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER S */
-+                              '&#x8293;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER S */
-+                              '&#x8268;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER I */
-+                              '&#x8289;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER I */
-+                              '&#x826E;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER O */
-+                              '&#x828F;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER O */
-+                              '&#x826D;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER N */
-+                              '&#x828E;'), /* Shift JIS FULLWIDTH LATIN SMALL LETTER N */
-+                       array('l', 'l', 'r','r','n','n',
-+                             'E','E','e','e','X','X','x','x','P','P','p','p','S','S','s','s','I','I',
-+                             'i','i','O','O','o','o','N','N','n','n','L','L','l','l','U','U','u','u','n',
-+                             'E','e','X','x','P','p','S','s','I','i','O','o','N','n'));
-+    $attvalue = str_replace($aDangerousCharsReplacementTable[0],$aDangerousCharsReplacementTable[1],$attvalue);
-+
-+    // Escapes are usefull for special characters like "{}[]()'&. In other cases they are
-+    // used for XSS
-+    $attvalue = preg_replace("/(\\\\)([a-zA-Z]{1})/",'$2',$attvalue);
-+}
-+
-+/**
-  * This function returns the final tag out of the tag name, an array
-  * of attributes, and the type of the tag. This function is called by
-  * sq_sanitize internally.
-@@ -1597,10 +1666,23 @@ function sq_fixatts($tagname,
-                 }
-             }
-         }
-+
-+        /**
-+         * Workaround for IE quirks
-+         */
-+        sq_fixIE_idiocy($attvalue);
-+
-         /**
-          * Remove any backslashes, entities, and extraneous whitespace.
-          */
-+        $oldattvalue = $attvalue;
-         sq_defang($attvalue);
-+        if ($attname == 'style' && $attvalue !== $oldattvalue) {
-+            // entities are used in the attribute value. In 99% of the cases it's there as XSS
-+            // i.e.<div style="{ left:exp&#x0280;essio&#x0274;( alert('XSS') ) }">
-+            $attvalue = "idiocy";
-+            $attary{$attname} = $attvalue;
-+        }
-         sq_unspace($attvalue);
- 
-         /**
-@@ -1694,14 +1776,18 @@ function sq_fixstyle($body, $pos, $messa
-     */
-     $content = preg_replace("|body(\s*\{.*?\})|si", ".bodyclass\\1", $content);
-     $secremoveimg = '../images/' . _("sec_remove_eng.png");
-+
-+    // IE Sucks hard. We have a special function for it.
-+    sq_fixIE_idiocy($content);
-+
-+    // remove @import line
-+    $content = preg_replace("/^\s*(@import.*)$/mi","\n<!-- @import rules forbidden -->\n",$content);
-+
-     /**
-     * Fix url('blah') declarations.
-     */
-     //   $content = preg_replace("|url\s*\(\s*([\'\"])\s*\S+script\s*:.*?([\'\"])\s*\)|si",
-     //                           "url(\\1$secremoveimg\\2)", $content);
--    // remove NUL
--    $content = str_replace("\0", "", $content);
--
-     // NB I insert NUL characters to keep to avoid an infinite loop. They are removed after the loop.
-     while (preg_match("/url\s*\(\s*[\'\"]?([^:]+):(.*)?[\'\"]?\s*\)/si", $content, $matches)) {
-         $sProto = strtolower($matches[1]);
-@@ -1759,8 +1845,10 @@ function sq_fixstyle($body, $pos, $messa
-                     '/expression/i',
-                     '/behaviou*r/i',
-                     '/binding/i',
--                    '/include-source/i');
--    $replace = Array('','idiocy', 'idiocy', 'idiocy', 'idiocy');
-+                    '/include-source/i',
-+                    '/javascript/i',
-+                    '/script/i');
-+    $replace = Array('','idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy');
-     $contentNew = preg_replace($match, $replace, $contentTemp);
-     if ($contentNew !== $contentTemp) {
-         // insecure css declarations are used. From now on we don't care
-@@ -2387,4 +2475,4 @@ function SendDownloadHeaders($type0, $ty
- 
- }  // end fn SendDownloadHeaders
- 
--?>
-\ No newline at end of file
-+?>
diff --git a/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2007-1262.patch b/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2007-1262.patch
deleted file mode 100644
index d5accd6c8eb2..000000000000
--- a/mail-client/squirrelmail/files/squirrelmail-1.5.1-CVE-2007-1262.patch
+++ /dev/null
@@ -1,433 +0,0 @@
-diff -Naurp squirrelmail-1.5.1.orig/functions/mime.php squirrelmail-1.5.1/functions/mime.php
---- squirrelmail-1.5.1.orig/functions/mime.php	2007-05-21 09:57:36.000000000 -0700
-+++ squirrelmail-1.5.1/functions/mime.php	2007-05-21 09:58:36.000000000 -0700
-@@ -428,13 +428,16 @@ function formatBody($imap_stream, $messa
-                 $body.="</iframe></div>\n";
-             } else {
-                 // old way of html rendering
--                $body = magicHTML($body, $id, $message, $mailbox);
-                 /**
-                  * convert character set. charset_decode does not remove html special chars
-                  * applied by magicHTML functions and does not sanitize them second time if
-                  * fourth argument is true.
-                  */
--                $body = charset_decode($body_message->header->getParameter('charset'),$body,false,true);
-+                $charset = $body_message->header->getParameter('charset');
-+                if (!empty($charset)) {
-+                    $body = charset_decode($charset,$body,false,true);
-+                }
-+                $body = magicHTML($body, $id, $message, $mailbox);
-             }
-         } else {
-             translateText($body, $wrap_at,
-@@ -1156,8 +1159,8 @@ function sq_fixIE_idiocy(&$attvalue) {
-                         array('&#x029F;', '&#0671;' ,/* L UNICODE IPA Extension */
-                               '&#x0280;', '&#0640;' ,/* R UNICODE IPA Extension */
-                               '&#x0274;', '&#0628;' ,/* N UNICODE IPA Extension */
--                              '&#xFF25;', '&#65317' ,/* Unicode FULLWIDTH LATIN CAPITAL LETTER E */
--                              '&#xFF45;', '&#65349' ,/* Unicode FULLWIDTH LATIN SMALL LETTER E */
-+                              '&#xFF25;', '&#65317;' ,/* Unicode FULLWIDTH LATIN CAPITAL LETTER E */
-+                              '&#xFF45;', '&#65349;' ,/* Unicode FULLWIDTH LATIN SMALL LETTER E */
-                               '&#xFF38;', '&#65336;',/* Unicode FULLWIDTH LATIN CAPITAL LETTER X */
-                               '&#xFF58;', '&#65368;',/* Unicode FULLWIDTH LATIN SMALL LETTER X */
-                               '&#xFF30;', '&#65328;',/* Unicode FULLWIDTH LATIN CAPITAL LETTER P */
-@@ -1177,26 +1180,34 @@ function sq_fixIE_idiocy(&$attvalue) {
-                               '&#xFF35;', '&#65333;',/* Unicode FULLWIDTH LATIN CAPITAL LETTER U */
-                               '&#xFF55;', '&#65365;',/* Unicode FULLWIDTH LATIN SMALL LETTER U */
-                               '&#x207F;', '&#8319;' ,/* Unicode SUPERSCRIPT LATIN SMALL LETTER N */
--                              '&#x8264;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER E */   // in unicode this is some chinese char range
--                              '&#x8285;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER E */
--                              '&#x8277;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER X */
--                              '&#x8298;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER X */
--                              '&#x826F;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER P */
--                              '&#x8290;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER P */
--                              '&#x8271;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER R */
--                              '&#x8292;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER R */
--                              '&#x8272;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER S */
--                              '&#x8293;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER S */
--                              '&#x8268;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER I */
--                              '&#x8289;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER I */
--                              '&#x826E;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER O */
--                              '&#x828F;', /* Shift JIS FULLWIDTH LATIN SMALL LETTER O */
--                              '&#x826D;', /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER N */
--                              '&#x828E;'), /* Shift JIS FULLWIDTH LATIN SMALL LETTER N */
-+                              "\xEF\xBC\xA5", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER E */   // in unicode this is some Chinese char range
-+                              "\xEF\xBD\x85", /* Shift JIS FULLWIDTH LATIN SMALL LETTER E */
-+                              "\xEF\xBC\xB8", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER X */
-+                              "\xEF\xBD\x98", /* Shift JIS FULLWIDTH LATIN SMALL LETTER X */
-+                              "\xEF\xBC\xB0", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER P */
-+                              "\xEF\xBD\x90", /* Shift JIS FULLWIDTH LATIN SMALL LETTER P */
-+                              "\xEF\xBC\xB2", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER R */
-+                              "\xEF\xBD\x92", /* Shift JIS FULLWIDTH LATIN SMALL LETTER R */
-+                              "\xEF\xBC\xB3", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER S */
-+                              "\xEF\xBD\x93", /* Shift JIS FULLWIDTH LATIN SMALL LETTER S */
-+                              "\xEF\xBC\xA9", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER I */
-+                              "\xEF\xBD\x89", /* Shift JIS FULLWIDTH LATIN SMALL LETTER I */
-+                              "\xEF\xBC\xAF", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER O */
-+                              "\xEF\xBD\x8F", /* Shift JIS FULLWIDTH LATIN SMALL LETTER O */
-+                              "\xEF\xBC\xAE", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER N */
-+                              "\xEF\xBD\x8E", /* Shift JIS FULLWIDTH LATIN SMALL LETTER N */
-+                              "\xEF\xBC\xAC", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER L */
-+                              "\xEF\xBD\x8C", /* Shift JIS FULLWIDTH LATIN SMALL LETTER L */
-+                              "\xEF\xBC\xB5", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER U */
-+                              "\xEF\xBD\x95", /* Shift JIS FULLWIDTH LATIN SMALL LETTER U */
-+                              "\xE2\x81\xBF", /* Shift JIS FULLWIDTH SUPERSCRIPT N */
-+                              "\xCA\x9F", /* L UNICODE IPA Extension */
-+                              "\xCA\x80", /* R UNICODE IPA Extension */
-+                              "\xC9\xB4"),  /* N UNICODE IPA Extension */
-                        array('l', 'l', 'r','r','n','n',
--                             'E','E','e','e','X','X','x','x','P','P','p','p','S','S','s','s','I','I',
--                             'i','i','O','O','o','o','N','N','n','n','L','L','l','l','U','U','u','u','n',
--                             'E','e','X','x','P','p','S','s','I','i','O','o','N','n'));
-+                             'E','E','e','e','X','X','x','x','P','P','p','p','R','R','r','r','S','S','s','s','I','I',
-+                             'i','i','O','O','o','o','N','N','n','n','L','L','l','l','U','U','u','u','n','n',
-+                             'E','e','X','x','P','p','R','r','S','s','I','i','O','o','N','n','L','l','U','u','n','l','r','n'));
-     $attvalue = str_replace($aDangerousCharsReplacementTable[0],$aDangerousCharsReplacementTable[1],$attvalue);
- 
-     // Escapes are usefull for special characters like "{}[]()'&. In other cases they are
-@@ -1709,38 +1720,34 @@ function sq_fixatts($tagname,
-                             preg_replace($valmatch, $valrepl, $attvalue);
-                         if ($newvalue != $attvalue){
-                             $attary{$attname} = $newvalue;
-+                            $attvalue = $newvalue;
-                         }
-                     }
-                 }
-             }
-         }
--
--        /**
--         * Replace empty src tags with the blank image.  src is only used
--         * for frames, images, and image inputs.  Doing a replace should
--         * not affect them working as should be, however it will stop
--         * IE from being kicked off when src for img tags are not set
--         */
--        if (($attname == 'src') && ($attvalue == '""')) {
--            $attary{$attname} = '"' . SM_PATH . 'images/blank.png"';
--        }
--
--        /**
--         * Turn cid: urls into http-friendly ones.
--         */
--        if (preg_match("/^[\'\"]\s*cid:/si", $attvalue)){
--            $attary{$attname} = sq_cid2http($message, $id, $attvalue, $mailbox);
-+        if ($attname == 'style') {
-+            if (preg_match('/[\0-\37\200-\377]+/',$attvalue)) {
-+                // 8bit and control characters in style attribute values can be used for XSS, remove them
-+                $attary{$attname} = '"disallowed character"';
-+            }
-+            preg_match_all("/url\s*\((.+)\)/si",$attvalue,$aMatch);
-+            if (count($aMatch)) {
-+                foreach($aMatch[1] as $sMatch) {
-+                    // url value
-+                    $urlvalue = $sMatch;
-+                    sq_fix_url($attname, $urlvalue, $message, $id, $mailbox,"'");
-+                    $attary{$attname} = str_replace($sMatch,$urlvalue,$attvalue);
-+                }
-+            }
-         }
--
-         /**
--         * "Hack" fix for Outlook using propriatary outbind:// protocol in img tags.
--         * One day MS might actually make it match something useful, for now, falling
--         * back to using cid2http, so we can grab the blank.png.
-+         * Use white list based filtering on attributes which can contain url's
-          */
--        if (preg_match("/^[\'\"]\s*outbind:\/\//si", $attvalue)) {
--            $attary{$attname} = sq_cid2http($message, $id, $attvalue, $mailbox);
-+        else if ($attname == 'href' || $attname == 'src' || $attname == 'background') {
-+            sq_fix_url($attname, $attvalue, $message, $id, $mailbox);
-+            $attary{$attname} = $attvalue;
-         }
--
-     }
-     /**
-      * See if we need to append any attributes to this tag.
-@@ -1754,6 +1761,98 @@ function sq_fixatts($tagname,
- }
- 
- /**
-+ * This function filters url's
-+ *
-+ * @param  $attvalue        String with attribute value to filter
-+ * @param  $message         message object
-+ * @param  $id               message id
-+ * @param  $mailbox         mailbox
-+ * @param  $sQuote          quoting characters around url's
-+ */
-+function sq_fix_url($attname, &$attvalue, $message, $id, $mailbox,$sQuote = '"') {
-+    $attvalue = trim($attvalue);
-+    if ($attvalue && ($attvalue[0] =='"'|| $attvalue[0] == "'")) {
-+        // remove the double quotes
-+        $sQuote = $attvalue[0];
-+        $attvalue = trim(substr($attvalue,1,-1));
-+    }
-+
-+    if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
-+        $view_unsafe_images = false;
-+    }
-+    $secremoveimg = '../images/' . _("sec_remove_eng.png");
-+
-+    /**
-+     * Replace empty src tags with the blank image.  src is only used
-+     * for frames, images, and image inputs.  Doing a replace should
-+     * not affect them working as should be, however it will stop
-+     * IE from being kicked off when src for img tags are not set
-+     */
-+    if ($attvalue == '') {
-+        $attvalue = '"' . SM_PATH . 'images/blank.png"';
-+    } else {
-+        // first, disallow 8 bit characters and control characters
-+        if (preg_match('/[\0-\37\200-\377]+/',$attvalue)) {
-+            switch ($attname) {
-+                case 'href':
-+                    $attvalue = $sQuote . 'http://invalid-stuff-detected.example.com' . $sQuote;
-+                    break;
-+                default:
-+                    $attvalue = $sQuote . SM_PATH . 'images/blank.png'. $sQuote;
-+                    break;
-+            }
-+        } else {
-+            $aUrl = parse_url($attvalue);
-+            if (isset($aUrl['scheme'])) {
-+                switch(strtolower($aUrl['scheme'])) {
-+                    case 'http':
-+                    case 'https':
-+                    case 'ftp':
-+                        if ($attname != 'href') {
-+                            if ($view_unsafe_images == false) {
-+                                $attvalue = $sQuote . $secremoveimg . $sQuote;
-+                            } else {
-+                                if (isset($aUrl['path'])) {
-+                                    // validate image extension.
-+                                    $ext = strtolower(substr($aUrl['path'],strrpos($aUrl['path'],'.')));
-+                                    if (!in_array($ext,array('.jpeg','.jpg','xjpeg','.gif','.bmp','.jpe','.png','.xbm'))) {
-+                                        $attvalue = $sQuote . SM_PATH . 'images/blank.png'. $sQuote;
-+                                    }
-+                                } else {
-+                                    $attvalue = $sQuote . SM_PATH . 'images/blank.png'. $sQuote;
-+                                }
-+                            }
-+                        }
-+                        break;
-+                    case 'outbind':
-+                        /**
-+                         * "Hack" fix for Outlook using propriatary outbind:// protocol in img tags.
-+                         * One day MS might actually make it match something useful, for now, falling
-+                         * back to using cid2http, so we can grab the blank.png.
-+                         */
-+                        $attvalue = sq_cid2http($message, $id, $attvalue, $mailbox);
-+                        break;
-+                    case 'cid':
-+                        /**
-+                            * Turn cid: urls into http-friendly ones.
-+                            */
-+                        $attvalue = sq_cid2http($message, $id, $attvalue, $mailbox);
-+                        break;
-+                    default:
-+                        $attvalue = $sQuote . SM_PATH . 'images/blank.png' . $sQuote;
-+                        break;
-+                }
-+            } else {
-+                if (!(isset($aUrl['path']) && $aUrl['path'] == $secremoveimg)) {
-+                    // parse_url did not lead to satisfying result
-+                    $attvalue = $sQuote . SM_PATH . 'images/blank.png' . $sQuote;
-+                }
-+            }
-+        }
-+    }
-+}
-+
-+/**
-  * This function edits the style definition to make them friendly and
-  * usable in SquirrelMail.
-  *
-@@ -1781,59 +1880,40 @@ function sq_fixstyle($body, $pos, $messa
-     $content = preg_replace("|body(\s*\{.*?\})|si", ".bodyclass\\1", $content);
-     $secremoveimg = '../images/' . _("sec_remove_eng.png");
- 
--    // IE Sucks hard. We have a special function for it.
--    sq_fixIE_idiocy($content);
--
--    // remove @import line
--    $content = preg_replace("/^\s*(@import.*)$/mi","\n<!-- @import rules forbidden -->\n",$content);
--
-     /**
-     * Fix url('blah') declarations.
-     */
-     //   $content = preg_replace("|url\s*\(\s*([\'\"])\s*\S+script\s*:.*?([\'\"])\s*\)|si",
-     //                           "url(\\1$secremoveimg\\2)", $content);
--    // NB I insert NUL characters to keep to avoid an infinite loop. They are removed after the loop.
--    while (preg_match("/url\s*\(\s*[\'\"]?([^:]+):(.*)?[\'\"]?\s*\)/si", $content, $matches)) {
--        $sProto = strtolower($matches[1]);
--        switch ($sProto) {
--            /**
--             * Fix url('https*://.*) declarations but only if $view_unsafe_images
--             * is false.
--             */
--            case 'https':
--            case 'http':
--                if (!$view_unsafe_images){
-+    // first check for 8bit sequences and disallowed control characters
-+    if (preg_match('/[\16-\37\200-\377]+/',$content)) {
-+        $content = '<!-- style block removed by html filter due to presence of 8bit characters -->';
- 
--                    $sExpr = "/url\s*\(\s*[\'\"]?\s*$sProto*:.*[\'\"]?\s*\)/si";
--                    $content = preg_replace($sExpr, "u\0r\0l(\\1$secremoveimg\\2)", $content);
-+        return array($content, $newpos);
-+    }
- 
--                } else {
--                    $content = preg_replace('/url/i',"u\0r\0l",$content);
--                }
--                break;
--            /**
--             * Fix urls that refer to cid:
--             */
--            case 'cid':
--                $cidurl = 'cid:'. $matches[2];
--                $httpurl = sq_cid2http($message, $id, $cidurl, $mailbox);
--                // escape parentheses that can modify the regular expression
--                $cidurl = str_replace(array('(',')'),array('\\(','\\)'),$cidurl);
--                $content = preg_replace("|url\s*\(\s*$cidurl\s*\)|si",
--                                        "u\0r\0l($httpurl)", $content);
--                break;
--            default:
--                /**
--                 * replace url with protocol other then the white list
--                 * http,https and cid by an empty string.
--                 */
--                $content = preg_replace("/url\s*\(\s*[\'\"]?([^:]+):(.*)?[\'\"]?\s*\)/si",
--                                 "", $content);
--                break;
-+    // IE Sucks hard. We have a special function for it.
-+    sq_fixIE_idiocy($content);
-+
-+    // remove @import line
-+    $content = preg_replace("/^\s*(@import.*)$/mi","\n<!-- @import rules forbidden -->\n",$content);
-+
-+    // translate ur\l and variations (IE parses that)
-+    // TODO check if the sq_fixIE_idiocy function already handles this.
-+    $content = preg_replace("/(\\\\)?u(\\\\)?r(\\\\)?l(\\\\)?/i", 'url', $content);
-+    preg_match_all("/url\s*\((.+)\)/si",$content,$aMatch);
-+    if (count($aMatch)) {
-+        $aValue = $aReplace = array();
-+        foreach($aMatch[1] as $sMatch) {
-+            // url value
-+            $urlvalue = $sMatch;
-+            sq_fix_url('style',$urlvalue, $message, $id, $mailbox,"'");
-+            $aValue[] = $sMatch;
-+            $aReplace[] = $urlvalue;
-         }
-+        $content = str_replace($aValue,$aReplace,$content);
-     }
--    // remove NUL
--    $content = str_replace("\0", "", $content);
-+
-    /**
-     * Remove any backslashes, entities, and extraneous whitespace.
-     */
-@@ -2267,7 +2347,7 @@ function magicHTML($body, $id, $message,
-                     "idiocy",
-                     "idiocy",
-                     "idiocy",
--                    "",
-+                    "idiocy",
-                     "url(\\1#\\1)",
-                     "url(\\1#\\1)",
-                     "url(\\1#\\1)",
-@@ -2312,7 +2392,7 @@ function magicHTML($body, $id, $message,
-                            $id,
-                            $mailbox
-                            );
--    if (preg_match("|$secremoveimg|i", $trusted)){
-+    if (strpos($trusted,$secremoveimg)){
-         $has_unsafe_images = true;
-     }
- 
-diff -Naurp squirrelmail-1.5.1.orig/src/compose.php squirrelmail-1.5.1/src/compose.php
---- squirrelmail-1.5.1.orig/src/compose.php	2007-05-21 09:57:36.000000000 -0700
-+++ squirrelmail-1.5.1/src/compose.php	2007-05-21 10:00:07.000000000 -0700
-@@ -55,31 +55,37 @@ if (is_array($delayed_errors)) {
- }
- 
- /** SESSION/POST/GET VARS */
--sqgetGlobalVar('session',$session);
--sqgetGlobalVar('mailbox',$mailbox);
--if(!sqgetGlobalVar('identity',$identity)) {
-+sqgetGlobalVar('send', $send, SQ_POST);
-+// Send can only be achieved by setting $_POST var. If Send = true then
-+// retrieve other form fields from $_POST
-+if (isset($send) && $send) {
-+    $SQ_GLOBAL = SQ_POST;
-+} else {
-+    $SQ_GLOBAL = SQ_FORM;
-+}
-+sqgetGlobalVar('session',$session, $SQ_GLOBAL);
-+sqgetGlobalVar('mailbox',$mailbox, $SQ_GLOBAL);
-+if(!sqgetGlobalVar('identity',$identity, $SQ_GLOBAL)) {
-     $identity=0;
- }
--sqgetGlobalVar('send_to',$send_to);
--sqgetGlobalVar('send_to_cc',$send_to_cc);
--sqgetGlobalVar('send_to_bcc',$send_to_bcc);
--sqgetGlobalVar('subject',$subject);
--sqgetGlobalVar('body',$body);
--sqgetGlobalVar('mailprio',$mailprio);
--sqgetGlobalVar('request_mdn',$request_mdn);
--sqgetGlobalVar('request_dr',$request_dr);
--sqgetGlobalVar('html_addr_search',$html_addr_search);
--sqgetGlobalVar('mail_sent',$mail_sent);
--sqgetGlobalVar('passed_id',$passed_id);
--sqgetGlobalVar('passed_ent_id',$passed_ent_id);
--sqgetGlobalVar('send',$send);
--
--sqgetGlobalVar('attach',$attach);
--
--sqgetGlobalVar('draft',$draft);
--sqgetGlobalVar('draft_id',$draft_id);
--sqgetGlobalVar('ent_num',$ent_num);
--sqgetGlobalVar('saved_draft',$saved_draft);
-+sqgetGlobalVar('send_to',$send_to, $SQ_GLOBAL);
-+sqgetGlobalVar('send_to_cc',$send_to_cc, $SQ_GLOBAL);
-+sqgetGlobalVar('send_to_bcc',$send_to_bcc, $SQ_GLOBAL);
-+sqgetGlobalVar('subject',$subject, $SQ_GLOBAL);
-+sqgetGlobalVar('body',$body, $SQ_GLOBAL);
-+sqgetGlobalVar('mailprio',$mailprio, $SQ_GLOBAL);
-+sqgetGlobalVar('request_mdn',$request_mdn, $SQ_GLOBAL);
-+sqgetGlobalVar('request_dr',$request_dr, $SQ_GLOBAL);
-+sqgetGlobalVar('html_addr_search',$html_addr_search, $SQ_GLOBAL);
-+sqgetGlobalVar('mail_sent',$mail_sent, $SQ_GLOBAL);
-+sqgetGlobalVar('passed_id',$passed_id, $SQ_GLOBAL);
-+sqgetGlobalVar('passed_ent_id',$passed_ent_id, $SQ_GLOBAL);
-+
-+sqgetGlobalVar('attach',$attach, SQ_POST);
-+sqgetGlobalVar('draft',$draft, SQ_POST);
-+sqgetGlobalVar('draft_id',$draft_id, $SQ_GLOBAL);
-+sqgetGlobalVar('ent_num',$ent_num, $SQ_GLOBAL);
-+sqgetGlobalVar('saved_draft',$saved_draft, SQ_FORM);
- 
- if ( sqgetGlobalVar('delete_draft',$delete_draft) ) {
-     $delete_draft = (int)$delete_draft;
-@@ -1765,4 +1771,4 @@ function deliverMessage($composeMessage,
-     return $success;
- }
- 
--?>
-\ No newline at end of file
-+?>
-diff -Naurp squirrelmail-1.5.1.orig/src/view_text.php squirrelmail-1.5.1/src/view_text.php
---- squirrelmail-1.5.1.orig/src/view_text.php	2006-02-05 03:18:50.000000000 -0800
-+++ squirrelmail-1.5.1/src/view_text.php	2007-05-21 09:58:36.000000000 -0700
-@@ -70,10 +70,10 @@ if (isset($languages[$squirrelmail_langu
- }
- 
- if ($type1 == 'html' || (isset($override_type1) &&  $override_type1 == 'html')) {
--    $body = MagicHTML( $body, $passed_id, $message, $mailbox);
-     // html attachment with character set information
-     if (! empty($charset))
-         $body = charset_decode($charset,$body,false,true);
-+    $body = MagicHTML( $body, $passed_id, $message, $mailbox);
- } else {
-     translateText($body, $wrap_at, $charset);
- }
diff --git a/mail-client/squirrelmail/files/squirrelmail-1.5.1-ie-mime.patch b/mail-client/squirrelmail/files/squirrelmail-1.5.1-ie-mime.patch
deleted file mode 100644
index 1b7eac318f06..000000000000
--- a/mail-client/squirrelmail/files/squirrelmail-1.5.1-ie-mime.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -u -r1.265.2.69 mime.php
---- functions/mime.php	2 Dec 2006 09:57:21 -0000	1.265.2.69
-+++ functions/mime.php	2 Dec 2006 14:30:29 -0000
-@@ -477,7 +477,11 @@
-         if ($where && $what) {
-            $defaultlink .= '&amp;where='. urlencode($where).'&amp;what='.urlencode($what);
-         }
--
-+        // IE does make use of mime content sniffing. Forcing a download
-+        // prohibit execution of XSS inside an application/octet-stream attachment
-+        if ($type0 == 'application' && $type1 == 'octet-stream') {
-+            $defaultlink .= '&amp;absolute_dl=true';
-+        }
-         /* This executes the attachment hook with a specific MIME-type.
-          * If that doesn't have results, it tries if there's a rule
-          * for a more generic type. Finally, a hook for ALL attachment
-@@ -2195,11 +2253,15 @@
- 
-             // This works for most types, but doesn't work with Word files
-             header ("Content-Type: application/download; name=\"$filename\"");
--
-+            // This is to prevent IE for MIME sniffing and auto open a file in IE
-+            header ("Content-Type: application/force-download; name=\"$filename\"");
-             // These are spares, just in case.  :-)
-             //header("Content-Type: $type0/$type1; name=\"$filename\"");
-             //header("Content-Type: application/x-msdownload; name=\"$filename\"");
-             //header("Content-Type: application/octet-stream; name=\"$filename\"");
-+        } else if ($isIE) {
-+             // This is to prevent IE for MIME sniffing and auto open a file in IE
-+             header ("Content-Type: application/force-download; name=\"$filename\"");
-         } else {
-             // another application/octet-stream forces download for Netscape
-             header ("Content-Type: application/octet-stream; name=\"$filename\"");
diff --git a/mail-client/squirrelmail/files/squirrelmail-1.5.1-sqimap_get_message.patch b/mail-client/squirrelmail/files/squirrelmail-1.5.1-sqimap_get_message.patch
deleted file mode 100644
index a96bc137b3a1..000000000000
--- a/mail-client/squirrelmail/files/squirrelmail-1.5.1-sqimap_get_message.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp squirrelmail-1.5.1.orig/functions/imap_messages.php squirrelmail-1.5.1/functions/imap_messages.php
---- squirrelmail-1.5.1.orig/functions/imap_messages.php	2006-02-12 10:21:50.000000000 -0800
-+++ squirrelmail-1.5.1/functions/imap_messages.php	2007-06-10 09:08:46.000000000 -0700
-@@ -923,7 +923,7 @@ function sqimap_get_message($imap_stream
-     if ($read) {
-         if (preg_match('/.+FLAGS\s\((.*)\)\s/AUi',$read[0],$regs)) {
-             if (trim($regs[1])) {
--                $flags = preg_split('/ /', $regs[1],-1,'PREG_SPLIT_NI_EMPTY');
-+                $flags = preg_split('/ /', $regs[1],-1,PREG_SPLIT_NO_EMPTY);
-             }
-         }
-     } else {
diff --git a/mail-client/squirrelmail/files/squirrelmail-gpg-2.1-CVE-2005-1924.patch b/mail-client/squirrelmail/files/squirrelmail-gpg-2.1-CVE-2005-1924.patch
deleted file mode 100644
index bae081657ae2..000000000000
--- a/mail-client/squirrelmail/files/squirrelmail-gpg-2.1-CVE-2005-1924.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naurp squirrelmail-1.4.10a.orig/plugins/gpg/gpg_key_functions.php squirrelmail-1.4.10a/plugins/gpg/gpg_key_functions.php
---- squirrelmail-1.4.10a.orig/plugins/gpg/gpg_key_functions.php	2007-07-07 13:03:42.000000000 -0700
-+++ squirrelmail-1.4.10a/plugins/gpg/gpg_key_functions.php	2007-07-15 18:22:35.000000000 -0700
-@@ -695,6 +695,9 @@ function gpg_recv_key($searchkeyid,$debu
-   if (!$keyserver) {
-       $keyserver = getPref($data_dir,$username,'keyserver');
-   }
-+
-+  $keyserver = escapeshellarg($keyserver);
-+
-   // import
-   // the following line redirects the output to stderr: 2>&1
-   // use --import
-@@ -1172,4 +1175,4 @@ function gpg_generate_keypair($debug, $r
-  * added $Log directive to broken out functions file.
-  *
-  */
--?>
-\ No newline at end of file
-+?>
-diff -Naurp squirrelmail-1.4.10a.orig/plugins/gpg/gpg_keyring.php squirrelmail-1.4.10a/plugins/gpg/gpg_keyring.php
---- squirrelmail-1.4.10a.orig/plugins/gpg/gpg_keyring.php	2007-07-07 13:03:42.000000000 -0700
-+++ squirrelmail-1.4.10a/plugins/gpg/gpg_keyring.php	2007-07-15 18:18:28.000000000 -0700
-@@ -454,6 +454,7 @@ class gpg_keyring {
-         }
- 
-         //Make and execute the delete command
-+	$fpr = escapeshellarg($fpr);
- 	$params = "--yes --homedir $gpg_key_dir $flag $fpr";
- 	$return=gpg_execute($debug,$params);
- 	$returnval=$return['returnval'];
-@@ -872,4 +873,4 @@ class gpg_keyring {
-  *  Initial Revision
-  *  new file for up-and-coming keyring class
-  */
--?>
-\ No newline at end of file
-+?>
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.10a-r2.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.10a-r2.ebuild
deleted file mode 100644
index 22637284aa0d..000000000000
--- a/mail-client/squirrelmail/squirrelmail-1.4.10a-r2.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.10a-r2.ebuild,v 1.9 2008/11/02 06:08:11 jmbsvicetto Exp $
-
-IUSE="crypt ldap spell ssl filter mysql postgres nls"
-
-inherit webapp eutils
-
-DESCRIPTION="Webmail for nuts!"
-
-# Plugin Versions
-COMPATIBILITY_VER=2.0.8-1.0
-USERDATA_VER=0.9-1.4.0
-ADMINADD_VER=0.1-1.4.0
-AMAVIS_VER=0.8.0-1.4
-GPG_VER=2.1
-LDAP_USERDATA_VER=0.4
-SECURELOGIN_VER=1.3-1.2.8
-SHOWSSL_VER=2.2-1.2.8
-LOCALES_VER=1.4.9-20070106
-DECODING_VER=1.2
-
-MY_P=${P/_rc/-RC}
-S="${WORKDIR}/${MY_P}"
-
-PLUGINS_LOC="http://www.squirrelmail.org/plugins"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	mirror://sourceforge/${PN}/squirrelmail-decode-${DECODING_VER}.tar.bz2
-	mirror://sourceforge/retruserdata/retrieveuserdata.${USERDATA_VER}.tar.gz
-	${PLUGINS_LOC}/compatibility-${COMPATIBILITY_VER}.tar.gz
-	ssl? ( ${PLUGINS_LOC}/secure_login-${SECURELOGIN_VER}.tar.gz )
-	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
-	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
-	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
-	crypt? ( ${PLUGINS_LOC}/gpg-${GPG_VER}.tar.gz )
-	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
-	nls? ( mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2 )"
-
-HOMEPAGE="http://www.squirrelmail.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-
-DEPEND=""
-
-RDEPEND="virtual/php
-	virtual/perl-DB_File
-	crypt? ( =app-crypt/gnupg-1.4* )
-	ldap? ( net-nds/openldap )
-	spell? ( || ( app-text/aspell app-text/ispell ) )
-	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
-	postgres? ( dev-php/PEAR-DB )
-	mysql? ( dev-php/PEAR-DB )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	unpack squirrelmail-decode-${DECODING_VER}.tar.bz2
-
-	cd "${S}"
-
-	mv config/config_default.php config/config.php
-
-	sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" config/config.php
-
-	# Now do the plugins
-	cd "${S}"/plugins
-
-	sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/setup.php || die "Unable to fix fortunes plugin."
-
-	unpack compatibility-${COMPATIBILITY_VER}.tar.gz
-
-	unpack admin_add.${ADMINADD_VER}.tar.gz
-
-	unpack retrieveuserdata.${USERDATA_VER}.tar.gz
-
-	use filter &&
-		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
-		mv amavisnewsql/config.php.dist amavisnewsql/config.php
-
-	use crypt &&
-		unpack gpg-${GPG_VER}.tar.gz
-
-	use ldap &&
-		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
-		epatch "${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch" &&
-		mv ldapuserdata/config_sample.php ldapuserdata/config.php
-
-	use ssl &&
-		unpack secure_login-${SECURELOGIN_VER}.tar.gz &&
-		mv secure_login/config.sample.php secure_login/config.php &&
-		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
-		mv show_ssl_link/config.php.sample show_ssl_link/config.php
-
-	use nls &&
-		cd "${S}" &&
-		unpack all_locales-${LOCALES_VER}.tar.bz2
-
-	cd "${S}"
-	use crypt && epatch "${FILESDIR}"/squirrelmail-gpg-2.1-CVE-2005-1924.patch
-}
-
-src_compile() {
-	#we need to have this empty function ... default compile hangs
-	echo "Nothing to compile"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	for doc in AUTHORS COPYING ChangeLog INSTALL README ReleaseNotes UPGRADE; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto compatibility
-	for doc in plugins/compatibility/INSTALL plugins/compatibility/README; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto admin_add
-	for doc in plugins/admin_add/README; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto retrieveuserdata
-	for doc in plugins/retrieveuserdata/INSTALL plugins/retrieveuserdata/changelog plugins/retrieveuserdata/users_example.txt; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	if use filter; then
-		docinto amavisnewsql
-		for doc in plugins/amavisnewsql/{CHANGELOG,README,UPGRADE}; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	if use crypt; then
-		docinto gpg
-		for doc in plugins/gpg/README plugins/gpg/README.txt plugins/gpg/INSTALL plugins/gpg/INSTALL.txt plugins/gpg/TODO; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	if use ldap; then
-		rm plugins/ldapuserdata/README
-		docinto ldapuserdata
-		for doc in plugins/ldapuserdata/doc/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	if use ssl; then
-		docinto secure_login
-		for doc in plugins/secure_login/INSTALL plugins/secure_login/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-
-		docinto show_ssl_link
-		for doc in plugins/show_ssl_link/INSTALL plugins/show_ssl_link/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	# Copy the app's main files
-	einfo "Installing squirrelmail files."
-	cp -r . "${D}${MY_HTDOCSDIR}"
-
-	cp "${WORKDIR}/squirrelmail-decode-${DECODING_VER}/*/*.php" "${D}${MY_HTDOCSDIR}/functions/decode"
-
-	# Identify the configuration files that this app uses
-	local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
-	use filter && configs="${configs} plugins/amavisnewsql/config.php"
-	use crypt && configs="${configs} plugins/gpg/gpg_local_prefs.txt"
-	use ldap && configs="${configs} plugins/ldapuserdata/config.php"
-	use ssl && configs="${configs} plugins/show_ssl_link/config.php plugins/secure_login/config.php"
-
-	for file in ${configs}; do
-		webapp_configfile ${MY_HTDOCSDIR}/${file}
-	done
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for phpmyadmin, we *assume* that all .php files that don't end in
-	# .inc.php need to have CGI/BIN support added
-
-	#for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
-	#	webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	#done
-
-	local server_owned="data index.php"
-	for file in ${server_owned}; do
-		webapp_serverowned ${MY_HTDOCSDIR}/${file}
-	done
-
-	# add the post-installation instructions
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-
-	# all done
-	#
-	# now we let the eclass strut its stuff ;-)
-
-	webapp_src_install
-}
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild
deleted file mode 100644
index 2abc40ff589b..000000000000
--- a/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild,v 1.2 2008/11/02 06:08:11 jmbsvicetto Exp $
-
-IUSE="ldap spell ssl filter mysql postgres nls"
-
-inherit webapp eutils
-
-DESCRIPTION="Webmail for nuts!"
-
-# Plugin Versions
-COMPATIBILITY_VER=2.0.9-1.0
-USERDATA_VER=0.9-1.4.0
-ADMINADD_VER=0.1-1.4.0
-AMAVIS_VER=0.8.0-1.4
-LDAP_USERDATA_VER=0.4
-SECURELOGIN_VER=1.3-1.2.8
-SHOWSSL_VER=2.2-1.2.8
-LOCALES_VER=1.4.9-20070106
-DECODING_VER=1.2
-
-MY_P=${P/_rc/-RC}
-S="${WORKDIR}/${MY_P}"
-
-PLUGINS_LOC="http://www.squirrelmail.org/plugins"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	mirror://sourceforge/${PN}/squirrelmail-decode-${DECODING_VER}.tar.bz2
-	mirror://sourceforge/retruserdata/retrieveuserdata.${USERDATA_VER}.tar.gz
-	${PLUGINS_LOC}/compatibility-${COMPATIBILITY_VER}.tar.gz
-	ssl? ( ${PLUGINS_LOC}/secure_login-${SECURELOGIN_VER}.tar.gz )
-	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
-	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
-	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
-	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
-	nls? ( mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2 )"
-
-HOMEPAGE="http://www.squirrelmail.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=""
-
-RDEPEND="virtual/php
-	virtual/perl-DB_File
-	ldap? ( net-nds/openldap )
-	spell? ( || ( app-text/aspell app-text/ispell ) )
-	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
-	postgres? ( dev-php/PEAR-DB )
-	mysql? ( dev-php/PEAR-DB )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	unpack squirrelmail-decode-${DECODING_VER}.tar.bz2
-
-	cd "${S}"
-
-	mv config/config_default.php config/config.php
-
-	sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" config/config.php
-
-	# Now do the plugins
-	cd "${S}"/plugins
-
-	sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/setup.php || die "Unable to fix fortunes plugin."
-
-	unpack compatibility-${COMPATIBILITY_VER}.tar.gz
-
-	unpack admin_add.${ADMINADD_VER}.tar.gz
-
-	unpack retrieveuserdata.${USERDATA_VER}.tar.gz
-
-	use filter &&
-		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
-		mv amavisnewsql/config.php.dist amavisnewsql/config.php
-
-	use ldap &&
-		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
-		epatch "${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch" &&
-		mv ldapuserdata/config_sample.php ldapuserdata/config.php
-
-	use ssl &&
-		unpack secure_login-${SECURELOGIN_VER}.tar.gz &&
-		mv secure_login/config.sample.php secure_login/config.php &&
-		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
-		mv show_ssl_link/config.php.sample show_ssl_link/config.php
-
-	use nls &&
-		cd "${S}" &&
-		unpack all_locales-${LOCALES_VER}.tar.bz2
-}
-
-src_compile() {
-	#we need to have this empty function ... default compile hangs
-	echo "Nothing to compile"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	for doc in AUTHORS COPYING ChangeLog INSTALL README ReleaseNotes UPGRADE; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto compatibility
-	for doc in plugins/compatibility/INSTALL plugins/compatibility/README; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto admin_add
-	for doc in plugins/admin_add/README; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto retrieveuserdata
-	for doc in plugins/retrieveuserdata/INSTALL plugins/retrieveuserdata/changelog plugins/retrieveuserdata/users_example.txt; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	if use filter; then
-		docinto amavisnewsql
-		for doc in plugins/amavisnewsql/{CHANGELOG,README,UPGRADE}; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	if use ldap; then
-		rm plugins/ldapuserdata/README
-		docinto ldapuserdata
-		for doc in plugins/ldapuserdata/doc/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	if use ssl; then
-		docinto secure_login
-		for doc in plugins/secure_login/INSTALL plugins/secure_login/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-
-		docinto show_ssl_link
-		for doc in plugins/show_ssl_link/INSTALL plugins/show_ssl_link/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	# Copy the app's main files
-	einfo "Installing squirrelmail files."
-	cp -r . "${D}${MY_HTDOCSDIR}"
-
-	cp "${WORKDIR}/squirrelmail-decode-${DECODING_VER}/*/*.php" "${D}${MY_HTDOCSDIR}/functions/decode"
-
-	# Identify the configuration files that this app uses
-	local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
-	use filter && configs="${configs} plugins/amavisnewsql/config.php"
-	use ldap && configs="${configs} plugins/ldapuserdata/config.php"
-	use ssl && configs="${configs} plugins/show_ssl_link/config.php plugins/secure_login/config.php"
-
-	for file in ${configs}; do
-		webapp_configfile ${MY_HTDOCSDIR}/${file}
-	done
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for phpmyadmin, we *assume* that all .php files that don't end in
-	# .inc.php need to have CGI/BIN support added
-
-	#for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
-	#	webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	#done
-
-	local server_owned="data index.php"
-	for file in ${server_owned}; do
-		webapp_serverowned ${MY_HTDOCSDIR}/${file}
-	done
-
-	# add the post-installation instructions
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-
-	# all done
-	#
-	# now we let the eclass strut its stuff ;-)
-
-	webapp_src_install
-}
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.15.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.15.ebuild
deleted file mode 100644
index 70220c0c600a..000000000000
--- a/mail-client/squirrelmail/squirrelmail-1.4.15.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.15.ebuild,v 1.5 2008/09/03 18:47:59 ranger Exp $
-
-IUSE="ldap spell ssl filter mysql postgres nls"
-
-inherit webapp eutils
-
-DESCRIPTION="Webmail for nuts!"
-
-# Plugin Versions
-COMPATIBILITY_VER=2.0.9-1.0
-USERDATA_VER=0.9-1.4.0
-ADMINADD_VER=0.1-1.4.0
-AMAVIS_VER=0.8.0-1.4
-LDAP_USERDATA_VER=0.4
-SECURELOGIN_VER=1.3-1.2.8
-SHOWSSL_VER=2.2-1.2.8
-LOCALES_VER=1.4.13-20071220
-DECODING_VER=1.2
-
-MY_P=${P/_rc/-RC}
-S="${WORKDIR}/${MY_P}"
-
-PLUGINS_LOC="http://www.squirrelmail.org/plugins"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	mirror://sourceforge/${PN}/squirrelmail-decode-${DECODING_VER}.tar.bz2
-	mirror://sourceforge/retruserdata/retrieveuserdata.${USERDATA_VER}.tar.gz
-	${PLUGINS_LOC}/compatibility-${COMPATIBILITY_VER}.tar.gz
-	ssl? ( ${PLUGINS_LOC}/secure_login-${SECURELOGIN_VER}.tar.gz )
-	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
-	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
-	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
-	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
-	nls? ( mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2 )"
-
-HOMEPAGE="http://www.squirrelmail.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-
-DEPEND=""
-
-RDEPEND="virtual/php
-	virtual/perl-DB_File
-	ldap? ( net-nds/openldap )
-	spell? ( || ( app-text/aspell app-text/ispell ) )
-	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
-	postgres? ( dev-php/PEAR-DB )
-	mysql? ( dev-php/PEAR-DB )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	unpack squirrelmail-decode-${DECODING_VER}.tar.bz2
-
-	cd "${S}"
-
-	mv config/config_default.php config/config.php
-
-	sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" config/config.php
-
-	# Now do the plugins
-	cd "${S}/plugins"
-
-	sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/setup.php || die "Unable to fix fortunes plugin."
-
-	unpack compatibility-${COMPATIBILITY_VER}.tar.gz
-
-	unpack admin_add.${ADMINADD_VER}.tar.gz
-
-	unpack retrieveuserdata.${USERDATA_VER}.tar.gz
-
-	use filter &&
-		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
-		mv amavisnewsql/config.php.dist amavisnewsql/config.php
-
-	use ldap &&
-		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
-		epatch "${FILESDIR}"/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch &&
-		mv ldapuserdata/config_sample.php ldapuserdata/config.php
-
-	use ssl &&
-		unpack secure_login-${SECURELOGIN_VER}.tar.gz &&
-		mv secure_login/config.sample.php secure_login/config.php &&
-		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
-		mv show_ssl_link/config.php.sample show_ssl_link/config.php
-
-	use nls &&
-		cd "${S}" &&
-		unpack all_locales-${LOCALES_VER}.tar.bz2
-}
-
-src_compile() {
-	#we need to have this empty function ... default compile hangs
-	echo "Nothing to compile"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	for doc in AUTHORS COPYING ChangeLog INSTALL README ReleaseNotes UPGRADE; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto compatibility
-	for doc in plugins/compatibility/INSTALL plugins/compatibility/README; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto admin_add
-	for doc in plugins/admin_add/README; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto retrieveuserdata
-	for doc in plugins/retrieveuserdata/INSTALL plugins/retrieveuserdata/changelog plugins/retrieveuserdata/users_example.txt; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	if use filter; then
-		docinto amavisnewsql
-		for doc in plugins/amavisnewsql/{CHANGELOG,README,UPGRADE}; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	if use ldap; then
-		rm plugins/ldapuserdata/README
-		docinto ldapuserdata
-		for doc in plugins/ldapuserdata/doc/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	if use ssl; then
-		docinto secure_login
-		for doc in plugins/secure_login/INSTALL plugins/secure_login/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-
-		docinto show_ssl_link
-		for doc in plugins/show_ssl_link/INSTALL plugins/show_ssl_link/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	# Copy the app's main files
-	einfo "Installing squirrelmail files."
-	cp -r . "${D}${MY_HTDOCSDIR}"
-
-	cp "${WORKDIR}"/squirrelmail-decode-${DECODING_VER}/*/*.php "${D}${MY_HTDOCSDIR}/functions/decode"
-
-	# Identify the configuration files that this app uses
-	local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
-	use filter && configs="${configs} plugins/amavisnewsql/config.php"
-	use ldap && configs="${configs} plugins/ldapuserdata/config.php"
-	use ssl && configs="${configs} plugins/show_ssl_link/config.php plugins/secure_login/config.php"
-
-	for file in ${configs}; do
-		webapp_configfile ${MY_HTDOCSDIR}/${file}
-	done
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for phpmyadmin, we *assume* that all .php files that don't end in
-	# .inc.php need to have CGI/BIN support added
-
-	#for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
-	#	webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	#done
-
-	local server_owned="data index.php"
-	for file in ${server_owned}; do
-		webapp_serverowned ${MY_HTDOCSDIR}/${file}
-	done
-
-	# add the post-installation instructions
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-
-	# all done
-	#
-	# now we let the eclass strut its stuff ;-)
-
-	webapp_src_install
-}
diff --git a/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild b/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild
deleted file mode 100644
index b162e37723a2..000000000000
--- a/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild,v 1.2 2008/11/02 06:08:11 jmbsvicetto Exp $
-
-IUSE="ldap spell ssl filter mysql postgres nls"
-
-inherit webapp eutils
-
-DESCRIPTION="Webmail for nuts!"
-
-# Plugin Versions
-COMPATIBILITY_VER=2.0.8-1.0
-USERDATA_VER=0.9-1.4.0
-ADMINADD_VER=0.1-1.4.0
-AMAVIS_VER=0.8.0-1.4
-LDAP_USERDATA_VER=0.4
-SECURELOGIN_VER=1.3-1.2.8
-SHOWSSL_VER=2.2-1.2.8
-LOCALES_VER=1.5.1-20060219
-DECODING_VER=1.2
-
-MY_P=${P/_rc/-RC}
-S="${WORKDIR}/${MY_P}"
-
-PLUGINS_LOC="http://www.squirrelmail.org/plugins"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	mirror://sourceforge/${PN}/squirrelmail-decode-${DECODING_VER}.tar.bz2
-	mirror://sourceforge/retruserdata/retrieveuserdata.${USERDATA_VER}.tar.gz
-	${PLUGINS_LOC}/compatibility-${COMPATIBILITY_VER}.tar.gz
-	ssl? ( ${PLUGINS_LOC}/secure_login-${SECURELOGIN_VER}.tar.gz )
-	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
-	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
-	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
-	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
-	nls? ( mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2 )"
-
-HOMEPAGE="http://www.squirrelmail.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=""
-
-RDEPEND="virtual/php
-	virtual/perl-DB_File
-	ldap? ( net-nds/openldap )
-	spell? ( || ( app-text/aspell app-text/ispell ) )
-	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
-	postgres? ( dev-php/PEAR-DB )
-	mysql? ( dev-php/PEAR-DB )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	unpack squirrelmail-decode-${DECODING_VER}.tar.bz2
-
-	cd "${S}"
-	epatch "${FILESDIR}/squirrelmail-1.5.1-CVE-2006-4019.patch"
-	epatch "${FILESDIR}/squirrelmail-1.5.1-CVE-2006-6142-draft_composesess.patch"
-	epatch "${FILESDIR}/squirrelmail-1.5.1-CVE-2006-6142-mailto.patch"
-	epatch "${FILESDIR}/squirrelmail-1.5.1-CVE-2006-6142-mime.patch"
-	epatch "${FILESDIR}/squirrelmail-1.5.1-ie-mime.patch"
-	epatch "${FILESDIR}/squirrelmail-1.5.1-CVE-2007-1262.patch"
-	epatch "${FILESDIR}/squirrelmail-1.5.1-sqimap_get_message.patch"
-
-	mv config/config_default.php config/config.php
-
-	sed -i "s:'/var/local/squirrelmail/data':SM_PATH . 'data/':" config/config.php
-
-	# Now do the plugins
-	cd "${S}"/plugins
-
-	mv fortune/config_default.php fortune/config.php
-	sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/config.php
-
-	mv bug_report/config_default.php bug_report/config.php
-	mv change_password/config_default.php change_password/config.php
-	mv filters/config_default.php filters/config.php
-	mv mail_fetch/config_sample.php mail_fetch/config.php
-	mv newmail/config_default.php newmail/config.php
-	mv translate/config_default.php translate/config.php
-
-	rm newmail/config_sample.php
-	rm translate/config_sample.php
-
-	unpack compatibility-${COMPATIBILITY_VER}.tar.gz
-
-	unpack admin_add.${ADMINADD_VER}.tar.gz
-
-	unpack retrieveuserdata.${USERDATA_VER}.tar.gz
-
-	use filter &&
-		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
-		mv amavisnewsql/config.php.dist amavisnewsql/config.php
-
-	use ldap &&
-		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
-		epatch "${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch" &&
-		mv ldapuserdata/config_sample.php ldapuserdata/config.php
-
-	use ssl &&
-		unpack secure_login-${SECURELOGIN_VER}.tar.gz &&
-		mv secure_login/config.sample.php secure_login/config.php &&
-		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
-		mv show_ssl_link/config.php.sample show_ssl_link/config.php
-
-	use nls &&
-		cd "${S}" &&
-		unpack all_locales-${LOCALES_VER}.tar.bz2
-}
-
-src_compile() {
-	#we need to have this empty function ... default compile hangs
-	echo "Nothing to compile"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# Copy the app's main files
-	einfo "Installing squirrelmail files."
-	cp -r . "${D}${MY_HTDOCSDIR}"
-
-	keepdir ${MY_HTDOCSDIR}/data
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	for doc in AUTHORS COPYING ChangeLog INSTALL README ReleaseNotes UPGRADE ; do
-		dodoc ${doc}
-		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
-	done
-
-	for doc in plugins/{README.plugins,*/{INSTALL,README,COPYRIGHTS,CHANGELOG,API,UPGRADE,TODO,README.txt,INSTALL.txt,user_example.txt}} ; do
-		if [[ -f ${doc} ]] ; then
-			docinto $(dirname ${doc})
-			dodoc ${doc}
-			rm -f "${D}${MY_HTDOCSDIR}/${doc}"
-		fi
-	done
-
-	cp "${WORKDIR}/squirrelmail-decode-${DECODING_VER}/*/*.php" "${D}${MY_HTDOCSDIR}/functions/decode"
-
-	# Identify the configuration files that this app uses
-	for file in config/config.php plugins/*/{config.php,sqspell_config.php,gpg_local_prefs.txt}; do
-		if [[ -f ${file} ]] ; then
-			webapp_configfile ${MY_HTDOCSDIR}/${file}
-		fi
-	done
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for phpmyadmin, we *assume* that all .php files that don't end in
-	# .inc.php need to have CGI/BIN support added
-
-	#for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
-	#	webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	#done
-
-	local server_owned="data index.php"
-	for file in ${server_owned}; do
-		webapp_serverowned ${MY_HTDOCSDIR}/${file}
-	done
-
-	# add the post-installation instructions
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-
-	# all done
-	#
-	# now we let the eclass strut its stuff ;-)
-
-	webapp_src_install
-}