Date: Thursday, May 19, 2011 @ 12:07:15 Author: bisson Revision: 124325
fix FS#24340 with direct calls to /usr/sbin/postfix in rc.d Modified: postfix/trunk/PKGBUILD postfix/trunk/rc.d ----------+ PKGBUILD | 4 ++-- rc.d | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-05-19 15:55:54 UTC (rev 124324) +++ PKGBUILD 2011-05-19 16:07:15 UTC (rev 124325) @@ -5,7 +5,7 @@ pkgname=postfix pkgver=2.8.3 -pkgrel=2 +pkgrel=3 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)' url='http://www.postfix.org/' arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ 'rc.d') sha1sums=('2604066f158f5327449960afd6334b996dc01799' '5fc3de6c7df1e5851a0a379e825148868808318b' - '050e6afc5886049682c945ce147b3c47fe113939') + '40c6be2eb55e6437a402f43775cdb3d22ea87a66') provides=('smtp-server' 'smtp-forwarder') replaces=('postfix-mysql' 'postfix-pgsql') Modified: rc.d =================================================================== --- rc.d 2011-05-19 15:55:54 UTC (rev 124324) +++ rc.d 2011-05-19 16:07:15 UTC (rev 124325) @@ -4,24 +4,23 @@ . /etc/rc.d/functions name=postfix -PID=$(pidof -o %PPID /usr/lib/postfix/master) case "$1" in start) stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && /usr/sbin/postfix start &>/dev/null \ + /usr/sbin/postfix start &>/dev/null \ && { add_daemon $name; stat_done; } \ || { stat_fail; exit 1; } ;; stop) stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && /usr/sbin/postfix stop &>/dev/null \ + /usr/sbin/postfix stop &>/dev/null \ && { rm_daemon $name; stat_done; } \ || { stat_fail; exit 1; } ;; reload) stat_busy "Reloading $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ + /usr/sbin/postfix reload &>/dev/null \ && { stat_done; } \ || { stat_fail; exit 1; } ;;
