reset execopts after setuid install of crontab to prevent init.d/dcron from being installed setuid as well

7 files changed, 106 insertions, 19 deletions

diff --git a/sys-apps/dcron/ChangeLog b/sys-apps/dcron/ChangeLog
index 4dba81655112..4a0a66f1bc85 100644
--- a/sys-apps/dcron/ChangeLog
+++ b/sys-apps/dcron/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/dcron
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/ChangeLog,v 1.23 2003/12/29 03:33:04 kumba Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/ChangeLog,v 1.24 2004/02/25 19:16:56 solar Exp $
+
+*dcron-2.9-r2 (25 Feb 2004)
+
+  25 Feb 2004; <solar@gentoo.org> dcron-2.9-r2.ebuild:
+  reset execopts after setuid install of crontab to prevent init.d/dcron from
+  being installed setuid as well
 
   28 Dec 2003; Joshua Kinard <kumba@gentoo.org> dcron-2.9.ebuild:
   Move to mips stable (~mips -> mips)
diff --git a/sys-apps/dcron/Manifest b/sys-apps/dcron/Manifest
index c97f078eb5c6..0b9ce040b0c4 100644
--- a/sys-apps/dcron/Manifest
+++ b/sys-apps/dcron/Manifest
@@ -1,14 +1,15 @@
-MD5 573b4d150efe80134647cc6fb9aff3ed files/crontab 822
-MD5 2db10e843ecdf10a2b3aa5f70322310b files/digest-dcron-2.9 55
-MD5 b0a661ba0ae334e2d9453a144907b375 files/digest-dcron-2.7-r10 55
+MD5 ae8d0cb51a6f6d6e51d126bf80607765 ChangeLog 3400
+MD5 85f1fafd1bda47abd467598e15e84514 dcron-2.7-r10.ebuild 1643
+MD5 0f78349bc91cd979cfd09bfe58f6897f dcron-2.9.ebuild 1643
+MD5 c4bc37a57ef82f60fc528147dc686887 dcron-2.9-r1.ebuild 1726
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 d0bd4fc464c59d351df70e8435206bfa dcron-2.9-r2.ebuild 1872
 MD5 7278fd48e8e262b669c68e453c991432 files/dcron.rc6 632
+MD5 573b4d150efe80134647cc6fb9aff3ed files/crontab 822
 MD5 932978359b7a3b3a2d29a96827ceca83 files/dcron-2.7-Makefile-gentoo.diff 534
-MD5 2db10e843ecdf10a2b3aa5f70322310b files/digest-dcron-2.9-r1 55
-MD5 bcd2422f3fe6cd487056bc986888b25d files/crontab-2.9-r1 825
 MD5 31317ebf17de1d739c57ccbee37caf13 files/dcron-2.7-whitespace.diff 244
-MD5 3f445d8c206bfe86226ef8a4cc3604d6 dcron-2.9-r1.ebuild 1728
-MD5 92469693f520a71a7fd09da7e7c7615e dcron-2.7-r10.ebuild 1645
-MD5 28b7e3f62c71fb67bbb944d6cd856718 .#Manifest.1.11 811
-MD5 eff5a5b965cd8272a7de36e7c65a129d dcron-2.9.ebuild 1643
-MD5 435bad7213cfa2f867b713b923b01087 ChangeLog 3204
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 b0a661ba0ae334e2d9453a144907b375 files/digest-dcron-2.7-r10 55
+MD5 2db10e843ecdf10a2b3aa5f70322310b files/digest-dcron-2.9 55
+MD5 bcd2422f3fe6cd487056bc986888b25d files/crontab-2.9-r1 825
+MD5 2db10e843ecdf10a2b3aa5f70322310b files/digest-dcron-2.9-r1 55
+MD5 2db10e843ecdf10a2b3aa5f70322310b files/digest-dcron-2.9-r2 55
diff --git a/sys-apps/dcron/dcron-2.7-r10.ebuild b/sys-apps/dcron/dcron-2.7-r10.ebuild
index 45fa943c12eb..0e02771ee63a 100644
--- a/sys-apps/dcron/dcron-2.7-r10.ebuild
+++ b/sys-apps/dcron/dcron-2.7-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.7-r10.ebuild,v 1.5 2003/12/27 05:14:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.7-r10.ebuild,v 1.6 2004/02/25 19:16:56 solar Exp $
 
 # to use this, you must be part of the "cron" group
 
