fix bug #171998

Package-Manager: portage-2.1.2.3

4 files changed, 269 insertions, 5 deletions

diff --git a/sys-process/fcron/ChangeLog b/sys-process/fcron/ChangeLog
index 1e8154a4d52a..b98ea2fbef6e 100644
--- a/sys-process/fcron/ChangeLog
+++ b/sys-process/fcron/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/fcron
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.37 2007/03/22 02:08:18 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.38 2007/04/13 11:29:25 wschlich Exp $
+
+*fcron-3.0.2-r2 (13 Apr 2007)
+
+  13 Apr 2007; Wolfram Schlich <wschlich@gentoo.org> +fcron-3.0.2-r2.ebuild:
+  fix bug #171998
 
   22 Mar 2007; Steve Dibb <beandog@gentoo.org> fcron-3.0.2-r1.ebuild:
   amd64 stable, security bug 171393
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index 209af36d781b..c7b9c4ab2597 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -60,14 +60,18 @@ EBUILD fcron-3.0.2-r1.ebuild 8069 RMD160 50ac3d782b95e1166cf2445396ca6dfb32f9a48
 MD5 b50da48e105bb4a6a2292a3e77b7657d fcron-3.0.2-r1.ebuild 8069
 RMD160 50ac3d782b95e1166cf2445396ca6dfb32f9a48a fcron-3.0.2-r1.ebuild 8069
 SHA256 8c0b87d2914ac57e102e1615f89ca692be33fe5ca39d877e971c791eec858706 fcron-3.0.2-r1.ebuild 8069
+EBUILD fcron-3.0.2-r2.ebuild 8844 RMD160 c1da32fee35b1cb924e8b5d0056950b70afe9cf4 SHA1 43c96c53aa155cdac758f2897fca4d1b1b53bade SHA256 73b9b2b84d13a93881ea640e20034c2cce5f42a44bd99214bd75dfc24daaa907
+MD5 62d7b53aaaa040bf786795a427918058 fcron-3.0.2-r2.ebuild 8844
+RMD160 c1da32fee35b1cb924e8b5d0056950b70afe9cf4 fcron-3.0.2-r2.ebuild 8844
+SHA256 73b9b2b84d13a93881ea640e20034c2cce5f42a44bd99214bd75dfc24daaa907 fcron-3.0.2-r2.ebuild 8844
 EBUILD fcron-3.0.2.ebuild 6686 RMD160 eb361dd305a3d26b3d627dee5c1f9474493639d4 SHA1 3fa33e1f0147f5e993c4bbe54b8dbbaf7ac15553 SHA256 2574eb90c8ab9aecff46f4faf04901331c50cd9624aceef7689d1aa29d828c95
 MD5 5ca8590d2dd47c5cdc7603bc2ab05e8f fcron-3.0.2.ebuild 6686
 RMD160 eb361dd305a3d26b3d627dee5c1f9474493639d4 fcron-3.0.2.ebuild 6686
 SHA256 2574eb90c8ab9aecff46f4faf04901331c50cd9624aceef7689d1aa29d828c95 fcron-3.0.2.ebuild 6686
-MISC ChangeLog 13077 RMD160 809558bf5a20b7f2eca51cac6a26fdf65f39a550 SHA1 fb6d06d5b3115e46fd1fd2986973173c9375109c SHA256 a7657378eb0335cdb9c30b98fddbc046061fde2daeb7e8076c7ea0dd0857f108
-MD5 b76fb05c7433837efe183ab1c1f355a9 ChangeLog 13077
-RMD160 809558bf5a20b7f2eca51cac6a26fdf65f39a550 ChangeLog 13077
-SHA256 a7657378eb0335cdb9c30b98fddbc046061fde2daeb7e8076c7ea0dd0857f108 ChangeLog 13077
+MISC ChangeLog 13205 RMD160 05055eb998395f28d72df57bddc95e79039fd7f0 SHA1 f4d0c997d49dfd77ff2edd55950260763035de3d SHA256 a29c2ddc0dc8bbaa885e680ae7fdf6d5031481c8fde8e8edf01a1b1376de41ea
+MD5 42546efed2d23c0e222229acab076384 ChangeLog 13205
+RMD160 05055eb998395f28d72df57bddc95e79039fd7f0 ChangeLog 13205
+SHA256 a29c2ddc0dc8bbaa885e680ae7fdf6d5031481c8fde8e8edf01a1b1376de41ea ChangeLog 13205
 MISC metadata.xml 303 RMD160 d24dcc8f24ba7a6a6881727d4f6bea37b319fee4 SHA1 6071b772615027860d246ae497df4866c991562a SHA256 550e002d2ddfc3e38a4fd062713956e335e068f6cf15828e139f01ce325937c6
 MD5 4ecc6e1f7881550e02353b1511d8b89e metadata.xml 303
 RMD160 d24dcc8f24ba7a6a6881727d4f6bea37b319fee4 metadata.xml 303
