[gentoo-commits] gentoo-x86 commit in sys-process/fcron: metadata.xml fcron-3.0.6-r3.ebuild ChangeLog fcron-3.0.5-r2.ebuild

[Diego Petteno (flameeyes)]

flameeyes    12/08/29 17:38:40

  Modified:             metadata.xml ChangeLog
  Added:                fcron-3.0.6-r3.ebuild
  Removed:              fcron-3.0.5-r2.ebuild
  Log:
  Remove old. Add new ebuild that avoid spitting pages-long documentation and instead relies on users knowing what they are doing and use pkg_config to set up the package with its systab. Do not change files' permissions at postinst time as that's bad practice.
  
  (Portage version: 2.2.0_alpha123/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  sys-process/fcron/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/metadata.xml?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/metadata.xml?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/metadata.xml?r1=1.6&r2=1.7

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-process/fcron/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml	27 Aug 2010 17:52:44 -0000	1.6
+++ metadata.xml	29 Aug 2012 17:38:40 -0000	1.7
@@ -11,13 +11,7 @@
     <email>flameeyes@g.o</email>
   </maintainer>
   <use>
-    <flag name="debug" restrict="&lt;sys-process/fcron-3.0.5">
-      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.
-    </flag>
-
-    <flag name="debug" restrict="&gt;=sys-process/fcron-3.0.5">
+    <flag name="debug">
       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.
@@ -29,5 +23,12 @@
       fcrontab will use the "fcrontab" stack to authenticate the user
       before editing its crontab file.
     </flag>
+
+    <flag name="system-crontab">
+      Set up fcron to respect /etc/crontab and /etc/cron.d. If this
+      flag is disabled, /etc/cron.d and /etc/crontab will be ignored,
+      but /etc/cron.{hourly,daily,weekly,monthly} will still be
+      respected.
+    </flag>
   </use>
 </pkgmetadata>



1.93                 sys-process/fcron/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/ChangeLog?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/ChangeLog?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/ChangeLog?r1=1.92&r2=1.93

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- ChangeLog	24 May 2012 05:51:09 -0000	1.92
+++ ChangeLog	29 Aug 2012 17:38:40 -0000	1.93
@@ -1,6 +1,15 @@
 # ChangeLog for sys-process/fcron
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.92 2012/05/24 05:51:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.93 2012/08/29 17:38:40 flameeyes Exp $
+
+*fcron-3.0.6-r3 (29 Aug 2012)
+
+  29 Aug 2012; Diego E. Pettenò <flameeyes@g.o> +fcron-3.0.6-r3.ebuild,
+  +files/fcron.init.3, +files/fcrontab.2, -fcron-3.0.5-r2.ebuild, metadata.xml:
+  Remove old. Add new ebuild that avoid spitting pages-long documentation and
+  instead relies on users knowing what they are doing and use pkg_config to set
+  up the package with its systab. Do not change files' permissions at postinst
+  time as that's bad practice.
 
   24 May 2012; Mike Frysinger <vapier@g.o> fcron-3.0.5-r2.ebuild,
   fcron-3.0.6-r1.ebuild, fcron-3.0.6-r2.ebuild:



1.1                  sys-process/fcron/fcron-3.0.6-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/fcron-3.0.6-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/fcron-3.0.6-r3.ebuild?rev=1.1&content-type=text/plain

Index: fcron-3.0.6-r3.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.6-r3.ebuild,v 1.1 2012/08/29 17:38:40 flameeyes Exp $

EAPI=4

inherit cron pam eutils flag-o-matic user

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 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE="debug pam selinux linguas_fr +system-crontab"

DEPEND="selinux? ( sys-libs/libselinux )
	pam? ( virtual/pam )"

# see bug 282214 for the reason to depend on bash
RDEPEND="${DEPEND}
	app-shells/bash
	>=app-misc/editor-wrapper-3
	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)
	[[ ${rootuser} ]] || rootuser=root
	rootgroup=$(egetent group 0 | cut -d ':' -f 1)
	[[ ${rootgroup} ]] || rootgroup=root
}

src_unpack() {
	unpack ${A}
	cd "${S}"

	# respect LDFLAGS
	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"

	sed -i -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' script/check_system_crontabs.sh || die
}

