einfo2elog transition, fix doc stuff

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 305 insertions, 2 deletions

diff --git a/sys-process/fcron/ChangeLog b/sys-process/fcron/ChangeLog
index 0c57bb3e5fe2..d271186780b1 100644
--- a/sys-process/fcron/ChangeLog
+++ b/sys-process/fcron/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/fcron
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.65 2009/05/12 09:21:57 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.66 2009/06/09 17:58:51 wschlich Exp $
+
+*fcron-3.0.4-r2 (25 May 2009)
+
+  25 May 2009; Wolfram Schlich <wschlich@gentoo.org>
+  +files/fcron-3.0.4-docfix.patch, +fcron-3.0.4-r2.ebuild:
+  einfo2elog transition, fix doc stuff
 
   12 May 2009; Thilo Bangert <bangert@gentoo.org> files/crontab:
   reduce chance of race condition - bug #98189
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index 8c2a016738b8..d3b89edec0e8 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -1,11 +1,13 @@
 AUX check_system_crontabs.fcron-config-file.patch 1726 RMD160 94dfa2c9f106f450e80e3d76cf1f664caca905ae SHA1 95a6952bfab75db728a207c4f17372c307922bbd SHA256 eb93c92fd6e266eba4fdf6f9597a362ff86fe2cce64368dc72e63fb9c622cb0d
 AUX crontab 864 RMD160 f181a337c032df8711384bd54c58e594fd516313 SHA1 db6ce92b9109134d8c8dfb3e6f248dafea217c69 SHA256 ccb4bf3d5732f7f26fb9a7ae75e13e5e20603e8f1db8859cfa6ee4d4dcb9df45
+AUX fcron-3.0.4-docfix.patch 1446 RMD160 1c57256ccd7cb2cd6c6723050e347577123a1afb SHA1 8e96a9b00eeecfe7add5848618c0f21f20cce30f SHA256 24737725423a109860ac77bf34a59211914434225e2e1f7ed1db922595730a47
 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 8826 RMD160 76e3ad7ff56abde00aae48fc1b9e4d553cdd0cad SHA1 40549580b30268147dd1b825b90ad57c9a9fff7a SHA256 a6f14fd567b52f44816a2a7035dc465fb243990835133832cf86f2b29e1f25bf
+EBUILD fcron-3.0.4-r2.ebuild 8983 RMD160 9ab939a3d1b9cf415c2975ca718d6c16e2ec6d60 SHA1 64edfc35f7c2dbaafe658b2f656ed8fc12f63f3e SHA256 690391481355c11456130d8b42434433d20c1429c52d69b2ee516aaccb0444fc
 EBUILD fcron-3.0.4.ebuild 8771 RMD160 2c10a8300d9cf2209b02c3733cd45131e746eab8 SHA1 e1de9664ba9f4ba67a8fb12f868f2c25f80c38a0 SHA256 b9b3d88416d241e5474fd45b09221515550e5acddfb61c3615a0225b1706bd6f
-MISC ChangeLog 16636 RMD160 3ce4f5f9eaf81298cde5c4e05d009c74774f9219 SHA1 873d223fa11504f8ecd6ca3025e8cebacd00445d SHA256 7ea3f31e8d9fe1f077ea3612f6e0d14cfbd48043ed02db64227acb7ab021299c
+MISC ChangeLog 16820 RMD160 291fd82a1d94e26a26b06da9982145f2e1bddde7 SHA1 74bde261e92e2fc5280604887f742b1e1b2d6870 SHA256 27b09a0c80a6959dc07ca58e02066c4c1fda681ecd627111fef22a5b6fbfe1f3
 MISC metadata.xml 303 RMD160 d24dcc8f24ba7a6a6881727d4f6bea37b319fee4 SHA1 6071b772615027860d246ae497df4866c991562a SHA256 550e002d2ddfc3e38a4fd062713956e335e068f6cf15828e139f01ce325937c6
