# HG changeset patch # User Michael Schloh von Bennewitz # Date 1240004408 -7200 # Node ID 5524672ebbe7d184dcb92071f4003d1e80787ecd # Parent f144dd621b72c31a655dd1d2759bfce7e7c55283 Update and completely overhaul packaging and build configuration. diff -r f144dd621b72 -r 5524672ebbe7 squirrelmail/config.php --- a/squirrelmail/config.php Fri Apr 17 23:07:57 2009 +0200 +++ b/squirrelmail/config.php Fri Apr 17 23:40:08 2009 +0200 @@ -6,26 +6,24 @@ */ global $version; -$config_version = '1.4.0'; +$config_version = '1.4.0'; $config_use_color = 1; -$org_name = "Email"; -$org_logo = SM_PATH . 'images/opkg_large.png'; +$org_name = "Provisional Email"; +$org_logo = SM_PATH . 'images/opkg_large.png'; $org_logo_width = '277'; $org_logo_height = '88'; -$org_title = "SquirrelMail $version"; -$signout_page = ''; -$frame_top = '_top'; +$org_title = "SquirrelMail $version"; +$signout_page = ''; +$frame_top = '_top'; -$provider_uri = 'http://www.openpkg.org/'; - -$provider_name = 'OpenPKG'; - -$motd = ""; +$motd = ""; +$provider_uri = 'http://www.openpkg.org/'; +$provider_name = 'OpenPKG'; $squirrelmail_default_language = 'de_DE'; -$default_charset = 'iso-8859-1'; -$lossy_encoding = false; +$default_charset = 'iso-8859-1'; +$lossy_encoding = false; $domain = '@l_fqdm@'; $imapServerAddress = '@l_fqdm@'; @@ -35,14 +33,14 @@ $smtpPort = 25; $sendmail_path = '@l_prefix@/sbin/sendmail'; $pop_before_smtp = false; -$imap_server_type = 'cyrus'; +$imap_server_type = 'dovecot'; $invert_time = false; -$optional_delimiter = '.'; +$optional_delimiter = 'detect'; $default_folder_prefix = ''; -$trash_folder = 'INBOX.Trash'; -$sent_folder = 'INBOX.Sent'; -$draft_folder = 'INBOX.Drafts'; +$trash_folder = 'Trash'; +$sent_folder = 'Sent'; +$draft_folder = 'Drafts'; $default_move_to_trash = true; $default_move_to_sent = true; $default_save_as_draft = true; @@ -55,19 +53,20 @@ $default_unseen_notify = 2; $default_unseen_type = 1; $auto_create_special = false; -$delete_folder = true; +$delete_folder = false; $noselect_fix_enable = false; $data_dir = '@l_prefix@/share/squirrelmail/prefs/'; $attachment_dir = '@l_prefix@/var/squirrelmail/spool/attach/'; $dir_hash_level = 1; $default_left_size = '224'; -$force_username_lowercase = false; +$force_username_lowercase = true; $default_use_priority = true; $hide_sm_attributions = false; $default_use_mdn = true; $edit_identity = true; $edit_name = true; +$hide_auth_header = true; $allow_thread_sort = true; $allow_server_sort = true; $allow_charset_search = true; @@ -91,103 +90,81 @@ /* NOP, for patch line placeholder (avoids fuzz) */ $theme_css = ''; -$theme_default = 0; -$theme[0]['PATH'] = '@l_prefix@/share/squirrelmail/themes/default_theme.php'; -$theme[0]['NAME'] = 'Default'; -$theme[1]['PATH'] = '@l_prefix@/share/squirrelmail/themes/plain_blue_theme.php'; -$theme[1]['NAME'] = 'Plain Blue'; -$theme[2]['PATH'] = '@l_prefix@/share/squirrelmail/themes/sandstorm_theme.php'; -$theme[2]['NAME'] = 'Sand Storm'; +$theme_default = 4; +$theme[0]['PATH'] = '@l_prefix@/share/squirrelmail/themes/bluesome.php'; +$theme[0]['NAME'] = 'Bluesome'; +$theme[1]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dark_green.php'; +$theme[1]['NAME'] = 'Dark Green'; +$theme[2]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dark_grey_theme.php'; +$theme[2]['NAME'] = 'Dark Grey'; $theme[3]['PATH'] = '@l_prefix@/share/squirrelmail/themes/deepocean_theme.php'; $theme[3]['NAME'] = 'Deep Ocean'; -$theme[4]['PATH'] = '@l_prefix@/share/squirrelmail/themes/slashdot_theme.php'; -$theme[4]['NAME'] = 'Slashdot'; -$theme[5]['PATH'] = '@l_prefix@/share/squirrelmail/themes/purple_theme.php'; -$theme[5]['NAME'] = 'Purple'; -$theme[6]['PATH'] = '@l_prefix@/share/squirrelmail/themes/forest_theme.php'; -$theme[6]['NAME'] = 'Forest'; -$theme[7]['PATH'] = '@l_prefix@/share/squirrelmail/themes/ice_theme.php'; -$theme[7]['NAME'] = 'Ice'; -$theme[8]['PATH'] = '@l_prefix@/share/squirrelmail/themes/seaspray_theme.php'; -$theme[8]['NAME'] = 'Sea Spray'; -$theme[9]['PATH'] = '@l_prefix@/share/squirrelmail/themes/bluesteel_theme.php'; -$theme[9]['NAME'] = 'Blue Steel'; -$theme[10]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dark_grey_theme.php'; -$theme[10]['NAME'] = 'Dark Grey'; -$theme[11]['PATH'] = '@l_prefix@/share/squirrelmail/themes/high_contrast_theme.php'; -$theme[11]['NAME'] = 'High Contrast'; -$theme[12]['PATH'] = '@l_prefix@/share/squirrelmail/themes/black_bean_burrito_theme.php'; -$theme[12]['NAME'] = 'Black Bean Burrito'; -$theme[13]['PATH'] = '@l_prefix@/share/squirrelmail/themes/servery_theme.php'; -$theme[13]['NAME'] = 'Servery'; -$theme[14]['PATH'] = '@l_prefix@/share/squirrelmail/themes/maize_theme.php'; -$theme[14]['NAME'] = 'Maize'; -$theme[15]['PATH'] = '@l_prefix@/share/squirrelmail/themes/bluesnews_theme.php'; -$theme[15]['NAME'] = 'BluesNews'; -$theme[16]['PATH'] = '@l_prefix@/share/squirrelmail/themes/deepocean2_theme.php'; -$theme[16]['NAME'] = 'Deep Ocean 2'; -$theme[17]['PATH'] = '@l_prefix@/share/squirrelmail/themes/blue_grey_theme.php'; -$theme[17]['NAME'] = 'Blue Grey'; -$theme[18]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dompie_theme.php'; -$theme[18]['NAME'] = 'Dompie'; -$theme[19]['PATH'] = '@l_prefix@/share/squirrelmail/themes/methodical_theme.php'; -$theme[19]['NAME'] = 'Methodical'; -$theme[20]['PATH'] = '@l_prefix@/share/squirrelmail/themes/greenhouse_effect.php'; -$theme[20]['NAME'] = 'Greenhouse Effect (Changes)'; -$theme[21]['PATH'] = '@l_prefix@/share/squirrelmail/themes/in_the_pink.php'; -$theme[21]['NAME'] = 'In The Pink (Changes)'; -$theme[22]['PATH'] = '@l_prefix@/share/squirrelmail/themes/kind_of_blue.php'; -$theme[22]['NAME'] = 'Kind of Blue (Changes)'; -$theme[23]['PATH'] = '@l_prefix@/share/squirrelmail/themes/monostochastic.php'; -$theme[23]['NAME'] = 'Monostochastic (Changes)'; -$theme[24]['PATH'] = '@l_prefix@/share/squirrelmail/themes/shades_of_grey.php'; -$theme[24]['NAME'] = 'Shades of Grey (Changes)'; -$theme[25]['PATH'] = '@l_prefix@/share/squirrelmail/themes/spice_of_life.php'; -$theme[25]['NAME'] = 'Spice of Life (Changes)'; -$theme[26]['PATH'] = '@l_prefix@/share/squirrelmail/themes/spice_of_life_lite.php'; -$theme[26]['NAME'] = 'Spice of Life - Lite (Changes)'; -$theme[27]['PATH'] = '@l_prefix@/share/squirrelmail/themes/spice_of_life_dark.php'; -$theme[27]['NAME'] = 'Spice of Life - Dark (Changes)'; -$theme[28]['PATH'] = '@l_prefix@/share/squirrelmail/themes/christmas.php'; -$theme[28]['NAME'] = 'Holiday - Christmas'; -$theme[29]['PATH'] = '@l_prefix@/share/squirrelmail/themes/darkness.php'; -$theme[29]['NAME'] = 'Darkness (Changes)'; -$theme[30]['PATH'] = '@l_prefix@/share/squirrelmail/themes/random.php'; -$theme[30]['NAME'] = 'Random (Changes every login)'; -$theme[31]['PATH'] = '@l_prefix@/share/squirrelmail/themes/midnight.php'; -$theme[31]['NAME'] = 'Midnight'; -$theme[32]['PATH'] = '@l_prefix@/share/squirrelmail/themes/alien_glow.php'; -$theme[32]['NAME'] = 'Alien Glow'; -$theme[33]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dark_green.php'; -$theme[33]['NAME'] = 'Dark Green'; -$theme[34]['PATH'] = '@l_prefix@/share/squirrelmail/themes/penguin.php'; -$theme[34]['NAME'] = 'Penguin'; +$theme[4]['PATH'] = '@l_prefix@/share/squirrelmail/themes/default_theme.php'; +$theme[4]['NAME'] = 'Default'; +$theme[5]['PATH'] = '@l_prefix@/share/squirrelmail/themes/forest_theme.php'; +$theme[5]['NAME'] = 'Forest'; +$theme[6]['PATH'] = '@l_prefix@/share/squirrelmail/themes/ice_theme.php'; +$theme[6]['NAME'] = 'Ice'; +$theme[7]['PATH'] = '@l_prefix@/share/squirrelmail/themes/maize_theme.php'; +$theme[7]['NAME'] = 'Maize'; +$theme[8]['PATH'] = '@l_prefix@/share/squirrelmail/themes/purple_theme.php'; +$theme[8]['NAME'] = 'Purple'; +$theme[9]['PATH'] = '@l_prefix@/share/squirrelmail/themes/sandstorm_theme.php'; +$theme[9]['NAME'] = 'Sand Storm'; +$theme[10]['PATH'] = '@l_prefix@/share/squirrelmail/themes/seaspray_theme.php'; +$theme[10]['NAME'] = 'Sea Spray'; +$theme[11]['PATH'] = '@l_prefix@/share/squirrelmail/themes/servery_theme.php'; +$theme[11]['NAME'] = 'Servery'; +$theme[12]['PATH'] = '@l_prefix@/share/squirrelmail/themes/silver_steel_theme.php'; +$theme[12]['NAME'] = 'SilverSteel'; +$theme[13]['PATH'] = '@l_prefix@/share/squirrelmail/themes/simple_green_theme.php'; +$theme[13]['NAME'] = 'SimpleGreen'; +$theme[14]['PATH'] = '@l_prefix@/share/squirrelmail/themes/simple_purple.php'; +$theme[14]['NAME'] = 'SimplePurple'; +$theme[15]['PATH'] = '@l_prefix@/share/squirrelmail/themes/wood_theme.php'; +$theme[15]['NAME'] = 'Wood'; -$default_use_javascript_addr_book = false; -$abook_global_file = ''; -$abook_global_file_writeable = false; +$ldap_server[0] = array( + 'host' => 'ldaps://ldap.host.tld:636/', + 'base' => 'dc=region,dc=domain,dc=tld', + 'name' => 'Serveur LDAP', + 'port' => 636, + 'binddn' => 'cn=user,dc=domain,dc=tld', + 'bindpw' => 'password', + 'protocol' => 3 +); -$addrbook_dsn = ''; -$addrbook_table = 'address'; +$addrbook_dsn = ''; +$addrbook_table = 'address'; +$abook_global_file = ''; +$abook_global_file_writeable = false; +$abook_global_file_listing = true; +$abook_file_line_length = 2048; +$default_use_javascript_addr_book = true; -$prefs_dsn = ''; -$prefs_table = 'userprefs'; -$prefs_user_field = 'user'; -$prefs_key_field = 'prefkey'; -$prefs_val_field = 'prefval'; -$addrbook_global_dsn = ''; -$addrbook_global_table = 'global_abook'; +$prefs_dsn = ''; +$prefs_table = 'userprefs'; +$prefs_user_field = 'user'; +$prefs_key_field = 'prefkey'; +$prefs_val_field = 'prefval'; +$addrbook_global_dsn = ''; +$addrbook_global_table = 'global_abook'; $addrbook_global_writeable = false; -$addrbook_global_listing = false; +$addrbook_global_listing = false; -$no_list_for_subscribe = false; -$smtp_auth_mech = 'digest-md5'; -$imap_auth_mech = 'digest-md5'; -$use_imap_tls = false; -$use_smtp_tls = false; -$session_name = 'SQMSESSID'; +$no_list_for_subscribe = false; +$smtp_auth_mech = 'digest-md5'; +$imap_auth_mech = 'digest-md5'; +$smtp_sitewide_user = ''; +$smtp_sitewide_pass = ''; +$use_imap_tls = false; +$use_smtp_tls = false; +$session_name = 'SQMSESSID'; +$only_secure_cookies = true; -@include 'config_local.php'; +$config_location_base = ''; + +@include SM_PATH . 'config_local.php'; /** * Make sure there are no characters after the PHP closing diff -r f144dd621b72 -r 5524672ebbe7 squirrelmail/defprefs.txt --- a/squirrelmail/defprefs.txt Fri Apr 17 23:07:57 2009 +0200 +++ b/squirrelmail/defprefs.txt Fri Apr 17 23:40:08 2009 +0200 @@ -22,17 +22,17 @@ smallcal_header=#770000 smallcal_calendar=Personal move_to_trash=1 -trash_folder=INBOX/Trash +trash_folder=INBOX.Trash save_as_draft=1 -draft_folder=INBOX/Drafts +draft_folder=INBOX.Drafts move_to_sent=1 -sent_folder=INBOX/Sent +sent_folder=INBOX.Sent left_size=220 folder_sizes_left_link=1 folder_sizes_on_folder_page=0 folder_sizes_subtotals=0 wrap_at=72 -custom_css=sans-10.css +custom_css=sans-12.css newmail_enable=on newmail_changetitle=on translate_server=babelfish diff -r f144dd621b72 -r 5524672ebbe7 squirrelmail/index.php --- a/squirrelmail/index.php Fri Apr 17 23:07:57 2009 +0200 +++ b/squirrelmail/index.php Fri Apr 17 23:40:08 2009 +0200 @@ -1,9 +1,8 @@ diff -r f144dd621b72 -r 5524672ebbe7 squirrelmail/squirrelmail.conf --- a/squirrelmail/squirrelmail.conf Fri Apr 17 23:07:57 2009 +0200 +++ b/squirrelmail/squirrelmail.conf Fri Apr 17 23:40:08 2009 +0200 @@ -1,3 +1,2 @@ - Alias /webmail @l_prefix@/share/squirrelmail diff -r f144dd621b72 -r 5524672ebbe7 squirrelmail/squirrelmail.patch --- a/squirrelmail/squirrelmail.patch Fri Apr 17 23:07:57 2009 +0200 +++ b/squirrelmail/squirrelmail.patch Fri Apr 17 23:40:08 2009 +0200 @@ -1,7 +1,7 @@ Index: functions/display_messages.php --- functions/display_messages.php.orig 2005-03-21 23:18:32 +0100 +++ functions/display_messages.php 2005-07-30 21:15:29 +0200 -@@ -88,8 +88,8 @@ +@@ -97,8 +97,8 @@ "\"$width_and_height />
\n"; } echo ( $hide_sm_attributions ? '' : @@ -15,7 +15,7 @@ Index: functions/imap_general.php --- functions/imap_general.php.orig 2005-05-20 12:37:34 +0200 +++ functions/imap_general.php 2005-07-30 21:14:27 +0200 -@@ -568,6 +568,7 @@ +@@ -578,6 +578,7 @@ set_up_language($squirrelmail_language, true); include_once(SM_PATH . 'functions/display_messages.php' ); @@ -26,7 +26,7 @@ Index: src/login.php --- src/login.php.orig 2005-06-22 15:45:35 +0200 +++ src/login.php 2005-07-30 21:15:39 +0200 -@@ -132,8 +132,8 @@ +@@ -196,8 +196,8 @@ ' />
' . "\n" : '' ). ( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' : 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; + } ++ } + } + + diff -r f144dd621b72 -r 5524672ebbe7 squirrelmail/squirrelmail.spec --- a/squirrelmail/squirrelmail.spec Fri Apr 17 23:07:57 2009 +0200 +++ b/squirrelmail/squirrelmail.spec Fri Apr 17 23:40:08 2009 +0200 @@ -24,20 +24,26 @@ # package version %define V_squirrelmail 1.4.17 %define V_locale 1.4.13-20071220 -%define V_plugin_compat 2.0.9-1.0 -%define V_plugin_logger 1.4.0-1.0.6 +%define V_plugin_compat 2.0.14-1.0 +%define V_plugin_logger 2.3-1.2.7 %define V_plugin_addgraphics 2.3-1.0.3 -%define V_plugin_avelsieve 1.9.7 +%define V_plugin_avelsieve 1.9.4 %define V_plugin_saslpwd 1.4.1-1.4 +%define V_plugin_ldappwd 2.2-1.4.0 %define V_plugin_checkquota 2.2-1.4.0 %define V_plugin_foldersize 1.5-1.4.0 -%define V_plugin_gnupg 2.0.1-1.4.2 +%define V_plugin_gnupg 2.1 %define V_plugin_ldif 1.4-1.2.x %define V_plugin_update 0.7-1.4.2 %define V_plugin_userip 3.3-re-1.2.2 %define V_plugin_smallcal 0.8-1.2.3 -%define V_plugin_vkeyboard 0.9 +%define V_plugin_vkeyboard 0.9.1 %define V_plugin_username 2.3-1.0.0 +%define V_plugin_loginnotes 1.2-1.4.0 +%define V_plugin_passforget 2.2-1.0.1 +%define V_plugin_captcha 1.2-1.2.9 +%define V_plugin_smime 0.7-1.1.1 +%define V_plugin_debug 1.2-1.4 # package information Name: squirrelmail @@ -50,7 +56,7 @@ Group: Mail License: GPL Version: %{V_squirrelmail} -Release: 20090327 +Release: 20090416 # package options %option with_plugins no @@ -60,27 +66,33 @@ Source0: http://switch.dl.sourceforge.net/squirrelmail/squirrelmail-%{V_squirrelmail}.tar.bz2 Source1: http://switch.dl.sourceforge.net/squirrelmail/all_locales-%{V_locale}.tar.bz2 Source2: http://www.squirrelmail.org/plugins/compatibility-%{V_plugin_compat}.tar.gz -Source3: http://www.squeaksoft.com/products/SquirrelLogger/squirrel_logger.%{V_plugin_logger}.tar.gz +Source3: http://www.squirrelmail.org/plugins/squirrel_logger-%{V_plugin_logger}.tar.gz Source4: http://www.squirrelmail.org/plugins/addgraphics-%{V_plugin_addgraphics}.tar.gz Source5: http://www.squirrelmail.org/plugins/avelsieve-%{V_plugin_avelsieve}.tar.gz Source6: http://www.squirrelmail.org/plugins/chg_sasl_passwd-%{V_plugin_saslpwd}.tar.gz -Source7: http://www.squirrelmail.org/plugins/check_quota-%{V_plugin_checkquota}.tar.gz -Source8: http://www.squirrelmail.org/plugins/folder_sizes-%{V_plugin_foldersize}.tar.gz -Source9: http://www.squirrelmail.org/plugins/gpg.%{V_plugin_gnupg}.tar.gz -Source10: http://www.squirrelmail.org/plugins/ldifimport-%{V_plugin_ldif}.tar.gz -Source11: http://www.squirrelmail.org/plugins/pupdate.%{V_plugin_update}.tar.gz -Source12: http://www.squirrelmail.org/plugins/show_user_and_ip-%{V_plugin_userip}.tar.gz -Source13: http://www.squirrelmail.org/plugins/smallcal-%{V_plugin_smallcal}.tar.gz -Source14: http://www.squirrelmail.org/plugins/vkeyboard-%{V_plugin_vkeyboard}.tar.gz -Source15: http://www.squirrelmail.org/plugins/username-%{V_plugin_username}.tar.gz -Source16: config.php -Source17: defprefs.txt -Source18: opkg_large.png -Source19: opkg_small.png -Source20: rc.squirrelmail -Source21: squirrelmail.conf -Source22: config_local_kolab.php -Source23: index.php +Source7: http://www.squirrelmail.org/plugins/change_ldappass-%{V_plugin_ldappwd}.tar.gz +Source8: http://www.squirrelmail.org/plugins/check_quota-%{V_plugin_checkquota}.tar.gz +Source9: http://www.squirrelmail.org/plugins/folder_sizes-%{V_plugin_foldersize}.tar.gz +Source10: http://www.squirrelmail.org/plugins/gpg-%{V_plugin_gnupg}.tar.gz +Source11: http://www.squirrelmail.org/plugins/ldifimport-%{V_plugin_ldif}.tar.gz +Source12: http://www.squirrelmail.org/plugins/pupdate.%{V_plugin_update}.tar.gz +Source13: http://www.squirrelmail.org/plugins/show_user_and_ip-%{V_plugin_userip}.tar.gz +Source14: http://www.squirrelmail.org/plugins/smallcal-%{V_plugin_smallcal}.tar.gz +Source15: http://www.squirrelmail.org/plugins/vkeyboard-%{V_plugin_vkeyboard}.tar.gz +Source16: http://www.squirrelmail.org/plugins/username-%{V_plugin_username}.tar.gz +Source17: http://www.squirrelmail.org/plugins/login_notes-%{V_plugin_loginnotes}.tar.gz +Source18: http://www.squirrelmail.org/plugins/password_forget-%{V_plugin_passforget}.tar.gz +Source19: http://www.squirrelmail.org/plugins/captcha-%{V_plugin_captcha}.tar.gz +Source20: http://www.squirrelmail.org/plugins/smime-%{V_plugin_smime}.tar.gz +Source21: http://www.squirrelmail.org/plugins/debugger-%{V_plugin_debug}.tar.gz +Source22: config.php +Source23: defprefs.txt +Source24: opkg_large.png +Source25: opkg_small.png +Source26: rc.squirrelmail +Source27: squirrelmail.conf +Source28: config_local_kolab.php +Source29: index.php Patch0: squirrelmail.patch Patch1: squirrelmail.patch.plugins @@ -94,8 +106,8 @@ AutoReqProv: no %description - SquirrelMail is a standards-based webmail package written in PHP. It - includes built-in pure PHP support for the IMAP and SMTP protocols, + SquirrelMail is a standards based webmail package written in PHP. It + includes built in pure PHP support for the IMAP and SMTP protocols, and all pages render in pure HTML 4.0 (with no Javascript) for maximum compatibility across browsers. It has very few requirements and is very easy to configure and install. SquirrelMail has all the @@ -146,6 +158,13 @@ url = http://www.squirrelmail.org/plugins_category.php?category_id=all regex = chg_sasl_passwd-(\d+\.\d+\.\d+-\d+\.\d+)\.tar\.gz } + prog squirrelmail:ldappwd = { + comment = "cs: untrackable due to CMS generated URLs" + disabled + version = %{V_plugin_ldappwd} + url = http://www.squirrelmail.org/plugins_category.php?category_id=all + regex = change_ldappass-(\d+\.\d+-\d+\.\d+\.\d+)\.tar\.gz + } prog squirrelmail:checkquota = { comment = "cs: untrackable due to CMS generated URLs" disabled @@ -165,7 +184,7 @@ disabled version = %{V_plugin_gnupg} url = http://www.squirrelmail.org/plugins_category.php?category_id=all - regex = gpg.(\d+\.\d+\.\d+-\d+\.\d+\.\d+)\.tar\.gz + regex = gpg-(\d+\.\d+)\.tar\.gz } prog squirrelmail:ldif = { comment = "cs: untrackable due to CMS generated URLs" @@ -209,6 +228,41 @@ url = http://www.squirrelmail.org/plugins_category.php?category_id=all regex = username-(__VER__)\.tar\.gz } + prog squirrelmail:loginnotes = { + comment = "cs: untrackable due to CMS generated URLs" + disabled + version = %{V_plugin_loginnotes} + url = http://www.squirrelmail.org/plugins_category.php?category_id=all + regex = login_notes--(__VER__)\.tar\.gz + } + prog squirrelmail:passforget = { + comment = "cs: untrackable due to CMS generated URLs" + disabled + version = %{V_plugin_passforget} + url = http://www.squirrelmail.org/plugins_category.php?category_id=all + regex = password_forget-(__VER__)\.tar\.gz + } + prog squirrelmail:captcha = { + comment = "cs: untrackable due to CMS generated URLs" + disabled + version = %{V_plugin_captcha} + url = http://www.squirrelmail.org/plugins_category.php?category_id=all + regex = captcha-(__VER__)\.tar\.gz + } + prog squirrelmail:smime = { + comment = "cs: untrackable due to CMS generated URLs" + disabled + version = %{V_plugin_smime} + url = http://www.squirrelmail.org/plugins_category.php?category_id=all + regex = smime-(__VER__)\.tar\.gz + } + prog squirrelmail:debugger = { + comment = "cs: untrackable due to CMS generated URLs" + disabled + version = %{V_plugin_debug} + url = http://www.squirrelmail.org/plugins_category.php?category_id=all + regex = debugger-(__VER__)\.tar\.gz + } %prep %setup -q -c -n squirrelmail @@ -230,11 +284,18 @@ %setup -q -D -T -a 13 -n squirrelmail %setup -q -D -T -a 14 -n squirrelmail %setup -q -D -T -a 15 -n squirrelmail + %setup -q -D -T -a 16 -n squirrelmail + %setup -q -D -T -a 17 -n squirrelmail + %setup -q -D -T -a 18 -n squirrelmail + %setup -q -D -T -a 19 -n squirrelmail + %setup -q -D -T -a 20 -n squirrelmail + %setup -q -D -T -a 21 -n squirrelmail # move additional plugins where other are already placed for plug in addgraphics avelsieve check_quota chg_sasl_passwd \ - folder_sizes gpg ldifimport pupdate show_user_and_ip \ - smallcal vkeyboard username; do + change_ldappass folder_sizes gpg ldifimport pupdate \ + show_user_and_ip smallcal vkeyboard username \ + login_notes password_forget captcha smime debugger; do mv $plug squirrelmail-%{V_squirrelmail}/plugins done %endif @@ -266,7 +327,7 @@ # postadjustment cosmetics %{l_shtool} subst \ - -e 's;\(#ffffff., .border="0" width=\)"350";\1"250";1' \ + -e 's;\(\$color\[4\], .border="0" width=\)"350";\1"250";1' \ src/login.php # set default prefs @@ -329,10 +390,6 @@ # install plugin config files ( cd $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins - %{l_shtool} subst \ - -e 's;../data/access_log;../../../var/squirrelmail/log/access.log;' \ - -e 's;\(\$sl_dateformat = \)"m/d/Y G:i:s";\1"d/m/Y G:i:s";' \ - squirrel_logger/setup.php %if "%{with_plugins}" == "yes" cp -pf check_quota/config.sample.php check_quota/config.php cp -pf chg_sasl_passwd/config.php.sample chg_sasl_passwd/config.php @@ -351,6 +408,32 @@ -e 's/^\(\$startitems =\).*/\1 4;/' \ avelsieve/config/config_sample.php \ avelsieve/config/config.php + %{l_shtool} install -c -m 644 \ + change_ldappass/config_sample.php \ + change_ldappass/config.php + %{l_shtool} install -c -m 644 \ + login_notes/config.sample.php \ + login_notes/config.php + %{l_shtool} install -c -m 644 \ + password_forget/config_example.php \ + password_forget/config.php + %{l_shtool} install -c -m 644 \ + -e 's;^//\( *\'CAPTCHA\'\);\1;g' \ + -e 's;\(\$sl_logfile *=\);\1 \'%{l_prefix}/var/squirrelmail/log/squirrelmail.log\';' \ + squirrel_logger/config_example.php \ + squirrel_logger/config.php + %{l_shtool} install -c -m 644 \ + -e 's;\(\$log_CAPTCHA_events =\).*;\1 1;' \ + -e 's;\(\$captcha_backend =\).*;\1 \'recaptcha\';' \ + captcha/config_example.php \ + captcha/config.php + %{l_shtool} install -c -m 644 \ + -e 's;\(\$captcha_backend =\).*;\1 \'recaptcha\';' \ + captcha/backends/recaptcha/recaptcha_config_example.php \ + captcha/backends/recaptcha/recaptcha_config.php + %{l_shtool} install -c -m 644 \ + smime/config_example.php \ + smime/config.php %{l_shtool} subst \ -e 's;\(path_to_gpg=\)/usr/bin/gpg.*;\1%{l_prefix}/bin/gpg;' \ gpg/gpg_local_prefs.txt @@ -394,13 +477,17 @@ %{SOURCE rc.squirrelmail} \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ + # correct path to optional perl interpreter + %{l_shtool} subst \ + -e 's;#!/usr/bin/env perl;#! %{l_prefix}/bin/perl;' \ + $RPM_BUILD_ROOT%{l_prefix}/bin/squirrelconf + # replace false /etc config paths throughout %{l_shtool} subst \ -e 's;SM_PATH \. \(.\)config/;\1%{l_prefix}/etc/squirrelmail/;g' \ -e 's;require_once(SM_PATH \. \(.*\)%{l_prefix};require_once(\1%{l_prefix};g' \ $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/functions/*.php \ $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/include/*.php \ - $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/abook_take/*.php \ $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/administrator/*.php \ $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/calendar/*.php \ $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/src/*.php @@ -425,21 +512,44 @@ # determine package ingredients and tag config files %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ - '%config %{l_prefix}/etc/squirrelmail/*' \ - '%config %{l_prefix}/share/squirrelmail/prefs/*' \ - '%config %{l_prefix}/share/squirrelmail/plugins/squirrelspell/sqspell_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/etc/squirrelmail/*' \ + + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/prefs/*' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/squirrelspell/sqspell_config.php' \ %if "%{with_plugins}" == "yes" - '%config %{l_prefix}/share/squirrelmail/plugins/addgraphics/config.php' \ - '%config %{l_prefix}/share/squirrelmail/plugins/avelsieve/config/config.php' \ - '%config %{l_prefix}/share/squirrelmail/plugins/check_quota/config.php' \ - '%config %{l_prefix}/share/squirrelmail/plugins/chg_sasl_passwd/config.php' \ - '%config %{l_prefix}/share/squirrelmail/plugins/folder_sizes/folder_sizes.php' \ - '%config %{l_prefix}/share/squirrelmail/plugins/gpg/gpg_local_prefs.txt' \ - '%config %{l_prefix}/share/squirrelmail/plugins/ldifimport/config.php' \ - '%config %{l_prefix}/share/squirrelmail/plugins/pupdate/config.php' \ - '%config %{l_prefix}/share/squirrelmail/plugins/show_user_and_ip/config.php' \ - '%config %{l_prefix}/share/squirrelmail/plugins/vkeyboard/config.php' \ - '%config %{l_prefix}/share/squirrelmail/plugins/username/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/addgraphics/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/avelsieve/config/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/check_quota/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/chg_sasl_passwd/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/change_ldappass/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/folder_sizes/folder_sizes.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/gpg/gpg_local_prefs.txt' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/ldifimport/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/pupdate/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/show_user_and_ip/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/vkeyboard/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/username/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/login_notes/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/password_forget/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/b2evo/b2evo_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/captcha_php/captcha_php_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/csi/csi_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/freecap/freecap_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/hec/hec_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/hn_captcha/hn_captcha_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/index.php/index.php_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/meezerk/meezerk_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/opencaptcha/opencaptcha_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/phpcaptcha/phpcaptcha_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/quickcaptcha/quickcaptcha_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/quickform/quickform_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/recaptcha/recaptcha_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/textcapnum/textcapnum_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/textcaptcha/textcaptcha_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/watercap/watercap_config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/smime/config.php' \ + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/debugger/setup.php' \ %endif '%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/share/squirrelmail/prefs' \ '%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/squirrelmail/spool/attach' \