From b86b100ae3c4f70c025cbae21efeabd118aa73aa9aba91b21fa03c0d19f8c7b7 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Mon, 30 Aug 2021 08:52:30 +0000 Subject: [PATCH] Accepting request 914973 from home:dspinella:branches:Base:System - Remove cronie-anacron-1.4.7-run-crons.patch to make anacron use run-parts OBS-URL: https://build.opensuse.org/request/show/914973 OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=197 --- cronie-anacron-1.4.7-run-crons.patch | 31 ---------------------------- cronie.changes | 2 ++ cronie.spec | 3 --- 3 files changed, 2 insertions(+), 34 deletions(-) delete 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 deleted file mode 100644 index 863c73b..0000000 --- a/cronie-anacron-1.4.7-run-crons.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: cronie-cronie-1.5.5/contrib/anacrontab -=================================================================== ---- cronie-cronie-1.5.5.orig/contrib/anacrontab -+++ cronie-cronie-1.5.5/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/libexec/cron/run-crons /etc/cron.daily -+7 25 cron.weekly nice /usr/libexec/cron/run-crons /etc/cron.weekly -+@monthly 45 cron.monthly nice /usr/libexec/cron/run-crons /etc/cron.monthly -Index: cronie-cronie-1.5.5/man/anacrontab.5 -=================================================================== ---- cronie-cronie-1.5.5.orig/man/anacrontab.5 -+++ cronie-cronie-1.5.5/man/anacrontab.5 -@@ -97,9 +97,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/libexec/cron/run-crons /etc/cron.daily -+7 0 cron.weekly nice /usr/libexec/cron/run-crons /etc/cron.weekly -+@monthly 0 cron.monthly nice /usr/libexec/cron/run-crons /etc/cron.monthly - .fi - .SH "SEE ALSO" - .BR anacron (8), diff --git a/cronie.changes b/cronie.changes index 91a404e..f2c624e 100644 --- a/cronie.changes +++ b/cronie.changes @@ -3,6 +3,8 @@ Mon Aug 30 07:18:09 UTC 2021 - Danilo Spinella - Change default configuration to use run-parts from debianutils instead of run-crons +- Remove cronie-anacron-1.4.7-run-crons.patch to make anacron use + run-parts ------------------------------------------------------------------- Sat May 8 20:33:29 UTC 2021 - Dirk Müller diff --git a/cronie.spec b/cronie.spec index c2d1c98..6bd0ea3 100644 --- a/cronie.spec +++ b/cronie.spec @@ -44,8 +44,6 @@ Patch3: cronie-pam_config.diff Patch4: cronie-nheader_lines.diff # we use cron.pid instead of crond.pid Patch5: cronie-crond_pid.diff -# PATCH-FIX-UPSTREAM use run-crons instead of run-parts for anacron (bnc#689494) -Patch8: cronie-anacron-1.4.7-run-crons.patch Patch12: cronie-piddir.patch # PATCH-FIX-SUSE the first occurance of "/etc/anacrontab" was replaced by "/etc/crontab" # in manpage file because the /etc/crontab is still used in SUSE. @@ -106,7 +104,6 @@ overloaded in settings. %patch3 -p1 %patch4 %patch5 -p1 -%patch8 -p1 cp %{SOURCE7} ./cron_to_cronie.README %patch12 -p1 %patch13 -p1