diff -r f144dd621b72 -r 5524672ebbe7 squirrelmail/squirrelmail.patch.plugins
--- a/squirrelmail/squirrelmail.patch.plugins	Fri Apr 17 23:07:57 2009 +0200
+++ b/squirrelmail/squirrelmail.patch.plugins	Fri Apr 17 23:40:08 2009 +0200
@@ -2,14 +2,15 @@
 diff -Nau etc/squirrelmail/config.php.orig etc/squirrelmail/config.php
 --- etc/squirrelmail/config.php.orig	2005-03-16 13:02:25 +0100
 +++ etc/squirrelmail/config.php	2005-03-16 12:31:51 +0100
-@@ -89,6 +89,19 @@
- $plugins[13] = 'squirrel_logger';
- $plugins[14] = 'translate';
+@@ -88,6 +88,24 @@
+ $plugins[12] = 'squirrel_logger';
+ $plugins[13] = 'translate';
  
-+$plugins[15] = 'addgraphics';
-+$plugins[16] = 'avelsieve';
-+$plugins[17] = 'check_quota';
-+$plugins[18] = 'chg_sasl_passwd';
++$plugins[14] = 'addgraphics';
++$plugins[15] = 'avelsieve';
++$plugins[16] = 'check_quota';
++$plugins[17] = 'chg_sasl_passwd';
++$plugins[18] = 'change_ldappass';
 +$plugins[19] = 'folder_sizes';
 +$plugins[20] = 'gpg';
 +$plugins[21] = 'ldifimport';
@@ -18,6 +19,10 @@
 +$plugins[24] = 'smallcal';
 +$plugins[25] = 'vkeyboard';
 +$plugins[26] = 'username';
++$plugins[27] = 'login_notes';
++$plugins[28] = 'password_forget';
++$plugins[39] = 'captcha';
++$plugins[30] = 'smime';
 +
  /* NOP, for patch line placeholder (avoids fuzz) */
  $theme_css = '';
@@ -26,17 +31,17 @@
 diff -Nau share/squirrelmail/plugins/gpg/setup.php.orig share/squirrelmail/plugins/gpg/setup.php
 --- share/squirrelmail/plugins/gpg/setup.php.orig	2005-03-18 12:01:39.398171000 +0100
 +++ share/squirrelmail/plugins/gpg/setup.php	2005-03-18 12:03:35.986216000 +0100
-@@ -14,7 +14,9 @@
-  *
-  */
- if (!defined (SM_PATH)){
+@@ -23,7 +23,9 @@
+ 
+ //define SM_PATH
+ if (!defined ('SM_PATH')){
 -    if (file_exists('./gpg_functions.php')){
 +    if (file_exists('../../../plugins/gpg/gpg_functions.php')){
-+        define (SM_PATH , '../../../');
++        define ('SM_PATH' , '../../../');
 +    } elseif (file_exists('../../plugins/gpg/gpg_functions.php')){
-         define (SM_PATH , '../../');
+         define ('SM_PATH' , '../../');
      } elseif (file_exists('../plugins/gpg/gpg_functions.php')) {
-         define (SM_PATH, '../');
+         define ('SM_PATH', '../');
 Index: share/squirrelmail/plugins/chg_sasl_passwd/options.php
 diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig share/squirrelmail/plugins/chg_sasl_passwd/options.php
 --- share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig	2005-03-17 21:00:03.157951000 +0100
@@ -84,4 +89,96 @@
  
  
  /*
-
+Index: share/squirrelmail/plugins/captcha/functions.php
+diff -uaN share/squirrelmail/plugins/captcha/functions.php.orig share/squirrelmail/plugins/captcha/functions.php     
+--- share/squirrelmail/plugins/captcha/functions.php.orig       2009-02-02 16:13:12.000000000 +0100
++++ share/squirrelmail/plugins/captcha/functions.php    2009-04-17 22:30:41.804849878 +0200
+@@ -122,13 +122,15 @@
+ 
+       if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries))
+       {
+-         include_once(SM_PATH . 'plugins/user_info/functions.php');
++         if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
++         {
+          $user_info = get_user_info();
+          if (empty($user_info['country_code']))
+          {
+             do_err('CAPTCHA plugin used with $show_captcha_countries or $do_not_show_captcha_countries requires the User Information plugin with a IP-to-country module', FALSE);
+             return TRUE;
+          }
++         }
+       }
+    }
+ 
+@@ -183,7 +185,8 @@
+    if (!empty($hide_captcha_ips) || !empty($show_captcha_ips)
+     && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
+    {
+-      include_once(SM_PATH . 'plugins/user_info/functions.php');
++      if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
++      {
+       $user_info = get_user_info();
+       if (!empty($user_info['ip_address']))
+       {
+@@ -194,6 +197,7 @@
+           && !captcha_match_ip_address($user_info['ip_address'], $show_captcha_ips))
+             return;
+       }
++      }
+    }
+ 
+ 
+@@ -203,7 +207,8 @@
+    if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries)
+     && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
+    {
+-      include_once(SM_PATH . 'plugins/user_info/functions.php');
++      if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
++      {
+       $user_info = get_user_info();
+       if (!empty($user_info['country_code']))
+       {
+@@ -214,6 +219,7 @@
+           && !in_array($user_info['country_code'], $show_captcha_countries))
+             return;
+       }
++      }
+    }
+ 
+ 
+@@ -257,7 +263,8 @@
+    if (!empty($hide_captcha_ips) || !empty($show_captcha_ips)
+     && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
+    {
+-      include_once(SM_PATH . 'plugins/user_info/functions.php');
++      if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
++      {
+       $user_info = get_user_info();
+       if (!empty($user_info['ip_address']))
+       {
+@@ -268,6 +275,7 @@
+           && !captcha_match_ip_address($user_info['ip_address'], $show_captcha_ips))
+             return;
+       }
++      }
+    }
+ 
+ 
+@@ -277,7 +285,8 @@
+    if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries)
+     && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
+    {
+-      include_once(SM_PATH . 'plugins/user_info/functions.php');
++      if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
++      {
+       $user_info = get_user_info();
+       if (!empty($user_info['country_code']))
+       {
+@@ -288,6 +297,7 @@
+           && !in_array($user_info['country_code'], $show_captcha_countries))
+             return;
+       }
++      }
+    }
+ 
+