diff --git a/bsc1198265.patch b/bsc1198265.patch new file mode 100644 index 0000000..f80e915 --- /dev/null +++ b/bsc1198265.patch @@ -0,0 +1,21 @@ +From 62e53f1cdb9c1e12a01ee7814c92cd937d50328d Mon Sep 17 00:00:00 2001 +From: w30023233 +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; diff --git a/cronie.changes b/cronie.changes index 8e7402c..2bf1cb5 100644 --- a/cronie.changes +++ b/cronie.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 14 13:19:35 UTC 2022 - Danilo Spinella + +- Fix bsc#1198265 Regression in handling 1-5 crontab entries + * bsc1198265.patch + ------------------------------------------------------------------- Tue Mar 29 13:08:02 UTC 2022 - Danilo Spinella diff --git a/cronie.spec b/cronie.spec index 5d8efc3..43a7b52 100644 --- a/cronie.spec +++ b/cronie.spec @@ -46,6 +46,9 @@ Patch5: cronie-crond_pid.diff # 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 +# 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: autoconf BuildRequires: automake @@ -104,6 +107,7 @@ overloaded in settings. %patch5 -p1 cp %{SOURCE7} ./cron_to_cronie.README %patch13 -p1 +%patch14 -p1 %build # fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked