diff --git a/cronie/0001-fix-range-entries.patch b/cronie/0001-fix-range-entries.patch new file mode 100644 index 0000000..cd5cbe7 --- /dev/null +++ b/cronie/0001-fix-range-entries.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: 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/PKGBUILD b/cronie/PKGBUILD index 560bbbb..957999f 100644 --- a/cronie/PKGBUILD +++ b/cronie/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname='cronie' -pkgver=1.5.7 +pkgver=1.6.0 pkgrel=02 pkgdesc='Daemon that runs specified programs at scheduled times and related tools w/o systemd' url='https://github.com/cronie-crond/cronie/' @@ -16,8 +16,9 @@ optdepends=('smtp-server: send job output via email' 'smtp-forwarder: forward job output to email server') conflicts=('cron') provides=('cron') +#options=('debug') source=("https://github.com/cronie-crond/cronie/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz" - '0001-crontab-use-bold-colors.patch' + '0001-fix-range-entries.patch' '80-cronie.hook' 'pam.d' 'deny') @@ -27,11 +28,14 @@ backup=('etc/cron.deny' 'etc/cron.d/0hourly' 'etc/anacrontab') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 < ../0001-fix-range-entries.patch +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 < ../0001-crontab-use-bold-colors.patch - - ./configure \ + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -66,8 +70,8 @@ package() { license=('custom:BSD') -sha256sums=(538bcfaf2e986e5ae1edf6d1472a77ea8271d6a9005aee2497a9ed6e13320eb3 # cronie-1.5.7.tar.gz - 2c9a2f386f23779907c468023538b195cd3e3c61fa16e19f036ee13a031f1c3a # 0001-crontab-use-bold-colors.patch +sha256sums=(3f7cc263d21838b53a9943eb2a26b862059e2ae36c3f11789ac33cd6818e3628 # cronie-1.6.0.tar.gz + 29830d76a12992e1c74249d2aa577b8f6c52fc041beef5b4a066bed1004ddf84 # 0001-fix-range-entries.patch f85e9a68bf3bf446f8a6167f068371c06afffe11ca71935d8ee5487b38b2c9db # 80-cronie.hook 00864268b491bab8c66400a4a4b4bf85f168a6e44e85676105e084940924090c # pam.d ae6e533ecdfc1bd2dd80a9e25acb0260cbe9f00c4e4abee93d552b3660f263fc) # deny diff --git a/cronie/PKGBUILD-arch b/cronie/PKGBUILD-arch index 5b15d4c..1392c6b 100644 --- a/cronie/PKGBUILD-arch +++ b/cronie/PKGBUILD-arch @@ -2,7 +2,7 @@ # Maintainer: Gaetan Bisson pkgname='cronie' -pkgver=1.5.7 +pkgver=1.6.0 pkgrel=2 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://github.com/cronie-crond/cronie/' @@ -13,14 +13,15 @@ optdepends=('smtp-server: send job output via email' 'smtp-forwarder: forward job output to email server') conflicts=('cron') provides=('cron') +options=('debug') source=("https://github.com/cronie-crond/cronie/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz" - '0001-crontab-use-bold-colors.patch' + '0001-fix-range-entries.patch' '80-cronie.hook' 'service' 'pam.d' 'deny') -sha256sums=('538bcfaf2e986e5ae1edf6d1472a77ea8271d6a9005aee2497a9ed6e13320eb3' - '2c9a2f386f23779907c468023538b195cd3e3c61fa16e19f036ee13a031f1c3a' +sha256sums=('3f7cc263d21838b53a9943eb2a26b862059e2ae36c3f11789ac33cd6818e3628' + '29830d76a12992e1c74249d2aa577b8f6c52fc041beef5b4a066bed1004ddf84' 'f85e9a68bf3bf446f8a6167f068371c06afffe11ca71935d8ee5487b38b2c9db' 'ac3ff3c8a5ce1b6367b06877b4b12ff74e7f18a3c510fb9f80d6ea6b6321e3b1' '00864268b491bab8c66400a4a4b4bf85f168a6e44e85676105e084940924090c' @@ -30,10 +31,14 @@ backup=('etc/cron.deny' 'etc/cron.d/0hourly' 'etc/anacrontab') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 < ../0001-crontab-use-bold-colors.patch + patch -Np1 < ../0001-fix-range-entries.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \