fix bugs #226629 and #227025

Package-Manager: portage-2.1.5.6

4 files changed, 308 insertions, 2 deletions

diff --git a/sys-process/fcron/ChangeLog b/sys-process/fcron/ChangeLog
index d6dab9b26b20..17d2396b5951 100644
--- a/sys-process/fcron/ChangeLog
+++ b/sys-process/fcron/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/fcron
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.59 2008/01/28 07:07:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.60 2008/07/19 15:48:01 wschlich Exp $
+
+*fcron-3.0.4-r1 (19 Jul 2008)
+
+  19 Jul 2008; Wolfram Schlich <wschlich@gentoo.org>
+  +files/check_system_crontabs.fcron-config-file.patch,
+  +fcron-3.0.4-r1.ebuild:
+  fix bugs #226629 and #227025
 
   28 Jan 2008; Jeroen Roovers <jer@gentoo.org> fcron-3.0.4.ebuild:
   Stable for HPPA (bug #207266).
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index ec2f7147afbc..89c9471f21ae 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -1,9 +1,11 @@
+AUX check_system_crontabs.fcron-config-file.patch 1726 RMD160 94dfa2c9f106f450e80e3d76cf1f664caca905ae SHA1 95a6952bfab75db728a207c4f17372c307922bbd SHA256 eb93c92fd6e266eba4fdf6f9597a362ff86fe2cce64368dc72e63fb9c622cb0d
 AUX crontab 832 RMD160 ac7e347d5cedccec74ad7301fb20857ac30a4df0 SHA1 bc8c0f0ea498a97c0533c815511a13bb933d5cc9 SHA256 052c8cfefc9d801cc7a1619e6932264d35c4f076b4fa3225791a91809ce49a59
 AUX fcron.init 1582 RMD160 e0fd0cadddac8b344ea84f70c3c6e645d9badce2 SHA1 fd5fddb75378af57c37fa57432f3c068521e4a68 SHA256 f5bc89e7204906790b0046bd30a865b7b04c4d21e7ef4154cbad3ae1213d6526
 AUX fcrontab 332 RMD160 062faddf0551bebbf9834b796f9957cf49dbc967 SHA1 063f77dd90a76170a793352530a35c60922283e4 SHA256 ab5c104248c51471d61e3312f52bf738d74ab3319b8c01cd0cc5c74458fb8fcc
 DIST fcron-3.0.3.src.tar.gz 549501 RMD160 4f6b8b425392f91fb3d3d32dac90ab9e480aa4ee SHA1 8f57be59c32c884d7cbeed4e9997a93285bea11c SHA256 5ba9605ce49446c18ed49c7d16602aef760169f29fbcc34dc09b6177388dce00
 DIST fcron-3.0.4.src.tar.gz 553609 RMD160 2bb8eb489251eaa1380b4e37b6526d2040291313 SHA1 daaa5287be026a425ea5bb56959ad38b1b6d030a SHA256 c8766c7f347f2146f84449401f8994d477d10f49df778f9a7cd802e534bc6f96
 EBUILD fcron-3.0.3.ebuild 8473 RMD160 ef71fc6d1c74d6e75fd7a92d5cfff41428d1c062 SHA1 a1a6430d872f4d8cafae89b814d2d2656b67bd42 SHA256 4d7a705f149a27d6e0468b54a244f2ef0946b2db9fc507b5fbdeaae9a7219d7b
+EBUILD fcron-3.0.4-r1.ebuild 8833 RMD160 6ff59b285982f30230e835b9dd6bef4d0ae78b6b SHA1 7595d8d5d129d4774901c07e294e390c7578bfc2 SHA256 74454c9eac1a5e6864a4bcb5f35742855c201eb57db474c17cb10e865d1dd7b3
 EBUILD fcron-3.0.4.ebuild 8771 RMD160 2c10a8300d9cf2209b02c3733cd45131e746eab8 SHA1 e1de9664ba9f4ba67a8fb12f868f2c25f80c38a0 SHA256 b9b3d88416d241e5474fd45b09221515550e5acddfb61c3615a0225b1706bd6f
-MISC ChangeLog 15907 RMD160 5afee0b23d3ed23bbe914620242f135f1fce2333 SHA1 417ed5da23525d22e49b7c3d855e94b0f9d5e589 SHA256 32ba65fdb8640fcc508803b96ce2f0192acae8c681bf755abbbb84549dce71e9
+MISC ChangeLog 16110 RMD160 2576120c99bb3e44a334e571c1a0555a2643bde6 SHA1 5db6225523b0d7d92a7b00d90078238c792a0347 SHA256 d7393d034733b7ca9bfb03aff7f30e2eeef9f3010b6f9917323181d93123ff84
 MISC metadata.xml 303 RMD160 d24dcc8f24ba7a6a6881727d4f6bea37b319fee4 SHA1 6071b772615027860d246ae497df4866c991562a SHA256 550e002d2ddfc3e38a4fd062713956e335e068f6cf15828e139f01ce325937c6
diff --git a/sys-process/fcron/fcron-3.0.4-r1.ebuild b/sys-process/fcron/fcron-3.0.4-r1.ebuild
new file mode 100644
index 000000000000..3d2267f6a31e
--- /dev/null
+++ b/sys-process/fcron/fcron-3.0.4-r1.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.4-r1.ebuild,v 1.1 2008/07/19 15:48:01 wschlich Exp $
+
+inherit autotools cron pam eutils
+
+MY_P=${P/_/-}
+DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
+HOMEPAGE="http://fcron.free.fr/"
+SRC_URI="http://fcron.free.fr/archives/${MY_P}.src.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc pam selinux"
+
+DEPEND="doc? ( >=app-text/docbook-dsssl-stylesheets-1.77 )
+	selinux? ( sys-libs/libselinux )
+	pam? ( virtual/pam )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup fcron
+	enewuser fcron -1 -1 -1 fcron
+	rootuser=$(egetent passwd 0 | cut -d ':' -f 1)
+	rootgroup=$(egetent group 0 | cut -d ':' -f 1)
+	if useq debug; then
+		ewarn
+		ewarn "WARNING: debug USE flag active!"
+		ewarn "The debug USE flag makes fcron start in debug mode"
+		ewarn "by default, thus not detaching into background."
+		ewarn "This will make your system HANG on bootup if"
+		ewarn "fcron is to be started automatically by the"
+		ewarn "init system!"
+		ewarn
+		ebeep 10
+		epause 60
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# respect LDFLAGS
+	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
+
+	## patch check_system_crontabs to support "-c /path/to/fcron.conf"
+	pushd script &>/dev/null \
+		&& epatch "${FILESDIR}"/check_system_crontabs.fcron-config-file.patch \
+		&& popd &>/dev/null
+
+	eautoreconf || die "autoreconf failed"
+}
+
+src_compile() {
+	local myconf
+
+	use doc \
+		&& myconf="${myconf} --with-dsssl-dir=/usr/share/sgml/stylesheets/dsssl/docbook"
+
+	[[ -n "${rootuser}" ]] && myconf="${myconf} --with-rootname=${rootuser}"
+	[[ -n "${rootgroup}" ]] && myconf="${myconf} --with-rootgroup=${rootgroup}"
+
+	econf \
+		"$(useq debug || echo --with-cflags=${CFLAGS})" \
+		$(use_with debug '' yes) \
+		$(use_with pam) \
+		$(use_with selinux) \
+		--sysconfdir=/etc/fcron \
+		--with-username=fcron \
+		--with-groupname=fcron \
+		--with-piddir=/var/run \
+		--with-etcdir=/etc/fcron \
+		--with-spooldir=/var/spool/fcron \
+		--with-fifodir=/var/run \
+		--with-fcrondyn=yes \
+		--disable-checks \
+		--with-editor=/usr/bin/vi \
+		--with-sendmail=/usr/sbin/sendmail \
+		--with-shell=/bin/sh \
+		${myconf} \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	# cron eclass stuff
+	docron fcron -m0755 -o ${rootuser:-root} -g ${rootgroup:-root}
+	docrondir /var/spool/fcron -m6770 -o fcron -g fcron
+	docrontab fcrontab -m6755 -o fcron -g fcron
+
+	# install fcron tools
+	insinto /usr/bin
+	# fcronsighup needs to be suid root, because it sends a HUP
+	# to the running fcron daemon
+	insopts -m6755 -o ${rootuser:-root} -g fcron
+	doins fcronsighup
+	insopts -m6755 -o fcron -g fcron
+	doins fcrondyn
+
+	# /etc stuff
+	diropts -m0750 -o ${rootuser:-root} -g fcron
+	dodir /etc/fcron
+	insinto /etc/fcron
+	insopts -m0640 -o ${rootuser:-root} -g fcron
+	doins files/fcron.{allow,deny,conf}
+
+	# install PAM files
+	newpamd files/fcron.pam fcron
+	newpamd files/fcrontab.pam fcrontab
+
+	# install /etc/crontab and /etc/fcrontab
+	insopts -m0640 -o ${rootuser:-root} -g ${rootgroup:-root}
+	insinto /etc
+	doins "${FILESDIR}"/crontab "${FILESDIR}"/fcrontab
+
+	# install init script
+	newinitd "${FILESDIR}"/fcron.init fcron
+
+	# install the very handy check_system_crontabs script
+	dosbin script/check_system_crontabs
+
+	# doc stuff
+	dodoc MANIFEST VERSION
+	newdoc files/fcron.conf fcron.conf.sample
+	dodoc "${FILESDIR}"/crontab
+	dodoc doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt
+	rm -f doc/en/man/*.3 # ugly hack for bitstring.3 manpage
+	doman doc/en/man/*.[0-9]
+	use doc && dohtml doc/en/HTML/*.html
+
+	# localized docs
+	local LANGUAGES=$(sed -n 's:LANGUAGES =::p' doc/Makefile)
+	LANGUAGES="${LANGUAGES/en/}"
+	local lang
+	for lang in ${LANGUAGES}; do
+		hasq ${lang} ${LINGUAS} || continue
+		rm -f doc/${lang}/man/*.3 # ugly hack for bitstring.3 manpage
+		doman -i18n=${lang} doc/${lang}/man/*.[0-9]
+		use doc && docinto html/${lang} && dohtml doc/${lang}/HTML/*.html
+	done
+}
+
+pkg_postinst() {
+	einfo
+	einfo "fcron has some important differences compared to vixie-cron:"
+	einfo
+	einfo "1. fcron stores the crontabs in ${ROOT}var/spool/fcron"
+	einfo "   instead of ${ROOT}var/spool/cron/crontabs"
+	einfo
+	einfo "2. fcron uses a special binary file format for storing the"
+	einfo "   crontabs in ${ROOT}var/spool/fcron/USERNAME,"
+	einfo "   but the original plain text version is saved as"
+	einfo "   ${ROOT}var/spool/fcron/USERNAME.orig for your"
+	einfo "   reference (and for being edited with fcrontab)."
+	einfo
+	einfo "3. fcron does not feature a system crontab in exactly the"
+	einfo "   same way as vixie-cron does. This version of fcron"
+	einfo "   features a crontab for a pseudo-user 'systab' for use"
+	einfo "   as the system crontab. Running a command like"
+	einfo
+	einfo "      fcrontab -u systab ${ROOT}etc/crontab"
+	einfo
+	einfo "   will write ${ROOT}etc/crontab to the fcron crontabs directory as"
+	einfo
+	einfo "      ${ROOT}var/spool/fcron/systab"
+	einfo
+	einfo "   Please note that changes to ${ROOT}etc/crontab will not become"
+	einfo "   active automatically! fcron also does not use the directory"
+	einfo "   ${ROOT}etc/cron.d by default like vixie-cron does."
+	einfo "   Fortunately, it's possible to emulate vixie-cron's behavior"
+	einfo "   with regards to ${ROOT}etc/crontab and ${ROOT}etc/cron.d by using a"
+	einfo "   little helper script called 'check_system_crontabs'."
+	einfo "   The file ${ROOT}etc/fcrontab (not ${ROOT}etc/crontab!) has been set up"
+	einfo "   to run the script once a while to check whether"
+	einfo "   ${ROOT}etc/fcrontab, ${ROOT}etc/crontab or files in ${ROOT}etc/cron.d/ have"
+	einfo "   changed since the last generation of the systab and"
+	einfo "   regenerate it from those three locations as necessary."
+	einfo "   You should now run 'check_system_crontabs' once to properly"
+	einfo "   generate an initial systab:"
+	einfo
+	einfo "      check_system_crontabs -v -i -f"
+	einfo
+	einfo "   The file ${ROOT}etc/fcrontab should only be used to run that"
+	einfo "   script in order to ensure independence from the standard"
+	einfo "   system crontab file ${ROOT}etc/crontab."
+	einfo "   You may of course adjust the schedule for the script"
+	einfo "   'check_system_crontabs' or any other setting in"
+	einfo "   ${ROOT}etc/fcrontab as you desire."
+	einfo
+	einfo "If you do NOT want to use 'check_system_crontabs', you"
+	einfo "might still want to activate the use of the well known"
+	einfo "directories ${ROOT}etc/cron.{hourly|daily|weekly|monthly} by"
+	einfo "just generating a systab once from ${ROOT}etc/crontab:"
+	einfo
+	einfo "   fcrontab -u systab ${ROOT}etc/crontab"
+	einfo
+	einfo "Happy fcron'ing!"
+	einfo
+
+	ewarn
+	ewarn "Fixing permissions and ownership of ${ROOT}usr/bin/fcron{tab,dyn,sighup}"
+	chown fcron:fcron "${ROOT}"usr/bin/fcron{tab,dyn} >&/dev/null
+	chown ${rootuser:-root}:fcron "${ROOT}"usr/bin/fcronsighup >&/dev/null
+	chmod 6755 "${ROOT}"usr/bin/fcron{tab,dyn,sighup} >&/dev/null
+	ewarn "Fixing permissions and ownership of ${ROOT}etc/{fcron,fcrontab,crontab}"
+	chown -R ${rootuser:-root}:fcron "${ROOT}"etc/{fcron,fcrontab,crontab} >&/dev/null
+	chmod -R g+rX,o= "${ROOT}"etc/fcron "${ROOT}"etc/{fcron,fcrontab,crontab} >&/dev/null
+	ewarn
+
+	ewarn
+	ewarn "WARNING: fcron now uses a dedicated user and group"
+	ewarn "'fcron' for the suid/sgid programs/files instead of"
+	ewarn "the user and group 'cron' that were previously used."
+	ewarn
+	ewarn "fcron usage can now only be restricted by adding users"
+	ewarn "to the following files instead of to the group 'cron':"
+	ewarn
+	ewarn "   ${ROOT}etc/fcron/fcron.allow"
+	ewarn "   ${ROOT}etc/fcron/fcron.deny"
+	ewarn
+	ebeep 10
+	epause 10
+
+	if ls -1 "${ROOT}"var/spool/cron/fcrontabs/* >&/dev/null; then
+		ewarn
+		ewarn "WARNING: fcron now uses a dedicated fcron-specific"
+		ewarn "spooldir ${ROOT}var/spool/fcron instead of the commonly"
+		ewarn "used ${ROOT}var/spool/cron for several reasons."
+		ewarn
+		ewarn "Copying over existing crontabs from ${ROOT}var/spool/cron/fcrontabs"
+		cp "${ROOT}"var/spool/cron/fcrontabs/* "${ROOT}"var/spool/fcron/ >&/dev/null \
+			|| die "failed to migrate existing crontabs"
+		ewarn "You should now remove ${ROOT}var/spool/cron/fcrontabs!"
+		ewarn
+		ewarn "Fixing permissions and ownership of ${ROOT}var/spool/fcron"
+		chown root:root "${ROOT}"var/spool/fcron/* >&/dev/null
+		chmod 0600 "${ROOT}"var/spool/fcron/* >&/dev/null
+		chown fcron:fcron "${ROOT}"var/spool/fcron/*.orig >&/dev/null
+		chmod 0640 "${ROOT}"var/spool/fcron/*.orig >&/dev/null
+		ewarn
+		ewarn "*** YOU SHOULD IMMEDIATELY UPDATE THE"
+		ewarn "*** fcrontabs ENTRY IN ${ROOT}etc/fcron/fcron.conf"
+		ewarn "*** AND RESTART YOUR FCRON DAEMON!"
+		ebeep 20
+		epause 10
+	fi
+}
diff --git a/sys-process/fcron/files/check_system_crontabs.fcron-config-file.patch b/sys-process/fcron/files/check_system_crontabs.fcron-config-file.patch
new file mode 100644
index 000000000000..983b7c36f35d
--- /dev/null
+++ b/sys-process/fcron/files/check_system_crontabs.fcron-config-file.patch
@@ -0,0 +1,47 @@
+--- check_system_crontabs.orig	2008-07-18 15:56:49.110205300 +0200
++++ check_system_crontabs	2008-07-18 16:00:46.303783312 +0200
+@@ -74,7 +74,7 @@
+ DEFAULT_CROND_DIR=/etc/cron.d
+ DEFAULT_CRONTAB_FILE=/etc/crontab
+ DEFAULT_FCRONTAB_FILE=/etc/fcrontab
+-
++DEFAULT_FCRON_CONFIG_FILE=/etc/fcron/fcron.conf
+ FCRONTAB_PROG=/usr/bin/fcrontab
+ FCRONTABS_DIR=/var/spool/fcron
+ 
+@@ -117,6 +117,7 @@
+     -i          Interactive use with no delay; same as -s 0.
+     -p PATHNAME Full path to or filename of the fcrontab binary; use this
+                 only if it cannot be found automatically.
++    -c FILE     Full path to fcron config file (default $DEFAULT_FCRON_CONFIG_FILE).
+     -F FILE     System fcrontab file (default $DEFAULT_FCRONTAB_FILE).
+     -C FILE     System crontab file (default $DEFAULT_CRONTAB_FILE).
+     -D DIR      System crontab directory (default $DEFAULT_CROND_DIR).
+@@ -127,6 +128,7 @@
+ 
+ SLEEP_TIME_BEFORE_REBUILD="$DEFAULT_SLEEP_TIME_BEFORE_REBUILD"
+ CROND_DIR="$DEFAULT_CROND_DIR"
++FCRON_CONFIG_FILE="$DEFAULT_FCRON_CONFIG_FILE"
+ CRONTAB_FILE="$DEFAULT_CRONTAB_FILE"
+ FCRONTAB_FILE="$DEFAULT_FCRONTAB_FILE"
+ FCRONTAB_PROG=
+@@ -153,6 +155,10 @@
+     FCRONTAB_PROG="$2"
+     shift
+     ;;
++  -c)
++    FCRON_CONFIG_FILE="$2"
++    shift
++    ;;
+   -F)
+     FCRONTAB_FILE="$2"
+     shift
+@@ -247,7 +253,7 @@
+   sed -i -e "s/@yearly/0 0 1 1 */g" -e "s/@annually/0 0 1 1 */g" -e "s/@monthly/0 0 1 * */g" -e "s/@weekly/0 0 * * 0/g" -e "s/@daily/0 0 * * */g" -e "s/@midnight/0 0 * * */g" -e "s/@hourly/0 * * * */g" $FCRONTAB_FILE_TMP
+ 
+   # notify fcron about the updated file
+-  $FCRONTAB_PROG $FCRONTAB_FILE_TMP -u systab
++  $FCRONTAB_PROG -c $FCRON_CONFIG_FILE $FCRONTAB_FILE_TMP -u systab
+ }
+ 
+ NEED_REBUILD=0