commit: f79f8ac5d95fa3f88301f0bad8b03e9d5f497a59 Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> AuthorDate: Mon Feb 5 03:23:05 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Feb 14 10:21:09 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f79f8ac5
sys-process/cronie: fix USE=anacron mess run-crons script from sys-process/cronbase is duplicating anacron's functionality. And since we run run-crons every 10 minutes and anacron every hour, we end up running every daily/weekly/monthly cron job twice. Fix this by removing run-crons from crontab. Also enable USE=anacron by default because this is closer to behaviour we previously had with USE=-anacron (thanks to run-crons). Closes: https://bugs.gentoo.org/621706 Closes: https://github.com/gentoo/gentoo/pull/7079 sys-process/cronie/cronie-1.5.1-r1.ebuild | 101 ++++++++++++++++++++++++++++++ sys-process/cronie/files/cronie-crontab | 17 +++++ 2 files changed, 118 insertions(+) diff --git a/sys-process/cronie/cronie-1.5.1-r1.ebuild b/sys-process/cronie/cronie-1.5.1-r1.ebuild new file mode 100644 index 00000000000..9030fc8fb1d --- /dev/null +++ b/sys-process/cronie/cronie-1.5.1-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools cron pam systemd user + +DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron" +HOMEPAGE="https://github.com/cronie-crond/cronie"; +SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"; + +LICENSE="ISC BSD BSD-2 GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="+anacron +inotify pam selinux" + +DEPEND="pam? ( virtual/pam ) + anacron? ( !sys-process/anacron )" +RDEPEND="${DEPEND} + sys-apps/debianutils" + +#cronie supports /etc/crontab +CRON_SYSTEM_CRONTAB="yes" + +S="${WORKDIR}/${PN}-${P}" + +PATCHES=( + "${FILESDIR}/cronie-systemd.patch" +) + +pkg_setup() { + enewgroup crontab +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + SPOOL_DIR="/var/spool/cron/crontabs" \ + ANACRON_SPOOL_DIR="/var/spool/anacron" \ + econf \ + $(use_with inotify) \ + $(use_with pam) \ + $(use_with selinux) \ + $(use_enable anacron) \ + --enable-syscrontab \ + --with-daemon_username=cron \ + --with-daemon_groupname=cron +} + +src_install() { + emake install DESTDIR="${D}" + + docrondir -m 1730 -o root -g crontab + fowners root:crontab /usr/bin/crontab + fperms 2751 /usr/bin/crontab + + newconfd "${S}"/crond.sysconfig ${PN} + + insinto /etc + newins "${FILESDIR}/${PN}-crontab" crontab + newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny + + insinto /etc/cron.d + doins contrib/0hourly + + newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN} + newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond + + systemd_newunit contrib/cronie.systemd cronie.service + + if use anacron ; then + local anacrondir="/var/spool/anacron" + keepdir ${anacrondir} + fowners root:cron ${anacrondir} + fperms 0750 ${anacrondir} + + insinto /etc + doins contrib/anacrontab + + insinto /etc/cron.hourly + doins contrib/0anacron + fperms 0750 /etc/cron.hourly/0anacron + else + insinto /etc/cron.d + doins contrib/dailyjobs + fi + + einstalldocs +} + +pkg_postinst() { + cron_pkg_postinst + + if [[ -n "${REPLACING_VERSIONS}" ]] ; then + ewarn "You should restart ${PN} daemon or else you might experience segfaults" + ewarn "or ${PN} not working reliably anymore." + einfo "(see https://bugs.gentoo.org/557406 for details.)" + fi +} diff --git a/sys-process/cronie/files/cronie-crontab b/sys-process/cronie/files/cronie-crontab new file mode 100644 index 00000000000..275f06c603d --- /dev/null +++ b/sys-process/cronie/files/cronie-crontab @@ -0,0 +1,17 @@ +# Global variables +SHELL=/bin/bash +PATH=/sbin:/bin:/usr/sbin:/usr/bin +MAILTO=root +HOME=/ + +# For details see man 4 crontabs + +# Example of job definition: +# .---------------- minute (0 - 59) +# | .------------- hour (0 - 23) +# | | .---------- day of month (1 - 31) +# | | | .------- month (1 - 12) OR jan,feb,mar,apr ... +# | | | | .---- day of week (0 - 6) (Sunday=0 or 7) OR sun,mon,tue,wed,thu,fri,sat +# | | | | | +# * * * * * user-name command to be executed +
