[gentoo-commits] repo/gentoo:master commit in: sys-process/cronie/files/, sys-process/cronie/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     64ffabcdbbdd71f9a3328d252cb033e6579011b9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 07:14:55 2022 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 07:16:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ffabcd

sys-process/cronie: Revbump to fix 1-5 crontab entries regression

Thanks-to: Klemen Mihevc <solor <AT> outlook.com>
Closes: https://bugs.gentoo.org/836888
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...ronie-1.6.0-r1.ebuild => cronie-1.6.0-r2.ebuild} |  1 +
 .../cronie-1.6.0-crontab_entries_regression.patch   | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/sys-process/cronie/cronie-1.6.0-r1.ebuild b/sys-process/cronie/cronie-1.6.0-r2.ebuild
similarity index 97%
rename from sys-process/cronie/cronie-1.6.0-r1.ebuild
rename to sys-process/cronie/cronie-1.6.0-r2.ebuild
index 93c845e1da39..6f15a911b057 100644
--- a/sys-process/cronie/cronie-1.6.0-r1.ebuild
+++ b/sys-process/cronie/cronie-1.6.0-r2.ebuild
@@ -33,6 +33,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.5.3-systemd.patch"
+	"${FILESDIR}/${P}-crontab_entries_regression.patch" #836888
 )
 
 src_prepare() {

diff --git a/sys-process/cronie/files/cronie-1.6.0-crontab_entries_regression.patch b/sys-process/cronie/files/cronie-1.6.0-crontab_entries_regression.patch
new file mode 100644
index 000000000000..160c03116415
--- /dev/null
+++ b/sys-process/cronie/files/cronie-1.6.0-crontab_entries_regression.patch
@@ -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;