From cfe037d46de3ba0eac43dc42f0234aee90c0dc58 Mon Sep 17 00:00:00 2001 From: Ondřej Pohořelský Date: Feb 26 2024 08:37:41 +0000 Subject: Update to 1.7.1 --- diff --git a/.gitignore b/.gitignore index 4079eb0..14befbb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /cronie-1.6.0.tar.gz /cronie-1.6.1.tar.gz /cronie-1.7.0.tar.gz +/cronie-1.7.1.tar.gz diff --git a/cronie.spec b/cronie.spec index fc4df93..6b48080 100644 --- a/cronie.spec +++ b/cronie.spec @@ -5,14 +5,12 @@ Summary: Cron daemon for executing programs at set times Name: cronie -Version: 1.7.0 +Version: 1.7.1 Release: %autorelease License: GPL-2.0-or-later AND BSD-3-Clause AND BSD-2-Clause AND ISC AND LGPL-2.1-or-later URL: https://github.com/cronie-crond/cronie Source0: https://github.com/cronie-crond/cronie/releases/download/cronie-%{version}/cronie-%{version}.tar.gz -# https://github.com/cronie-crond/cronie/pull/163 -Patch: n_option_wait_on_finnishing_grandchild_process.patch Requires: dailyjobs diff --git a/n_option_wait_on_finnishing_grandchild_process.patch b/n_option_wait_on_finnishing_grandchild_process.patch deleted file mode 100644 index b01c6f5..0000000 --- a/n_option_wait_on_finnishing_grandchild_process.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5cf85f8cbb816ff1df5b317d6f8559b67e1993dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= -Date: Wed, 25 Oct 2023 10:58:46 +0200 -Subject: [PATCH] -n option: wait on finnishing grandchild process - -With `WNOHANG` we skip sending the email when waitpid() returns 0, -which happens if the process is still running. Instead, using `0` -parameter will wait for the process to actually stop running. ---- - src/do_command.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/do_command.c b/src/do_command.c -index d7ca840..2ada913 100644 ---- a/src/do_command.c -+++ b/src/do_command.c -@@ -579,7 +579,7 @@ static int child_process(entry * e, char **jobenv) { - if (mail && e->flags & MAIL_WHEN_ERR) { - int jobstatus = -1; - if (jobpid > 0) { -- while (waitpid(jobpid, &jobstatus, WNOHANG) == -1) { -+ while (waitpid(jobpid, &jobstatus, 0) == -1) { - if (errno == EINTR) continue; - log_it("CRON", getpid(), "error", "invalid job pid", errno); - break; diff --git a/sources b/sources index 22b8e68..9c61c48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cronie-1.7.0.tar.gz) = a8e6688a164540e2cd3741c58813b6684c4c22a04806bcc8ba028a9ff72f986f165715ac3663bd34133af6566bdbd272a3e7be893f139e315aef35b2dbeb622f +SHA512 (cronie-1.7.1.tar.gz) = 4479f6f05ca9da3ecefa0e9b73662f1db58ffff309916de9f92f89c5e7f93f1c5c744f18cb3e1a3df9664d533afe7dad710f97484e72a314c87d84f57a6c56fb