cronie-selinux 1.6.1-1 update

3 files changed, 9 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 671fa119c565..6304d39cffbe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cronie-selinux
 	pkgdesc = Daemon that runs specified programs at scheduled times and related tools with SELinux support
-	pkgver = 1.6.0
-	pkgrel = 2
+	pkgver = 1.6.1
+	pkgrel = 1
 	url = https://github.com/cronie-crond/cronie/
 	arch = i686
 	arch = x86_64
@@ -15,8 +15,8 @@ pkgbase = cronie-selinux
 	optdepends = smtp-server: send job output via email
 	optdepends = smtp-forwarder: forward job output to email server
 	provides = cron
-	provides = cronie=1.6.0-2
-	provides = selinux-cronie=1.6.0-2
+	provides = cronie=1.6.1-1
+	provides = selinux-cronie=1.6.1-1
 	conflicts = cron
 	conflicts = cronie
 	conflicts = selinux-cronie
@@ -24,14 +24,12 @@ pkgbase = cronie-selinux
 	backup = etc/pam.d/crond
 	backup = etc/cron.d/0hourly
 	backup = etc/anacrontab
-	source = https://github.com/cronie-crond/cronie/releases/download/cronie-1.6.0/cronie-1.6.0.tar.gz
-	source = 0001-fix-range-entries.patch
+	source = https://github.com/cronie-crond/cronie/releases/download/cronie-1.6.1/cronie-1.6.1.tar.gz
 	source = 80-cronie.hook
 	source = service
 	source = pam.d
 	source = deny
-	sha256sums = 3f7cc263d21838b53a9943eb2a26b862059e2ae36c3f11789ac33cd6818e3628
-	sha256sums = 29830d76a12992e1c74249d2aa577b8f6c52fc041beef5b4a066bed1004ddf84
+	sha256sums = 2cd0f0dd1680e6b9c39bf1e3a5e7ad6df76aa940de1ee90a453633aa59984e62
 	sha256sums = f85e9a68bf3bf446f8a6167f068371c06afffe11ca71935d8ee5487b38b2c9db
 	sha256sums = ac3ff3c8a5ce1b6367b06877b4b12ff74e7f18a3c510fb9f80d6ea6b6321e3b1
 	sha256sums = 00864268b491bab8c66400a4a4b4bf85f168a6e44e85676105e084940924090c
diff --git a/0001-fix-range-entries.patch b/0001-fix-range-entries.patch
deleted file mode 100644
index cd5cbe75d594..000000000000
--- a/0001-fix-range-entries.patch
+++ /dev/null
@@ -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: 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/PKGBUILD b/PKGBUILD
index e1104f3ac257..9e543a0578cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 # If you want to help keep it up to date, please open a Pull Request there.
 
 pkgname='cronie-selinux'
-pkgver=1.6.0
-pkgrel=2
+pkgver=1.6.1
+pkgrel=1
 pkgdesc='Daemon that runs specified programs at scheduled times and related tools with SELinux support'
 url='https://github.com/cronie-crond/cronie/'
 license=('custom:BSD')
@@ -22,13 +22,11 @@ provides=('cron' "${pkgname/-selinux}=${pkgver}-${pkgrel}"
           "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
 groups=('selinux')
 source=("https://github.com/cronie-crond/cronie/releases/download/${pkgname/-selinux}-${pkgver}/${pkgname/-selinux}-${pkgver}.tar.gz"
-        '0001-fix-range-entries.patch'
         '80-cronie.hook'
         'service'
         'pam.d'
         'deny')
-sha256sums=('3f7cc263d21838b53a9943eb2a26b862059e2ae36c3f11789ac33cd6818e3628'
-            '29830d76a12992e1c74249d2aa577b8f6c52fc041beef5b4a066bed1004ddf84'
+sha256sums=('2cd0f0dd1680e6b9c39bf1e3a5e7ad6df76aa940de1ee90a453633aa59984e62'
             'f85e9a68bf3bf446f8a6167f068371c06afffe11ca71935d8ee5487b38b2c9db'
             'ac3ff3c8a5ce1b6367b06877b4b12ff74e7f18a3c510fb9f80d6ea6b6321e3b1'
             '00864268b491bab8c66400a4a4b4bf85f168a6e44e85676105e084940924090c'
@@ -38,12 +36,6 @@ backup=('etc/cron.deny'
         'etc/cron.d/0hourly'
         'etc/anacrontab')
 
-prepare() {
-	cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
-
-	patch -Np1 < ../0001-fix-range-entries.patch
-}
-
 build() {
 	cd "${srcdir}/${pkgname/-selinux}-${pkgver}"