Dual version bumps for security vulnerability (bug #71311); Marked 2.0.2 stable on x86. Added pkg_setup EDITOR check to fix bug #65263. Remove --with-cflags configure flag for 2.9.5.1, since it causes CFLAGS to be specified twice. Also fixed default editor path in fcron.conf-2.5.9.1 (nano isn't in /bin).

7 files changed, 291 insertions, 15 deletions

diff --git a/sys-apps/fcron/ChangeLog b/sys-apps/fcron/ChangeLog
index 8a9483cd40c2..bda98d0fdd52 100644
--- a/sys-apps/fcron/ChangeLog
+++ b/sys-apps/fcron/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/fcron
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/ChangeLog,v 1.33 2004/11/13 03:18:49 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/ChangeLog,v 1.34 2004/11/16 10:34:34 ka0ttic Exp $
+
+*fcron-2.9.5.1 (16 Nov 2004)
+
+  16 Nov 2004; Aaron Walker <ka0ttic@gentoo.org> +files/fcron.conf-2.9.5.1,
+  +fcron-2.0.2.ebuild, +fcron-2.9.5.1.ebuild:
+  Dual version bumps for security vulnerability (bug #71311); Marked 2.0.2
+  stable on x86. Added pkg_setup EDITOR check to fix bug #65263. Remove
+  --with-cflags configure flag for 2.9.5.1, since it causes CFLAGS to be
+  specified twice. Also fixed default editor path in fcron.conf-2.5.9.1 (nano
+  isn't in /bin).
 
   12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> fcron-2.0.1.ebuild:
   Stable on sparc
diff --git a/sys-apps/fcron/Manifest b/sys-apps/fcron/Manifest
index 6299a4217f57..d765878e5cc7 100644
--- a/sys-apps/fcron/Manifest
+++ b/sys-apps/fcron/Manifest
@@ -1,22 +1,37 @@
-MD5 25056731a42a875dcdc781c0f7355164 ChangeLog 5026
-MD5 bf70b2d5bfca86650565d966109dcdab fcron-2.0.0-r4.ebuild 2392
-MD5 df0ac43022acdd5cded9cdf086312719 fcron-2.9.4.ebuild 2956
-MD5 9c8fdf815ce980c230d763b496d4d088 metadata.xml 158
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 ac3eeedc9816cd658681bb2b2f4ca32c fcron-2.0.1.ebuild 2408
+MD5 df0ac43022acdd5cded9cdf086312719 fcron-2.9.4.ebuild 2956
+MD5 566f3bb71a8d8cce47a7082453b0ea46 fcron-2.0.2.ebuild 2889
+MD5 bf70b2d5bfca86650565d966109dcdab fcron-2.0.0-r4.ebuild 2392
 MD5 ae26f2f2d02d77ea2a5bd83fbc25a57b fcron-2.9.5.ebuild 2895
-MD5 fdf5c18f2b46001e9a6c1bf561e49676 files/digest-fcron-2.0.1 67
-MD5 52572ff759db2d68e16f8cbc46fc6cd9 files/crontab 833
-MD5 4ca5f2b70a7519c6390c5b23c9d058b4 files/digest-fcron-2.0.0-r4 67
-MD5 068bd306e10da92d3c159ee12be338bb files/digest-fcron-2.9.4 67
+MD5 e29aa58aa07015db5ce1c6c8c88d3eab fcron-2.9.5.1.ebuild 3285
+MD5 21b623205077a6c655d9edc70172192b ChangeLog 5494
+MD5 9c8fdf815ce980c230d763b496d4d088 metadata.xml 158
+MD5 8331ba4de4f67517afa3af7c269bab22 files/fcron.conf-2.9.4 681
 MD5 8331ba4de4f67517afa3af7c269bab22 files/fcron.conf-2.9.5 681
-MD5 d69c448b972f28fe669f2d70b7bf4c5b files/fcron-2.9.4-selinuxupdate.diff 6902
-MD5 2d4d092f7a76917183b5d8086d871e67 files/fcron.allow 375
+MD5 52572ff759db2d68e16f8cbc46fc6cd9 files/crontab 833
 MD5 7e9a6dd8e9a4e482d7b6bf33d1f9881b files/fcron.conf 747
-MD5 8331ba4de4f67517afa3af7c269bab22 files/fcron.conf-2.9.4 681
 MD5 d450e99144dc943526cd370c2b3a87e1 files/fcron.deny 377
+MD5 fdf5c18f2b46001e9a6c1bf561e49676 files/digest-fcron-2.0.1 67
+MD5 d18b499ccc7338a352ccc5111a23e224 files/digest-fcron-2.0.2 67
+MD5 068bd306e10da92d3c159ee12be338bb files/digest-fcron-2.9.4 67
+MD5 36ac9fab5fd89ba7f8f9a1900d5562fc files/digest-fcron-2.9.5 67
+MD5 b53d17ddba7360bc230a94a0537b4395 files/fcron-2.0.0-gcc34.diff 251
 MD5 618ee227782ad9a3939c89e932eb2d2e files/fcron.pam 296
 MD5 54d34efc5c1c41481d4605e38ddba3a8 files/fcron.rc6 705
-MD5 f659349d3f24fa1b57684af8f495efe6 files/fcrontab.pam 506
-MD5 b53d17ddba7360bc230a94a0537b4395 files/fcron-2.0.0-gcc34.diff 251
-MD5 36ac9fab5fd89ba7f8f9a1900d5562fc files/digest-fcron-2.9.5 67
 MD5 bebebfe6bc1ce39b1703b624f2be567e files/fcron-2.0.0-configure.diff 390
+MD5 2d4d092f7a76917183b5d8086d871e67 files/fcron.allow 375
+MD5 f659349d3f24fa1b57684af8f495efe6 files/fcrontab.pam 506
+MD5 d69c448b972f28fe669f2d70b7bf4c5b files/fcron-2.9.4-selinuxupdate.diff 6902
+MD5 42d8a93754df65def4a3746bbc68e494 files/digest-fcron-2.9.5.1 69
+MD5 583200a8686cf8bdd59e970ad8a55d21 files/fcron.conf-2.9.5.1 800
+MD5 4ca5f2b70a7519c6390c5b23c9d058b4 files/digest-fcron-2.0.0-r4 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBmdfLEZCkKN40op4RAhcbAJsHoBShD/5HWm4Tkk54+mCICG7NfwCdHj6x
+xYFORtTGTaELwVT6lJEHAXE=
+=hUsA
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/fcron/fcron-2.0.2.ebuild b/sys-apps/fcron/fcron-2.0.2.ebuild
new file mode 100644
index 000000000000..042d5524090c
--- /dev/null
+++ b/sys-apps/fcron/fcron-2.0.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.0.2.ebuild,v 1.1 2004/11/16 10:34:34 ka0ttic Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
+HOMEPAGE="http://fcron.free.fr/"
+SRC_URI="http://fcron.free.fr/archives/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~hppa ~amd64"
+IUSE=""
+
+DEPEND="virtual/editor"
+RDEPEND="!virtual/cron
+	>=sys-apps/cronbase-0.2.1-r3
+	virtual/mta"
+PROVIDE="virtual/cron"
+
+pkg_setup() {
+	# bug #65263
+	# fcron's ./configure complains if EDITOR is not set to an absolute path,
+	# so try to set it to the abs path if it isn't
+	if [[ "${EDITOR}" != */* ]] ; then
+		einfo "Attempting to deduce absolute path of ${EDITOR}"
+		EDITOR=$(which ${EDITOR} 2>/dev/null)
+		if [ ! -x "${EDITOR}" ] ; then
+			die "Please set the EDITOR env variable to the path of a valid executable."
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.0.0-configure.diff
+	# fix LIBOBJS vs AC_LIBOBJ problem
+	sed -i -e 's|LIBOBJS|AC_LIBOBJ|g' configure.in
+	# respect LDFLAGS
+	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	# QA security notice fix; see "[gentoo-core] Heads up changes in suid
+	# handing with portage >=51_pre21" for more details.
+	append-ldflags -Wl,-z,now
+
+	econf \
+		--with-username=cron \
+		--with-groupname=cron \
+		--with-piddir=/var/run \
+		--with-etcdir=/etc/fcron \
+		--with-spooldir=/var/spool/cron \
+		--with-sendmail=/usr/sbin/sendmail \
+		--with-editor="${EDITOR}" \
+		--with-cflags="${CFLAGS}" \
+		|| die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	dodir /var/spool
+	diropts -m 0770 -o cron -g cron
+	keepdir /var/spool/cron/fcrontabs
+
+	insinto /usr/sbin
+	insopts -o root -g root -m 0110 ; doins fcron
+	insinto /usr/bin
+	insopts -o cron -g cron -m 6110 ; doins fcrontab
+	insopts -o root -g cron -m 6110 ; doins fcronsighup
+	dosym fcrontab /usr/bin/crontab
+
+	insinto /etc/fcron
+	insopts -m 640 -o root -g cron
+	doins ${FILESDIR}/{fcron.allow,fcron.deny,fcron.conf}
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/fcron.rc6 fcron
+
+	insinto /etc
+	insopts -m 0644 -o root -g root
+	doins ${FILESDIR}/crontab
+
+	doman doc/*.{1,3,5,8}
+
+	dodoc MANIFEST VERSION doc/{CHANGES,README,FAQ,INSTALL,THANKS}
+	newdoc ${FILESDIR}/fcron.conf fcron.conf.sample
+	dohtml doc/*.html
+	dodoc ${FILESDIR}/crontab
+}
+
+pkg_postinst() {
+	einfo "Each user who uses fcron should be added to the cron group"
+	einfo "in /etc/group and also be added in /etc/fcron/fcron.allow"
+	einfo
+	einfo "To activate /etc/cron.{hourly|daily|weekly|montly} please run: "
+	einfo "crontab /etc/crontab"
+	einfo
+	einfo "!!! That will replace root's current crontab !!!"
+	einfo
+}
diff --git a/sys-apps/fcron/fcron-2.9.5.1.ebuild b/sys-apps/fcron/fcron-2.9.5.1.ebuild
new file mode 100644
index 000000000000..31c99e11c3f4
--- /dev/null
+++ b/sys-apps/fcron/fcron-2.9.5.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.9.5.1.ebuild,v 1.1 2004/11/16 10:34:34 ka0ttic Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
+HOMEPAGE="http://fcron.free.fr/"
+SRC_URI="http://fcron.free.fr/archives/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~hppa ~amd64"
+IUSE="pam doc selinux"
+
+DEPEND="virtual/editor
+	doc? ( >=app-text/docbook-dsssl-stylesheets-1.77 )
+	selinux? ( sys-libs/libselinux )
+	pam? ( >=sys-libs/pam-0.77 )"
+RDEPEND="!virtual/cron
+	>=sys-apps/cronbase-0.2.1-r3
+	virtual/mta"
+PROVIDE="virtual/cron"
+
+pkg_setup() {
+	# bug #65263
+	# fcron's ./configure complains if EDITOR is not set to an absolute path,
+	# so try to set it to the abs path if it isn't
+	if [[ "${EDITOR}" != */* ]] ; then
+		einfo "Attempting to deduce absolute path of ${EDITOR}"
+		EDITOR=$(which ${EDITOR} 2>/dev/null)
+		if [ ! -x "${EDITOR}" ] ; then
+			die "Please set the EDITOR env variable to the path of a valid executable."
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.0.0-configure.diff
+	# respect LDFLAGS
+	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	local myconf=
+	use doc && \
+		myconf="--with-dsssl-dir=/usr/share/sgml/stylesheets/dsssl/docbook"
+
+	# QA security notice fix; see "[gentoo-core] Heads up changes in suid
+	# handing with portage >=51_pre21" for more details.
+	append-ldflags -Wl,-z,now
+
+	econf \
+		$(use_with pam) \
+		$(use_with selinux) \
+		--with-username=cron \
+		--with-groupname=cron \
+		--with-piddir=/var/run \
+		--with-etcdir=/etc/fcron \
+		--with-spooldir=/var/spool/cron \
+		--with-fifodir=/var/run \
+		--with-sendmail=/usr/sbin/sendmail \
+		--with-fcrondyn=yes \
+		--with-editor=${EDITOR} \
+		${myconf} \
+		|| die "Configure problem"
+
+	emake || die "Compile problem"
+}
+
+src_install() {
+	dodir /var/spool
+	diropts -m 0770 -o cron -g cron
+	keepdir /var/spool/cron/fcrontabs
+
+	insinto /usr/sbin
+	insopts -o root -g root -m0110 ; doins fcron
+	insinto /usr/bin
+	insopts -o cron -g cron -m6110 ; doins fcrontab fcrondyn
+	insopts -o root -g cron -m6110 ; doins fcronsighup
+	dosym fcrontab /usr/bin/crontab
+
+	insinto /etc/fcron
+	insopts -m 640 -o root -g cron
+	doins ${FILESDIR}/{fcron.allow,fcron.deny}
+	newins ${FILESDIR}/fcron.conf-${PV} fcron.conf
+
+	insopts -m 644 -o root -g root
+	if use pam ; then
+		insinto /etc/pam.d
+		newins ${FILESDIR}/fcron.pam fcron
+		newins ${FILESDIR}/fcrontab.pam fcrontab
+	fi
+	insinto /etc
+	doins ${FILESDIR}/crontab
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/fcron.rc6 fcron
+
+	dodoc MANIFEST VERSION doc/txt/*.txt
+	newdoc ${FILESDIR}/fcron.conf-${PV} fcron.conf.sample
+	use doc && dohtml doc/HTML/*.html
+	dodoc ${FILESDIR}/crontab
+
+	doman doc/man/*.{1,3,5,8}
+}
+
+pkg_postinst() {
+	einfo "Each user who uses fcron should be added to the cron group"
+	einfo "in /etc/group and also be added in /etc/fcron/fcron.allow"
+	einfo
+	einfo "To activate /etc/cron.{hourly|daily|weekly|montly} please run: "
+	einfo "crontab /etc/crontab"
+	einfo
+	einfo "!!! That will replace root's current crontab !!!"
+	einfo
+}
diff --git a/sys-apps/fcron/files/digest-fcron-2.0.2 b/sys-apps/fcron/files/digest-fcron-2.0.2
new file mode 100644
index 000000000000..bfdbd9960fae
--- /dev/null
+++ b/sys-apps/fcron/files/digest-fcron-2.0.2
@@ -0,0 +1 @@
+MD5 416c55d8a484eb6c9907828009fd649c fcron-2.0.2.src.tar.gz 169081
diff --git a/sys-apps/fcron/files/digest-fcron-2.9.5.1 b/sys-apps/fcron/files/digest-fcron-2.9.5.1
new file mode 100644
index 000000000000..bca17bd60680
--- /dev/null
+++ b/sys-apps/fcron/files/digest-fcron-2.9.5.1
@@ -0,0 +1 @@
+MD5 bf39dcef6d0c452f167f5a31a1231e4e fcron-2.9.5.1.src.tar.gz 398400
diff --git a/sys-apps/fcron/files/fcron.conf-2.9.5.1 b/sys-apps/fcron/files/fcron.conf-2.9.5.1
new file mode 100644
index 000000000000..be27e30e9e5c
--- /dev/null
+++ b/sys-apps/fcron/files/fcron.conf-2.9.5.1
@@ -0,0 +1,24 @@
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/files/fcron.conf-2.9.5.1,v 1.1 2004/11/16 10:34:34 ka0ttic Exp $
+# fcron.conf - Configuration file for fcron(8) and fcrontab(1).
+#	See fcron.conf(5) for syntax and explanations.
+#
+# WARNING : this file must be owned by root:cron and 640.
+#
+
+# The spool directory where fcron stores its files
+fcrontabs	=	/var/spool/cron/fcrontabs
+
+# The locations of the pid file and the fifo file
+pidfile		=	/var/run/fcron.pid
+fifofile	=	/var/run/fcron.fifo
+
+# allow/deny files to determine which users are allowed to use fcrontab
+fcronallow	=	/etc/fcron/fcron.allow
+fcrondeny	=	/etc/fcron/fcron.deny
+
+# Location of the programs used by fcron
+shell		=	/bin/sh
+sendmail	=	/usr/sbin/sendmail
+
+# Location of the default editor for "fcrontab -e"
+editor		=	/usr/bin/nano