diff --git a/sys-process/fcron/fcron-3.0.4-r2.ebuild b/sys-process/fcron/fcron-3.0.4-r2.ebuild
new file mode 100644
index 000000000000..c5c89f0e03ca
--- /dev/null
+++ b/sys-process/fcron/fcron-3.0.4-r2.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2009 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-r2.ebuild,v 1.1 2009/06/09 17:58:51 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/openjade
+		app-text/docbook-sgml
+		>=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
+
+	## fix SGML files
+	epatch "${FILESDIR}"/${P}-docfix.patch
+
+	eautoreconf || die "autoreconf failed"
+}
+
+src_compile() {
+	local myconf
+
+	use doc \
+		&& myconf="${myconf} --with-dsssl-dir=/usr/share/sgml/stylesheets/dsssl/docbook --with-db2man=/usr/bin/docbook2man"
+
+	[[ -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"
+
+	use doc && {
+		make updatedoc || die "make updatedoc 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() {
+	elog
+	elog "fcron has some important differences compared to vixie-cron:"
+	elog
+	elog "1. fcron stores the crontabs in ${ROOT}var/spool/fcron"
+	elog "   instead of ${ROOT}var/spool/cron/crontabs"
+	elog
+	elog "2. fcron uses a special binary file format for storing the"
+	elog "   crontabs in ${ROOT}var/spool/fcron/USERNAME,"
+	elog "   but the original plain text version is saved as"
+	elog "   ${ROOT}var/spool/fcron/USERNAME.orig for your"
+	elog "   reference (and for being edited with fcrontab)."
+	elog
+	elog "3. fcron does not feature a system crontab in exactly the"
+	elog "   same way as vixie-cron does. This version of fcron"
+	elog "   features a crontab for a pseudo-user 'systab' for use"
+	elog "   as the system crontab. Running a command like"
+	elog
+	elog "      fcrontab -u systab ${ROOT}etc/crontab"
+	elog
+	elog "   will write ${ROOT}etc/crontab to the fcron crontabs directory as"
+	elog
+	elog "      ${ROOT}var/spool/fcron/systab"
+	elog
+	elog "   Please note that changes to ${ROOT}etc/crontab will not become"
+	elog "   active automatically! fcron also does not use the directory"
+	elog "   ${ROOT}etc/cron.d by default like vixie-cron does."
+	elog "   Fortunately, it's possible to emulate vixie-cron's behavior"
+	elog "   with regards to ${ROOT}etc/crontab and ${ROOT}etc/cron.d by using a"
+	elog "   little helper script called 'check_system_crontabs'."
+	elog "   The file ${ROOT}etc/fcrontab (not ${ROOT}etc/crontab!) has been set up"
+	elog "   to run the script once a while to check whether"
+	elog "   ${ROOT}etc/fcrontab, ${ROOT}etc/crontab or files in ${ROOT}etc/cron.d/ have"
+	elog "   changed since the last generation of the systab and"
+	elog "   regenerate it from those three locations as necessary."
+	elog "   You should now run 'check_system_crontabs' once to properly"
+	elog "   generate an initial systab:"
+	elog
+	elog "      check_system_crontabs -v -i -f"
+	elog
+	elog "   The file ${ROOT}etc/fcrontab should only be used to run that"
+	elog "   script in order to ensure independence from the standard"
+	elog "   system crontab file ${ROOT}etc/crontab."
+	elog "   You may of course adjust the schedule for the script"
+	elog "   'check_system_crontabs' or any other setting in"
+	elog "   ${ROOT}etc/fcrontab as you desire."
+	elog
+	elog "If you do NOT want to use 'check_system_crontabs', you"
+	elog "might still want to activate the use of the well known"
+	elog "directories ${ROOT}etc/cron.{hourly|daily|weekly|monthly} by"
+	elog "just generating a systab once from ${ROOT}etc/crontab:"
+	elog
+	elog "   fcrontab -u systab ${ROOT}etc/crontab"
+	elog
+	elog "Happy fcron'ing!"
+	elog
+
+	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/fcron-3.0.4-docfix.patch b/sys-process/fcron/files/fcron-3.0.4-docfix.patch
new file mode 100644
index 000000000000..3af27b22f028
--- /dev/null
+++ b/sys-process/fcron/files/fcron-3.0.4-docfix.patch
@@ -0,0 +1,36 @@
+diff -urN fcron-3.0.4.orig/doc/en/changes.sgml fcron-3.0.4/doc/en/changes.sgml
+--- fcron-3.0.4.orig/doc/en/changes.sgml	2007-11-08 10:02:42.000000000 +0100
++++ fcron-3.0.4/doc/en/changes.sgml	2008-07-24 11:47:27.861704216 +0200
+@@ -178,6 +178,7 @@
+ 	    <para>made fcrontab behave better when there is no space left in the
+ 	       spool directory (used to truncate the fcrontab source file).
+ 	    </para>
++	 </listitem>
+ 	 <listitem>
+ 	    <para>Added a script, check_system_crontabs, to emulate Vixie cron's
+ 	       behavior about /etc/crontab and /etc/cron.d. Please have a look
+@@ -1135,4 +1136,4 @@
+ sgml-parent-document:("fcron-doc.sgml" "book" "chapter" "sect1" "")
+ End:
+ -->
+-   
+\ No newline at end of file
++   
+diff -urN fcron-3.0.4.orig/doc/fr/changes.sgml fcron-3.0.4/doc/fr/changes.sgml
+--- fcron-3.0.4.orig/doc/fr/changes.sgml	2007-11-08 10:02:42.000000000 +0100
++++ fcron-3.0.4/doc/fr/changes.sgml	2008-07-24 11:48:12.422376403 +0200
+@@ -86,6 +86,7 @@
+ 	    <para>made fcrontab behave better when there is no space left in the
+ 	       spool directory (used to truncate the fcrontab source file).
+ 	    </para>
++	 </listitem>
+ 	 <listitem>
+ 	    <para>Added a script, check_system_crontabs, to emulate Vixie cron's
+ 	       behavior about /etc/crontab and /etc/cron.d. Please have a look
+@@ -1043,4 +1044,4 @@
+ sgml-parent-document:("fcron-doc.sgml" "book" "chapter" "sect1" "")
+ End:
+ -->
+-   
+\ No newline at end of file
++