Fix /etc/cron.d/, bug #61961. Thanks to Aaron Walker for doing all the hard work.

4 files changed, 129 insertions, 14 deletions

diff --git a/sys-apps/vixie-cron/ChangeLog b/sys-apps/vixie-cron/ChangeLog
index 87ec114db0da..b9c77910fb1f 100644
--- a/sys-apps/vixie-cron/ChangeLog
+++ b/sys-apps/vixie-cron/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/vixie-cron
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/ChangeLog,v 1.24 2004/09/03 21:03:24 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/ChangeLog,v 1.25 2004/09/24 15:01:45 ciaranm Exp $
+
+*vixie-cron-4.1-r1 (24 Sep 2004)
+
+  24 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> +vixie-cron-4.1-r1.ebuild:
+  Fix /etc/cron.d/, bug #61961. Thanks to Aaron Walker for doing all the hard
+  work.
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   vixie-cron-3.0.1-r4.ebuild, vixie-cron-3.0.1-r5.ebuild:
diff --git a/sys-apps/vixie-cron/Manifest b/sys-apps/vixie-cron/Manifest
index b70aeeb46ecd..6ce562893c27 100644
--- a/sys-apps/vixie-cron/Manifest
+++ b/sys-apps/vixie-cron/Manifest
@@ -1,23 +1,35 @@
-MD5 9723c27f200fd7b731d749fbecee96ce ChangeLog 7629
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 141bf296f623dc44f4bfa4d856dc21fa vixie-cron-3.0.1-r1.ebuild 1502
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 dd33c1120b51b3d049054c798c20d5fa vixie-cron-3.0.1-r3.ebuild 1748
 MD5 3ff8b5eb733d9a828e916a46eabfa6ca vixie-cron-3.0.1-r4.ebuild 1852
+MD5 89931211b30bf048e232dd1ce663bc52 ChangeLog 7828
 MD5 ab3b7df1ed3ce81f23a9050de83ca101 vixie-cron-3.0.1-r5.ebuild 2035
+MD5 d7982ec779ca055f20cf43c07dfa0dbc vixie-cron-4.1-r1.ebuild 2066
+MD5 141bf296f623dc44f4bfa4d856dc21fa vixie-cron-3.0.1-r1.ebuild 1502
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 99c27c934570343bcf68cfb5f877b6bc vixie-cron-4.1.ebuild 2051
-MD5 5eab102dfecfc35810ab8cf50f95d0d3 files/cron.pam.d 123
-MD5 f9c762005dc744193babe199ba3fb297 files/crontab 604
 MD5 90b7dda2ca0ecdd2f4dcd9764eaa2358 files/crontab-3.0.1-r4 617
-MD5 de84c3326555349db053b4aa13c0805f files/crontab.5.diff 772
-MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r1 144
-MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r3 144
-MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r4 144
+MD5 1915f29deae7e87c569877f1dbbbec67 files/vixie-cron-3.0.1-selinux.diff.bz2 1853
 MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r5 144
-MD5 b7bb9c09c189426ce50e45673324a2f7 files/digest-vixie-cron-4.1 140
 MD5 9d66b761d15afae9471d33509b712fe9 files/vixie-cron-3.0.1-close_stdin.diff 810
+MD5 b7bb9c09c189426ce50e45673324a2f7 files/digest-vixie-cron-4.1 140
+MD5 f9c762005dc744193babe199ba3fb297 files/crontab 604
+MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r4 144
+MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r1 144
 MD5 cec7bf697ed66fa43aedb973b2ad5362 files/vixie-cron-3.0.1-pam.patch 1854
-MD5 1915f29deae7e87c569877f1dbbbec67 files/vixie-cron-3.0.1-selinux.diff.bz2 1853
-MD5 8692002451e69ee31d667eb2d0dc904d files/vixie-cron-4.1-cron.deny 220
 MD5 620b10c2982aed3071acd92d52e76d8e files/vixie-cron-4.1-pam.patch 1714
-MD5 d761c119dd9d5273737a1f0b7714be01 files/vixie-cron-4.1-selinux.diff.bz2 1739
+MD5 de8a7ebb15e58d9c6496378ff64c5137 files/digest-vixie-cron-4.1-r1 143
 MD5 2790891d7be3833a500e5af547546b0d files/vixie-cron.rc6 526
