Sat, 24 Mar 2012 21:40:49 +0100
Introduce many changes to the buildconf and source code including:
(01) clean up, update, and partially update default config files,
(02) seems that Melware is unable to perform release engineering so
update chan_capi to new daily snapshot to solve echo problems,
(03) correct Asterisk inadequate hard coded gmime version check,
(04) force postgresql pthreads linkage to solve build problem,
(05) remove buggy hard coded LibXML configure definitions,
(06) remove local architecture specification to allow GCC
internal logic to determine proper CPU type instead,
(07) remove vendor sound install target causing uncontrolled
downloads and non RPM managed file installation,
(08) solve long outstanding bug in tcptls causing Asterisk
to ignore any intermediate CA certificate signatures,
(09) back out Digium engineering team's bright idea of replacing the
very portable and pervasive POSIX rand(1) with ast_random(), and
then not even implementing it causing all references to fail in
platforms not providing the very new POSIX.1-2008 mkdtemp(3)
function only distributed by BSD and some Linux,
(10) withdraw advanced linker symbol manipulations from SVR5 builds
until either Binutils supports hybrid versioned and anonymous
linker scripts or GCC stops hard coding versioned linker scripts,
(11) correct missing library linkage, some tailored to a specific OS,
(12) remove outdated logic for the no longer distributed gmime-config(1),
(13) remove local gmime buildconf hacks now that Asterisk has corrected
their own build configuration to almost portably support gmime,
(14) solve build problems relating to undetected LibXML paths,
(15) correct erroneous out of tree include definitions,
(16) improve some variable and comment naming,
(17) simplify sound language path hierarchy creation,
and correct australian english installation logic.
1 Index: etc/squirrelmail/config.php
2 diff -Nau etc/squirrelmail/config.php.orig etc/squirrelmail/config.php
3 --- etc/squirrelmail/config.php.orig 2005-03-16 13:02:25 +0100
4 +++ etc/squirrelmail/config.php 2005-03-16 12:31:51 +0100
5 @@ -90,6 +90,23 @@
6 $plugins[15] = 'squirrelspell';
7 $plugins[16] = 'translate';
9 +$plugins[17] = 'addgraphics';
10 +$plugins[18] = 'avelsieve';
11 +$plugins[19] = 'captcha';
12 +$plugins[20] = 'change_ldappass';
13 +$plugins[21] = 'check_quota';
14 +$plugins[22] = 'chg_sasl_passwd';
15 +$plugins[23] = 'folder_sizes';
16 +$plugins[24] = 'gpg';
17 +$plugins[25] = 'login_notes';
18 +$plugins[26] = 'password_forget';
19 +$plugins[27] = 'pupdate';
20 +$plugins[28] = 'show_user_and_ip';
21 +$plugins[29] = 'smallcal';
22 +$plugins[30] = 'smime';
23 +$plugins[31] = 'username';
24 +$plugins[32] = 'vkeyboard';
25 +
26 /* NOP, for patch line placeholder (avoids fuzz) */
27 $theme_css = '';
28 $theme_default = 4;
29 Index: share/squirrelmail/plugins/gpg/setup.php
30 diff -Nau share/squirrelmail/plugins/gpg/setup.php.orig share/squirrelmail/plugins/gpg/setup.php
31 --- share/squirrelmail/plugins/gpg/setup.php.orig 2005-03-18 12:01:39.398171000 +0100
32 +++ share/squirrelmail/plugins/gpg/setup.php 2005-03-18 12:03:35.986216000 +0100
33 @@ -23,7 +23,9 @@
35 //define SM_PATH
36 if (!defined ('SM_PATH')){
37 - if (file_exists('./gpg_functions.php')){
38 + if (file_exists('../../../plugins/gpg/gpg_functions.php')){
39 + define ('SM_PATH' , '../../../');
40 + } elseif (file_exists('../../plugins/gpg/gpg_functions.php')){
41 define ('SM_PATH' , '../../');
42 } elseif (file_exists('../plugins/gpg/gpg_functions.php')) {
43 define ('SM_PATH', '../');
44 Index: share/squirrelmail/plugins/chg_sasl_passwd/options.php
45 diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig share/squirrelmail/plugins/chg_sasl_passwd/options.php
46 --- share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig 2005-03-17 21:00:03.157951000 +0100
47 +++ share/squirrelmail/plugins/chg_sasl_passwd/options.php 2005-03-18 14:16:40.480988000 +0100
48 @@ -70,8 +70,8 @@
49 ' "" + dir_path + "/../../src/signout.php?chg_sasl_passwd";' . "', 0);\n" .
50 "//-->\n</script>\n";
52 - echo "<H2>" . _("Your password has successfully been changed.") . "</H2>\n";
53 - echo '<div align=center>' . _("Please") . '<a href="' . SM_PATH .
54 + echo "<H2><div align=center>" . _("Your password has successfully been changed.") . "</div></H2>\n";
55 + echo '<div align=center>' . _("Please, ") . '<a href="' . SM_PATH .
56 'src/signout.php?chg_sasl_passwd" TARGET=_top>' .
57 _("logout and log back in using your new password.") . "</div>\n";
58 }
59 Index: share/squirrelmail/plugins/chg_sasl_passwd/setup.php
60 diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/setup.php.orig share/squirrelmail/plugins/chg_sasl_passwd/setup.php
61 --- share/squirrelmail/plugins/chg_sasl_passwd/setup.php.orig 2005-03-03 00:38:44.000000000 +0100
62 +++ share/squirrelmail/plugins/chg_sasl_passwd/setup.php 2005-03-18 14:29:52.513613000 +0100
63 @@ -32,8 +32,12 @@
65 if (isset($_SERVER['QUERY_STRING']) &&
66 stristr($_SERVER['QUERY_STRING'], 'chg_sasl_passwd') )
67 - echo "<br><b>" . _("Your password has been changed. This requires that you logout and then log back in with the new password.") .
68 - "<br><p><br>\n" . _("Logging out automagically") . ".<br><br>\n";
69 + echo "<center>" .
70 + "<br /><b>" . _("Your password has been changed.") .
71 + "</b><br />" . _("This requires that you logout and then") .
72 + "<br />" . _("log back in with the new password.") .
73 + "<br /><br />" . _("Logging out automatically...") .
74 + "</center><br /><br /><br />\n";
76 /* Switch back to the SquirrelMail domain */
77 textdomain('squirrelmail');
78 Index: share/squirrelmail/plugins/check_quota/config.sample.php
79 diff -uaN share/squirrelmail/plugins/check_quota/config.sample.php.orig share/squirrelmail/plugins/check_quota/config.sample.php
80 --- share/squirrelmail/plugins/check_quota/config.sample.php.orig 2008-01-03 06:39:34.000000000 +0100
81 +++ share/squirrelmail/plugins/check_quota/config.sample.php 2008-01-03 06:39:48.000000000 +0100
82 @@ -25,7 +25,7 @@
83 * 0: UNIX / 1: IMAP / 2: cPanel
84 */
86 -$settings['quota_type'] = 0;
87 +$settings['quota_type'] = 1;
90 /*
91 Index: share/squirrelmail/plugins/captcha/functions.php
92 diff -uaN share/squirrelmail/plugins/captcha/functions.php.orig share/squirrelmail/plugins/captcha/functions.php
93 --- share/squirrelmail/plugins/captcha/functions.php.orig 2009-02-02 16:13:12.000000000 +0100
94 +++ share/squirrelmail/plugins/captcha/functions.php 2009-04-17 22:30:41.804849878 +0200
95 @@ -122,13 +122,15 @@
97 if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries))
98 {
99 - include_once(SM_PATH . 'plugins/user_info/functions.php');
100 + if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
101 + {
102 $user_info = get_user_info();
103 if (empty($user_info['country_code']))
104 {
105 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);
106 return TRUE;
107 }
108 + }
109 }
110 }
112 @@ -183,7 +185,8 @@
113 if (!empty($hide_captcha_ips) || !empty($show_captcha_ips)
114 && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
115 {
116 - include_once(SM_PATH . 'plugins/user_info/functions.php');
117 + if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
118 + {
119 $user_info = get_user_info();
120 if (!empty($user_info['ip_address']))
121 {
122 @@ -194,6 +197,7 @@
123 && !captcha_match_ip_address($user_info['ip_address'], $show_captcha_ips))
124 return;
125 }
126 + }
127 }
130 @@ -203,7 +207,8 @@
131 if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries)
132 && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
133 {
134 - include_once(SM_PATH . 'plugins/user_info/functions.php');
135 + if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
136 + {
137 $user_info = get_user_info();
138 if (!empty($user_info['country_code']))
139 {
140 @@ -214,6 +219,7 @@
141 && !in_array($user_info['country_code'], $show_captcha_countries))
142 return;
143 }
144 + }
145 }
148 @@ -257,7 +263,8 @@
149 if (!empty($hide_captcha_ips) || !empty($show_captcha_ips)
150 && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
151 {
152 - include_once(SM_PATH . 'plugins/user_info/functions.php');
153 + if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
154 + {
155 $user_info = get_user_info();
156 if (!empty($user_info['ip_address']))
157 {
158 @@ -268,6 +275,7 @@
159 && !captcha_match_ip_address($user_info['ip_address'], $show_captcha_ips))
160 return;
161 }
162 + }
163 }
166 @@ -277,7 +285,8 @@
167 if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries)
168 && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
169 {
170 - include_once(SM_PATH . 'plugins/user_info/functions.php');
171 + if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
172 + {
173 $user_info = get_user_info();
174 if (!empty($user_info['country_code']))
175 {
176 @@ -288,6 +297,7 @@
177 && !in_array($user_info['country_code'], $show_captcha_countries))
178 return;
179 }
180 + }
181 }