Added anacron functionality (bug #403295). Reworked init script

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

7 files changed, 83 insertions, 76 deletions

diff --git a/sys-process/cronie/ChangeLog b/sys-process/cronie/ChangeLog
index d0b088663637..72d75458c29c 100644
--- a/sys-process/cronie/ChangeLog
+++ b/sys-process/cronie/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-process/cronie
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/ChangeLog,v 1.20 2011/10/27 22:42:32 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/ChangeLog,v 1.21 2012/02/13 17:32:34 polynomial-c Exp $
+
+*cronie-1.4.8-r1 (13 Feb 2012)
+
+  13 Feb 2012; Lars Wendler <polynomial-c@gentoo.org> +files/anacron-1.0-initd,
+  +files/cronie-1.3-initd, -cronie-1.4.4-r1.ebuild, -cronie-1.4.6.ebuild,
+  +cronie-1.4.8-r1.ebuild:
+  Added anacron functionality and conf.d file. Thanks to Florian Steinel for
+  providing an ebuild patch in bug #403295. Reworked init script.
 
   27 Oct 2011; Mike Frysinger <vapier@gentoo.org> cronie-1.4.8.ebuild:
   Arm love #388713 by Norman Shulman.
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index 868e505f0573..401f91935783 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -1,22 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX anacron-1.0-initd 622 RMD160 acbd71d01320e424adf8837236acac79031bdb73 SHA1 c2f6d93cd80ca309f110239c3a2db863e9735323 SHA256 eb85f233fe09869b93b45f6fb870d933ec7d886e6cd00545ec5cd2460badbd5d
 AUX cronie-1.2-cron.deny 216 RMD160 768f5ecd49ad62568e0e6924b2436423b6b415d0 SHA1 e5c64f18d907e27e0590e7889c5a11c6f4c4aa6b SHA256 4a857b2c58bb10d4aefbdd7d4a41710456a8cc27774c365e361ca5271128e0b8
 AUX cronie-1.2-crontab 605 RMD160 291301b2672215b1353975397e0f141502abd660 SHA1 793ed897551f7faf282ef974fb36a248fc03f769 SHA256 369665b00a9f278fb57e6c2e285d6335b38970474d27e7563b68a65aa1045d4b
 AUX cronie-1.2-initd 522 RMD160 7bb3c6e1824b59bfd95e79eb3f04083f6865da18 SHA1 177b9de44154590b2f2e49db8d753e50ef8c7705 SHA256 a2ae854440229bc79112f378de93312a9b4784eaef7c3c8e11512f783f0d66b3
+AUX cronie-1.3-initd 395 RMD160 72f57548680e46ce7e38b4a91f5ec0c8f782cc6d SHA1 462d658153956ad647624f7a5ac82862b6cce58b SHA256 0954be9e1e1c34d2f963cc60828b63711a2949bfe91f65620caf9c80256383f2
 AUX cronie-1.4.3-pamd 231 RMD160 cfcf347aaa639bb9bd46ed49e3204babe2098c07 SHA1 471a4898f3da48266443a2f9f3424da685e731b3 SHA256 c281c9b8fb4984e20142a7e099d7032192d5c2ca2eb02ece5eb4f73ca64593dd
-DIST cronie-1.4.4.tar.gz 200729 RMD160 680d303aab25ad349683741b61b0f647aa952422 SHA1 e0b963dd7162ff8ddb095d37d7b4dc10312d3079 SHA256 cdceb796afe78e3955131ddec07b31e6b1600a72b1178c33d3074c6e0a021e60
-DIST cronie-1.4.6.tar.gz 208120 RMD160 95ac3cf1de765ffd44c2f949788eb017a78e3e74 SHA1 296420833e3272bd4c8b2b26e7c241e39254d079 SHA256 4435484c28a4452ee37db27182675660cdebf16d8956771b28c8a6f2e9c8048b
 DIST cronie-1.4.8.tar.gz 209994 RMD160 9ef37c18c97514cd5c8ff10ad3ccd25c425ac4a0 SHA1 1d2ce3a6ca2a6f96ff31921e4060be3199dc10f3 SHA256 a3b910876f255712f1a5c364b74f34b0ceac9f6f3bbc45e854c5722785f513b3
-EBUILD cronie-1.4.4-r1.ebuild 1355 RMD160 6db824aeed987a8088a762aa2e15e9349be4ae09 SHA1 08b08285a4bf5ac21e4384353466f96981f0b24f SHA256 815c30e578fb85d50ff9127e347d213d283c7033c9d69cb1ccac5ec745d07244
-EBUILD cronie-1.4.6.ebuild 1354 RMD160 3a1b386475c962224df499d78c81efac427179b3 SHA1 dc904763e4a219c762116186f0381c368b94faf3 SHA256 d65d6d3858193ecd2fad088da7022c60221f032853eaf5804c12bcfce9052fd1
+EBUILD cronie-1.4.8-r1.ebuild 1661 RMD160 aa42f82d0654df7db50d425035f72d940022d02a SHA1 dc30c0e7a8bf4befa08eb9f79ada316bb6a80572 SHA256 f3ea2d0ad719129052a7d3c271616046bbe677fbf3a446529d9a045ea404239d
 EBUILD cronie-1.4.8.ebuild 1358 RMD160 175dfcfc076a12200f2473d6b8593da67567e72a SHA1 e8edacc5ff6a1fa79a25cd203dd6d2fe08f673be SHA256 9f8e0a32d721ac3717914e862303fedfecb0fd57a5c95d1c7bb662627c4d8302
-MISC ChangeLog 3284 RMD160 3f6758a8aa659035115c301ea75e393ac7ddc4df SHA1 de5d775a326c23d3d098acffb1e23a0898d56633 SHA256 e2dfa9219876d0044fc88de02c772c84eb30978a85cc3aecb8dba64137cd151b
-MISC metadata.xml 867 RMD160 593eb62683698bc42da16a994174e9c4d24ce235 SHA1 65a7097e37f78b8577768a2ef3fb6a9e836f4dd1 SHA256 88a42e9901f20e28e43d567775fd1388897ef3cab7db1ce826b9dc39848a578d
+MISC ChangeLog 3647 RMD160 15dc8e959a02fc3813532bf272a5b41f1e219515 SHA1 68d4a2d9ad7c904d8548e7314bb91aa7ee477205 SHA256 824be78b627ec3502882b585b3f04fc35dc2ac2ccd13fa6d0ba3af5dad8b600f
+MISC metadata.xml 799 RMD160 116d829467713bf9aa921e3f10312076b969ab1b SHA1 88446c25e9676fe8b87afb2a2884a5897fb92365 SHA256 fe8f004016da48f9eaf570c4777bd407f210d468e8779d8db538b5fa1f0dad7d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6p3rAACgkQaC/OocHi7JZ+6gEAltKdzpujwDxGsUBpa3xIbe7a
-8+x/xXiHMKUVRzkXaEsA/0NoV6i4tkOtyik5WPQ5dgGc25JzJGUc6CYkt7zUoHtf
-=Qlp/
+iQIcBAEBCgAGBQJPOUk4AAoJEPiazRVxLXTF6+MP/A9JhyTvEphs/tPpLmCRbMyr
+RIZzwsJse4biuORpJd/gl+MG9j7njvZwPn9io6dS133vsQfTWWBsrEBY2nc2ISis
+CfWDHdhwZi6rIQpPV2OrritR0mG+uWAnBHBPZCyRGbh8x3PWfJy21txzgHDNSbqm
+JKl+XqqUD5wLHd1+/QfiXdHL5Agl3ApFT5edZGAcK9JBI2I1LhoKSwd6/lO+Sb5g
+L5a5gm8+4hjwGS0yEERKtGwjO1KCf9RhdPj8e+rMUevIwnNiRnXY4HVlcqITH+Ld
+vbb/Q8JjtIAE1vXaYXh34oSRkartNymxNMCwa8MuOPDJU05wcdsRCVIp5a0z/Fum
+xtJuQBZh3BVk7SBJCvxBDcLyFFjr4t2FxrOWnREzpD+S1V3+XVZEe5Hic7lIg3ps
+4k52wE7eiHsygYMgJqhtybud0wyv672ubX5T4bMYd7OXL7AXWKBzLTZiH5zk8ZzR
+N64w2oUorjWXA6OWw9zqbttSExGwjMnMyW1+qHgY9STlhxfc5uZkLZ+Cd4NyfRCV
+vX2mhuxJc79jGdne0YfH/8yxXA9Lt0JwNqk5vEcrCIfPHgnbQGuiiFIN8hDWcuE4
+v1YyvO9MCR8f/uMNKLVS9Qz1ufoUhHEqVtSUEzJFaHA6AJ3eLIK9b5o2K3uAniYD
+i7IEmwCRlcZDkYCGxwry
+=cu7S
 -----END PGP SIGNATURE-----
diff --git a/sys-process/cronie/cronie-1.4.4-r1.ebuild b/sys-process/cronie/cronie-1.4.4-r1.ebuild
deleted file mode 100644
index c287f6b8c265..000000000000
--- a/sys-process/cronie/cronie-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/cronie-1.4.4-r1.ebuild,v 1.1 2011/07/10 19:41:09 polynomial-c Exp $
-
-EAPI="2"
-
-inherit cron eutils pam
-
-DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron."
-SRC_URI="https://fedorahosted.org/releases/c/r/cronie/${P}.tar.gz"
-HOMEPAGE="https://fedorahosted.org/cronie/wiki"
-
-LICENSE="ISC BSD BSD-2"
-KEYWORDS="amd64 x86"
-IUSE="inotify pam"
-
-DEPEND="pam? ( virtual/pam )"
-RDEPEND="${DEPEND}"
-
-#cronie supports /etc/crontab
-CRON_SYSTEM_CRONTAB="yes"
-
-pkg_setup() {
-	enewgroup crontab
-}
-
-src_configure() {
-	SPOOL_DIR="/var/spool/cron/crontabs" econf \
-		$(use_with inotify ) \
-		$(use_with pam ) \
-		--with-daemon_username=cron \
-		--with-daemon_groupname=cron \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-
-	docrondir -m 1730 -o root -g crontab
-	fowners root:crontab /usr/bin/crontab
-	fperms 2751 /usr/bin/crontab
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}-1.2-crontab" crontab
-	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
-
-	keepdir /etc/cron.d
-	newinitd "${FILESDIR}/${PN}-1.2-initd" cronie
-	newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
-
-	dodoc NEWS AUTHORS README
-}
-
-pkg_postinst() {
-	cron_pkg_postinst
-}
diff --git a/sys-process/cronie/cronie-1.4.6.ebuild b/sys-process/cronie/cronie-1.4.8-r1.ebuild
index df0498fcc552..db6d24ae607b 100644
--- a/sys-process/cronie/cronie-1.4.6.ebuild
+++ b/sys-process/cronie/cronie-1.4.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/cronie-1.4.6.ebuild,v 1.3 2011/07/10 19:53:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/cronie-1.4.8-r1.ebuild,v 1.1 2012/02/13 17:32:34 polynomial-c Exp $
 
 EAPI="3"
 
