fix lines starting with whitespace bug

9 files changed, 23 insertions, 117 deletions

diff --git a/sys-apps/dcron/ChangeLog b/sys-apps/dcron/ChangeLog
index e76a53bd7d5e..419adb7ea39c 100644
--- a/sys-apps/dcron/ChangeLog
+++ b/sys-apps/dcron/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/dcron
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/ChangeLog,v 1.2 2002/03/21 21:27:35 woodchip Exp $
+
+*dcron-2.7-r8 (21 Mar 2002)
+
+  21 Mar 2002; Donny Davies <woodchip@gentoo.org> dcron-2.7-r8.ebuild,
+  files/dcron-2.7-whitespace.diff :
+
+  Added patch from Matt Dillon to fix crontabs that begin with whitespace.
+  Thanks to everybody who helped analyze this problem.
 
 *dcron-2.7-r7 (1 Feb 2002)
 
diff --git a/sys-apps/dcron/dcron-2.7-r6.ebuild b/sys-apps/dcron/dcron-2.7-r6.ebuild
deleted file mode 100644
index aececc5d03fa..000000000000
--- a/sys-apps/dcron/dcron-2.7-r6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.7-r6.ebuild,v 1.4 2001/12/31 23:47:55 azarah Exp $
-
-# to use this, you must be part of the "cron" group
-
-S=${WORKDIR}/dcron
-DESCRIPTION="A cute little cron from Matt Dillon"
-SRC_URI="http://apollo.backplane.com/FreeSrc/dcron27.tgz"
-HOMEPAGE="http://apollo.backplane.com"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-Makefile-gentoo.diff || die
-}
-
-src_compile() {
-	make || die
-}
-
-src_install() {
-	# lets just do it this way shall we
-	dodir /usr/{sbin,bin}
-	install -o root -g wheel -m 0700 crond ${D}/usr/sbin
-	install -o root -g cron -m 4750 crontab ${D}/usr/bin
-
-	diropts -m0755 ; dodir /var
-	diropts -m0750 ; dodir /var/cron/lastrun
-	# gotcha: /var/spool needs to be 755
-	diropts -m0755 ; dodir /var/spool
-	diropts -m0750 ; dodir /var/spool/cron/crontabs
-	# this still do not alway get created
-	touch ${D}/var/spool/cron/crontabs/.dummy
-
-	dodoc CHANGELOG README
-	doman crontab.1 crond.8
-
-	insinto /etc ; doins ${FILESDIR}/crontab
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/dcron.rc6 dcron
-}
diff --git a/sys-apps/dcron/dcron-2.7-r7.ebuild b/sys-apps/dcron/dcron-2.7-r8.ebuild
index fc6a607335f6..f7fa5339ce1b 100644
--- a/sys-apps/dcron/dcron-2.7-r7.ebuild
+++ b/sys-apps/dcron/dcron-2.7-r8.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.7-r7.ebuild,v 1.1 2002/01/10 18:50:04 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.7-r8.ebuild,v 1.1 2002/03/21 21:27:35 woodchip Exp $
 
 # to use this, you must be part of the "cron" group
 
