Fix default crontab file and push it out #98189.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 67 insertions, 16 deletions

diff --git a/sys-process/dcron/ChangeLog b/sys-process/dcron/ChangeLog
index 047e7ce8fdb6..ca48aad37888 100644
--- a/sys-process/dcron/ChangeLog
+++ b/sys-process/dcron/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/dcron
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/dcron/ChangeLog,v 1.14 2009/05/12 20:59:20 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/dcron/ChangeLog,v 1.15 2009/12/19 14:47:28 vapier Exp $
+
+*dcron-3.2-r1 (19 Dec 2009)
+
+  19 Dec 2009; Mike Frysinger <vapier@gentoo.org> +dcron-3.2-r1.ebuild,
+  files/crontab:
+  Fix default crontab file and push it out #98189.
 
   12 May 2009; Thilo Bangert <bangert@gentoo.org> files/dcron.confd,
   files/dcron.init:
diff --git a/sys-process/dcron/Manifest b/sys-process/dcron/Manifest
index 0bef5b6af29b..57fbc0166aa7 100644
--- a/sys-process/dcron/Manifest
+++ b/sys-process/dcron/Manifest
@@ -1,4 +1,4 @@
-AUX crontab 864 RMD160 99fdb8b232687e4bca3ff9d7cd485817300ccc32 SHA1 087da8ec5c4826eac93ccfb8e4948a7472e84d02 SHA256 c7392f254810088f8c98e65f945f56ea8038440e968c8f2989128fdfb22f486a
+AUX crontab 728 RMD160 5f89a59157c63f0bfb5c07c7bb7c387b96a6db92 SHA1 a20c566e003d7623016d2003fc088286ce0c8d60 SHA256 e10c141909e620d3497ae83fa051a92bc58cd9150b4c552f4e56364c8e47caf7
 AUX dcron 611 RMD160 f72fee129e8ab4e35864ffd147d7b9af01d3c5ad SHA1 a70d659dc38b2f2849f085885ab52f8fbd446c6b SHA256 83b7f37724d0fac6045346acc4c8a5c7d5989e77a9249ddd21e2c4f05c362db1
 AUX dcron-2.9-EDITOR.patch 634 RMD160 d7adf079a79d3d5a7e56f33cd28bd8003a9da6f8 SHA1 f939572de994898e1cc597048f5e18fc7be8dcd9 SHA256 45f5b532c038daf05a0f6b203019f16726efd4d1cd8903237100b974522a258b
 AUX dcron-2.9-Makefile.patch 629 RMD160 a8024950f23725ed289bb48828c9939e75cf23c3 SHA1 92322fe501e4ee949c79a1f74fb08d220aac9210 SHA256 d064a108c00470e7e7a4ce9bfaf4accae15d4faf5014d032cee9b7836c51dd06
@@ -8,6 +8,6 @@ AUX dcron.confd 204 RMD160 5cda3c81b292886365441231522b00ced2323c03 SHA1 d8b7ab7
 AUX dcron.init 586 RMD160 3118cb590a85cc88f435fa72f472dc73995496b0 SHA1 234e0e1fce9fff3b7f837ad34e0dc4444916d6f5 SHA256 53c6d41df259fafb4852bada06325e16c40f8dabd0ecc694b3d0f29e49496d6f
 AUX dcron.logrotate 36 RMD160 c7fd6d92edb921054e202653ac57e89bdefbb0fe SHA1 1899ab7fd369e3b1d52bec65438b99e6ff0cb995 SHA256 fbbf3b7ff15e3dc5f8de63f621240cbab96ca9b2b3935284fbdd63cc6d16a3c8
 DIST dcron32.tgz 22184 RMD160 202036b917fd4fd48fe0a7d057d7dc5ae4c64ac5 SHA1 9ad539a5256684b86183cb51d92faf4dc40f179b SHA256 3236828eeead5ca3f4c4abef1c0ad0305582158eb5492aac6d34912e407f5318
