fix #26413

5 files changed, 97 insertions, 2 deletions

diff --git a/sys-apps/vcron/ChangeLog b/sys-apps/vcron/ChangeLog
index 5f502c88c6c2..4af922ed048a 100644
--- a/sys-apps/vcron/ChangeLog
+++ b/sys-apps/vcron/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/vcron
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/ChangeLog,v 1.16 2003/05/07 20:29:34 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/ChangeLog,v 1.17 2003/10/17 03:42:09 pebenito Exp $
+
+*vcron-3.0.1-r2 (16 Oct 2003)
+
+  16 Oct 2003; Chris PeBenito <pebenito@gentoo.org> vcron-3.0.1-r2.ebuild,
+  files/vcron-3.0.1-close_stdin.diff:
+  Add 1-line patch to close stdin, to close out #26413.
 
 *vcron-3.0.1-r1 (20 Apr 2002)
 
diff --git a/sys-apps/vcron/Manifest b/sys-apps/vcron/Manifest
index a14964fa3c1a..b7d42d991031 100644
--- a/sys-apps/vcron/Manifest
+++ b/sys-apps/vcron/Manifest
@@ -1,6 +1,9 @@
-MD5 5297fbcebcdce2d2898932fbffed9dee ChangeLog 2242
+MD5 a6b11a0284a2f2059672f4faeb5f5fe2 ChangeLog 2444
 MD5 f736fe5ee6f82e92efa1a2b6ba15122f vcron-3.0.1-r1.ebuild 1558
+MD5 a97fcb10d409de6f9e5efe5efcead2cc vcron-3.0.1-r2.ebuild 1611
 MD5 7f79290c2f51c9dcee459c8a5636f652 files/vcron.rc6 520
 MD5 6a065c2a4012e573ebb852275516a1d4 files/crontab 563
 MD5 21a88e40cea6fde9bf6163e501b993dd files/digest-vcron-3.0.1-r1 140
 MD5 5c0d6c06f2d878a6de894e7a6c1ab8da files/vixie-cron-3.0.1-gentoo.patch 59320
+MD5 21a88e40cea6fde9bf6163e501b993dd files/digest-vcron-3.0.1-r2 140
+MD5 73b3a3fde51e9070b50a5a4482a1b5b4 files/vcron-3.0.1-close_stdin.diff 323
diff --git a/sys-apps/vcron/files/digest-vcron-3.0.1-r2 b/sys-apps/vcron/files/digest-vcron-3.0.1-r2
new file mode 100644
index 000000000000..213b21a53c3a
--- /dev/null
+++ b/sys-apps/vcron/files/digest-vcron-3.0.1-r2
@@ -0,0 +1,2 @@
+MD5 369390355808fcf947cd2f9847f88859 vixie-cron-3.0.1.tar.bz2 50376
+MD5 d82f9e7688f59255493f4386e7d51503 vcron-3.0.1-selinux.patch.bz2 2624
diff --git a/sys-apps/vcron/files/vcron-3.0.1-close_stdin.diff b/sys-apps/vcron/files/vcron-3.0.1-close_stdin.diff
new file mode 100644
index 000000000000..6cfa8df25891
--- /dev/null
+++ b/sys-apps/vcron/files/vcron-3.0.1-close_stdin.diff
@@ -0,0 +1,11 @@
+diff -urN vixie-cron-3.0.1.orig/cron.c vixie-cron-3.0.1/cron.c
+--- vixie-cron-3.0.1.orig/cron.c	1995-05-31 16:37:20.000000000 -0500
++++ vixie-cron-3.0.1/cron.c	2003-10-16 17:31:41.000000000 -0500
+@@ -107,6 +107,7 @@
+ 		}
+ 	}
+ 
++	close(STDIN_FILENO);
+ 	acquire_daemonlock(0);
+ 	database.head = NULL;
+ 	database.tail = NULL;
diff --git a/sys-apps/vcron/vcron-3.0.1-r2.ebuild b/sys-apps/vcron/vcron-3.0.1-r2.ebuild
new file mode 100644
index 000000000000..2228aff2dcdc
--- /dev/null
+++ b/sys-apps/vcron/vcron-3.0.1-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/vcron-3.0.1-r2.ebuild,v 1.1 2003/10/17 03:42:09 pebenito Exp $
+
+inherit eutils
+
+IUSE="selinux"
+
+MY_P=${P/vcron/vixie-cron}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="The Vixie cron daemon"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+	 selinux? mirror://gentoo/${P}-selinux.patch.bz2"
+HOMEPAGE=""
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~arm ~mips ~hppa ~ia64"
+SLOT="0"
+LICENSE="as-is"
+
+DEPEND=">=sys-apps/portage-2.0.47-r10
+	>=sys-apps/sed-4.0.5
+	selinux? ( sys-apps/selinux-small )"
+
+RDEPEND="!virtual/cron
+	 sys-apps/cronbase
+	 virtual/mta
+	 selinux? ( sys-apps/selinux-small )"
+
+PROVIDE="virtual/cron"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch ${FILESDIR}/${MY_P}-gentoo.patch
+	epatch ${FILESDIR}/${P}-close_stdin.diff
+
+	use selinux && epatch ${DISTDIR}/${P}-selinux.patch.bz2
+
+	sed -i "s:-O2:${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 MANIFEST README THANKS
+
+	diropts -m0755 ; dodir /etc/cron.d
+	touch ${D}/etc/cron.d/.keep
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/vcron.rc6 vcron
+
+	insinto /etc
+	doins ${FILESDIR}/crontab
+
+	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
+}