From dccd7f8d8e69280df9d1c92c536070ded326ec29 Mon Sep 17 00:00:00 2001 From: Wolfram Schlich Date: Fri, 13 Apr 2007 11:42:40 +0000 Subject: [PATCH] really use upstream default spooldir (/var/spool/fcron instead of /var/spool/fcron/fcrontabs) Package-Manager: portage-2.1.2.3 --- sys-process/fcron/ChangeLog | 6 ++++- sys-process/fcron/Manifest | 16 +++++++------- sys-process/fcron/fcron-3.0.2-r2.ebuild | 29 ++++++++++--------------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/sys-process/fcron/ChangeLog b/sys-process/fcron/ChangeLog index b98ea2fbef6e..c3c6f2595667 100644 --- a/sys-process/fcron/ChangeLog +++ b/sys-process/fcron/ChangeLog @@ -1,6 +1,10 @@ # 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.38 2007/04/13 11:29:25 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.39 2007/04/13 11:42:40 wschlich Exp $ + + 13 Apr 2007; Wolfram Schlich fcron-3.0.2-r2.ebuild: + really use upstream default spooldir (/var/spool/fcron instead of + /var/spool/fcron/fcrontabs) *fcron-3.0.2-r2 (13 Apr 2007) diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest index c7b9c4ab2597..e43a3b797397 100644 --- a/sys-process/fcron/Manifest +++ b/sys-process/fcron/Manifest @@ -60,18 +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-r2.ebuild 8420 RMD160 8d0f14f86fcbb4ac64eb5d2a08913eed132d51cd SHA1 8f52763a8e3278f15079ff373bd36882d6242f56 SHA256 f5279c040c0f44294c7ff024c1de1873a2ef0712d4d648603b0123ba74daa35c +MD5 94b802c7ccf9bb470b463cf46ee29683 fcron-3.0.2-r2.ebuild 8420 +RMD160 8d0f14f86fcbb4ac64eb5d2a08913eed132d51cd fcron-3.0.2-r2.ebuild 8420 +SHA256 f5279c040c0f44294c7ff024c1de1873a2ef0712d4d648603b0123ba74daa35c fcron-3.0.2-r2.ebuild 8420 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 13205 RMD160 05055eb998395f28d72df57bddc95e79039fd7f0 SHA1 f4d0c997d49dfd77ff2edd55950260763035de3d SHA256 a29c2ddc0dc8bbaa885e680ae7fdf6d5031481c8fde8e8edf01a1b1376de41ea -MD5 42546efed2d23c0e222229acab076384 ChangeLog 13205 -RMD160 05055eb998395f28d72df57bddc95e79039fd7f0 ChangeLog 13205 -SHA256 a29c2ddc0dc8bbaa885e680ae7fdf6d5031481c8fde8e8edf01a1b1376de41ea ChangeLog 13205 +MISC ChangeLog 13380 RMD160 c93e552e1d5aaa5f72c77934e848ada675f840ac SHA1 69573b3715331b96a3d77c5eecc2a8ff58eb6c7c SHA256 50521ae5f0913089a1b9ca7c56d4076b3b8863c373c11a8386306a8a224afdfc +MD5 2bc1813d77d6d84cf778da3c5fbb5939 ChangeLog 13380 +RMD160 c93e552e1d5aaa5f72c77934e848ada675f840ac ChangeLog 13380 +SHA256 50521ae5f0913089a1b9ca7c56d4076b3b8863c373c11a8386306a8a224afdfc ChangeLog 13380 MISC metadata.xml 303 RMD160 d24dcc8f24ba7a6a6881727d4f6bea37b319fee4 SHA1 6071b772615027860d246ae497df4866c991562a SHA256 550e002d2ddfc3e38a4fd062713956e335e068f6cf15828e139f01ce325937c6 MD5 4ecc6e1f7881550e02353b1511d8b89e metadata.xml 303 RMD160 d24dcc8f24ba7a6a6881727d4f6bea37b319fee4 metadata.xml 303 diff --git a/sys-process/fcron/fcron-3.0.2-r2.ebuild b/sys-process/fcron/fcron-3.0.2-r2.ebuild index 9208c51a0609..bfc5c9cb315c 100644 --- a/sys-process/fcron/fcron-3.0.2-r2.ebuild +++ b/sys-process/fcron/fcron-3.0.2-r2.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.2-r2.ebuild,v 1.2 2007/04/13 11:42:40 wschlich Exp $ inherit cron pam eutils @@ -82,7 +82,7 @@ src_compile() { src_install() { # cron eclass stuff docron fcron -m0755 -o ${ROOTUSER:-root} -g ${ROOTGROUP:-root} - docrondir /var/spool/fcron/fcrontabs -m6770 -o fcron -g fcron + docrondir /var/spool/fcron -m6770 -o fcron -g fcron docrontab fcrontab -m6755 -o fcron -g fcron # install fcron tools @@ -100,8 +100,6 @@ src_install() { 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 @@ -116,9 +114,6 @@ src_install() { 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 @@ -146,13 +141,13 @@ 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 "1. fcron stores the crontabs in /var/spool/fcron" 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 " crontabs in /var/spool/fcron/USERNAME," einfo " but the original plain text version is saved as" - einfo " /var/spool/fcron/fcrontabs/USERNAME.orig for your" + einfo " /var/spool/fcron/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" @@ -164,7 +159,7 @@ pkg_postinst() { einfo einfo " will write /etc/crontab to the fcron crontabs directory as" einfo - einfo " /var/spool/fcron/fcrontabs/systab" + einfo " /var/spool/fcron/systab" einfo einfo " Please note that changes to /etc/crontab will not become" einfo " active automatically! fcron also does not use the directory" @@ -230,15 +225,15 @@ pkg_postinst() { 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 \ + cp /var/spool/cron/fcrontabs/* /var/spool/fcron/ >&/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 "Fixing permissions and ownership of /var/spool/fcron" + chown root:root /var/spool/fcron/* >&/dev/null + chmod 0600 /var/spool/fcron/* >&/dev/null + chown fcron:fcron /var/spool/fcron/*.orig >&/dev/null + chmod 0640 /var/spool/fcron/.orig >&/dev/null ewarn ewarn "*** YOU SHOULD IMMEDIATELY UPDATE THE" ewarn "*** fcrontabs ENTRY IN /etc/fcron/fcron.conf" -- 2.26.2