Hello community, here is the log from the commit of package cronie for openSUSE:Factory checked in at 2012-08-26 14:21:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cronie (Old) and /work/SRC/openSUSE:Factory/.cronie.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cronie", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/cronie/cronie.changes 2012-06-26 15:16:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cronie.new/cronie.changes 2012-08-26 14:21:39.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 15 00:48:54 UTC 2012 - [email protected] + +- When the cron daemon does not fork, as it is the case + when using systemd, pid files are useless. avoid creating + them in the first place. + +------------------------------------------------------------------- New: ---- cronie-nofork-nopid.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cronie.spec ++++++ --- /var/tmp/diff_new_pack.RzKVE5/_old 2012-08-26 14:21:41.000000000 +0200 +++ /var/tmp/diff_new_pack.RzKVE5/_new 2012-08-26 14:21:41.000000000 +0200 @@ -57,6 +57,7 @@ # PATCH-FIX-UPSTREAM use run-crons instead of run-parts for anacron (bnc#689494) Patch8: cronie-anacron-1.4.7-run-crons.patch Patch9: cronie-1.4.8-bug_756197.diff +Patch10: cronie-nofork-nopid.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 @@ -101,7 +102,7 @@ %patch8 -p1 %patch9 cp %{S:7} ./cron_to_cronie.README - +%patch10 %build # fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked export CFLAGS="$RPM_OPT_FLAGS -DCRON_VERSION=\\\"%{version}\\\"" ++++++ cronie-nofork-nopid.patch ++++++ --- src/misc.c.orig +++ src/misc.c @@ -293,6 +293,8 @@ void acquire_daemonlock(int closeflag) { return; } + if(NoFork == 1) return; //move along, nothing to do here.. + if (fd == -1) { pidfile = _PATH_CRON_PID; /* Initial mode is 0600 to prevent flock() race/DoS. */ --- src/cron.c.orig +++ src/cron.c @@ -600,7 +600,7 @@ static void sigchld_handler(int x) { } static void quit(int x) { - (void) unlink(_PATH_CRON_PID); + if(NoFork == 0) unlink(_PATH_CRON_PID); _exit(0); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
