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' \