Sat, 09 Jul 2011 16:54:58 +0200
Update solving Google captcha buyout and adjust packaging and buildconf.
squirrelmail/squirrelmail.patch | file | annotate | diff | comparison | revisions | |
squirrelmail/squirrelmail.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/squirrelmail/squirrelmail.patch Sat Jul 09 15:39:59 2011 +0200 1.2 +++ b/squirrelmail/squirrelmail.patch Sat Jul 09 16:54:58 2011 +0200 1.3 @@ -15,7 +15,7 @@ 1.4 Index: functions/imap_general.php 1.5 --- functions/imap_general.php.orig 2005-05-20 12:37:34 +0200 1.6 +++ functions/imap_general.php 2005-07-30 21:14:27 +0200 1.7 -@@ -578,6 +578,7 @@ 1.8 +@@ -618,6 +618,7 @@ 1.9 1.10 set_up_language($squirrelmail_language, true); 1.11 include_once(SM_PATH . 'functions/display_messages.php' ); 1.12 @@ -26,7 +26,7 @@ 1.13 Index: src/login.php 1.14 --- src/login.php.orig 2005-06-22 15:45:35 +0200 1.15 +++ src/login.php 2005-07-30 21:15:39 +0200 1.16 -@@ -196,8 +196,8 @@ 1.17 +@@ -198,8 +198,8 @@ 1.18 ' /><br />' . "\n" 1.19 : '' ). 1.20 ( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' : 1.21 @@ -40,7 +40,7 @@ 1.22 Index: src/right_main.php 1.23 --- src/right_main.php.orig 2005-06-15 23:12:05 +0200 1.24 +++ src/right_main.php 2005-07-30 21:14:27 +0200 1.25 -@@ -182,6 +182,7 @@ 1.26 +@@ -194,6 +194,7 @@ 1.27 ) 1.28 ) , 1.29 'center', $color[9], 'width="70%" cellpadding="0" cellspacing="3" border="0"' );
2.1 --- a/squirrelmail/squirrelmail.spec Sat Jul 09 15:39:59 2011 +0200 2.2 +++ b/squirrelmail/squirrelmail.spec Sat Jul 09 16:54:58 2011 +0200 2.3 @@ -22,12 +22,12 @@ 2.4 ## 2.5 2.6 # package version 2.7 -%define V_squirrelmail 1.4.17 2.8 -%define V_locale 1.4.13-20071220 2.9 +%define V_squirrelmail 1.4.21 2.10 +%define V_locale 1.4.18-20090526 2.11 %define V_plugin_compat 2.0.14-1.0 2.12 -%define V_plugin_logger 2.3-1.2.7 2.13 +%define V_plugin_logger 2.3.1-1.2.7 2.14 %define V_plugin_addgraphics 2.3-1.0.3 2.15 -%define V_plugin_avelsieve 1.9.4 2.16 +%define V_plugin_avelsieve 1.9.7 2.17 %define V_plugin_saslpwd 1.4.1-1.4 2.18 %define V_plugin_ldappwd 2.2-1.4.0 2.19 %define V_plugin_checkquota 2.2-1.4.0 2.20 @@ -37,11 +37,11 @@ 2.21 %define V_plugin_update 0.7-1.4.2 2.22 %define V_plugin_userip 3.3-re-1.2.2 2.23 %define V_plugin_smallcal 0.8-1.2.3 2.24 -%define V_plugin_vkeyboard 0.9.1 2.25 +%define V_plugin_vkeyboard 0.9 2.26 %define V_plugin_username 2.3-1.0.0 2.27 %define V_plugin_loginnotes 1.2-1.4.0 2.28 %define V_plugin_passforget 2.2-1.0.1 2.29 -%define V_plugin_captcha 1.2-1.2.9 2.30 +%define V_plugin_captcha 1.2.3-1.2.9 2.31 %define V_plugin_smime 0.7-1.1.1 2.32 %define V_plugin_debug 1.2-1.4 2.33 2.34 @@ -56,7 +56,7 @@ 2.35 Group: Mail 2.36 License: GPL 2.37 Version: %{V_squirrelmail} 2.38 -Release: 20110706 2.39 +Release: 20110708 2.40 2.41 # package options 2.42 %option with_plugins no 2.43 @@ -296,11 +296,6 @@ 2.44 login_notes password_forget captcha smime debugger; do 2.45 mv $plug squirrelmail-%{V_squirrelmail}/plugins 2.46 done 2.47 - 2.48 - # provisionary untested recaptcha google buyout hack 2.49 - %{l_shtool} subst \ 2.50 - -e 's;\(\$recaptcha_uri *=.*https://\)api-secure.recaptcha.net;\1www.google.com/recaptcha/api;' \ 2.51 - plugins/captcha/backends/recaptcha/recaptcha.php 2.52 %endif 2.53 2.54 # clean up login screen of distractions 2.55 @@ -318,11 +313,9 @@ 2.56 %{l_shtool} mkdir -f -p -m 755 doc/`dirname $fil` 2.57 mv -f $fil $_ 2.58 done 2.59 - mv doc/plugins/squirrelspell/doc/README doc/plugins/squirrelspell 2.60 rm -rf doc/plugins/squirrelspell/doc doc/plugins/squirrelspell/index.php 2.61 mv plugins/squirrelspell/doc/* doc/plugins/squirrelspell 2.62 rm -rf plugins/squirrelspell/doc 2.63 - rm -f plugins/make_archive.pl 2.64 %if "%{with_plugins}" == "yes" 2.65 mv plugins/pupdate/docs/* doc/plugins/pupdate 2.66 rm -rf plugins/pupdate/docs 2.67 @@ -385,9 +378,8 @@ 2.68 %if "%{with_plugins}" == "yes" 2.69 ( cd $RPM_BUILD_ROOT%{l_prefix} 2.70 %{l_patch} -p0 <%{PATCH squirrelmail.patch.plugins} 2.71 - rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/squirrelmail/*.orig 2.72 - rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/gpg/*.orig 2.73 - rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/chg_sasl_passwd/*.orig 2.74 + rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/functions/*.orig 2.75 + rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/src/*.orig 2.76 ) || exit $? 2.77 %endif 2.78