From 466ad1fa5a715bfff3727e2de43dd47b0aae680b77932e034bcca5c0db71a2a0 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 12 May 2022 18:16:11 +0000 Subject: [PATCH] Accepting request 976257 from home:dspinella:branches:Base:System - Update to 1.6.1: * Fix a regression in handling ranges (x-y) in crontab - Remove upstreamed patch: * bsc1198265.patch OBS-URL: https://build.opensuse.org/request/show/976257 OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=205 --- bsc1198265.patch | 21 --------------------- cronie-1.6.0.tar.gz | 3 --- cronie-1.6.1.tar.gz | 3 +++ cronie.changes | 8 ++++++++ cronie.spec | 6 +----- 5 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 bsc1198265.patch delete mode 100644 cronie-1.6.0.tar.gz create mode 100644 cronie-1.6.1.tar.gz diff --git a/bsc1198265.patch b/bsc1198265.patch deleted file mode 100644 index f80e915..0000000 --- a/bsc1198265.patch +++ /dev/null @@ -1,21 +0,0 @@ -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-1.6.0.tar.gz b/cronie-1.6.0.tar.gz deleted file mode 100644 index f145f3b..0000000 --- a/cronie-1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:019473a6387e65db46e1b3aeaff69d130cd7bd2e6ce480764aba20279577ddfa -size 149859 diff --git a/cronie-1.6.1.tar.gz b/cronie-1.6.1.tar.gz new file mode 100644 index 0000000..ba45bb4 --- /dev/null +++ b/cronie-1.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ddbc8f8d07dfe1d45998b0a0cbd9a216cd4d7bc64d1626b2bc8b3a69e4641d1 +size 149913 diff --git a/cronie.changes b/cronie.changes index 2bf1cb5..657f526 100644 --- a/cronie.changes +++ b/cronie.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed May 11 09:17:27 UTC 2022 - Danilo Spinella + +- Update to 1.6.1: + * Fix a regression in handling ranges (x-y) in crontab +- Remove upstreamed patch: + * bsc1198265.patch + ------------------------------------------------------------------- Thu Apr 14 13:19:35 UTC 2022 - Danilo Spinella diff --git a/cronie.spec b/cronie.spec index 43a7b52..a11f198 100644 --- a/cronie.spec +++ b/cronie.spec @@ -22,7 +22,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: cronie -Version: 1.6.0 +Version: 1.6.1 Release: 0 Summary: Cron Daemon License: BSD-3-Clause AND GPL-2.0-only AND MIT @@ -46,9 +46,6 @@ 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 @@ -107,7 +104,6 @@ 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