src_configure() {
	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

	# bindir is used just for calling fcronsighup
	econf \
		--with-cflags="${CFLAGS}" \
		--bindir=/usr/libexec \
		$(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/editor \
		--with-sendmail=/usr/sbin/sendmail \
		--with-shell=/bin/sh \
		--without-db2man --without-dsssl-dir \
		--with-rootname=${rootuser} \
		--with-rootgroup=${rootgroup}
}

src_compile() {
	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() {
	keepdir /var/spool/fcron

	exeinto /usr/libexec
	doexe fcron fcronsighup

	dobin fcrondyn fcrontab

	insinto /etc/fcron
	doins files/fcron.{allow,deny,conf}

	if use system-crontab; then
		dosym /usr/bin/fcrontab crontab

		exeinto /usr/libexec
		newexe script/check_system_crontabs.sh check_system_crontabs

		insinto /etc/fcron
		newins "${FILESDIR}"/fcrontab.2 fcrontab

		fowners ${rootuser}:fcron /etc/fcron/fcrontab
		fperms 0640 /etc/fcron/fcrontab

		insinto /etc
		doins "${FILESDIR}"/crontab
	fi

	fowners fcron:fcron \
		/var/spool/fcron \
		/usr/bin/fcron{dyn,tab}

	# fcronsighup needs to be suid root, because it sends a HUP to the
	# running fcron daemon, but only has to be called by the fcron group
	# anyway
	fowners ${rootuser}:fcron \
		/usr/libexec/fcronsighup \
		/etc/fcron \
		/etc/fcron/fcron.{allow,deny,conf} \

	fperms 6770 /var/spool/fcron
	fperms 2775 /usr/bin/fcron{dyn,tab}

	fperms 4710 /usr/libexec/fcronsighup

	fperms 0750 /etc/fcron
	fperms 0640 /etc/fcron/fcron.{allow,deny,conf}

	pamd_mimic system-services fcron auth account session
	cat - > "${T}"/fcrontab.pam <<EOF
# Don't ask for the user's password; fcrontab will only allow to
# change user if running as root.
auth		sufficient		pam_permit.so

# Still use the system-auth stack for account and session as the
# sysadmin might have set up stuff properly, and also avoids
# sidestepping limits (since fcrontab will run $EDITOR).
account		include			system-auth
session		include			system-auth
EOF
	newpamd "${T}"/fcrontab.pam fcrontab

	newinitd "${FILESDIR}"/fcron.init.3 fcron

	dodoc MANIFEST VERSION "${FILESDIR}"/crontab \
		doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt
	newdoc files/fcron.conf fcron.conf.sample
	dohtml doc/en/HTML/*.html
	doman doc/en/man/*.{1,5,8}

	for lang in fr; do
		use linguas_${lang} || continue

		doman -i18n=${lang} doc/${lang}/man/*.{1,5,8} || die
		docinto html/${lang}
		dohtml doc/${lang}/HTML/*.html || die
	done
}

pkg_postinst() {
	elog "If it's the first time you install fcron make sure to execute"
	elog "  emerge --config ${CATEGORY}/${PN}"
	elog "to configure the proper settings."
	if ! use system-crontab; then
		ewarn ""
		ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration"
		ewarn ""
	fi
}

pkg_config() {
	if [[ $(fcrontab -l -u systab 2>/dev/null) ]]; then
		eerror "We're not going to make any change to your systab as long as"
		eerror "it contains data; please clear it before proceeding."
		return 1
	fi

	if use system-crontab; then
		elog "This is going to set up fcron to execute check_system_crontabs."
		elog "In this configuration, you're no longer free to edit the systab"
		elog "at your leisure, at it'll be rewritten the moment the crontabs"
		elog "are modified."
		/usr/libexec/check_system_crontabs -v -i -f
	else
		elog "This is going to set up fcron to set up a default systab that"
		elog "executes /etc/cron.{hourly,daily,weekly,monthly}."
		fcrontab -u systab - <<EOF
0  *  * * *      rm -f /var/spool/cron/lastrun/cron.hourly
1  3  * * *      rm -f /var/spool/cron/lastrun/cron.daily
15 4  * * 6      rm -f /var/spool/cron/lastrun/cron.weekly
30 5  1 * *      rm -f /var/spool/cron/lastrun/cron.monthly
EOF
	fi
}