Accepting request 76089 from Base:System

- changed run-parts to run-crons in anacron (bnc#689494)

- mention possibility of disabling logging to syslog in the crontab (forwarded request 76038 from vitezslav_cizek)

OBS-URL: https://build.opensuse.org/request/show/76089
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cronie?expand=0&rev=29
This commit is contained in:
Marcus Rückert 2011-07-12 11:50:14 +00:00 committed by Git OBS Bridge
commit fdeb78bcf7
3 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,31 @@
Index: cronie-1.4.7/contrib/anacrontab
===================================================================
--- cronie-1.4.7.orig/contrib/anacrontab
+++ cronie-1.4.7/contrib/anacrontab
@@ -11,6 +11,6 @@ RANDOM_DELAY=45
START_HOURS_RANGE=3-22
#period in days delay in minutes job-identifier command
-1 5 cron.daily nice run-parts /etc/cron.daily
-7 25 cron.weekly nice run-parts /etc/cron.weekly
-@monthly 45 cron.monthly nice run-parts /etc/cron.monthly
+1 5 cron.daily nice /usr/lib/cron/run-crons /etc/cron.daily
+7 25 cron.weekly nice /usr/lib/cron/run-crons /etc/cron.weekly
+@monthly 45 cron.monthly nice /usr/lib/cron/run-crons /etc/cron.monthly
Index: cronie-1.4.7/man/anacrontab.5
===================================================================
--- cronie-1.4.7.orig/man/anacrontab.5
+++ cronie-1.4.7/man/anacrontab.5
@@ -79,9 +79,9 @@ RANDOM_DELAY=30
# Anacron jobs will start between 6am and 8am.
START_HOURS_RANGE=6-8
# delay will be 5 minutes + RANDOM_DELAY for cron.daily
-1 5 cron.daily nice run-parts /etc/cron.daily
-7 0 cron.weekly nice run-parts /etc/cron.weekly
-@monthly 0 cron.monthly nice run-parts /etc/cron.monthly
+1 5 cron.daily nice /usr/lib/cron/run-crons /etc/cron.daily
+7 0 cron.weekly nice /usr/lib/cron/run-crons /etc/cron.weekly
+@monthly 0 cron.monthly nice /usr/lib/cron/run-crons /etc/cron.monthly
.fi
.SH "SEE ALSO"
.BR anacron (8),

View File

@ -1,7 +1,12 @@
-------------------------------------------------------------------
Mon Jul 11 10:28:40 UTC 2011 - vcizek@novell.com
- changed run-parts to run-crons in anacron (bnc#689494)
-------------------------------------------------------------------
Mon Jun 6 08:51:11 UTC 2011 - vcizek@novell.com
- Mention possibility of disabling logging to syslog in a crontab
- mention possibility of disabling logging to syslog in the crontab
manual
- to keep compatibility with 11.3, execute the command despite
an unprivileged user tries to disable logging (bnc#698549)

View File

@ -54,6 +54,8 @@ Patch5: %name-crond_pid.diff
Patch6: cronie-1.4.7-syslog_output.patch
# PATCH-FIX-UPSTREAM mention logging disabling for a command in man
Patch7: cronie-1.4.7-disable_logging.patch
# PATCH-FIX-UPSTREAM use run-crons instead of run-parts for anacron (bnc#689494)
Patch8: cronie-anacron-1.4.7-run-crons.patch
Conflicts: cron <= 4.1
# When finish update protection of sles11 we could uncomment line bellow and drop all
# ugly hacks with subpackage cron needed for proper update proces
@ -98,6 +100,7 @@ overloaded in settings.
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
cp %{S:7} ./cron_to_cronie.README
%build