From e0125c526af0e26bb943030f193ec9b76ff8c8013ad302e6860dd2539150ce44 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 15 Jun 2011 06:56:38 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/cronie revision 28.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=452c21919ea33d927467e59ba1e7715a --- cronie.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cronie.spec b/cronie.spec index 3f8ba66..3c7e711 100644 --- a/cronie.spec +++ b/cronie.spec @@ -30,7 +30,7 @@ Recommends: postfix AutoReqProv: on PreReq: permissions %fillup_prereq %insserv_prereq cron sysvinit(syslog) Version: 1.4.7 -Release: 12 +Release: 13 %{expand: %%define cronie_version %version} Summary: Cron Daemon Source0: %name-%version.tar.gz @@ -72,7 +72,7 @@ started automatically. %package -n cron License: MIT and BSD and GPLv2 Version: 4.2 -Release: 12 +Release: 13 Summary: Auxiliary package Group: System/Daemons Requires: %{name} = %{cronie_version}-%{release} From da8a361d1463f0d18400f21da25f1b692b15aede707be7c82da81ade56cd7c66 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 12 Jul 2011 09:28:42 +0000 Subject: [PATCH 2/2] Accepting request 76038 from home:vitezslav_cizek:branches:Base:System - changed run-parts to run-crons in anacron (bnc#689494) - mention possibility of disabling logging to syslog in the crontab OBS-URL: https://build.opensuse.org/request/show/76038 OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=84 --- cronie-anacron-1.4.7-run-crons.patch | 31 ++++++++++++++++++++++++++++ cronie.changes | 7 ++++++- cronie.spec | 3 +++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 cronie-anacron-1.4.7-run-crons.patch diff --git a/cronie-anacron-1.4.7-run-crons.patch b/cronie-anacron-1.4.7-run-crons.patch new file mode 100644 index 0000000..7e933c5 --- /dev/null +++ b/cronie-anacron-1.4.7-run-crons.patch @@ -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), diff --git a/cronie.changes b/cronie.changes index d4ca6e6..2bcabe3 100644 --- a/cronie.changes +++ b/cronie.changes @@ -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) diff --git a/cronie.spec b/cronie.spec index 3c7e711..f037a87 100644 --- a/cronie.spec +++ b/cronie.spec @@ -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