Update and completely overhaul packaging and build configuration.

Fri, 17 Apr 2009 23:40:08 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 17 Apr 2009 23:40:08 +0200
changeset 159
5524672ebbe7
parent 158
f144dd621b72
child 160
1a36468e720c

Update and completely overhaul packaging and build configuration.

squirrelmail/config.php file | annotate | diff | comparison | revisions
squirrelmail/defprefs.txt file | annotate | diff | comparison | revisions
squirrelmail/index.php file | annotate | diff | comparison | revisions
squirrelmail/squirrelmail.conf file | annotate | diff | comparison | revisions
squirrelmail/squirrelmail.patch file | annotate | diff | comparison | revisions
squirrelmail/squirrelmail.patch.plugins file | annotate | diff | comparison | revisions
squirrelmail/squirrelmail.spec file | annotate | diff | comparison | revisions
     1.1 --- a/squirrelmail/config.php	Fri Apr 17 23:07:57 2009 +0200
     1.2 +++ b/squirrelmail/config.php	Fri Apr 17 23:40:08 2009 +0200
     1.3 @@ -6,26 +6,24 @@
     1.4   */
     1.5  
     1.6  global $version;
     1.7 -$config_version = '1.4.0';
     1.8 +$config_version   = '1.4.0';
     1.9  $config_use_color = 1;
    1.10  
    1.11 -$org_name      = "Email";
    1.12 -$org_logo      = SM_PATH . 'images/opkg_large.png';
    1.13 +$org_name        = "Provisional Email";
    1.14 +$org_logo        = SM_PATH . 'images/opkg_large.png';
    1.15  $org_logo_width  = '277';
    1.16  $org_logo_height = '88';
    1.17 -$org_title     = "SquirrelMail $version";
    1.18 -$signout_page  = '';
    1.19 -$frame_top     = '_top';
    1.20 +$org_title       = "SquirrelMail $version";
    1.21 +$signout_page    = '';
    1.22 +$frame_top       = '_top';
    1.23  
    1.24 -$provider_uri     = 'http://www.openpkg.org/';
    1.25 -
    1.26 -$provider_name     = 'OpenPKG';
    1.27 -
    1.28 -$motd = "";
    1.29 +$motd            = "";
    1.30 +$provider_uri    = 'http://www.openpkg.org/';
    1.31 +$provider_name   = 'OpenPKG';
    1.32  
    1.33  $squirrelmail_default_language = 'de_DE';
    1.34 -$default_charset       = 'iso-8859-1';
    1.35 -$lossy_encoding        = false;
    1.36 +$default_charset        = 'iso-8859-1';
    1.37 +$lossy_encoding         = false;
    1.38  
    1.39  $domain                 = '@l_fqdm@';
    1.40  $imapServerAddress      = '@l_fqdm@';
    1.41 @@ -35,14 +33,14 @@
    1.42  $smtpPort               = 25;
    1.43  $sendmail_path          = '@l_prefix@/sbin/sendmail';
    1.44  $pop_before_smtp        = false;
    1.45 -$imap_server_type       = 'cyrus';
    1.46 +$imap_server_type       = 'dovecot';
    1.47  $invert_time            = false;
    1.48 -$optional_delimiter     = '.';
    1.49 +$optional_delimiter     = 'detect';
    1.50  
    1.51  $default_folder_prefix          = '';
    1.52 -$trash_folder                   = 'INBOX.Trash';
    1.53 -$sent_folder                    = 'INBOX.Sent';
    1.54 -$draft_folder                   = 'INBOX.Drafts';
    1.55 +$trash_folder                   = 'Trash';
    1.56 +$sent_folder                    = 'Sent';
    1.57 +$draft_folder                   = 'Drafts';
    1.58  $default_move_to_trash          = true;
    1.59  $default_move_to_sent           = true;
    1.60  $default_save_as_draft          = true;
    1.61 @@ -55,19 +53,20 @@
    1.62  $default_unseen_notify          = 2;
    1.63  $default_unseen_type            = 1;
    1.64  $auto_create_special            = false;
    1.65 -$delete_folder                  = true;
    1.66 +$delete_folder                  = false;
    1.67  $noselect_fix_enable            = false;
    1.68  
    1.69  $data_dir                 = '@l_prefix@/share/squirrelmail/prefs/';
    1.70  $attachment_dir           = '@l_prefix@/var/squirrelmail/spool/attach/';
    1.71  $dir_hash_level           = 1;
    1.72  $default_left_size        = '224';
    1.73 -$force_username_lowercase = false;
    1.74 +$force_username_lowercase = true;
    1.75  $default_use_priority     = true;
    1.76  $hide_sm_attributions     = false;
    1.77  $default_use_mdn          = true;
    1.78  $edit_identity            = true;
    1.79  $edit_name                = true;
    1.80 +$hide_auth_header         = true;
    1.81  $allow_thread_sort        = true;
    1.82  $allow_server_sort        = true;
    1.83  $allow_charset_search     = true;
    1.84 @@ -91,103 +90,81 @@
    1.85  
    1.86  /* NOP, for patch line placeholder (avoids fuzz) */
    1.87  $theme_css = '';
    1.88 -$theme_default = 0;
    1.89 -$theme[0]['PATH'] = '@l_prefix@/share/squirrelmail/themes/default_theme.php';
    1.90 -$theme[0]['NAME'] = 'Default';
    1.91 -$theme[1]['PATH'] = '@l_prefix@/share/squirrelmail/themes/plain_blue_theme.php';
    1.92 -$theme[1]['NAME'] = 'Plain Blue';
    1.93 -$theme[2]['PATH'] = '@l_prefix@/share/squirrelmail/themes/sandstorm_theme.php';
    1.94 -$theme[2]['NAME'] = 'Sand Storm';
    1.95 +$theme_default = 4;
    1.96 +$theme[0]['PATH'] = '@l_prefix@/share/squirrelmail/themes/bluesome.php';
    1.97 +$theme[0]['NAME'] = 'Bluesome';
    1.98 +$theme[1]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dark_green.php';
    1.99 +$theme[1]['NAME'] = 'Dark Green';
   1.100 +$theme[2]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dark_grey_theme.php';
   1.101 +$theme[2]['NAME'] = 'Dark Grey';
   1.102  $theme[3]['PATH'] = '@l_prefix@/share/squirrelmail/themes/deepocean_theme.php';
   1.103  $theme[3]['NAME'] = 'Deep Ocean';
   1.104 -$theme[4]['PATH'] = '@l_prefix@/share/squirrelmail/themes/slashdot_theme.php';
   1.105 -$theme[4]['NAME'] = 'Slashdot';
   1.106 -$theme[5]['PATH'] = '@l_prefix@/share/squirrelmail/themes/purple_theme.php';
   1.107 -$theme[5]['NAME'] = 'Purple';
   1.108 -$theme[6]['PATH'] = '@l_prefix@/share/squirrelmail/themes/forest_theme.php';
   1.109 -$theme[6]['NAME'] = 'Forest';
   1.110 -$theme[7]['PATH'] = '@l_prefix@/share/squirrelmail/themes/ice_theme.php';
   1.111 -$theme[7]['NAME'] = 'Ice';
   1.112 -$theme[8]['PATH'] = '@l_prefix@/share/squirrelmail/themes/seaspray_theme.php';
   1.113 -$theme[8]['NAME'] = 'Sea Spray';
   1.114 -$theme[9]['PATH'] = '@l_prefix@/share/squirrelmail/themes/bluesteel_theme.php';
   1.115 -$theme[9]['NAME'] = 'Blue Steel';
   1.116 -$theme[10]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dark_grey_theme.php';
   1.117 -$theme[10]['NAME'] = 'Dark Grey';
   1.118 -$theme[11]['PATH'] = '@l_prefix@/share/squirrelmail/themes/high_contrast_theme.php';
   1.119 -$theme[11]['NAME'] = 'High Contrast';
   1.120 -$theme[12]['PATH'] = '@l_prefix@/share/squirrelmail/themes/black_bean_burrito_theme.php';
   1.121 -$theme[12]['NAME'] = 'Black Bean Burrito';
   1.122 -$theme[13]['PATH'] = '@l_prefix@/share/squirrelmail/themes/servery_theme.php';
   1.123 -$theme[13]['NAME'] = 'Servery';
   1.124 -$theme[14]['PATH'] = '@l_prefix@/share/squirrelmail/themes/maize_theme.php';
   1.125 -$theme[14]['NAME'] = 'Maize';
   1.126 -$theme[15]['PATH'] = '@l_prefix@/share/squirrelmail/themes/bluesnews_theme.php';
   1.127 -$theme[15]['NAME'] = 'BluesNews';
   1.128 -$theme[16]['PATH'] = '@l_prefix@/share/squirrelmail/themes/deepocean2_theme.php';
   1.129 -$theme[16]['NAME'] = 'Deep Ocean 2';
   1.130 -$theme[17]['PATH'] = '@l_prefix@/share/squirrelmail/themes/blue_grey_theme.php';
   1.131 -$theme[17]['NAME'] = 'Blue Grey';
   1.132 -$theme[18]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dompie_theme.php';
   1.133 -$theme[18]['NAME'] = 'Dompie';
   1.134 -$theme[19]['PATH'] = '@l_prefix@/share/squirrelmail/themes/methodical_theme.php';
   1.135 -$theme[19]['NAME'] = 'Methodical';
   1.136 -$theme[20]['PATH'] = '@l_prefix@/share/squirrelmail/themes/greenhouse_effect.php';
   1.137 -$theme[20]['NAME'] = 'Greenhouse Effect (Changes)';
   1.138 -$theme[21]['PATH'] = '@l_prefix@/share/squirrelmail/themes/in_the_pink.php';
   1.139 -$theme[21]['NAME'] = 'In The Pink (Changes)';
   1.140 -$theme[22]['PATH'] = '@l_prefix@/share/squirrelmail/themes/kind_of_blue.php';
   1.141 -$theme[22]['NAME'] = 'Kind of Blue (Changes)';
   1.142 -$theme[23]['PATH'] = '@l_prefix@/share/squirrelmail/themes/monostochastic.php';
   1.143 -$theme[23]['NAME'] = 'Monostochastic (Changes)';
   1.144 -$theme[24]['PATH'] = '@l_prefix@/share/squirrelmail/themes/shades_of_grey.php';
   1.145 -$theme[24]['NAME'] = 'Shades of Grey (Changes)';
   1.146 -$theme[25]['PATH'] = '@l_prefix@/share/squirrelmail/themes/spice_of_life.php';
   1.147 -$theme[25]['NAME'] = 'Spice of Life (Changes)';
   1.148 -$theme[26]['PATH'] = '@l_prefix@/share/squirrelmail/themes/spice_of_life_lite.php';
   1.149 -$theme[26]['NAME'] = 'Spice of Life - Lite (Changes)';
   1.150 -$theme[27]['PATH'] = '@l_prefix@/share/squirrelmail/themes/spice_of_life_dark.php';
   1.151 -$theme[27]['NAME'] = 'Spice of Life - Dark (Changes)';
   1.152 -$theme[28]['PATH'] = '@l_prefix@/share/squirrelmail/themes/christmas.php';
   1.153 -$theme[28]['NAME'] = 'Holiday - Christmas';
   1.154 -$theme[29]['PATH'] = '@l_prefix@/share/squirrelmail/themes/darkness.php';
   1.155 -$theme[29]['NAME'] = 'Darkness (Changes)';
   1.156 -$theme[30]['PATH'] = '@l_prefix@/share/squirrelmail/themes/random.php';
   1.157 -$theme[30]['NAME'] = 'Random (Changes every login)';
   1.158 -$theme[31]['PATH'] = '@l_prefix@/share/squirrelmail/themes/midnight.php';
   1.159 -$theme[31]['NAME'] = 'Midnight';
   1.160 -$theme[32]['PATH'] = '@l_prefix@/share/squirrelmail/themes/alien_glow.php';
   1.161 -$theme[32]['NAME'] = 'Alien Glow';
   1.162 -$theme[33]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dark_green.php';
   1.163 -$theme[33]['NAME'] = 'Dark Green';
   1.164 -$theme[34]['PATH'] = '@l_prefix@/share/squirrelmail/themes/penguin.php';
   1.165 -$theme[34]['NAME'] = 'Penguin';
   1.166 +$theme[4]['PATH'] = '@l_prefix@/share/squirrelmail/themes/default_theme.php';
   1.167 +$theme[4]['NAME'] = 'Default';
   1.168 +$theme[5]['PATH'] = '@l_prefix@/share/squirrelmail/themes/forest_theme.php';
   1.169 +$theme[5]['NAME'] = 'Forest';
   1.170 +$theme[6]['PATH'] = '@l_prefix@/share/squirrelmail/themes/ice_theme.php';
   1.171 +$theme[6]['NAME'] = 'Ice';
   1.172 +$theme[7]['PATH'] = '@l_prefix@/share/squirrelmail/themes/maize_theme.php';
   1.173 +$theme[7]['NAME'] = 'Maize';
   1.174 +$theme[8]['PATH'] = '@l_prefix@/share/squirrelmail/themes/purple_theme.php';
   1.175 +$theme[8]['NAME'] = 'Purple';
   1.176 +$theme[9]['PATH'] = '@l_prefix@/share/squirrelmail/themes/sandstorm_theme.php';
   1.177 +$theme[9]['NAME'] = 'Sand Storm';
   1.178 +$theme[10]['PATH'] = '@l_prefix@/share/squirrelmail/themes/seaspray_theme.php';
   1.179 +$theme[10]['NAME'] = 'Sea Spray';
   1.180 +$theme[11]['PATH'] = '@l_prefix@/share/squirrelmail/themes/servery_theme.php';
   1.181 +$theme[11]['NAME'] = 'Servery';
   1.182 +$theme[12]['PATH'] = '@l_prefix@/share/squirrelmail/themes/silver_steel_theme.php';
   1.183 +$theme[12]['NAME'] = 'SilverSteel';
   1.184 +$theme[13]['PATH'] = '@l_prefix@/share/squirrelmail/themes/simple_green_theme.php';
   1.185 +$theme[13]['NAME'] = 'SimpleGreen';
   1.186 +$theme[14]['PATH'] = '@l_prefix@/share/squirrelmail/themes/simple_purple.php';
   1.187 +$theme[14]['NAME'] = 'SimplePurple';
   1.188 +$theme[15]['PATH'] = '@l_prefix@/share/squirrelmail/themes/wood_theme.php';
   1.189 +$theme[15]['NAME'] = 'Wood';
   1.190  
   1.191 -$default_use_javascript_addr_book = false;
   1.192 -$abook_global_file = '';
   1.193 -$abook_global_file_writeable = false;
   1.194 +$ldap_server[0] = array(
   1.195 +    'host' => 'ldaps://ldap.host.tld:636/',
   1.196 +    'base' => 'dc=region,dc=domain,dc=tld',
   1.197 +    'name' => 'Serveur LDAP',
   1.198 +    'port' => 636,
   1.199 +    'binddn' => 'cn=user,dc=domain,dc=tld',
   1.200 +    'bindpw' => 'password',
   1.201 +    'protocol' => 3
   1.202 +);
   1.203  
   1.204 -$addrbook_dsn = '';
   1.205 -$addrbook_table = 'address';
   1.206 +$addrbook_dsn                     = '';
   1.207 +$addrbook_table                   = 'address';
   1.208 +$abook_global_file                = '';
   1.209 +$abook_global_file_writeable      = false;
   1.210 +$abook_global_file_listing        = true;
   1.211 +$abook_file_line_length           = 2048;
   1.212 +$default_use_javascript_addr_book = true;
   1.213  
   1.214 -$prefs_dsn = '';
   1.215 -$prefs_table = 'userprefs';
   1.216 -$prefs_user_field = 'user';
   1.217 -$prefs_key_field = 'prefkey';
   1.218 -$prefs_val_field = 'prefval';
   1.219 -$addrbook_global_dsn = '';
   1.220 -$addrbook_global_table = 'global_abook';
   1.221 +$prefs_dsn                 = '';
   1.222 +$prefs_table               = 'userprefs';
   1.223 +$prefs_user_field          = 'user';
   1.224 +$prefs_key_field           = 'prefkey';
   1.225 +$prefs_val_field           = 'prefval';
   1.226 +$addrbook_global_dsn       = '';
   1.227 +$addrbook_global_table     = 'global_abook';
   1.228  $addrbook_global_writeable = false;
   1.229 -$addrbook_global_listing = false;
   1.230 +$addrbook_global_listing   = false;
   1.231  
   1.232 -$no_list_for_subscribe = false;
   1.233 -$smtp_auth_mech = 'digest-md5';
   1.234 -$imap_auth_mech = 'digest-md5';
   1.235 -$use_imap_tls = false;
   1.236 -$use_smtp_tls = false;
   1.237 -$session_name = 'SQMSESSID';
   1.238 +$no_list_for_subscribe     = false;
   1.239 +$smtp_auth_mech            = 'digest-md5';
   1.240 +$imap_auth_mech            = 'digest-md5';
   1.241 +$smtp_sitewide_user        = '';
   1.242 +$smtp_sitewide_pass        = '';
   1.243 +$use_imap_tls              = false;
   1.244 +$use_smtp_tls              = false;
   1.245 +$session_name              = 'SQMSESSID';
   1.246 +$only_secure_cookies       = true;
   1.247  
   1.248 -@include 'config_local.php';
   1.249 +$config_location_base      = '';
   1.250 +
   1.251 +@include SM_PATH . 'config_local.php';
   1.252  
   1.253  /**
   1.254   * Make sure there are no characters after the PHP closing
     2.1 --- a/squirrelmail/defprefs.txt	Fri Apr 17 23:07:57 2009 +0200
     2.2 +++ b/squirrelmail/defprefs.txt	Fri Apr 17 23:40:08 2009 +0200
     2.3 @@ -22,17 +22,17 @@
     2.4  smallcal_header=#770000
     2.5  smallcal_calendar=Personal
     2.6  move_to_trash=1
     2.7 -trash_folder=INBOX/Trash
     2.8 +trash_folder=INBOX.Trash
     2.9  save_as_draft=1
    2.10 -draft_folder=INBOX/Drafts
    2.11 +draft_folder=INBOX.Drafts
    2.12  move_to_sent=1
    2.13 -sent_folder=INBOX/Sent
    2.14 +sent_folder=INBOX.Sent
    2.15  left_size=220
    2.16  folder_sizes_left_link=1
    2.17  folder_sizes_on_folder_page=0
    2.18  folder_sizes_subtotals=0
    2.19  wrap_at=72
    2.20 -custom_css=sans-10.css
    2.21 +custom_css=sans-12.css
    2.22  newmail_enable=on
    2.23  newmail_changetitle=on
    2.24  translate_server=babelfish
     3.1 --- a/squirrelmail/index.php	Fri Apr 17 23:07:57 2009 +0200
     3.2 +++ b/squirrelmail/index.php	Fri Apr 17 23:40:08 2009 +0200
     3.3 @@ -1,9 +1,8 @@
     3.4  <?php
     3.5  
     3.6 -// If we are, go ahead to the login page.
     3.7 -
     3.8 -// This index.php presume SM is already configured (no check anymore)
     3.9 -
    3.10 +// Go to the login page.
    3.11 +// This presumes SM is already
    3.12 +// configured (no check anymore.)
    3.13  header('Location: src/login.php');
    3.14  
    3.15  ?>
     4.1 --- a/squirrelmail/squirrelmail.conf	Fri Apr 17 23:07:57 2009 +0200
     4.2 +++ b/squirrelmail/squirrelmail.conf	Fri Apr 17 23:40:08 2009 +0200
     4.3 @@ -1,3 +1,2 @@
     4.4 -
     4.5  Alias /webmail @l_prefix@/share/squirrelmail
     4.6  
     5.1 --- a/squirrelmail/squirrelmail.patch	Fri Apr 17 23:07:57 2009 +0200
     5.2 +++ b/squirrelmail/squirrelmail.patch	Fri Apr 17 23:40:08 2009 +0200
     5.3 @@ -1,7 +1,7 @@
     5.4  Index: functions/display_messages.php
     5.5  --- functions/display_messages.php.orig	2005-03-21 23:18:32 +0100
     5.6  +++ functions/display_messages.php	2005-07-30 21:15:29 +0200
     5.7 -@@ -88,8 +88,8 @@
     5.8 +@@ -97,8 +97,8 @@
     5.9                "\"$width_and_height /><br />\n";
    5.10       }
    5.11       echo ( $hide_sm_attributions ? '' :
    5.12 @@ -15,7 +15,7 @@
    5.13  Index: functions/imap_general.php
    5.14  --- functions/imap_general.php.orig	2005-05-20 12:37:34 +0200
    5.15  +++ functions/imap_general.php	2005-07-30 21:14:27 +0200
    5.16 -@@ -568,6 +568,7 @@
    5.17 +@@ -578,6 +578,7 @@
    5.18   
    5.19                   set_up_language($squirrelmail_language, true);
    5.20                   include_once(SM_PATH . 'functions/display_messages.php' );
    5.21 @@ -26,7 +26,7 @@
    5.22  Index: src/login.php
    5.23  --- src/login.php.orig	2005-06-22 15:45:35 +0200
    5.24  +++ src/login.php	2005-07-30 21:15:39 +0200
    5.25 -@@ -132,8 +132,8 @@
    5.26 +@@ -196,8 +196,8 @@
    5.27                   ' /><br />' . "\n"
    5.28                 : '' ).
    5.29               ( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' :
     6.1 --- a/squirrelmail/squirrelmail.patch.plugins	Fri Apr 17 23:07:57 2009 +0200
     6.2 +++ b/squirrelmail/squirrelmail.patch.plugins	Fri Apr 17 23:40:08 2009 +0200
     6.3 @@ -2,14 +2,15 @@
     6.4  diff -Nau etc/squirrelmail/config.php.orig etc/squirrelmail/config.php
     6.5  --- etc/squirrelmail/config.php.orig	2005-03-16 13:02:25 +0100
     6.6  +++ etc/squirrelmail/config.php	2005-03-16 12:31:51 +0100
     6.7 -@@ -89,6 +89,19 @@
     6.8 - $plugins[13] = 'squirrel_logger';
     6.9 - $plugins[14] = 'translate';
    6.10 +@@ -88,6 +88,24 @@
    6.11 + $plugins[12] = 'squirrel_logger';
    6.12 + $plugins[13] = 'translate';
    6.13   
    6.14 -+$plugins[15] = 'addgraphics';
    6.15 -+$plugins[16] = 'avelsieve';
    6.16 -+$plugins[17] = 'check_quota';
    6.17 -+$plugins[18] = 'chg_sasl_passwd';
    6.18 ++$plugins[14] = 'addgraphics';
    6.19 ++$plugins[15] = 'avelsieve';
    6.20 ++$plugins[16] = 'check_quota';
    6.21 ++$plugins[17] = 'chg_sasl_passwd';
    6.22 ++$plugins[18] = 'change_ldappass';
    6.23  +$plugins[19] = 'folder_sizes';
    6.24  +$plugins[20] = 'gpg';
    6.25  +$plugins[21] = 'ldifimport';
    6.26 @@ -18,6 +19,10 @@
    6.27  +$plugins[24] = 'smallcal';
    6.28  +$plugins[25] = 'vkeyboard';
    6.29  +$plugins[26] = 'username';
    6.30 ++$plugins[27] = 'login_notes';
    6.31 ++$plugins[28] = 'password_forget';
    6.32 ++$plugins[39] = 'captcha';
    6.33 ++$plugins[30] = 'smime';
    6.34  +
    6.35   /* NOP, for patch line placeholder (avoids fuzz) */
    6.36   $theme_css = '';
    6.37 @@ -26,17 +31,17 @@
    6.38  diff -Nau share/squirrelmail/plugins/gpg/setup.php.orig share/squirrelmail/plugins/gpg/setup.php
    6.39  --- share/squirrelmail/plugins/gpg/setup.php.orig	2005-03-18 12:01:39.398171000 +0100
    6.40  +++ share/squirrelmail/plugins/gpg/setup.php	2005-03-18 12:03:35.986216000 +0100
    6.41 -@@ -14,7 +14,9 @@
    6.42 -  *
    6.43 -  */
    6.44 - if (!defined (SM_PATH)){
    6.45 +@@ -23,7 +23,9 @@
    6.46 + 
    6.47 + //define SM_PATH
    6.48 + if (!defined ('SM_PATH')){
    6.49  -    if (file_exists('./gpg_functions.php')){
    6.50  +    if (file_exists('../../../plugins/gpg/gpg_functions.php')){
    6.51 -+        define (SM_PATH , '../../../');
    6.52 ++        define ('SM_PATH' , '../../../');
    6.53  +    } elseif (file_exists('../../plugins/gpg/gpg_functions.php')){
    6.54 -         define (SM_PATH , '../../');
    6.55 +         define ('SM_PATH' , '../../');
    6.56       } elseif (file_exists('../plugins/gpg/gpg_functions.php')) {
    6.57 -         define (SM_PATH, '../');
    6.58 +         define ('SM_PATH', '../');
    6.59  Index: share/squirrelmail/plugins/chg_sasl_passwd/options.php
    6.60  diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig share/squirrelmail/plugins/chg_sasl_passwd/options.php
    6.61  --- share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig	2005-03-17 21:00:03.157951000 +0100
    6.62 @@ -84,4 +89,96 @@
    6.63   
    6.64   
    6.65   /*
    6.66 -
    6.67 +Index: share/squirrelmail/plugins/captcha/functions.php
    6.68 +diff -uaN share/squirrelmail/plugins/captcha/functions.php.orig share/squirrelmail/plugins/captcha/functions.php     
    6.69 +--- share/squirrelmail/plugins/captcha/functions.php.orig       2009-02-02 16:13:12.000000000 +0100
    6.70 ++++ share/squirrelmail/plugins/captcha/functions.php    2009-04-17 22:30:41.804849878 +0200
    6.71 +@@ -122,13 +122,15 @@
    6.72 + 
    6.73 +       if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries))
    6.74 +       {
    6.75 +-         include_once(SM_PATH . 'plugins/user_info/functions.php');
    6.76 ++         if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
    6.77 ++         {
    6.78 +          $user_info = get_user_info();
    6.79 +          if (empty($user_info['country_code']))
    6.80 +          {
    6.81 +             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);
    6.82 +             return TRUE;
    6.83 +          }
    6.84 ++         }
    6.85 +       }
    6.86 +    }
    6.87 + 
    6.88 +@@ -183,7 +185,8 @@
    6.89 +    if (!empty($hide_captcha_ips) || !empty($show_captcha_ips)
    6.90 +     && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
    6.91 +    {
    6.92 +-      include_once(SM_PATH . 'plugins/user_info/functions.php');
    6.93 ++      if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
    6.94 ++      {
    6.95 +       $user_info = get_user_info();
    6.96 +       if (!empty($user_info['ip_address']))
    6.97 +       {
    6.98 +@@ -194,6 +197,7 @@
    6.99 +           && !captcha_match_ip_address($user_info['ip_address'], $show_captcha_ips))
   6.100 +             return;
   6.101 +       }
   6.102 ++      }
   6.103 +    }
   6.104 + 
   6.105 + 
   6.106 +@@ -203,7 +207,8 @@
   6.107 +    if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries)
   6.108 +     && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
   6.109 +    {
   6.110 +-      include_once(SM_PATH . 'plugins/user_info/functions.php');
   6.111 ++      if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
   6.112 ++      {
   6.113 +       $user_info = get_user_info();
   6.114 +       if (!empty($user_info['country_code']))
   6.115 +       {
   6.116 +@@ -214,6 +219,7 @@
   6.117 +           && !in_array($user_info['country_code'], $show_captcha_countries))
   6.118 +             return;
   6.119 +       }
   6.120 ++      }
   6.121 +    }
   6.122 + 
   6.123 + 
   6.124 +@@ -257,7 +263,8 @@
   6.125 +    if (!empty($hide_captcha_ips) || !empty($show_captcha_ips)
   6.126 +     && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
   6.127 +    {
   6.128 +-      include_once(SM_PATH . 'plugins/user_info/functions.php');
   6.129 ++      if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
   6.130 ++      {
   6.131 +       $user_info = get_user_info();
   6.132 +       if (!empty($user_info['ip_address']))
   6.133 +       {
   6.134 +@@ -268,6 +275,7 @@
   6.135 +           && !captcha_match_ip_address($user_info['ip_address'], $show_captcha_ips))
   6.136 +             return;
   6.137 +       }
   6.138 ++      }
   6.139 +    }
   6.140 + 
   6.141 + 
   6.142 +@@ -277,7 +285,8 @@
   6.143 +    if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries)
   6.144 +     && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
   6.145 +    {
   6.146 +-      include_once(SM_PATH . 'plugins/user_info/functions.php');
   6.147 ++      if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
   6.148 ++      {
   6.149 +       $user_info = get_user_info();
   6.150 +       if (!empty($user_info['country_code']))
   6.151 +       {
   6.152 +@@ -288,6 +297,7 @@
   6.153 +           && !in_array($user_info['country_code'], $show_captcha_countries))
   6.154 +             return;
   6.155 +       }
   6.156 ++      }
   6.157 +    }
   6.158 + 
   6.159 + 
     7.1 --- a/squirrelmail/squirrelmail.spec	Fri Apr 17 23:07:57 2009 +0200
     7.2 +++ b/squirrelmail/squirrelmail.spec	Fri Apr 17 23:40:08 2009 +0200
     7.3 @@ -24,20 +24,26 @@
     7.4  #   package version
     7.5  %define       V_squirrelmail        1.4.17
     7.6  %define       V_locale              1.4.13-20071220
     7.7 -%define       V_plugin_compat       2.0.9-1.0
     7.8 -%define       V_plugin_logger       1.4.0-1.0.6
     7.9 +%define       V_plugin_compat       2.0.14-1.0
    7.10 +%define       V_plugin_logger       2.3-1.2.7
    7.11  %define       V_plugin_addgraphics  2.3-1.0.3
    7.12 -%define       V_plugin_avelsieve    1.9.7
    7.13 +%define       V_plugin_avelsieve    1.9.4
    7.14  %define       V_plugin_saslpwd      1.4.1-1.4
    7.15 +%define       V_plugin_ldappwd      2.2-1.4.0
    7.16  %define       V_plugin_checkquota   2.2-1.4.0
    7.17  %define       V_plugin_foldersize   1.5-1.4.0
    7.18 -%define       V_plugin_gnupg        2.0.1-1.4.2
    7.19 +%define       V_plugin_gnupg        2.1
    7.20  %define       V_plugin_ldif         1.4-1.2.x
    7.21  %define       V_plugin_update       0.7-1.4.2
    7.22  %define       V_plugin_userip       3.3-re-1.2.2
    7.23  %define       V_plugin_smallcal     0.8-1.2.3
    7.24 -%define       V_plugin_vkeyboard    0.9
    7.25 +%define       V_plugin_vkeyboard    0.9.1
    7.26  %define       V_plugin_username     2.3-1.0.0
    7.27 +%define       V_plugin_loginnotes   1.2-1.4.0
    7.28 +%define       V_plugin_passforget   2.2-1.0.1
    7.29 +%define       V_plugin_captcha      1.2-1.2.9
    7.30 +%define       V_plugin_smime        0.7-1.1.1
    7.31 +%define       V_plugin_debug        1.2-1.4
    7.32  
    7.33  #   package information
    7.34  Name:         squirrelmail
    7.35 @@ -50,7 +56,7 @@
    7.36  Group:        Mail
    7.37  License:      GPL
    7.38  Version:      %{V_squirrelmail}
    7.39 -Release:      20090327
    7.40 +Release:      20090416
    7.41  
    7.42  #   package options
    7.43  %option       with_plugins  no
    7.44 @@ -60,27 +66,33 @@
    7.45  Source0:      http://switch.dl.sourceforge.net/squirrelmail/squirrelmail-%{V_squirrelmail}.tar.bz2
    7.46  Source1:      http://switch.dl.sourceforge.net/squirrelmail/all_locales-%{V_locale}.tar.bz2
    7.47  Source2:      http://www.squirrelmail.org/plugins/compatibility-%{V_plugin_compat}.tar.gz
    7.48 -Source3:      http://www.squeaksoft.com/products/SquirrelLogger/squirrel_logger.%{V_plugin_logger}.tar.gz
    7.49 +Source3:      http://www.squirrelmail.org/plugins/squirrel_logger-%{V_plugin_logger}.tar.gz   
    7.50  Source4:      http://www.squirrelmail.org/plugins/addgraphics-%{V_plugin_addgraphics}.tar.gz
    7.51  Source5:      http://www.squirrelmail.org/plugins/avelsieve-%{V_plugin_avelsieve}.tar.gz
    7.52  Source6:      http://www.squirrelmail.org/plugins/chg_sasl_passwd-%{V_plugin_saslpwd}.tar.gz
    7.53 -Source7:      http://www.squirrelmail.org/plugins/check_quota-%{V_plugin_checkquota}.tar.gz
    7.54 -Source8:      http://www.squirrelmail.org/plugins/folder_sizes-%{V_plugin_foldersize}.tar.gz
    7.55 -Source9:      http://www.squirrelmail.org/plugins/gpg.%{V_plugin_gnupg}.tar.gz
    7.56 -Source10:     http://www.squirrelmail.org/plugins/ldifimport-%{V_plugin_ldif}.tar.gz
    7.57 -Source11:     http://www.squirrelmail.org/plugins/pupdate.%{V_plugin_update}.tar.gz
    7.58 -Source12:     http://www.squirrelmail.org/plugins/show_user_and_ip-%{V_plugin_userip}.tar.gz
    7.59 -Source13:     http://www.squirrelmail.org/plugins/smallcal-%{V_plugin_smallcal}.tar.gz
    7.60 -Source14:     http://www.squirrelmail.org/plugins/vkeyboard-%{V_plugin_vkeyboard}.tar.gz
    7.61 -Source15:     http://www.squirrelmail.org/plugins/username-%{V_plugin_username}.tar.gz
    7.62 -Source16:     config.php
    7.63 -Source17:     defprefs.txt
    7.64 -Source18:     opkg_large.png
    7.65 -Source19:     opkg_small.png
    7.66 -Source20:     rc.squirrelmail
    7.67 -Source21:     squirrelmail.conf
    7.68 -Source22:     config_local_kolab.php
    7.69 -Source23:     index.php
    7.70 +Source7:      http://www.squirrelmail.org/plugins/change_ldappass-%{V_plugin_ldappwd}.tar.gz
    7.71 +Source8:      http://www.squirrelmail.org/plugins/check_quota-%{V_plugin_checkquota}.tar.gz
    7.72 +Source9:      http://www.squirrelmail.org/plugins/folder_sizes-%{V_plugin_foldersize}.tar.gz
    7.73 +Source10:     http://www.squirrelmail.org/plugins/gpg-%{V_plugin_gnupg}.tar.gz
    7.74 +Source11:     http://www.squirrelmail.org/plugins/ldifimport-%{V_plugin_ldif}.tar.gz
    7.75 +Source12:     http://www.squirrelmail.org/plugins/pupdate.%{V_plugin_update}.tar.gz
    7.76 +Source13:     http://www.squirrelmail.org/plugins/show_user_and_ip-%{V_plugin_userip}.tar.gz
    7.77 +Source14:     http://www.squirrelmail.org/plugins/smallcal-%{V_plugin_smallcal}.tar.gz
    7.78 +Source15:     http://www.squirrelmail.org/plugins/vkeyboard-%{V_plugin_vkeyboard}.tar.gz
    7.79 +Source16:     http://www.squirrelmail.org/plugins/username-%{V_plugin_username}.tar.gz
    7.80 +Source17:     http://www.squirrelmail.org/plugins/login_notes-%{V_plugin_loginnotes}.tar.gz
    7.81 +Source18:     http://www.squirrelmail.org/plugins/password_forget-%{V_plugin_passforget}.tar.gz
    7.82 +Source19:     http://www.squirrelmail.org/plugins/captcha-%{V_plugin_captcha}.tar.gz
    7.83 +Source20:     http://www.squirrelmail.org/plugins/smime-%{V_plugin_smime}.tar.gz
    7.84 +Source21:     http://www.squirrelmail.org/plugins/debugger-%{V_plugin_debug}.tar.gz
    7.85 +Source22:     config.php
    7.86 +Source23:     defprefs.txt
    7.87 +Source24:     opkg_large.png
    7.88 +Source25:     opkg_small.png
    7.89 +Source26:     rc.squirrelmail
    7.90 +Source27:     squirrelmail.conf
    7.91 +Source28:     config_local_kolab.php
    7.92 +Source29:     index.php
    7.93  Patch0:       squirrelmail.patch
    7.94  Patch1:       squirrelmail.patch.plugins
    7.95  
    7.96 @@ -94,8 +106,8 @@
    7.97  AutoReqProv:  no
    7.98  
    7.99  %description
   7.100 -    SquirrelMail is a standards-based webmail package written in PHP. It
   7.101 -    includes built-in pure PHP support for the IMAP and SMTP protocols,
   7.102 +    SquirrelMail is a standards based webmail package written in PHP. It
   7.103 +    includes built in pure PHP support for the IMAP and SMTP protocols,
   7.104      and all pages render in pure HTML 4.0 (with no Javascript) for
   7.105      maximum compatibility across browsers. It has very few requirements
   7.106      and is very easy to configure and install. SquirrelMail has all the
   7.107 @@ -146,6 +158,13 @@
   7.108          url       = http://www.squirrelmail.org/plugins_category.php?category_id=all
   7.109          regex     = chg_sasl_passwd-(\d+\.\d+\.\d+-\d+\.\d+)\.tar\.gz
   7.110      }
   7.111 +    prog squirrelmail:ldappwd = {
   7.112 +        comment   = "cs: untrackable due to CMS generated URLs"
   7.113 +        disabled
   7.114 +        version   = %{V_plugin_ldappwd}
   7.115 +        url       = http://www.squirrelmail.org/plugins_category.php?category_id=all
   7.116 +        regex     = change_ldappass-(\d+\.\d+-\d+\.\d+\.\d+)\.tar\.gz
   7.117 +    }
   7.118      prog squirrelmail:checkquota = {
   7.119          comment   = "cs: untrackable due to CMS generated URLs"
   7.120          disabled
   7.121 @@ -165,7 +184,7 @@
   7.122          disabled
   7.123          version   = %{V_plugin_gnupg}
   7.124          url       = http://www.squirrelmail.org/plugins_category.php?category_id=all
   7.125 -        regex     = gpg.(\d+\.\d+\.\d+-\d+\.\d+\.\d+)\.tar\.gz
   7.126 +        regex     = gpg-(\d+\.\d+)\.tar\.gz
   7.127      }
   7.128      prog squirrelmail:ldif = {
   7.129          comment   = "cs: untrackable due to CMS generated URLs"
   7.130 @@ -209,6 +228,41 @@
   7.131          url       = http://www.squirrelmail.org/plugins_category.php?category_id=all
   7.132          regex     = username-(__VER__)\.tar\.gz
   7.133      }
   7.134 +    prog squirrelmail:loginnotes = {
   7.135 +        comment   = "cs: untrackable due to CMS generated URLs"
   7.136 +        disabled
   7.137 +        version   = %{V_plugin_loginnotes}
   7.138 +        url       = http://www.squirrelmail.org/plugins_category.php?category_id=all
   7.139 +        regex     = login_notes--(__VER__)\.tar\.gz
   7.140 +    }
   7.141 +    prog squirrelmail:passforget = {
   7.142 +        comment   = "cs: untrackable due to CMS generated URLs"
   7.143 +        disabled
   7.144 +        version   = %{V_plugin_passforget}
   7.145 +        url       = http://www.squirrelmail.org/plugins_category.php?category_id=all
   7.146 +        regex     = password_forget-(__VER__)\.tar\.gz
   7.147 +    }
   7.148 +    prog squirrelmail:captcha = {
   7.149 +        comment   = "cs: untrackable due to CMS generated URLs"
   7.150 +        disabled
   7.151 +        version   = %{V_plugin_captcha}
   7.152 +        url       = http://www.squirrelmail.org/plugins_category.php?category_id=all
   7.153 +        regex     = captcha-(__VER__)\.tar\.gz
   7.154 +    }
   7.155 +    prog squirrelmail:smime = {
   7.156 +        comment   = "cs: untrackable due to CMS generated URLs"
   7.157 +        disabled
   7.158 +        version   = %{V_plugin_smime}
   7.159 +        url       = http://www.squirrelmail.org/plugins_category.php?category_id=all
   7.160 +        regex     = smime-(__VER__)\.tar\.gz
   7.161 +    }
   7.162 +    prog squirrelmail:debugger = {
   7.163 +        comment   = "cs: untrackable due to CMS generated URLs"
   7.164 +        disabled
   7.165 +        version   = %{V_plugin_debug}
   7.166 +        url       = http://www.squirrelmail.org/plugins_category.php?category_id=all
   7.167 +        regex     = debugger-(__VER__)\.tar\.gz
   7.168 +    }
   7.169  
   7.170  %prep
   7.171      %setup -q -c -n squirrelmail
   7.172 @@ -230,11 +284,18 @@
   7.173      %setup -q -D -T -a 13 -n squirrelmail
   7.174      %setup -q -D -T -a 14 -n squirrelmail
   7.175      %setup -q -D -T -a 15 -n squirrelmail
   7.176 +    %setup -q -D -T -a 16 -n squirrelmail
   7.177 +    %setup -q -D -T -a 17 -n squirrelmail
   7.178 +    %setup -q -D -T -a 18 -n squirrelmail
   7.179 +    %setup -q -D -T -a 19 -n squirrelmail
   7.180 +    %setup -q -D -T -a 20 -n squirrelmail
   7.181 +    %setup -q -D -T -a 21 -n squirrelmail
   7.182  
   7.183      #   move additional plugins where other are already placed
   7.184      for plug in addgraphics avelsieve check_quota chg_sasl_passwd \
   7.185 -                folder_sizes gpg ldifimport pupdate show_user_and_ip \
   7.186 -                smallcal vkeyboard username; do
   7.187 +                change_ldappass folder_sizes gpg ldifimport pupdate \
   7.188 +                show_user_and_ip smallcal vkeyboard username \
   7.189 +                login_notes password_forget captcha smime debugger; do
   7.190          mv $plug squirrelmail-%{V_squirrelmail}/plugins
   7.191      done
   7.192  %endif
   7.193 @@ -266,7 +327,7 @@
   7.194  
   7.195        #   postadjustment cosmetics
   7.196        %{l_shtool} subst \
   7.197 -          -e 's;\(#ffffff., .border="0" width=\)"350";\1"250";1' \
   7.198 +          -e 's;\(\$color\[4\], .border="0" width=\)"350";\1"250";1' \
   7.199            src/login.php
   7.200  
   7.201        #   set default prefs
   7.202 @@ -329,10 +390,6 @@
   7.203  
   7.204        #   install plugin config files
   7.205        ( cd $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins
   7.206 -        %{l_shtool} subst \
   7.207 -            -e 's;../data/access_log;../../../var/squirrelmail/log/access.log;' \
   7.208 -            -e 's;\(\$sl_dateformat = \)"m/d/Y G:i:s";\1"d/m/Y G:i:s";' \
   7.209 -            squirrel_logger/setup.php
   7.210  %if "%{with_plugins}" == "yes"
   7.211          cp -pf check_quota/config.sample.php check_quota/config.php
   7.212          cp -pf chg_sasl_passwd/config.php.sample chg_sasl_passwd/config.php
   7.213 @@ -351,6 +408,32 @@
   7.214              -e 's/^\(\$startitems =\).*/\1 4;/' \
   7.215              avelsieve/config/config_sample.php \
   7.216              avelsieve/config/config.php
   7.217 +        %{l_shtool} install -c -m 644 \
   7.218 +            change_ldappass/config_sample.php \
   7.219 +            change_ldappass/config.php
   7.220 +        %{l_shtool} install -c -m 644 \
   7.221 +            login_notes/config.sample.php \
   7.222 +            login_notes/config.php
   7.223 +        %{l_shtool} install -c -m 644 \
   7.224 +            password_forget/config_example.php \
   7.225 +            password_forget/config.php
   7.226 +        %{l_shtool} install -c -m 644 \
   7.227 +            -e 's;^//\( *\'CAPTCHA\'\);\1;g' \
   7.228 +            -e 's;\(\$sl_logfile *=\);\1 \'%{l_prefix}/var/squirrelmail/log/squirrelmail.log\';' \
   7.229 +            squirrel_logger/config_example.php \
   7.230 +            squirrel_logger/config.php
   7.231 +        %{l_shtool} install -c -m 644 \
   7.232 +            -e 's;\(\$log_CAPTCHA_events =\).*;\1 1;' \
   7.233 +            -e 's;\(\$captcha_backend =\).*;\1 \'recaptcha\';' \
   7.234 +            captcha/config_example.php \
   7.235 +            captcha/config.php
   7.236 +        %{l_shtool} install -c -m 644 \
   7.237 +            -e 's;\(\$captcha_backend =\).*;\1 \'recaptcha\';' \
   7.238 +            captcha/backends/recaptcha/recaptcha_config_example.php \
   7.239 +            captcha/backends/recaptcha/recaptcha_config.php
   7.240 +        %{l_shtool} install -c -m 644 \
   7.241 +            smime/config_example.php \
   7.242 +            smime/config.php
   7.243          %{l_shtool} subst \
   7.244              -e 's;\(path_to_gpg=\)/usr/bin/gpg.*;\1%{l_prefix}/bin/gpg;' \
   7.245              gpg/gpg_local_prefs.txt
   7.246 @@ -394,13 +477,17 @@
   7.247          %{SOURCE rc.squirrelmail} \
   7.248          $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   7.249  
   7.250 +    #   correct path to optional perl interpreter
   7.251 +    %{l_shtool} subst \
   7.252 +        -e 's;#!/usr/bin/env perl;#! %{l_prefix}/bin/perl;' \
   7.253 +        $RPM_BUILD_ROOT%{l_prefix}/bin/squirrelconf
   7.254 +
   7.255      #   replace false /etc config paths throughout
   7.256      %{l_shtool} subst \
   7.257          -e 's;SM_PATH \. \(.\)config/;\1%{l_prefix}/etc/squirrelmail/;g' \
   7.258          -e 's;require_once(SM_PATH \. \(.*\)%{l_prefix};require_once(\1%{l_prefix};g' \
   7.259          $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/functions/*.php \
   7.260          $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/include/*.php \
   7.261 -        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/abook_take/*.php \
   7.262          $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/administrator/*.php \
   7.263          $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/calendar/*.php \
   7.264          $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/src/*.php
   7.265 @@ -425,21 +512,44 @@
   7.266      #   determine package ingredients and tag config files
   7.267      %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
   7.268          %{l_files_std} \
   7.269 -        '%config %{l_prefix}/etc/squirrelmail/*' \
   7.270 -        '%config %{l_prefix}/share/squirrelmail/prefs/*' \
   7.271 -        '%config %{l_prefix}/share/squirrelmail/plugins/squirrelspell/sqspell_config.php' \
   7.272 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/etc/squirrelmail/*' \
   7.273 +
   7.274 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/prefs/*' \
   7.275 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/squirrelspell/sqspell_config.php' \
   7.276  %if "%{with_plugins}" == "yes"
   7.277 -        '%config %{l_prefix}/share/squirrelmail/plugins/addgraphics/config.php' \
   7.278 -        '%config %{l_prefix}/share/squirrelmail/plugins/avelsieve/config/config.php' \
   7.279 -        '%config %{l_prefix}/share/squirrelmail/plugins/check_quota/config.php' \
   7.280 -        '%config %{l_prefix}/share/squirrelmail/plugins/chg_sasl_passwd/config.php' \
   7.281 -        '%config %{l_prefix}/share/squirrelmail/plugins/folder_sizes/folder_sizes.php' \
   7.282 -        '%config %{l_prefix}/share/squirrelmail/plugins/gpg/gpg_local_prefs.txt' \
   7.283 -        '%config %{l_prefix}/share/squirrelmail/plugins/ldifimport/config.php' \
   7.284 -        '%config %{l_prefix}/share/squirrelmail/plugins/pupdate/config.php' \
   7.285 -        '%config %{l_prefix}/share/squirrelmail/plugins/show_user_and_ip/config.php' \
   7.286 -        '%config %{l_prefix}/share/squirrelmail/plugins/vkeyboard/config.php' \
   7.287 -        '%config %{l_prefix}/share/squirrelmail/plugins/username/config.php' \
   7.288 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/addgraphics/config.php' \
   7.289 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/avelsieve/config/config.php' \
   7.290 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/check_quota/config.php' \
   7.291 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/chg_sasl_passwd/config.php' \
   7.292 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/change_ldappass/config.php' \
   7.293 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/folder_sizes/folder_sizes.php' \
   7.294 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/gpg/gpg_local_prefs.txt' \
   7.295 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/ldifimport/config.php' \
   7.296 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/pupdate/config.php' \
   7.297 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/show_user_and_ip/config.php' \
   7.298 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/vkeyboard/config.php' \
   7.299 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/username/config.php' \
   7.300 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/login_notes/config.php' \
   7.301 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/password_forget/config.php' \
   7.302 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/config.php' \
   7.303 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/b2evo/b2evo_config.php' \
   7.304 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/captcha_php/captcha_php_config.php' \
   7.305 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/csi/csi_config.php' \
   7.306 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/freecap/freecap_config.php' \
   7.307 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/hec/hec_config.php' \
   7.308 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/hn_captcha/hn_captcha_config.php' \
   7.309 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/index.php/index.php_config.php' \
   7.310 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/meezerk/meezerk_config.php' \
   7.311 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/opencaptcha/opencaptcha_config.php' \
   7.312 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/phpcaptcha/phpcaptcha_config.php' \
   7.313 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/quickcaptcha/quickcaptcha_config.php' \
   7.314 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/quickform/quickform_config.php' \
   7.315 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/recaptcha/recaptcha_config.php' \
   7.316 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/textcapnum/textcapnum_config.php' \
   7.317 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/textcaptcha/textcaptcha_config.php' \
   7.318 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/watercap/watercap_config.php' \
   7.319 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/smime/config.php' \
   7.320 +        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/debugger/setup.php' \
   7.321  %endif
   7.322          '%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/share/squirrelmail/prefs' \
   7.323          '%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/squirrelmail/spool/attach' \

mercurial