Author: glen Date: Wed Jan 6 15:58:54 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to r4022, switching to uid/gid http
---- Files affected: packages/eventum: eventum-mail-download.cron (1.6 -> 1.7) , eventum-mail-queue.cron (1.7 -> 1.8) , eventum-monitor.cron (1.7 -> 1.8) , eventum-reminder.cron (1.6 -> 1.7) , eventum.spec (1.310 -> 1.311) ---- Diffs: ================================================================ Index: packages/eventum/eventum-mail-download.cron diff -u packages/eventum/eventum-mail-download.cron:1.6 packages/eventum/eventum-mail-download.cron:1.7 --- packages/eventum/eventum-mail-download.cron:1.6 Wed Nov 4 21:58:36 2009 +++ packages/eventum/eventum-mail-download.cron Wed Jan 6 16:58:49 2010 @@ -11,4 +11,4 @@ # # Administration >>> Manage Email Accounts -#0 * * * * eventum /usr/share/eventum/download_emails.php username_here mail.domain.com INBOX +#0 * * * * http /usr/share/eventum/download_emails.php username_here mail.domain.com INBOX ================================================================ Index: packages/eventum/eventum-mail-queue.cron diff -u packages/eventum/eventum-mail-queue.cron:1.7 packages/eventum/eventum-mail-queue.cron:1.8 --- packages/eventum/eventum-mail-queue.cron:1.7 Wed Nov 4 21:58:37 2009 +++ packages/eventum/eventum-mail-queue.cron Wed Jan 6 16:58:49 2010 @@ -2,7 +2,7 @@ # bounce messages back to root MAILTO=root -* * * * * eventum /usr/share/eventum/process_mail_queue.php +* * * * * http /usr/share/eventum/process_mail_queue.php # The above line will run the mail queue script every minute. To setup # the SMTP server that Eventum should use to send these queued emails, ================================================================ Index: packages/eventum/eventum-monitor.cron diff -u packages/eventum/eventum-monitor.cron:1.7 packages/eventum/eventum-monitor.cron:1.8 --- packages/eventum/eventum-monitor.cron:1.7 Wed Nov 4 21:58:37 2009 +++ packages/eventum/eventum-monitor.cron Wed Jan 6 16:58:49 2010 @@ -2,4 +2,4 @@ # bounce messages back to root MAILTO=root -*/10 * * * * eventum /usr/share/eventum/monitor.php +*/10 * * * * http /usr/share/eventum/monitor.php ================================================================ Index: packages/eventum/eventum-reminder.cron diff -u packages/eventum/eventum-reminder.cron:1.6 packages/eventum/eventum-reminder.cron:1.7 --- packages/eventum/eventum-reminder.cron:1.6 Wed Nov 4 21:58:37 2009 +++ packages/eventum/eventum-reminder.cron Wed Jan 6 16:58:49 2010 @@ -2,7 +2,7 @@ # bounce messages back to root MAILTO=root -*/10 * * * * eventum /usr/share/eventum/check_reminders.php +*/10 * * * * http /usr/share/eventum/check_reminders.php # It is recommended that you run the reminder cron job every 10 minutes, # so it won't flood you with alerts too often, but it would still be ================================================================ Index: packages/eventum/eventum.spec diff -u packages/eventum/eventum.spec:1.310 packages/eventum/eventum.spec:1.311 --- packages/eventum/eventum.spec:1.310 Tue Dec 15 19:45:11 2009 +++ packages/eventum/eventum.spec Wed Jan 6 16:58:49 2010 @@ -11,8 +11,8 @@ %bcond_without order # with experimental order patch #define snap 20060921 -%define rev r4018 -%define rel 2.49 +%define rev r4022 +%define rel 2.54 #define _rc RC3 %define php_min_version 5.1.2 @@ -29,7 +29,7 @@ #Source0: http://mysql.easynet.be/Downloads/eventum/%{name}-%{version}.tar.gz # bzr branch lp:eventum eventum && cd eventum && make dist Source0: %{name}-%{version}-dev-%{rev}.tar.gz -# Source0-md5: 74cc4307c0641c2fbe7e543e994cfbe0 +# Source0-md5: 660e9e1e8cd45e848fc84f7d02361fb8 Source1: %{name}-apache.conf Source2: %{name}-mail-queue.cron Source3: %{name}-mail-download.cron @@ -58,8 +58,6 @@ BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.461 BuildRequires: sed >= 4.0 -Requires(triggerpostun): /usr/bin/php -Requires(triggerpostun): sed >= 4.0 Requires: %{name}-base = %{version}-%{release} Requires: Smarty >= 2.6.10-4 Requires: php-common >= 4:%{php_min_version} @@ -368,7 +366,6 @@ Summary(pl.UTF-8): IRC-owy bot powiadamiający dla Eventum Group: Applications/WWW Requires(post,preun): /sbin/chkconfig -Requires(triggerpostun): sed >= 4.0 Requires: %{name} = %{version}-%{release} Requires: php(sockets) Requires: php-pear-Net_SmartIRC @@ -661,21 +658,32 @@ %triggerun -- lighttpd %webapp_unregister lighttpd %{_webapp} +%triggerpostun -- %{name} < 2.2-2.54 +set -x +chgrp http %{_webappdir}/config.php +chgrp http %{_webappdir}/private_key.php +chgrp http %{_webappdir}/setup.php +chgrp http /var/log/%{name}/* +# update crontab user +for a in /etc/cron.d/eventum-*; do + awk '!/#/ && NR > 6 && $6 =="eventum" {sub("eventum", "http", $6)}{print}' $a > $a.rpmtmp && cat $a.rpmtmp > $a + rm -f $a.rpmtmp +done + %files -f %{name}.lang %defattr(644,root,root,755) -%doc ChangeLog FAQ INSTALL README UPGRADE CONTRIB %doc docs/* htdocs/setup/schema.sql mysql-permissions.sql %attr(751,root,root) %dir %{_webappdir} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/lighttpd.conf -%attr(640,root,eventum) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/config.php -%attr(640,root,eventum) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/private_key.php -%attr(660,root,eventum) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/setup.php +%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/config.php +%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/private_key.php +%attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/setup.php %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/htpasswd -%dir %attr(731,root,eventum) /var/log/%{name} -%attr(620,root,eventum) %ghost /var/log/%{name}/* +%dir %attr(731,root,http) /var/log/%{name} +%attr(620,root,http) %ghost /var/log/%{name}/* %dir %attr(750,root,root) /var/log/archive/%{name} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name} @@ -708,8 +716,8 @@ %{_appdir}/lib/jpgraph %exclude %{_appdir}/lib/eventum/class.monitor.php -%dir %attr(730,root,eventum) /var/run/%{name} -%dir %attr(730,root,eventum) /var/cache/%{name} +%dir %attr(730,root,http) /var/run/%{name} +%dir %attr(730,root,http) /var/cache/%{name} %files base %defattr(644,root,root,755) @@ -718,9 +726,9 @@ %dir %{_appdir} %dir /var/lib/%{name} # saved mail copies -%attr(770,root,eventum) %dir /var/lib/%{name}/routed_emails -%attr(770,root,eventum) %dir /var/lib/%{name}/routed_drafts -%attr(770,root,eventum) %dir /var/lib/%{name}/routed_notes +%attr(770,root,http) %dir /var/lib/%{name}/routed_emails +%attr(770,root,http) %dir /var/lib/%{name}/routed_drafts +%attr(770,root,http) %dir /var/lib/%{name}/routed_notes %files setup %defattr(644,root,root,755) @@ -790,6 +798,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.311 2010/01/06 15:58:49 glen +- up to r4022, switching to uid/gid http + Revision 1.310 2009/12/15 18:45:11 glen - remove php-pear-HTTP_Request dep, i don't see it being used - define php_min_version so new php dep generator will satsify with it ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-mail-download.cron?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-mail-queue.cron?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-monitor.cron?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-reminder.cron?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum.spec?r1=1.310&r2=1.311&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