@@ -11,10 +11,11 @@ SRC_URI="https://fedorahosted.org/releases/c/r/cronie/${P}.tar.gz"
 HOMEPAGE="https://fedorahosted.org/cronie/wiki"
 
 LICENSE="ISC BSD BSD-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="inotify pam"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
+IUSE="anacron inotify pam"
 
-DEPEND="pam? ( virtual/pam )"
+DEPEND="pam? ( virtual/pam )
+	anacron? ( !sys-process/anacron )"
 RDEPEND="${DEPEND}"
 
 #cronie supports /etc/crontab
@@ -28,6 +29,7 @@ src_configure() {
 	SPOOL_DIR="/var/spool/cron/crontabs" econf \
 		$(use_with inotify ) \
 		$(use_with pam ) \
+		$(use_enable anacron ) \
 		--with-daemon_username=cron \
 		--with-daemon_groupname=cron \
 		|| die "econf failed"
@@ -40,15 +42,27 @@ src_install() {
 	fowners root:crontab /usr/bin/crontab
 	fperms 2751 /usr/bin/crontab
 
+	insinto /etc/conf.d
+	newins "${S}"/crond.sysconfig ${PN}
+
 	insinto /etc
 	newins "${FILESDIR}/${PN}-1.2-crontab" crontab
 	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
 
 	keepdir /etc/cron.d
-	newinitd "${FILESDIR}/${PN}-1.2-initd" cronie
+	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
 	newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
 
-	dodoc NEWS AUTHORS README
+	if use anacron ; then
+		keepdir /var/spool/anacron
+
+		insinto /etc
+		doins "${S}"/contrib/anacrontab
+
+		newinitd "${FILESDIR}"/anacron-1.0-initd anacron
+	fi
+
+	dodoc AUTHORS README contrib/*
 }
 
 pkg_postinst() {
diff --git a/sys-process/cronie/files/anacron-1.0-initd b/sys-process/cronie/files/anacron-1.0-initd
new file mode 100644
index 000000000000..f4f0e5eb2133
--- /dev/null
+++ b/sys-process/cronie/files/anacron-1.0-initd
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/files/anacron-1.0-initd,v 1.1 2012/02/13 17:32:34 polynomial-c Exp $
+
+# anacron forks itself when -d gets omitted. So s-s-d fails to create a valid
+# pidfile. DO NOT remove -d from command_args and -b from s-s-d_args!
+
+command="/usr/sbin/anacron"
+command_args="-d -s -S /var/spool/anacron"
+pidfile="var/run/anacron.pid"
+start_stop_daemon_args="--background --make-pidfile --pidfile ${pidfile}"
+
+depend() {
+	use clock logger
+	need localmount
+}
diff --git a/sys-process/cronie/files/cronie-1.3-initd b/sys-process/cronie/files/cronie-1.3-initd
new file mode 100644
index 000000000000..5213ab72fae5
--- /dev/null
+++ b/sys-process/cronie/files/cronie-1.3-initd
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/files/cronie-1.3-initd,v 1.1 2012/02/13 17:32:34 polynomial-c Exp $
+
+command="/usr/sbin/crond"
+command_args="${CRONDARGS}"
+pidfile="/var/run/crond.pid"
+
+depend() {
+	use clock logger
+	need localmount
+	provide cron	
+}
diff --git a/sys-process/cronie/metadata.xml b/sys-process/cronie/metadata.xml
index 4cf857201623..79ee2465bc19 100644
--- a/sys-process/cronie/metadata.xml
+++ b/sys-process/cronie/metadata.xml
@@ -13,7 +13,8 @@
   SELinux.
   And why cronie? See http://www.urbandictionary.com/define.php?term=cronie
   </longdescription>
-  <use>                                                                                                                                                    
+  <use>
+    <flag name='anacron'>Install the periodic anacron command scheduler.</flag>
     <flag name='inotify'>Enable inotify filesystem monitoring support.</flag>
   </use>
 </pkgmetadata>