diff options
Diffstat (limited to 'core/cronie')
| -rw-r--r-- | core/cronie/PKGBUILD | 17 | ||||
| -rwxr-xr-x | core/cronie/rc.d | 38 | ||||
| -rw-r--r-- | core/cronie/service | 2 |
3 files changed, 11 insertions, 46 deletions
diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD index ab03530b2..e45d47fa8 100644 --- a/core/cronie/PKGBUILD +++ b/core/cronie/PKGBUILD @@ -3,7 +3,7 @@ pkgname='cronie' pkgver=1.4.9 -pkgrel=2 +pkgrel=4 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') @@ -16,13 +16,11 @@ optdepends=('pm-utils: defer anacron on battery power' source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'cron.deny' 'service' - 'pam.d' - 'rc.d') + 'pam.d') sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4' '0f279b8fb820340267d578dc85511c980715f91e' - 'fa91ebee59df127ff3983b8d6fb9e1cc5fca53d0' - '5eff7fb31f6bc0a924243ff046704726cf20c221' - 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5') + 'de455f11a310e64d6930390e57726ed70f3295d0' + '5eff7fb31f6bc0a924243ff046704726cf20c221') backup=('etc/anacrontab' 'etc/conf.d/crond' @@ -33,6 +31,11 @@ conflicts=('cron') provides=('cron') groups=('base') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's:usr/sbin:usr/bin:g' -i contrib/0anacron +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -40,6 +43,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --enable-anacron \ --with-inotify \ --with-pam \ @@ -56,7 +60,6 @@ package() { install -d "${pkgdir}"/var/spool/{ana,}cron install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service diff --git a/core/cronie/rc.d b/core/cronie/rc.d deleted file mode 100755 index d0659685c..000000000 --- a/core/cronie/rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=crond -. /etc/conf.d/crond -PID=$(pidof -o %PPID /usr/sbin/crond) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/core/cronie/service b/core/cronie/service index 4fa4d4593..cc671f7b6 100644 --- a/core/cronie/service +++ b/core/cronie/service @@ -2,7 +2,7 @@ Description=Periodic Command Scheduler [Service] -ExecStart=/usr/sbin/crond -n +ExecStart=/usr/bin/crond -n ExecReload=/bin/kill -HUP $MAINPID KillMode=process Restart=always |