@@ -21,6 +21,8 @@ src_unpack() {
 	sed -e 's:VISUAL:EDITOR:g' ${S}/crontab.c.orig > ${S}/crontab.c
 	cp ${S}/crontab.1 ${S}/crontab.1.orig
 	sed -e 's:VISUAL:EDITOR:g' ${S}/crontab.1.orig > ${S}/crontab.1
+	# fix for lines starting with whitespace
+	patch -p0 < ${FILESDIR}/${P}-whitespace.diff || die
 }
 
 src_compile() {
diff --git a/sys-apps/dcron/dcron-2.7.ebuild b/sys-apps/dcron/dcron-2.7.ebuild
deleted file mode 100644
index 82d9dc13c821..000000000000
--- a/sys-apps/dcron/dcron-2.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>, Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.7.ebuild,v 1.8 2001/10/03 04:35:19 woodchip Exp $
-
-# to use this, you must be part of the "cron" group
-
-S=${WORKDIR}/dcron
-DESCRIPTION="A cute little cron from Matt Dillon"
-SRC_URI="http://apollo.backplane.com/FreeSrc/dcron27.tgz"
-HOMEPAGE="http://apollo.backplane.com"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-Makefile-gentoo.diff || die
-}
-
-src_compile() {
-	make || die
-}
-
-src_install() {
-	# lets just do it this way shall we
-	dodir /usr/{sbin,bin}
-	install -o root -g wheel -m 0700 crond ${D}/usr/sbin
-	install -o root -g cron -m 4750 crontab ${D}/usr/bin
-
-	diropts -m0755 ; dodir /var
-	diropts -m0750 ; dodir /var/cron/lastrun
-	# gotcha: /var/spool needs to be 755
-	diropts -m0755 ; dodir /var/spool
-	diropts -m0750 ; dodir /var/spool/cron/crontabs
-
-	dodoc CHANGELOG README
-	doman crontab.1 crond.8
-
-	insinto /etc ; doins ${FILESDIR}/crontab
-
-	exeinto /etc/rc.d/init.d ; newexe ${FILESDIR}/dcron.rc5 dcron
-}
diff --git a/sys-apps/dcron/files/dcron-2.7-whitespace.diff b/sys-apps/dcron/files/dcron-2.7-whitespace.diff
new file mode 100644
index 000000000000..024cf43a28ae
--- /dev/null
+++ b/sys-apps/dcron/files/dcron-2.7-whitespace.diff
@@ -0,0 +1,11 @@
+--- database.c.orig	Thu Mar 21 13:37:30 2002
++++ database.c	Thu Mar 21 13:38:43 2002
+@@ -174,7 +174,7 @@
+ 			++ptr;
+ 
+ 		    if (*ptr)
+-			buf[strlen(ptr)-1] = 0;
++			ptr[strlen(ptr)-1] = 0;
+ 
+ 		    if (*ptr == 0 || *ptr == '#')
+ 			continue;
diff --git a/sys-apps/dcron/files/dcron.rc5 b/sys-apps/dcron/files/dcron.rc5
deleted file mode 100644
index a8da6b9eddd7..000000000000
--- a/sys-apps/dcron/files/dcron.rc5
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#RCUPDATE:2 3 4:80:This line is required for script management
-
-. /etc/rc.d/config/basic
-. /etc/rc.d/config/functions
-
-SERVICE=dcron
-EXE="/usr/sbin/crond"
-opts="start stop"
-
-start() {
-	ebegin "Starting ${SERVICE}"
-	start-stop-daemon --start --quiet --exec $EXE 1>&2
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SERVICE}"
-	start-stop-daemon --stop --quiet -u root -n $SERVICE 1>&2
-	eend $?
-}
-
-doservice ${@}
-
diff --git a/sys-apps/dcron/files/digest-dcron-2.7-r6 b/sys-apps/dcron/files/digest-dcron-2.7-r6
deleted file mode 100644
index 0bbc16c10bc6..000000000000
--- a/sys-apps/dcron/files/digest-dcron-2.7-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8984a6bb120cd674d4fb7f1cc52630a2 dcron27.tgz 15868
diff --git a/sys-apps/dcron/files/digest-dcron-2.7-r7 b/sys-apps/dcron/files/digest-dcron-2.7-r7
deleted file mode 100644
index 0bbc16c10bc6..000000000000
--- a/sys-apps/dcron/files/digest-dcron-2.7-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8984a6bb120cd674d4fb7f1cc52630a2 dcron27.tgz 15868
diff --git a/sys-apps/dcron/files/digest-dcron-2.7 b/sys-apps/dcron/files/digest-dcron-2.7-r8
index 0bbc16c10bc6..0bbc16c10bc6 100644
--- a/sys-apps/dcron/files/digest-dcron-2.7
+++ b/sys-apps/dcron/files/digest-dcron-2.7-r8