+MD5 de84c3326555349db053b4aa13c0805f files/crontab.5.diff 772
+MD5 5eab102dfecfc35810ab8cf50f95d0d3 files/cron.pam.d 123
+MD5 8692002451e69ee31d667eb2d0dc904d files/vixie-cron-4.1-cron.deny 220
+MD5 d761c119dd9d5273737a1f0b7714be01 files/vixie-cron-4.1-selinux.diff.bz2 1739
+MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r3 144
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBVDYcLLFUmVNQ7rkRAiZsAJ0ekPHDHcExoyVdt+IeuQxsVVHukgCgoBKF
+qMBMXTeTSGWzhYuDNCEEHxw=
+=ACzb
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r1 b/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r1
new file mode 100644
index 000000000000..44721524e50e
--- /dev/null
+++ b/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r1
@@ -0,0 +1,2 @@
+MD5 09dc04f9879684d27c64c910174a9536 vixie-cron-4.1.tar.bz2 54246
+MD5 6629da19f6ddd41288d41894a0f663ed vixie-cron-4.1-gentoo-r1.patch.bz2 3782
diff --git a/sys-apps/vixie-cron/vixie-cron-4.1-r1.ebuild b/sys-apps/vixie-cron/vixie-cron-4.1-r1.ebuild
new file mode 100644
index 000000000000..5d367c77cb7d
--- /dev/null
+++ b/sys-apps/vixie-cron/vixie-cron-4.1-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/vixie-cron-4.1-r1.ebuild,v 1.1 2004/09/24 15:01:45 ciaranm Exp $
+
+inherit eutils
+
+IUSE="selinux pam"
+
+SELINUX_PATCH="${P}-selinux.diff.bz2"
+
+DESCRIPTION="The Vixie cron daemon"
+HOMEPAGE="http://www.vix.com/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${P}-gentoo-${PR}.patch.bz2"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64 ~ppc64"
+
+DEPEND=">=sys-apps/portage-2.0.47-r10
+	>=sys-apps/sed-4.0.5
+	selinux? ( sys-libs/libselinux )
+	pam? ( sys-libs/pam )"
+
+RDEPEND="!virtual/cron
+	>=sys-apps/cronbase-0.2.1-r3
+	 virtual/mta
+	 selinux? ( sys-libs/libselinux )
+	 pam? ( sys-libs/pam )"
+
+PROVIDE="virtual/cron"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch ${WORKDIR}/${P}-gentoo-${PR}.patch
+	epatch ${FILESDIR}/crontab.5.diff
+
+	use pam && epatch ${FILESDIR}/${P}-pam.patch
+	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
+
+	sed -i "s:gcc \(-Wall.*\):${CC:-gcc} \1 ${CFLAGS}:" Makefile
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	# this does not work if the directory exists already
+	diropts -m0750 -o root -g cron
+	dodir /var/spool/cron/crontabs
+	keepdir /var/spool/cron/crontabs/
+
+	doman crontab.1 crontab.5 cron.8
+
+	dodoc CHANGES CONVERSION FEATURES MAIL README THANKS
+
+	diropts -m0755 ; dodir /etc/cron.d
+	keepdir /etc/cron.d/
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/vixie-cron.rc6 vixie-cron
+
+	insinto /etc
+	insopts -o root -g root -m 0644
+	newins  ${FILESDIR}/crontab-3.0.1-r4 crontab
+	newins ${FILESDIR}/${P}-cron.deny cron.deny
+
+	dodoc ${FILESDIR}/crontab
+
+	insinto /usr/sbin
+	insopts -o root -g root -m 0750 ; doins cron
+
+	insinto /usr/bin
+	insopts -o root -g cron -m 4750 ; doins crontab
+
+	if use pam
+	then
+		insinto /etc/pam.d
+		newins ${FILESDIR}/cron.pam.d cron
+	fi
+}
+
+pkg_postinst() {
+
+	if [ -f ${ROOT}/etc/init.d/vcron ]
+	then
+		ewarn "Please run:"
+		ewarn "rc-update del vcron"
+		ewarn "rc-update add vixie-cron default"
+	fi
+}