From: Diego Elio Pettenò Date: Wed, 10 Mar 2010 01:38:22 +0000 (+0000) Subject: Version bump (bug #308075); use gentoo-editor instead of vi as hardcoded editor;... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e2630b908182b9b6009dc86e53c7fe84067dc8a2;p=gentoo.git Version bump (bug #308075); use gentoo-editor instead of vi as hardcoded editor; don't build documentation at all (avoids a long list of deps and closes bug #273482); fix pre-generated documentation paths (bug #216460); solve bug #277077; install proper PAM default (closes bug #261683); use bash as shell for the check_system_crontabs (works around bug #282214, upstream will have to fix the script); update debug USE flag not to disable background-execution of fcron, and avoid mocking with CFLAGS; remove use-dependencies from the init script for ldap, postgres and mysql. Package-Manager: portage-2.2_rc66/cvs/Linux x86_64 --- diff --git a/sys-process/fcron/ChangeLog b/sys-process/fcron/ChangeLog index 4a161619fc9c..cbcf09fd4750 100644 --- a/sys-process/fcron/ChangeLog +++ b/sys-process/fcron/ChangeLog @@ -1,6 +1,20 @@ # 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.68 2009/10/02 16:31:05 armin76 Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.69 2010/03/10 01:38:20 flameeyes Exp $ + +*fcron-3.0.5 (10 Mar 2010) + + 10 Mar 2010; Diego E. Pettenò +fcron-3.0.5.ebuild, + files/check_system_crontabs.fcron-config-file.patch, +files/fcron.init.2, + metadata.xml: + Version bump (bug #308075); use gentoo-editor instead of vi as hardcoded + editor; don't build documentation at all (avoids a long list of deps and + closes bug #273482); fix pre-generated documentation paths (bug #216460); + solve bug #277077; install proper PAM default (closes bug #261683); use + bash as shell for the check_system_crontabs (works around bug #282214, + upstream will have to fix the script); update debug USE flag not to + disable background-execution of fcron, and avoid mocking with CFLAGS; + remove use-dependencies from the init script for ldap, postgres and mysql. 02 Oct 2009; Raúl Porcel fcron-3.0.4-r1.ebuild, fcron-3.0.4-r2.ebuild: diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest index 4c65c578dffd..b5e532edd163 100644 --- a/sys-process/fcron/Manifest +++ b/sys-process/fcron/Manifest @@ -1,10 +1,23 @@ -AUX check_system_crontabs.fcron-config-file.patch 1726 RMD160 94dfa2c9f106f450e80e3d76cf1f664caca905ae SHA1 95a6952bfab75db728a207c4f17372c307922bbd SHA256 eb93c92fd6e266eba4fdf6f9597a362ff86fe2cce64368dc72e63fb9c622cb0d +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX check_system_crontabs.fcron-config-file.patch 1740 RMD160 05a8b1f3ae6a2217482765806dce1b24a4a51c29 SHA1 32125fbe6752fa839e2dc00e21e8ddaee5b26801 SHA256 40ed92d5f2ea1468b705d624e6ff756eddda212cb8216d26fbf63ec7d50a2b86 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 fcron.init.2 1562 RMD160 6434ae17c2636454a16c8fba1f2bae0933598692 SHA1 52baed45ddebe6b343fb28f187e667a055e40d44 SHA256 b8bd49ce367ed30e1f5d7f6eabfb8cbff14f1a7bc486f0816c53a64c2dc0ac6c AUX fcrontab 332 RMD160 062faddf0551bebbf9834b796f9957cf49dbc967 SHA1 063f77dd90a76170a793352530a35c60922283e4 SHA256 ab5c104248c51471d61e3312f52bf738d74ab3319b8c01cd0cc5c74458fb8fcc DIST fcron-3.0.4.src.tar.gz 553609 RMD160 2bb8eb489251eaa1380b4e37b6526d2040291313 SHA1 daaa5287be026a425ea5bb56959ad38b1b6d030a SHA256 c8766c7f347f2146f84449401f8994d477d10f49df778f9a7cd802e534bc6f96 +DIST fcron-3.0.5.src.tar.gz 551516 RMD160 7523bd7de39bb2aa96e61714ee98f389b1fb68b1 SHA1 73a1fe43305c6afaafd82086a17c03fa1ebcfac3 SHA256 f3360475a2d09598f24254e41d626b11be89aa8680933e6e35b7708edce90671 EBUILD fcron-3.0.4-r1.ebuild 8833 RMD160 4e0d5b162d05c031fe7a33fe90be94b9d8938bd8 SHA1 255dbcdbc715d84b4196f557dc8211f27b48c934 SHA256 c02d90a080f53a30e3a14002406514e9f83d94201d7c770cdcce4447963663bc EBUILD fcron-3.0.4-r2.ebuild 8988 RMD160 33be5526cb595f9311007dc312709338a9431a6c SHA1 47b22e75ba0b08071ede0cec9a8c946896292269 SHA256 d013ac7e4c3174aace5070bec0b1f2dd38b67540785ec40331c64d198d3d915a -MISC ChangeLog 17062 RMD160 d9442c5194a4968b5d94d406f3116aacaab06e70 SHA1 bb47eccb33a8eea5ad9ef437d341915a3d489c6e SHA256 40de17c84180f71be38d8bcd7a8ad696337ba18b77cb17e5fa78b0d9736149ae -MISC metadata.xml 303 RMD160 d24dcc8f24ba7a6a6881727d4f6bea37b319fee4 SHA1 6071b772615027860d246ae497df4866c991562a SHA256 550e002d2ddfc3e38a4fd062713956e335e068f6cf15828e139f01ce325937c6 +EBUILD fcron-3.0.5.ebuild 9626 RMD160 1b5f62cc1a49e9568583aaa498b7c568ec6fcc78 SHA1 d0767fd412d1922f85c9695b4bb70805d2806de5 SHA256 9910755b3c16bb088058181a523afd8548de272a4d128b5b97eff1f9ba1ef007 +MISC ChangeLog 17854 RMD160 186b47802b2af7efabedd7382ae801200f7f469d SHA1 f0d905c76c0fabdf7066943a6466dec749e854de SHA256 df9d6d47b2889a40a84ee933ad04118140ba84cbf6c77def7c91e1f1d17c5a05 +MISC metadata.xml 1347 RMD160 4486afd8502fab6c38b763f076ff6a97b9dbf602 SHA1 39bf4e2ffaf810b299c57c753a4e3bbaf5a42900 SHA256 d0bfa88c1dd0a7c2fdcc3be81004a9a0d97f3fff13606dca4b8a1fff92552464 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkuW+BYACgkQAiZjviIA2XhJGACgwUPmyA6kF2tXmYF8U5wEO45j +z1oAnieVHtD1MUiwIIJt81YbwBpnmvtL +=VAGZ +-----END PGP SIGNATURE----- diff --git a/sys-process/fcron/fcron-3.0.5.ebuild b/sys-process/fcron/fcron-3.0.5.ebuild new file mode 100644 index 000000000000..f80e1bdd4b9b --- /dev/null +++ b/sys-process/fcron/fcron-3.0.5.ebuild @@ -0,0 +1,271 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.5.ebuild,v 1.1 2010/03/10 01:38:20 flameeyes Exp $ + +inherit 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 ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd" +IUSE="debug pam selinux linguas_fr" + +DEPEND="selinux? ( sys-libs/libselinux ) + pam? ( virtual/pam )" + +# see bug 282214 for the reason to depend on bash +RDEPEND="${DEPEND} + app-shells/bash + app-editors/gentoo-editor + pam? ( >=sys-auth/pambase-20100310 )" + +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) +} + +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" + epatch "${FILESDIR}"/check_system_crontabs.fcron-config-file.patch + + # the script contains bashism, so until upstream fixes it we're + # going to simply require bash for this to work, sorry! + # see also bug #282214 + sed -i -e '1s:/bin/sh:/bin/bash:' script/check_system_crontabs \ + || die "Unable to fix check_system_crontabs shebang." +} + +src_compile() { + local myconf + + # Don't try to pass --with-debug as it'll play with cflags as + # well, and run foreground which is a _very_ nasty idea for + # Gentoo. + use debug && append-flags -DDEBUG + + [[ -n "${rootuser}" ]] && myconf="${myconf} --with-rootname=${rootuser}" + [[ -n "${rootgroup}" ]] && myconf="${myconf} --with-rootgroup=${rootgroup}" + + econf \ + --with-cflags="${CFLAGS}" \ + $(use_with pam) \ + $(use_with selinux) \ + --sysconfdir=/etc/fcron \ + --with-username=fcron \ + --with-groupname=fcron \ + --with-piddir=/var/run \ + --with-spooldir=/var/spool/fcron \ + --with-fifodir=/var/run \ + --with-fcrondyn=yes \ + --disable-checks \ + --with-editor=/usr/libexec/gentoo-editor \ + --with-sendmail=/usr/sbin/sendmail \ + --with-shell=/bin/sh \ + --without-db2man --without-dsssl-dir \ + ${myconf} \ + || die "configure failed" + + emake || die "make failed" + + # bug #216460 + sed -i \ + -e 's:/usr/local/etc/fcron:/etc/fcron/fcron:g' \ + -e 's:/usr/local/etc:/etc:g' \ + -e 's:/usr/local/:/usr/:g' \ + doc/*/*/*.{txt,1,5,8,html} \ + || die "unable to fix documentation references" +} + +src_install() { + # create directories that don't have special permissions first so + # that we can play with the permissions later + dodir /usr/bin /etc /var/spool + + diropts -m6770 -o fcron -g fcron + keepdir /var/spool/fcron + + # install fcron tools + insinto /usr/bin + dosbin fcron || die + + # 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 || die + insopts -m6755 -o fcron -g fcron + doins fcrondyn fcrontab || die + + # /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} || die + + diropts -m0755 + insopts -m0644 + + # install /etc/crontab and /etc/fcrontab + insopts -m0640 -o ${rootuser:-root} -g ${rootgroup:-root} + doins "${FILESDIR}"/crontab "${FILESDIR}"/fcrontab || die + + # install PAM files + pamd_mimic system-services fcron auth account session + cat - > "${T}"/fcrontab.pam <&/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 + + 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!" + fi + + elog "" + elog "Since version 3.0.5 the fcron init script will no longer wait for LDAP, MySQL" + elog "or PostgreSQL before starting. If you need any of these for authentication or" + elog "for jobs that are executed by fcron, please create a /etc/conf.d/fcron file to" + elog "set the rc_need variable to the list of services you should be waiting for." + elog "" +} 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 index 983b7c36f35d..5a757e3fe2bd 100644 --- a/sys-process/fcron/files/check_system_crontabs.fcron-config-file.patch +++ b/sys-process/fcron/files/check_system_crontabs.fcron-config-file.patch @@ -1,5 +1,5 @@ ---- check_system_crontabs.orig 2008-07-18 15:56:49.110205300 +0200 -+++ check_system_crontabs 2008-07-18 16:00:46.303783312 +0200 +--- script/check_system_crontabs.orig 2008-07-18 15:56:49.110205300 +0200 ++++ script/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 diff --git a/sys-process/fcron/files/fcron.init.2 b/sys-process/fcron/files/fcron.init.2 new file mode 100644 index 000000000000..0d0bc3e7b0b9 --- /dev/null +++ b/sys-process/fcron/files/fcron.init.2 @@ -0,0 +1,50 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/files/fcron.init.2,v 1.1 2010/03/10 01:38:22 flameeyes Exp $ + +depend() { + use logger + need clock hostname + # provide the cron service if we are the main instance + if [ "${SVCNAME}" = "fcron" ]; then + provide cron + fi +} + +checkconfig() { + FCRON_INSTANCE=${SVCNAME##*.} + if [ -n "${FCRON_INSTANCE}" -a "${SVCNAME}" != "fcron" ]; then + FCRON_CONF=/etc/fcron/fcron.${FCRON_INSTANCE}.conf + else + FCRON_CONF=/etc/fcron/fcron.conf + fi + if [ ! -e ${FCRON_CONF} ]; then + eerror "You will need an ${FCRON_CONF} first" + eerror "There is a sample in /etc/fcron" + return 1 + fi + FCRON_PIDFILE=$(grep '^pidfile' ${FCRON_CONF} 2>/dev/null | sed -e 's:^pidfile[[:space:]]*=[[:space:]]*\(.*\)$:\1:') + FCRON_PIDFILE=${FCRON_PIDFILE:-/var/run/fcron.pid} + FCRON_SPOOLDIR=$(grep '^fcrontabs' ${FCRON_CONF} 2>/dev/null | sed -e 's:^fcrontabs[[:space:]]*=[[:space:]]*\(.*\)$:\1:') + FCRON_SPOOLDIR=${FCRON_SPOOLDIR:-/var/spool/cron/fcrontabs} + if [ ! -d ${FCRON_SPOOLDIR} ]; then + ebegin "Creating missing spooldir ${FCRON_SPOOLDIR}" + /usr/sbin/fcron --newspooldir ${FCRON_SPOOLDIR} + eend $? + fi +} + +start() { + checkconfig || return 1 + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --pidfile ${FCRON_PIDFILE} --exec /usr/sbin/fcron -- -c ${FCRON_CONF} + eend $? +} + +stop() { + checkconfig || return 1 + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --pidfile ${FCRON_PIDFILE} + eend $? +} diff --git a/sys-process/fcron/metadata.xml b/sys-process/fcron/metadata.xml index e367aa98c278..d83a6dde2539 100644 --- a/sys-process/fcron/metadata.xml +++ b/sys-process/fcron/metadata.xml @@ -1,10 +1,39 @@ - cron - - wschlich@gentoo.org - Wolfram Schlich - Primary maintainer - + cron + + wschlich@gentoo.org + Wolfram Schlich + Primary maintainer + + + flameeyes@gentoo.org + + + + Rebuild the user documentation provided with the package; this + should really not be necessary as all the documentation is + shipped pre-built. + + + + Enable debug code, output and allocation checks. Warning: in + ebuilds before 3.0.5, enabling this flag will prevent fcron from + running as a proper service. + + + + Enable debug code and output. Since version 3.0.5 this will no + longer force foreground execution, and fcron will be able to run + as a service properly. + + + + Enable PAM support for fcron. This means that fcron will pass + through the “fcron” stack before executing the jobs, and + fcrontab will use the “fcrontab” stack to authenticate the user + before editing its crontab file. + +