diff --git a/sys-apps/dcron/dcron-2.9-r1.ebuild b/sys-apps/dcron/dcron-2.9-r1.ebuild
index 5ad1f55cfbb0..2d9e2494a049 100644
--- a/sys-apps/dcron/dcron-2.9-r1.ebuild
+++ b/sys-apps/dcron/dcron-2.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.9-r1.ebuild,v 1.2 2003/12/27 05:14:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.9-r1.ebuild,v 1.3 2004/02/25 19:16:56 solar Exp $
 
 # to use this, you must be part of the "cron" group
 
diff --git a/sys-apps/dcron/dcron-2.9-r2.ebuild b/sys-apps/dcron/dcron-2.9-r2.ebuild
new file mode 100644
index 000000000000..7637f83c5cc0
--- /dev/null
+++ b/sys-apps/dcron/dcron-2.9-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.9-r2.ebuild,v 1.1 2004/02/25 19:16:56 solar Exp $
+
+# to use this, you must be part of the "cron" group
+
+inherit eutils
+
+MY_PV=29
+S=${WORKDIR}/${PN}
+DESCRIPTION="A cute little cron from Matt Dillon"
+SRC_URI="http://apollo.backplane.com/FreeSrc/${PN}${MY_PV}.tgz"
+HOMEPAGE="http://apollo.backplane.com/"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~alpha ~mips"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+	>=sys-apps/sed-4"
+
+RDEPEND="!virtual/cron
+	>=sys-apps/cronbase-0.2.1-r3
+	virtual/mta"
+
+PROVIDE="virtual/cron"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/dcron-2.7-Makefile-gentoo.diff
+
+	# fix 'crontab -e' to look at $EDITOR and not $VISUAL
+	sed -i 's:VISUAL:EDITOR:g' ${S}/crontab.c
+
+	sed -i 's:VISUAL:EDITOR:g' ${S}/crontab.1
+
+	# remove gcc hardcode
+	sed -i "s:\(CC  = \)gcc:\1${CC:-gcc}:" ${S}/Makefile
+}
+
+src_compile() {
+	make || die
+}
+
+src_install() {
+	#this does not work if the directory already exists
+	diropts -m 0750 -o root -g cron
+	keepdir /var/spool/cron/crontabs
+
+	exeopts -m 0700 -o root -g wheel
+	exeinto /usr/sbin
+	doexe crond
+
+	exeopts -m 4750 -o root -g cron
+	exeinto /usr/bin
+	doexe crontab
+	# reset execopts after setuid install of crontab to
+	# prevent init.d/dcron from being installed setuid as well
+	exeopts -m 0750 -o root -g root
+
+	dodoc CHANGELOG README ${FILESDIR}/crontab
+	doman crontab.1 crond.8
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/dcron.rc6 dcron
+
+	insopts -o root -g root -m 0644
+	insinto /etc
+	newins ${FILESDIR}/crontab-2.9-r1 crontab
+}
+
+
+pkg_postinst() {
+	echo
+	einfo "To activate /etc/cron.{hourly|daily|weekly|montly} please run: "
+	einfo "crontab /etc/crontab"
+	echo
+	einfo "!!! That will replace root's current crontab !!!"
+	echo
+}
diff --git a/sys-apps/dcron/dcron-2.9.ebuild b/sys-apps/dcron/dcron-2.9.ebuild
index f57ddbbaba8d..b052f1e04bbd 100644
--- a/sys-apps/dcron/dcron-2.9.ebuild
+++ b/sys-apps/dcron/dcron-2.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.9.ebuild,v 1.11 2003/12/29 03:33:04 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.9.ebuild,v 1.12 2004/02/25 19:16:56 solar Exp $
 
 # to use this, you must be part of the "cron" group
 
diff --git a/sys-apps/dcron/files/digest-dcron-2.9-r2 b/sys-apps/dcron/files/digest-dcron-2.9-r2
new file mode 100644
index 000000000000..bf4decff8ad3
--- /dev/null
+++ b/sys-apps/dcron/files/digest-dcron-2.9-r2
@@ -0,0 +1 @@
+MD5 120fb2ca3d91496b32df0ab01dcaec5e dcron29.tgz 15608