pool/cronie
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 690292 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/690292
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cronie?expand=0&rev=71
This commit is contained in:
Dominique Leuenberger 2019-04-02 07:17:18 +00:00 committed by Git OBS Bridge
commit 2ab7131ad5
5 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cronie-1.5.3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1cb51ef28e079153227ff3d0de8e876863e9b57b25642ced37df48769960fe20
size 122363

34
cronie-1.5.4-dont_abort_loading_crontab.patch Normal file
View File

@ -0,0 +1,34 @@
From 425b2da28d61b701b6016e57a690c6c55d2b8d4a Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
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:

3
cronie-1.5.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:87661b49269c82d437156921fd3385dae14cb316071aa7903faa00a5ea05c13f
size 122452

9
cronie.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Mar 29 13:50:01 UTC 2019 - Kristýna Streitová <kstreitova@suse.com>
- 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á <kstreitova@suse.com>

4
cronie.spec
View File

@ -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