-EBUILD dcron-3.2.ebuild 1236 RMD160 cd5b0ffeaa828b5997ec32112ecdbbb38a8fbe0d SHA1 f29804a5676cda2713af0497749f500899d6f6ca SHA256 30b3859f778f0db0f275abb78333f218d812355b073276f9402479800a835d31
-MISC ChangeLog 7530 RMD160 a1c34bec5f0c511a939c0cb5f840a39ebee3ade2 SHA1 8f33a1d11aa5501ff0abc62c47a849df99a0f6dc SHA256 8db92ae9d7047cc8507e10505298e0df066dcab92f8e2cd87c1e792a559ee98d
+EBUILD dcron-3.2-r1.ebuild 1238 RMD160 9f988b0cf449a8cb0eac77baff276bdb6bb407b6 SHA1 005dfa437dcd0466f85b8cef0378cc8e57709c4e SHA256 f0570ee97def52e739f2691ebab6af7789bd4b62b4fdaad0686264d4a3cb52c0
+MISC ChangeLog 7699 RMD160 554dc7c62588ce7b8c0d2946dddd11a2faba039d SHA1 1b1c2f70e3752846d4f6857fd6b56216035c2a24 SHA256 594faa690c481efc7c4873d011fbab807a5a634b8d46a792be3eba72c9b26f77
 MISC metadata.xml 218 RMD160 c01fda1af815f11fe07be1a02118ff1821860881 SHA1 ba2b3b173b49038884e1b9817f6a8980e7588bea SHA256 62f3785bfb158584115c7a514f8a0163340a675605512239037efa79529348ee
diff --git a/sys-process/dcron/dcron-3.2-r1.ebuild b/sys-process/dcron/dcron-3.2-r1.ebuild
new file mode 100644
index 000000000000..6328726e1bb3
--- /dev/null
+++ b/sys-process/dcron/dcron-3.2-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/dcron/dcron-3.2-r1.ebuild,v 1.1 2009/12/19 14:47:28 vapier Exp $
+
+inherit cron toolchain-funcs
+
+DESCRIPTION="A cute little cron from Matt Dillon"
+HOMEPAGE="http://apollo.backplane.com/FreeSrc/"
+SRC_URI="http://apollo.backplane.com/FreeSrc/${PN}${PV//.}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/dcron-2.9-Makefile.patch
+	epatch "${FILESDIR}"/dcron-3.2-pidfile.patch
+	epatch "${FILESDIR}"/dcron-2.9-EDITOR.patch
+	epatch "${FILESDIR}"/${P}-build.patch #181043
+}
+
+src_compile() {
+	append-cppflags -D_GNU_SOURCE # for asprintf()
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	docrondir
+	docron crond -m0700 -o root -g wheel
+	docrontab
+
+	dodoc CHANGELOG README "${FILESDIR}"/crontab
+	doman crontab.1 crond.8
+
+	newinitd "${FILESDIR}"/dcron.init dcron
+	newconfd "${FILESDIR}"/dcron.confd dcron
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dcron.logrotate dcron
+
+	insinto /etc
+	doins "${FILESDIR}"/crontab
+}
diff --git a/sys-process/dcron/files/crontab b/sys-process/dcron/files/crontab
index 29a7ead6766a..afee25203a6a 100644
--- a/sys-process/dcron/files/crontab
+++ b/sys-process/dcron/files/crontab
@@ -1,5 +1,5 @@
 # for dcron 
-# $Header: /var/cvsroot/gentoo-x86/sys-process/dcron/files/crontab,v 1.2 2009/05/12 09:18:29 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/dcron/files/crontab,v 1.3 2009/12/19 14:47:30 vapier Exp $
 
 # dcron:
 # This is NOT the system crontab! dcron does not support a system crontab.
@@ -8,15 +8,9 @@
 # as root.
 # NOTE: This will REPLACE root's current crontab!!
 
-# Global variables
-SHELL=/bin/bash
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-MAILTO=root
-HOME=/
-
 # check scripts in cron.hourly, cron.daily, cron.weekly and cron.monthly
-59  *  * * *    root    rm -f /var/spool/cron/lastrun/cron.hourly
-9  3  * * *     root    rm -f /var/spool/cron/lastrun/cron.daily
-19 4  * * 6     root    rm -f /var/spool/cron/lastrun/cron.weekly
-29 5  1 * *     root    rm -f /var/spool/cron/lastrun/cron.monthly
-*/10  *  * * *  root    test -x /usr/sbin/run-crons && /usr/sbin/run-crons
+59   *  * * *  rm -f /var/spool/cron/lastrun/cron.hourly
+9    3  * * *  rm -f /var/spool/cron/lastrun/cron.daily
+19   4  * * 6  rm -f /var/spool/cron/lastrun/cron.weekly
+29   5  1 * *  rm -f /var/spool/cron/lastrun/cron.monthly
+*/10 *  * * *  test -x /usr/sbin/run-crons && /usr/sbin/run-crons