diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2010-03-16 19:28:31 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2010-03-16 19:28:31 +0000 |
| commit | 8077a224cfd82c44f9dd029c4ada5b1be7eea8e4 (patch) | |
| tree | 26e8256326ee1273423563e8131db7d1ad83a5e6 /mail-filter | |
| parent | Removed old (diff) | |
| download | historical-8077a224cfd82c44f9dd029c4ada5b1be7eea8e4.tar.gz historical-8077a224cfd82c44f9dd029c4ada5b1be7eea8e4.tar.bz2 historical-8077a224cfd82c44f9dd029c4ada5b1be7eea8e4.zip | |
Making init script start/stop work properly
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'mail-filter')
| -rw-r--r-- | mail-filter/MailScanner/ChangeLog | 5 | ||||
| -rw-r--r-- | mail-filter/MailScanner/Manifest | 4 | ||||
| -rw-r--r-- | mail-filter/MailScanner/files/initd.mailscanner | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/mail-filter/MailScanner/ChangeLog b/mail-filter/MailScanner/ChangeLog index c6bf0c3af756..091a5fc8b4bf 100644 --- a/mail-filter/MailScanner/ChangeLog +++ b/mail-filter/MailScanner/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for mail-filter/MailScanner # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/MailScanner/ChangeLog,v 1.12 2010/03/16 18:42:05 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/MailScanner/ChangeLog,v 1.13 2010/03/16 19:28:30 patrick Exp $ + + 16 Mar 2010; Patrick Lauer <patrick@gentoo.org> files/initd.mailscanner: + Making init script start/stop work properly *MailScanner-4.79.11.1 (16 Mar 2010) diff --git a/mail-filter/MailScanner/Manifest b/mail-filter/MailScanner/Manifest index f43c2993e2e3..93e879e3fd76 100644 --- a/mail-filter/MailScanner/Manifest +++ b/mail-filter/MailScanner/Manifest @@ -1,8 +1,8 @@ AUX confd.mailscanner 147 RMD160 2472095d115d136498f93a6dca3ce540e335222f SHA1 377447317cf1354b4e377912d18a459b12f7a8d6 SHA256 d0ef32a53c83a2c2938d970f30b3765676fe4669b2ec98407c39ca070cd24bbb -AUX initd.mailscanner 756 RMD160 f75589025bbe9e7a3bc2f10a4a5eadab11f8d36a SHA1 cb4c505b3c9f4f993b656b6c96c6992ae00be5e0 SHA256 ba63aec0dae9c820b533d467c3325ada70a4b73761bed2207d10814f82f31b65 +AUX initd.mailscanner 981 RMD160 89a1fbf97ee53b8776ce0e654da05c08cef2e03d SHA1 63352e234d28ff51b889ef06bc6c5b770a2ccd9f SHA256 e65a64fbfe6a20146ea99e48097a7320253a1eab1afd31134e5df65d8da435b0 DIST MailScanner-install-4.70.7-1.tar.gz 8329186 RMD160 245e3e5f06f90d227a76bd7b4c28763ee2c06cdb SHA1 1e54cb379de9f79e4f4014bf2d91e1db878bb422 SHA256 b5d7487438dfd1559a4e8b6c6f42839a4fe87170760e3661002cc5f31ece4cc2 DIST MailScanner-install-4.79.11-1.tar.gz 9111441 RMD160 2390afcc730c5f2b868d80b61ff49c6b46b47917 SHA1 ebca05de73859e143a042d54ea4a992186ef2393 SHA256 68a7577dda36a219362db687e7ae2da226c9aa7683992259a94ace4cc739cce4 EBUILD MailScanner-4.70.7.1.ebuild 9193 RMD160 f72927aee90087165611650821cbe5d1de813708 SHA1 df48a2521f59b80f9a7679ca381b43444c71a931 SHA256 10fcb0c11acfd03e948f3c66a5594d61b8ea375a025080a975521f50433fcf37 EBUILD MailScanner-4.79.11.1.ebuild 9866 RMD160 ce4c9230c8225d6915486e6d559ffbc9677b22c3 SHA1 b0250819df62f7612d22d6232fe3c1cb3c0a319f SHA256 9a6b16aa6fd3626725952ede1123d2b695cb00cb76bcb66f2b20896f7d7643a6 -MISC ChangeLog 3594 RMD160 e1fb10467e01ba73c6758805770d0171a3583118 SHA1 c1073471399f18f530d2c1cedb169e95a671e084 SHA256 eac6290e27a8752614333f6620cb912897061ef9d4a5c65bed2eb882f475a22f +MISC ChangeLog 3716 RMD160 94912833985b255421c750ab868260e391c7fcbc SHA1 585e489472f75e7aa0577518d0695709b25ca018 SHA256 a4dc61a6076876d7abcaa7ffef52b750e7eedd5511b0e8cea117ddb1d7d84b4c MISC metadata.xml 507 RMD160 2288900de2cd3e263a463bad0df7df0c350837e5 SHA1 1f5af39db35da2555491bc93675eb51fca6097ed SHA256 015cd4117483ca9805b641ee8a3b5cbca689a1c8622c7c8d8c967fa861880fca diff --git a/mail-filter/MailScanner/files/initd.mailscanner b/mail-filter/MailScanner/files/initd.mailscanner index 3883ee99d549..accda9ef26f3 100644 --- a/mail-filter/MailScanner/files/initd.mailscanner +++ b/mail-filter/MailScanner/files/initd.mailscanner @@ -9,7 +9,11 @@ depend() { start() { ebegin "Starting MailScanner" - /usr/sbin/check_MailScanner >/dev/null + #/usr/sbin/check_MailScanner >/dev/null + start-stop-daemon --start --pidfile /var/run/${SVCNAME}.pid \ + --exec /usr/sbin/MailScanner -- /etc/MailScanner/MailScanner.conf ${OPT} > /var/run/${SVCNAME}.pid + eend $? + RETVAL=$? [ ${RETVAL} -eq 0 ] && touch /var/lock/subsys/MailScanner [ ${RETVAL} -eq 0 ] && rm -f /var/lock/subsys/MailScanner.off @@ -18,7 +22,7 @@ start() { stop() { ebegin "Stopping MailScanner" - killall -15 MailScanner + start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid RETVAL=$? [ ${RETVAL} -eq 0 ] && rm -f /var/lock/subsys/MailScanner [ ${RETVAL} -eq 0 ] && touch /var/lock/subsys/MailScanner.off |