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

Accepting request 970162 from home:dspinella:branches:Base:System

Browse Source 
- Fix bsc#1198265 Regression in handling 1-5 crontab entries
  * bsc1198265.patch

OBS-URL: https://build.opensuse.org/request/show/970162
OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=203
This commit is contained in:
Danilo Spinella 2022-04-14 13:20:56 +00:00 committed by Git OBS Bridge
parent 0b12c5eced
commit 53758061b7
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bsc1198265.patch Normal file
View File

@ -0,0 +1,21 @@
From 62e53f1cdb9c1e12a01ee7814c92cd937d50328d Mon Sep 17 00:00:00 2001
From: w30023233 <wangyuhang27@huawei.com>
Date: Wed, 23 Mar 2022 15:40:01 +0800
Subject: [PATCH] Fix regression in handling 1-5 crontab entries
---
src/entry.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/entry.c b/src/entry.c
index e9e258b..bb7cb62 100644
--- a/src/entry.c
+++ b/src/entry.c
@@ -595,6 +595,7 @@ get_range(bitstr_t * bits, int low, int high, const char *names[],
return (EOF);
case R_RANGE:
+ unget_char(ch, file);
if (get_number(&num2, low, names, file) != EOF) {
state = R_RANGE_NUM2;
break;

6
cronie.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 14 13:19:35 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
- Fix bsc#1198265 Regression in handling 1-5 crontab entries
* bsc1198265.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 29 13:08:02 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com> Tue Mar 29 13:08:02 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>

4
cronie.spec
View File

@ -46,6 +46,9 @@ Patch5: cronie-crond_pid.diff
# PATCH-FIX-SUSE the first occurance of "/etc/anacrontab" was replaced by "/etc/crontab" # 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. # in manpage file because the /etc/crontab is still used in SUSE.
Patch13: fix-manpage-replace-anacrontab-with-crontab.patch Patch13: fix-manpage-replace-anacrontab-with-crontab.patch
# PATCH-FIX-UPSTREAM Fix regression in handling 1-5 crontab entries bsc#1198265
# https://github.com/cronie-crond/cronie/commit/62e53f1cdb9c1e12a01ee7814c92cd937d50328d
Patch14: bsc1198265.patch
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -104,6 +107,7 @@ overloaded in settings.
%patch5 -p1 %patch5 -p1
cp %{SOURCE7} ./cron_to_cronie.README cp %{SOURCE7} ./cron_to_cronie.README
%patch13 -p1 %patch13 -p1
%patch14 -p1
%build %build
# fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked # fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked