From: Wolfram Schlich Date: Tue, 13 Feb 2007 16:33:57 +0000 (+0000) Subject: fix non-gnu sed related issue wrt bug #166103 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5875d32a08d2df10febb172cfb55f8a71a0e67aa;p=gentoo.git fix non-gnu sed related issue wrt bug #166103 Package-Manager: portage-2.1.2 --- diff --git a/sys-process/fcron/ChangeLog b/sys-process/fcron/ChangeLog index 4a8630134706..7648e0563879 100644 --- a/sys-process/fcron/ChangeLog +++ b/sys-process/fcron/ChangeLog @@ -1,6 +1,9 @@ # 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.25 2007/02/12 00:00:33 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.26 2007/02/13 16:33:57 wschlich Exp $ + + 13 Feb 2007; Wolfram Schlich files/fcron.init: + fix non-gnu sed related issue wrt bug #166103 11 Feb 2007; Wolfram Schlich fcron-3.0.2.ebuild: fix bug #156433, add warning about debug USE flag wrt bug #163126 diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest index 74cfb7b5ce1f..1e7799282a6c 100644 --- a/sys-process/fcron/Manifest +++ b/sys-process/fcron/Manifest @@ -10,10 +10,10 @@ AUX fcron-2.9.5.1-fix-mail-output.diff 415 RMD160 52ebf91af0ad51548586ee52c8dea8 MD5 e87691832e6f48a5aed1c6cf3b681bce files/fcron-2.9.5.1-fix-mail-output.diff 415 RMD160 52ebf91af0ad51548586ee52c8dea8d0d51fe7ec files/fcron-2.9.5.1-fix-mail-output.diff 415 SHA256 74312697660a07fab97d0f4e19b656b99195a22e967a2309d158b53d5308dd24 files/fcron-2.9.5.1-fix-mail-output.diff 415 -AUX fcron.init 1549 RMD160 6bd158091d8a20cc15cd236d19746a4b39fbef9a SHA1 42a8fdab04571e71b8d62914ff494713c156245c SHA256 a5f24eca50f36af76a8aa3f2143543271543601dcba85f753474e222cabbe7f5 -MD5 a75a0d0c3e3d8b82350e489ec1cc1b62 files/fcron.init 1549 -RMD160 6bd158091d8a20cc15cd236d19746a4b39fbef9a files/fcron.init 1549 -SHA256 a5f24eca50f36af76a8aa3f2143543271543601dcba85f753474e222cabbe7f5 files/fcron.init 1549 +AUX fcron.init 1585 RMD160 8b569e349a960d8eb33a201f9cf15b9ab90faa2b SHA1 5c3de5396d5fd47dde28fa388c6ae1feaeb6a986 SHA256 9c142ec7f744430aba79ffb7814fddfaa4296cdb8eed5d72669985d06dde3196 +MD5 6b238e2412c751a65bf1dba39b08c0a2 files/fcron.init 1585 +RMD160 8b569e349a960d8eb33a201f9cf15b9ab90faa2b files/fcron.init 1585 +SHA256 9c142ec7f744430aba79ffb7814fddfaa4296cdb8eed5d72669985d06dde3196 files/fcron.init 1585 AUX fcron.rc6 732 RMD160 c06263fd78998360780ec55df8bd08bd9332f705 SHA1 2308179d6630c614f1789d473f4ffcf8cced17e9 SHA256 4ce3a3395ce032c3e21594211055dd038153f506ba54f0008850d43bba01fa6e MD5 69137c81685b56b4e3195203a14bbb8b files/fcron.rc6 732 RMD160 c06263fd78998360780ec55df8bd08bd9332f705 files/fcron.rc6 732 @@ -60,10 +60,10 @@ EBUILD fcron-3.0.2.ebuild 6680 RMD160 a5438ca90e8a37dcc577360b2babd6ae7888c1b9 S MD5 993f7456cc8ada77bdb3322d045b9490 fcron-3.0.2.ebuild 6680 RMD160 a5438ca90e8a37dcc577360b2babd6ae7888c1b9 fcron-3.0.2.ebuild 6680 SHA256 14f814ee03d5496c6384a42328021c95f1dfd32ca677c5a623b20761b5be35ac fcron-3.0.2.ebuild 6680 -MISC ChangeLog 11733 RMD160 b35edc885befffeeacb3777fde9779de820f708c SHA1 2b807399b5b461a527f02050ca05c49d1e622aff SHA256 579cf6740c7fa49dc849023706ec2361d40dde47c9f06fc1867c5058b9d7f773 -MD5 93fb458dc58f5306e840821cfb922ee9 ChangeLog 11733 -RMD160 b35edc885befffeeacb3777fde9779de820f708c ChangeLog 11733 -SHA256 579cf6740c7fa49dc849023706ec2361d40dde47c9f06fc1867c5058b9d7f773 ChangeLog 11733 +MISC ChangeLog 11853 RMD160 1435bf01edef9dad95899f5e5d4e90a8a34a9760 SHA1 908fa8ca5740e8ea9d620fefce10df1988eb4291 SHA256 a820bcc7781869a97a12003bc5bbd4af3e486d1af9aa37a8261deac9625f2c18 +MD5 65c08906abf626ebc92aeb0e50b59d00 ChangeLog 11853 +RMD160 1435bf01edef9dad95899f5e5d4e90a8a34a9760 ChangeLog 11853 +SHA256 a820bcc7781869a97a12003bc5bbd4af3e486d1af9aa37a8261deac9625f2c18 ChangeLog 11853 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/files/fcron.init b/sys-process/fcron/files/fcron.init index 61a2ed1666dd..30d5e0405888 100755 --- a/sys-process/fcron/files/fcron.init +++ b/sys-process/fcron/files/fcron.init @@ -1,7 +1,7 @@ #!/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,v 1.1 2006/06/20 19:44:58 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/files/fcron.init,v 1.2 2007/02/13 16:33:57 wschlich Exp $ depend() { use logger slapd mysql postgresql @@ -24,9 +24,9 @@ checkconfig() { eerror "There is a sample in /etc/fcron" return 1 fi - FCRON_PIDFILE=$(grep '^pidfile' ${FCRON_CONF} 2>/dev/null | sed -e 's:^pidfile\s*=\s*\(.*\)$:\1:') + 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\s*=\s*\(.*\)$:\1:') + 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}"