cronie: add cron alternatives group
Also: - remove /etc/crontab - remove replaces line - call cronie-crond in sv script
This commit is contained in:
parent
b59d70df0c
commit
6178214aaf
|
@ -1,2 +1,2 @@
|
|||
#!/bin/sh
|
||||
exec crond -n 2>&1
|
||||
exec cronie-crond -n 2>&1
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
# /etc/crontab - main system crontab(5) file
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'cronie'
|
||||
pkgname=cronie
|
||||
version=1.5.0
|
||||
revision=2
|
||||
revision=3
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-inotify --without-selinux --with-pam
|
||||
--enable-anacron --enable-pie --enable-relro"
|
||||
|
@ -15,8 +15,7 @@ make_dirs="
|
|||
/etc/cron.monthly 0755 root root
|
||||
/var/spool/cron 0755 root root
|
||||
/var/spool/anacron 0755 root root"
|
||||
conf_files="/etc/crontab /etc/anacrontab /etc/pam.d/crond /etc/cron.deny"
|
||||
replaces="cron-daemon>=0"
|
||||
conf_files="/etc/anacrontab /etc/pam.d/crond /etc/cron.deny"
|
||||
provides="cron-daemon-0_1"
|
||||
short_desc="Runs specified programs at scheduled times"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
|
@ -29,6 +28,14 @@ case "$XBPS_TARGET_MACHINE" in
|
|||
*-musl) makedepends+=" musl-obstack" ;;
|
||||
esac
|
||||
|
||||
alternatives="
|
||||
cron:/etc/sv/cronie:/etc/sv/crond
|
||||
cron:/usr/bin/cronie-crond:/usr/bin/crond
|
||||
cron:/usr/bin/cronie-crontab:/usr/bin/crontab
|
||||
cron:/usr/share/man/man1/cronie-crontab.1:/usr/share/man/man1/crontab.1
|
||||
cron:/usr/share/man/man8/cronie-crond.8:/usr/share/man/man8/crond.8
|
||||
"
|
||||
|
||||
pre_build() {
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
*-musl) sed -i Makefile */Makefile -e "s; -lpam; -lobstack&;" ;;
|
||||
|
@ -37,7 +44,6 @@ pre_build() {
|
|||
|
||||
post_install() {
|
||||
vsv cronie
|
||||
vinstall ${FILESDIR}/crontab 644 etc
|
||||
vinstall ${FILESDIR}/crond.pam 644 etc/pam.d crond
|
||||
|
||||
# Add /etc/cron.deny empty, to allow all users.
|
||||
|
@ -51,4 +57,13 @@ post_install() {
|
|||
|
||||
# crontab must be setuid
|
||||
chmod u+s ${DESTDIR}/usr/bin/crontab
|
||||
|
||||
# All licenses are here
|
||||
vlicense COPYING
|
||||
|
||||
# Fix conflicts with other packages
|
||||
mv ${DESTDIR}/usr/bin/crond ${DESTDIR}/usr/bin/cronie-crond
|
||||
mv ${DESTDIR}/usr/bin/crontab ${DESTDIR}/usr/bin/cronie-crontab
|
||||
mv ${DESTDIR}/usr/share/man/man1/crontab.1 ${DESTDIR}/usr/share/man/man1/cronie-crontab.1
|
||||
mv ${DESTDIR}/usr/share/man/man8/crond.8 ${DESTDIR}/usr/share/man/man8/cronie-crond.8
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue