From 8e8fb60fcc47a3a97cdcb475769d0b5a064106e661a505b804c061cb127a29b8 Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Mon, 1 Apr 2019 08:55:57 +0000 Subject: [PATCH] Accepting request 689903 from home:kstreitova:branches:Base:System - update to 1.5.4 * crond: Fix regression from previous release. Only first job from a crontab was being run [bsc#1130746] - add cronie-1.5.4-dont_abort_loading_crontab.patch to not abort loading crontab prematurely in case of error OBS-URL: https://build.opensuse.org/request/show/689903 OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=173 --- cronie-1.5.3.tar.gz | 3 -- cronie-1.5.4-dont_abort_loading_crontab.patch | 34 +++++++++++++++++++ cronie-1.5.4.tar.gz | 3 ++ cronie.changes | 9 +++++ cronie.spec | 4 ++- 5 files changed, 49 insertions(+), 4 deletions(-) delete mode 100644 cronie-1.5.3.tar.gz create mode 100644 cronie-1.5.4-dont_abort_loading_crontab.patch create mode 100644 cronie-1.5.4.tar.gz diff --git a/cronie-1.5.3.tar.gz b/cronie-1.5.3.tar.gz deleted file mode 100644 index 532b20f..0000000 --- a/cronie-1.5.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cb51ef28e079153227ff3d0de8e876863e9b57b25642ced37df48769960fe20 -size 122363 diff --git a/cronie-1.5.4-dont_abort_loading_crontab.patch b/cronie-1.5.4-dont_abort_loading_crontab.patch new file mode 100644 index 0000000..1ce75d5 --- /dev/null +++ b/cronie-1.5.4-dont_abort_loading_crontab.patch @@ -0,0 +1,34 @@ +From 425b2da28d61b701b6016e57a690c6c55d2b8d4a Mon Sep 17 00:00:00 2001 +From: Tomas Mraz +Date: Mon, 18 Mar 2019 11:38:36 +0100 +Subject: [PATCH] crond: Do not abort loading crontab prematurely in case of + error + +--- + src/user.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/user.c b/src/user.c +index 9e12271..c34d271 100644 +--- a/src/user.c ++++ b/src/user.c +@@ -116,9 +116,10 @@ load_user (int crontab_fd, struct passwd *pw, const char *uname, + #endif + /* load the crontab + */ +- while (status >= TRUE) { ++ while (status >= OK) { + if (!skip_comments(file) && !u->system) { + log_error("too many garbage characters"); ++ status = TRUE; + break; + } + status = load_env (envstr, file); +@@ -135,7 +136,6 @@ load_user (int crontab_fd, struct passwd *pw, const char *uname, + if (e) { + e->next = u->crontab; + u->crontab = e; +- status = TRUE; + } + break; + case TRUE: diff --git a/cronie-1.5.4.tar.gz b/cronie-1.5.4.tar.gz new file mode 100644 index 0000000..84dede4 --- /dev/null +++ b/cronie-1.5.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87661b49269c82d437156921fd3385dae14cb316071aa7903faa00a5ea05c13f +size 122452 diff --git a/cronie.changes b/cronie.changes index 2ea17f6..c497006 100644 --- a/cronie.changes +++ b/cronie.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Mar 29 13:50:01 UTC 2019 - Kristýna Streitová + +- update to 1.5.4 + * crond: Fix regression from previous release. Only first job + from a crontab was being run [bsc#1130746] +- add cronie-1.5.4-dont_abort_loading_crontab.patch to not abort + loading crontab prematurely in case of error + ------------------------------------------------------------------- Sun Mar 17 10:37:44 UTC 2019 - Kristýna Streitová diff --git a/cronie.spec b/cronie.spec index 1a90bdb..25339d2 100644 --- a/cronie.spec +++ b/cronie.spec @@ -23,7 +23,7 @@ %define cron_configs %{_sysconfdir}/pam.d/crond %{_sysconfdir}/crontab %{_sysconfdir}/cron.deny Name: cronie -Version: 1.5.3 +Version: 1.5.4 Release: 0 Summary: Cron Daemon License: BSD-3-Clause AND GPL-2.0-only AND MIT @@ -51,6 +51,7 @@ 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. Patch13: fix-manpage-replace-anacrontab-with-crontab.patch +Patch14: cronie-1.5.4-dont_abort_loading_crontab.patch BuildRequires: audit-devel BuildRequires: autoconf BuildRequires: automake @@ -110,6 +111,7 @@ overloaded in settings. cp %{SOURCE7} ./cron_to_cronie.README %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build # fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked