Hello community, here is the log from the commit of package lighttpd for openSUSE:Factory checked in at Thu Apr 22 21:25:17 CEST 2010. -------- --- lighttpd/lighttpd.changes 2010-04-15 18:11:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/lighttpd/lighttpd.changes 2010-04-22 13:55:48.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 22 11:54:26 UTC 2010 - mrueckert@suse.de + +- use the pid file for killing the lighttpd to avoid killing other + services which are using the lighttpd binary. (bnc#559534) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lighttpd.spec ++++++ --- /var/tmp/diff_new_pack.kNcsmu/_old 2010-04-22 21:24:23.000000000 +0200 +++ /var/tmp/diff_new_pack.kNcsmu/_new 2010-04-22 21:24:23.000000000 +0200 @@ -20,7 +20,7 @@ Name: lighttpd Version: 1.4.26 -Release: 1 +Release: 2 # %define pkg_name lighttpd %define pkg_user lighttpd ++++++ lighttpd.init ++++++ --- /var/tmp/diff_new_pack.kNcsmu/_old 2010-04-22 21:24:24.000000000 +0200 +++ /var/tmp/diff_new_pack.kNcsmu/_new 2010-04-22 21:24:24.000000000 +0200 @@ -127,6 +127,15 @@ # Read config . $LIGHTTPD_CONFIG +# +# WARNING WARNING WARNING WARNING WARNING +# +# If you change the path here be sure you also update the path in +# /etc/lighttpd/lighttpd.conf server.pid-file. +# +# WARNING WARNING WARNING WARNING WARNING +# +PID_FILE=/var/run/lighttpd.pid # Source LSB init functions # providing start_daemon, killproc, pidofproc, @@ -175,7 +184,7 @@ ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. umask ${LIGHTTPD_UMASK:-077} - startproc -e $LIGHTTPD_BIN $LIGHTTPD_PARAMS + startproc -p $PID_FILE -e $LIGHTTPD_BIN $LIGHTTPD_PARAMS # Remember status and be verbose rc_status -v @@ -185,7 +194,7 @@ ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. - killproc -TERM $LIGHTTPD_BIN + killproc -TERM -p $PID_FILE $LIGHTTPD_BIN # Remember status and be verbose rc_status -v @@ -222,7 +231,7 @@ echo -n "Reload service lighttpd " ## if it supports it: - killproc -HUP $LIGHTTPD_BIN + killproc -HUP -p $PID_FILE $LIGHTTPD_BIN #touch /var/run/lighttpd.pid rc_status -v @@ -236,7 +245,7 @@ # If it supports signaling: echo -n "Reload service lighttpd " - killproc -HUP $LIGHTTPD_BIN + killproc -HUP -p $PID_FILE $LIGHTTPD_BIN #touch /var/run/lighttpd.pid rc_status -v @@ -258,7 +267,7 @@ # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. - checkproc $LIGHTTPD_BIN + checkproc -k -p $PID_FILE $LIGHTTPD_BIN # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v @@ -268,7 +277,7 @@ ## argument to this init script which is required for a reload. ## Note: probe is not (yet) part of LSB (as of 1.9) - test /etc/lighttpd/lighttpd.conf -nt /var/run/lighttpd.pid && echo reload + test /etc/lighttpd/lighttpd.conf -nt $PID_FILE && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org