diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-08-29 17:38:40 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-08-29 17:38:40 +0000 |
commit | 072ff2fbea35390062a94466b61c007755634df8 (patch) | |
tree | aa30bb144090e10309a875f0895d318ae52b6648 /sys-process/fcron | |
parent | Recognize hardfp on arm, bug #429298 by Till Crueger. (diff) | |
download | historical-072ff2fbea35390062a94466b61c007755634df8.tar.gz historical-072ff2fbea35390062a94466b61c007755634df8.tar.bz2 historical-072ff2fbea35390062a94466b61c007755634df8.zip |
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.
Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64
Diffstat (limited to 'sys-process/fcron')
-rw-r--r-- | sys-process/fcron/ChangeLog | 11 | ||||
-rw-r--r-- | sys-process/fcron/Manifest | 47 | ||||
-rw-r--r-- | sys-process/fcron/fcron-3.0.5-r2.ebuild | 274 | ||||
-rw-r--r-- | sys-process/fcron/fcron-3.0.6-r3.ebuild | 202 | ||||
-rw-r--r-- | sys-process/fcron/files/fcron.init.3 | 58 | ||||
-rw-r--r-- | sys-process/fcron/files/fcrontab.2 | 5 | ||||
-rw-r--r-- | sys-process/fcron/metadata.xml | 15 |
7 files changed, 304 insertions, 308 deletions
diff --git a/sys-process/fcron/ChangeLog b/sys-process/fcron/ChangeLog index 3e15e1d9cccd..fb973e7a1198 100644 --- a/sys-process/fcron/ChangeLog +++ b/sys-process/fcron/ChangeLog @@ -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@gentoo.org> +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@gentoo.org> fcron-3.0.5-r2.ebuild, fcron-3.0.6-r1.ebuild, fcron-3.0.6-r2.ebuild: diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest index 3698f3db8b00..4f3ea8eb2365 100644 --- a/sys-process/fcron/Manifest +++ b/sys-process/fcron/Manifest @@ -1,32 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -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.5-gentoo.patch 1025 RMD160 e3c634e5833d50450fcccba7833f668212352c70 SHA1 95354a2e033abbaf46948ffe0bb6db7a75a39680 SHA256 9de8ebb711f371c5bf0a14063be5405d39658965c7b643ecdba7a63c482bbd60 -AUX fcron.init.2 1562 RMD160 6434ae17c2636454a16c8fba1f2bae0933598692 SHA1 52baed45ddebe6b343fb28f187e667a055e40d44 SHA256 b8bd49ce367ed30e1f5d7f6eabfb8cbff14f1a7bc486f0816c53a64c2dc0ac6c -AUX fcrontab 332 RMD160 062faddf0551bebbf9834b796f9957cf49dbc967 SHA1 063f77dd90a76170a793352530a35c60922283e4 SHA256 ab5c104248c51471d61e3312f52bf738d74ab3319b8c01cd0cc5c74458fb8fcc -DIST fcron-3.0.5.src.tar.gz 551516 RMD160 7523bd7de39bb2aa96e61714ee98f389b1fb68b1 SHA1 73a1fe43305c6afaafd82086a17c03fa1ebcfac3 SHA256 f3360475a2d09598f24254e41d626b11be89aa8680933e6e35b7708edce90671 -DIST fcron-3.0.6.src.tar.gz 552805 RMD160 fadcb39ce106dcd61f31e1d4d6ab7c2d1149b36b SHA1 6b0a886931d9a89c65df33228384b07d672238bf SHA256 9c36b1bc6c931ec8b4ef55fef569ba17004b32f3ae0a72e3cc4ec4d15bee30a1 -EBUILD fcron-3.0.5-r2.ebuild 9695 RMD160 3b1be639e7d6d0edc3f5a113300064e995605d43 SHA1 f78475f38fd79f6feabda5b2072527de853daaf6 SHA256 7f3903f9fb280501ebf8a3f456f054dff7f0917531f6c70b59bbd4b586e365a0 -EBUILD fcron-3.0.6-r1.ebuild 9343 RMD160 de839fece7bef7f6278fab0e28ee49d48680f274 SHA1 14bd19538014fee6832dc83682849f3ab98aa467 SHA256 73535e9a331823d2dd57ab8e616e97adb62c65b9fdc162c88f51503f06bb53bc -EBUILD fcron-3.0.6-r2.ebuild 9514 RMD160 656f09090a25bb5e8872a09babf8f22c5a4e5b9b SHA1 43498f423d48ede14670a61e4d72fdfb9c0c541e SHA256 75ee65e6671f624e5c5e08bd3f8c81484814db9ae409287704e6a956eb74d92c -MISC ChangeLog 21433 RMD160 da11eb4463eccd9811e96f414b9a3f050f8176b0 SHA1 ef1164c242952fcf93e2ffdc41cf72680e7460c9 SHA256 4bdb5837f30f8b5b3236bca0652dee9494df625253e088588a6812ae5f6f94ff -MISC metadata.xml 1169 RMD160 db7a0eace77ad9faf56fc7cb623f06cb4841a59b SHA1 135f0a81d4fd786116a28566deb05abbd99553db SHA256 3cb97f48f6af8cccfb246a142a6ffd983e8bcec6f9deda53cf57a7e93068b0fb +AUX check_system_crontabs.fcron-config-file.patch 1740 SHA256 40ed92d5f2ea1468b705d624e6ff756eddda212cb8216d26fbf63ec7d50a2b86 SHA512 a4b36bc4e70018c6ddc7484692b11b0fc629be7c159d17f15d25e92e98450d007b0b5494f07797183f16629eaaa8513fad1184275189b726e4cca266a52c4571 WHIRLPOOL 7628fb092fa9dd8b8250a32a7e976899b88468921c8da1e82a93c31d62b1237632b01526ce7c9e66d141a1924d6ee3eb4f11e9a5e149f2440883bfefb496fff5 +AUX crontab 864 SHA256 ccb4bf3d5732f7f26fb9a7ae75e13e5e20603e8f1db8859cfa6ee4d4dcb9df45 SHA512 1446e401fd4578ff9c3cee1b2f923543915f24d301749e3e77a3847d9e34659d1ed39155abd9677bbbddb5ad9c33744e3d3a98042d996c7fde2c5dfa083cdeb5 WHIRLPOOL 9f01309184ccf51d72e9e99670b518844afc8af638b02cd228197398878800e9d370ab8ea7a8c4267a41d9cc1ce88bff26390070213bfb95e0d09c77b75f0a9f +AUX fcron-3.0.5-gentoo.patch 1025 SHA256 9de8ebb711f371c5bf0a14063be5405d39658965c7b643ecdba7a63c482bbd60 SHA512 4aaa340de33cc935bb08282340e27ec1f72c48a4bc01563ddc19a763eb081161440b1ff31016a6f63a5391371398070d6be08252f02338e6a8b78b5503e166d1 WHIRLPOOL ace509071f25f567191c4c460c387064b7ac9e90b6655782b7ce46fb59416d5d44dea506b64407847437aaf71dfee3a169280adb12e263545364cbc2a0ec5c3a +AUX fcron.init.2 1562 SHA256 b8bd49ce367ed30e1f5d7f6eabfb8cbff14f1a7bc486f0816c53a64c2dc0ac6c SHA512 011ff7c3dc74b3df5729405f78ec5d948db0acfc809ab561bf176475a01de2ed229727da1962a6bab49d7ec8e95821bf3010ae0cd2891460beb1f5daa24d45f4 WHIRLPOOL 1757f7312463431e9837ea3ec2e7d9e40c058ab338d9d2c3524cba0650541b5de1686104dc6e5dbfc116dc2dd5975d81111351cb68d0077e407272671bb496a4 +AUX fcron.init.3 1371 SHA256 ceada7a1c9e8b62cff506bc94a1813706c7de1ed23daf9c3450ad549df4fafb7 SHA512 3ae8caea11c7e05d74e601d3f1a37d21d3f5fb8958c517a0e780db2cc0333601f8911892b5a700e2ea156960bcd6ee6afbe023553c72066fd908e06a33a89470 WHIRLPOOL 0a69a211edabc10859566208f37a2a8261d6f232ceab171081cbeeb8aab6d63fd78de6f21c9cfcd49819c410d98ac4fc7dbbd28157796ebfd5975f32c60186e8 +AUX fcrontab 332 SHA256 ab5c104248c51471d61e3312f52bf738d74ab3319b8c01cd0cc5c74458fb8fcc SHA512 1c6a8f0554dd4ffbdccc3ff75451e70508bc6fe5d5269f5d022301811457b76402b2bbffbdb1e39b847a48ea0537595858893357e0a46b7e0ba05351dcb9a27a WHIRLPOOL ede39398061d983adb3c4a01790132096e306561cd918f34d83ac35cd4e78eb31bf659d2cb58eda618d9e98146ae04a342178fda4e91cc9422dcdabdc869bcbf +AUX fcrontab.2 338 SHA256 542d735935b46561a92ea36ebf33a91dd11ddc01a8576202e2474161d87e6671 SHA512 365d950f4baabd748478d1f5bf4343b6a95f0d8193d405f37ed62d70ded41daf7127c9e5b2a9d09750c7c6900b2f6109b80ecbf2902e98429de2991a3fb95464 WHIRLPOOL e7506faacf1ffa569ebaddf5dfddc4f78de5d4cada825601bb5f8dc2d61537d123d75c42d5f237c448ecd131760300d2b058a967c35cd51005bee0552382e2be +DIST fcron-3.0.6.src.tar.gz 552805 SHA256 9c36b1bc6c931ec8b4ef55fef569ba17004b32f3ae0a72e3cc4ec4d15bee30a1 SHA512 53dfc2f57820392e4d32230d9abeaa3ec8a2c4aac6fc4888a266553806e7c31cecc655ff8cd5dbd635e40903cf649962e752e5ba6a5bd7728c79bc42771dfb99 WHIRLPOOL 49ba19f87f3190b0a04f75c48f6aaeea8572fc75ec9bc643a07817743c51ed3c23e2c606ee731d9b2994f04b9af4c8cce5ec0efdb20b5b0345b9acff519994b5 +EBUILD fcron-3.0.6-r1.ebuild 9343 SHA256 73535e9a331823d2dd57ab8e616e97adb62c65b9fdc162c88f51503f06bb53bc SHA512 7566c13b2599fb3a9d695334fa719b0222cf4733fcdb715bf85443f3762501399419556f3ac22db5e4a9a10cd0f41019e455286f2eda4cf09e71d3f93fc66836 WHIRLPOOL c278ffb973c35c1f0327e773f0edbf7f69093c25daecb8e97b87817f9f0a908082bfd2966db229c57e1173ebb786b299c5d9937aaee500cabcdb39d4cd5bbaab +EBUILD fcron-3.0.6-r2.ebuild 9514 SHA256 75ee65e6671f624e5c5e08bd3f8c81484814db9ae409287704e6a956eb74d92c SHA512 8fe4c61f4837bd5d835b40adfb90a84c47ecaa07e652cb44cb0e8004cd532e66c88347018d04a35599f028ab85e467144e8502197abea19c1feb069b1c3a9eff WHIRLPOOL 8f0416db1156f17a9b709175bc8210e1e6c44678a291812e6e11c81b911f6458cfcfc6999ff944e8412220d39cd350058312aa9201c0a9103a4d9e9303ab993a +EBUILD fcron-3.0.6-r3.ebuild 5599 SHA256 a6fe30bf4f19519f126282fa5a0b8e32cb1bd05d41ca0f7e9cd455944e1fa998 SHA512 f234145448c62d48aaf825239b41d4bd6345c31b85d66e526a8ae30753e038f498b999c02c3a71b3439b86024f50368a9357ec1daef7fc14c41e7fc189bf9511 WHIRLPOOL 70f87f9708171644e9046316a07223aa38ce7430af950ee3456b3c5c11c4bb5141621f8913371c898b7ca8e3e37d3dbd9dafeac638d9b762de8801705268ad77 +MISC ChangeLog 21896 SHA256 b7ac47c8ec011a060dab9c493885f1c6562f32f28235108348bc4f09d86f1d5a SHA512 f66679f74677b03c93501fc0213b50b162d0185144bc5e7d7041f0899f8d2c438377a7512f7df201a0c3f1151a558c81f044135768f8d354dfbc87df2b8a90e6 WHIRLPOOL d0eca566677459caf635ad1eb0fcca4ef43b663c0e4cf7355b2f1ffeb0684a0886fbec7b95a2a1b7d27c7631869fac6a2a54763e085db2b00c43a3921f6303d4 +MISC metadata.xml 1145 SHA256 fc17c178fee45cab1119feadafef9f53ea70ac7a9b07a7226ec973a1db20491c SHA512 4eb05c2e74d31926dd5586a1632dc2355d4708614fe9278c721ea081d24a981ab4694afb8c2709ee28b19be90b00b341b9dcbffd859256db9246dd95aefa9e35 WHIRLPOOL a00955c5c3907a4d33a0816e7b6d30722205a100d4e6165701a155f92f760ea19d36690e0f8931b0145096c4dd44c67521f52db33cbd79eac07110ba92e3feef -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBAgAGBQJPvcyhAAoJELEHsLL7fEFWS54P/j6GEtvUHjXq7FwQ0+MDGHx9 -TC7FAyFUtiVdp2hKXAKFUovcYDjTNNGjbYVU2MHjE5IYGaKXzaTizSn1KYk6ZGQT -qJvUNcvEzbpSTasl+b3b+66rRKUWIp61doFkZUWK98/MMSXE9lN7x6ge0XlHyzlz -4AdOVEsTDv4VIB6B9J3PIiAs1Sj4JOO7VzO4i09AbWqky48t3eR/2ubtImeC9D8+ -z+MSgGoc3yHN0GTZhaYLCD5e2v8bCjM2YIlaPMcQph9gsi33fvTeXZN+8H3Va0bK -6PBRNNpeLilQmESnxFNlBQP+uHnymgCwN3Yukmnc5aRrFaSAzNC+3a2Hs71mTv7U -Mqnnm7dELWsJ4iUF90FNgepshbzpqEeM29qurzW6r4M7oSkB8chF/OOUS+0kjlyV -z04owHKq+SVvbNxEMJ4V2qCzOPNG8Jd5coget+a/dEtumUl4//YB43ilmoJCe7US -eeZuFDHBMsv8xDCt/xlawio5EkVa6z92c36W8M6w2rM/k2OCpdER8ZBaXvjagwPf -rmM3fqdqrjObIMQIW1OrGKlbGeY2QlFamQf3MS+BTfnX6DnxjPv9usmiOwQUxGO4 -Jv8wUWyEDDPD/xnhPDC4BxJQumcZTXdl5wO4VdPz5uyz9EEGcMqMM6DJqAe7+jgx -EVhnmwvV9p79P6jX6XaY -=ATZ7 +iQEcBAEBCAAGBQJQPlSpAAoJEBzRPIrUMBNCzwsIAJZdDLawMpMB4LB6n3gUNfdv +oGatBWa2Cn2tYL8455POqsr3p6Yd0DIc6r4gvixk0a7WlYbDE7F/T8o//CR+hFkx +plNMXXCOInWY8DtRv9VVhqjzD3kKcUL83MRrmvIMMRlqKD7W33OFWx2/617yIEdw +wkBcyXriAPTPSbvKg0ZdyWDwwG8tjr0G0+zJMSBazM1/kXwDH0pznQmt/t7puYQ0 +rTF9OxLyN9zOiyjVjhKKbqedOGaJDejNIxV8+0kx6RDCWL7e1vtDak5Fsn9cUd5j +6yJle8GVgC/szh2eUJkxM606EKJ23fqGJgUbxOtoSl/8XuzVaWr1TDor2cM7DwM= +=38bA -----END PGP SIGNATURE----- diff --git a/sys-process/fcron/fcron-3.0.5-r2.ebuild b/sys-process/fcron/fcron-3.0.5-r2.ebuild deleted file mode 100644 index 0b63961bc24c..000000000000 --- a/sys-process/fcron/fcron-3.0.5-r2.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# 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.5-r2.ebuild,v 1.10 2012/05/24 05:51:09 vapier Exp $ - -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" - -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) - 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 - - # bug #308799 - epatch "${FILESDIR}"/${P}-gentoo.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/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 <<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 - - # install init script - newinitd "${FILESDIR}"/fcron.init.2 fcron || die - - # install the very handy check_system_crontabs script - dosbin script/check_system_crontabs || die - - # doc stuff - dodoc MANIFEST VERSION "${FILESDIR}"/crontab \ - doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt \ - || die - newdoc files/fcron.conf fcron.conf.sample || die - dohtml doc/en/HTML/*.html || die - doman doc/en/man/*.{1,5,8} || die - - # localized docs - 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 - 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 - - 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/fcron-3.0.6-r3.ebuild b/sys-process/fcron/fcron-3.0.6-r3.ebuild new file mode 100644 index 000000000000..ee704b59b1fb --- /dev/null +++ b/sys-process/fcron/fcron-3.0.6-r3.ebuild @@ -0,0 +1,202 @@ +# 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 +} diff --git a/sys-process/fcron/files/fcron.init.3 b/sys-process/fcron/files/fcron.init.3 new file mode 100644 index 000000000000..09c05c6d0361 --- /dev/null +++ b/sys-process/fcron/files/fcron.init.3 @@ -0,0 +1,58 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/files/fcron.init.3,v 1.1 2012/08/29 17:38:40 flameeyes Exp $ + +FCRON_INSTANCE=${SVCNAME##*.} + +configfile() { + if [ -n "${FCRON_INSTANCE}" -a "${SVCNAME}" != "fcron" ]; then + echo /etc/fcron/fcron.${FCRON_INSTANCE}.conf + else + echo /etc/fcron/fcron.conf + fi +} + +getconfig() { + # if there is no configuration file return the default value + if ! [ -f $(configfile) ]; then + echo $2 + return 0 + fi + + sed -n -e 's:^$1[ \t]*=[ \t]*::p' $(configfile) +} + +depend() { + config $(configfile) + + use logger + need clock hostname + # provide the cron service if we are the main instance + [ "${SVCNAME}" = "fcron" ] && provide cron +} + +command="/usr/libexec/fcron" +command_args="-c $(configfile)" +pidfile=$(getconfig pidfile /var/run/fcron.pid) +fcrontabs=$(getconfig fcrontabs /var/spool/fcron) + +extra_started_commands="reload" + +start_pre() { + if [ ! -e $(configfile) ]; then + eerror "You will need to create $(configfile) first" + eerror "There is a sample in /etc/fcron" + return 1 + fi + + if [ ! -d ${fcrontabs} ]; then + ebegin "Creating missing spooldir ${fcrontabs}" + ${command} --newspooldir ${fcrontabs} + eend $? + fi +} + +reload() { + kill -HUP `cat ${pidfile}` +} diff --git a/sys-process/fcron/files/fcrontab.2 b/sys-process/fcron/files/fcrontab.2 new file mode 100644 index 000000000000..0649397cf944 --- /dev/null +++ b/sys-process/fcron/files/fcrontab.2 @@ -0,0 +1,5 @@ +# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/files/fcrontab.2,v 1.1 2012/08/29 17:38:40 flameeyes Exp $ +# Script for checking system crontabs and creating the fcron systab. +# Runs every 10 minutes, does not mail output, doesn't log job runs +# except for errors. +@mail(false),nolog(true) 10 /usr/libexec/check_system_crontabs -s 0 diff --git a/sys-process/fcron/metadata.xml b/sys-process/fcron/metadata.xml index 349c0bc3d6f6..54be2f8daf41 100644 --- a/sys-process/fcron/metadata.xml +++ b/sys-process/fcron/metadata.xml @@ -11,13 +11,7 @@ <email>flameeyes@gentoo.org</email> </maintainer> <use> - <flag name="debug" restrict="<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=">=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> |