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
This commit is contained in:
parent
53758061b7
commit
466ad1fa5a
@ -1,21 +0,0 @@
|
|||||||
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;
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:019473a6387e65db46e1b3aeaff69d130cd7bd2e6ce480764aba20279577ddfa
|
|
||||||
size 149859
|
|
BIN
cronie-1.6.1.tar.gz
(Stored with Git LFS)
Normal file
BIN
cronie-1.6.1.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 11 09:17:27 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
|
||||||
|
|
||||||
|
- 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 <danilo.spinella@suse.com>
|
Thu Apr 14 13:19:35 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
%define _fillupdir %{_localstatedir}/adm/fillup-templates
|
%define _fillupdir %{_localstatedir}/adm/fillup-templates
|
||||||
%endif
|
%endif
|
||||||
Name: cronie
|
Name: cronie
|
||||||
Version: 1.6.0
|
Version: 1.6.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Cron Daemon
|
Summary: Cron Daemon
|
||||||
License: BSD-3-Clause AND GPL-2.0-only AND MIT
|
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"
|
# 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
|
||||||
@ -107,7 +104,6 @@ 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
|
||||||
|
Loading…
Reference in New Issue
Block a user