@@ -99,3 +103,6 @@ SHA256 30748f48c2fe7ff5126a09e4791b186aee9cddc4b85d7c785b786ffbe5a3be9f files/di
 MD5 24d2ff586b2fb5d7014a19619d6e34d5 files/digest-fcron-3.0.2-r1 247
 RMD160 a80a8667bc13f224ee3c332f4a53af41d533a83b files/digest-fcron-3.0.2-r1 247
 SHA256 30748f48c2fe7ff5126a09e4791b186aee9cddc4b85d7c785b786ffbe5a3be9f files/digest-fcron-3.0.2-r1 247
+MD5 24d2ff586b2fb5d7014a19619d6e34d5 files/digest-fcron-3.0.2-r2 247
+RMD160 a80a8667bc13f224ee3c332f4a53af41d533a83b files/digest-fcron-3.0.2-r2 247
+SHA256 30748f48c2fe7ff5126a09e4791b186aee9cddc4b85d7c785b786ffbe5a3be9f files/digest-fcron-3.0.2-r2 247
diff --git a/sys-process/fcron/fcron-3.0.2-r2.ebuild b/sys-process/fcron/fcron-3.0.2-r2.ebuild
new file mode 100644
index 000000000000..9208c51a0609
--- /dev/null
+++ b/sys-process/fcron/fcron-3.0.2-r2.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.2-r2.ebuild,v 1.1 2007/04/13 11:29:25 wschlich Exp $
+
+inherit cron pam eutils
+
+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"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc pam selinux"
+
+DEPEND="app-editors/nano
+	doc? ( >=app-text/docbook-dsssl-stylesheets-1.77 )
+	selinux? ( sys-libs/libselinux )
+	pam? ( virtual/pam )"
+
+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}
+	epatch ${FILESDIR}/${PN}-2.0.0-configure.diff
+	# respect LDFLAGS
+	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
+}
+
+src_compile() {
+	local myconf
+
+	autoconf || die "autoconf failed"
+
+	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}"
+
+	# QA security notice fix; see "[gentoo-core] Heads up changes in suid
+	# handing with portage >=51_pre21" for more details.
+	append-ldflags $(bindnow-flags)
+
+	econf \
+		$(use_with pam) \
+		$(use_with selinux) \
+		$(use_with debug) \
+		--with-username=fcron \
+		--with-groupname=fcron \
+		--with-piddir=/var/run \
+		--with-etcdir=/etc/fcron \
+		--with-spooldir=/var/spool/fcron \
+		--with-fifodir=/var/run \
+		--with-sendmail=/usr/sbin/sendmail \
+		--with-fcrondyn=yes \
+		--with-editor=/bin/nano \
+		--with-shell=/bin/sh \
+		${myconf} \
+		|| die "Configure problem"
+
+	emake || die "Compile problem"
+}
+
+src_install() {
+	# cron eclass stuff
+	docron fcron -m0755 -o ${ROOTUSER:-root} -g ${ROOTGROUP:-root}
+	docrondir /var/spool/fcron/fcrontabs -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}
+	dosed 's:^\(fcrontabs.*=.*\)$:\1/fcrontabs:' /etc/fcron/fcron.conf \
+		|| die "dosed fcron.conf failed"
+
+	# 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 || die "newinitd failed"
+
+	# install the very handy check_system_crontabs script
+	mv script/check_system_crontabs script/check_system_crontabs.orig
+	sed -e 's:^FCRONTABS_DIR=.*$:FCRONTABS_DIR=/var/spool/cron/fcrontabs:' \
+		script/check_system_crontabs.orig > script/check_system_crontabs
+	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 /var/spool/fcron/fcrontabs"
+	einfo "   instead of /var/spool/cron/crontabs"
+	einfo
+	einfo "2. fcron uses a special binary file format for storing the"
+	einfo "   crontabs in /var/spool/fcron/fcrontabs/USERNAME,"
+	einfo "   but the original plain text version is saved as"
+	einfo "   /var/spool/fcron/fcrontabs/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 /etc/crontab"
+	einfo
+	einfo "   will write /etc/crontab to the fcron crontabs directory as"
+	einfo
+	einfo "      /var/spool/fcron/fcrontabs/systab"
+	einfo
+	einfo "   Please note that changes to /etc/crontab will not become"
+	einfo "   active automatically! fcron also does not use the directory"
+	einfo "   /etc/cron.d by default like vixie-cron does."
+	einfo "   Fortunately, it's possible to emulate vixie-cron's behavior"
+	einfo "   with regards to /etc/crontab and /etc/cron.d by using a"
+	einfo "   little helper script called 'check_system_crontabs'."
+	einfo "   The file /etc/fcrontab (not /etc/crontab!) has been set up"
+	einfo "   to run the script once a while to check whether"
+	einfo "   /etc/fcrontab, /etc/crontab or files in /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 /etc/fcrontab should only be used to run that"
+	einfo "   script in order to ensure independence from the standard"
+	einfo "   system crontab file /etc/crontab."
+	einfo "   You may of course adjust the schedule for the script"
+	einfo "   'check_system_crontabs' or any other setting in"
+	einfo "   /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 /etc/cron.{hourly|daily|weekly|monthly} by"
+	einfo "just generating a systab once from /etc/crontab:"
+	einfo
+	einfo "   fcrontab -u systab /etc/crontab"
+	einfo
+	einfo "Happy fcron'ing!"
+	einfo
+
+	ewarn
+	ewarn "Fixing permissions and ownership of /usr/bin/fcron{tab,dyn,sighup}"
+	chown fcron:fcron /usr/bin/fcron{tab,dyn} >&/dev/null
+	chown ${ROOTUSER:-root}:fcron /usr/bin/fcronsighup >&/dev/null
+	chmod 6755 /usr/bin/fcron{tab,dyn,sighup} >&/dev/null
+	ewarn "Fixing permissions and ownership of /etc/{fcron,fcrontab,crontab}"
+	chown -R ${ROOTUSER:-root}:fcron /etc/{fcron,fcrontab,crontab} >&/dev/null
+	chmod -R g+rX,o= /etc/fcron /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 "   /etc/fcron/fcron.allow"
+	ewarn "   /etc/fcron/fcron.deny"
+	ewarn
+	ebeep 10
+	epause 10
+
+	if ls -1 /var/spool/cron/fcrontabs/* >&/dev/null; then
+		ewarn
+		ewarn "WARNING: fcron now uses a dedicated fcron-specific"
+		ewarn "spooldir /var/spool/fcron instead of the commonly"
+		ewarn "used /var/spool/cron for several reasons."
+		ewarn
+		ewarn "Copying over existing crontabs from /var/spool/cron/fcrontabs"
+		cp /var/spool/cron/fcrontabs/* /var/spool/fcron/fcrontabs/ >&/dev/null \
+			|| die "failed to migrate existing crontabs"
+		ewarn "You should now remove /var/spool/cron/fcrontabs!"
+		ewarn
+		ewarn "Fixing permissions and ownership of /var/spool/fcron/fcrontabs"
+		chown root:root /var/spool/fcron/fcrontabs/* >&/dev/null
+		chmod 0600 /var/spool/fcron/fcrontabs/* >&/dev/null
+		chown fcron:fcron /var/spool/fcron/fcrontabs/*.orig >&/dev/null
+		chmod 0640 /var/spool/fcron/fcrontabs/*.orig >&/dev/null
+		ewarn
+		ewarn "*** YOU SHOULD IMMEDIATELY UPDATE THE"
+		ewarn "*** fcrontabs ENTRY IN /etc/fcron/fcron.conf"
+		ewarn "*** AND RESTART YOUR FCRON DAEMON!"
+		ebeep 20
+		epause 10
+	fi
+}
diff --git a/sys-process/fcron/files/digest-fcron-3.0.2-r2 b/sys-process/fcron/files/digest-fcron-3.0.2-r2
new file mode 100644
index 000000000000..c39f78dc0007
--- /dev/null
+++ b/sys-process/fcron/files/digest-fcron-3.0.2-r2
@@ -0,0 +1,3 @@
+MD5 f35e6af41d356ebcb38882f86a14fb94 fcron-3.0.2.src.tar.gz 540559
+RMD160 822f559550780c61c5822f4034fe99dd47577847 fcron-3.0.2.src.tar.gz 540559
+SHA256 ea25f4e9a78f6872c65cc97aa18c018b548e9fcd73b06d77c312e635ecf9ad48 fcron-3.0.2.src.tar.gz 540559