ref: refs/heads/master commit c827dbff4be050721d48aae7497a3aacf6146c20 Author: Martin Vidner Date: Fri Dec 4 14:39:55 2009 +0100 Require fixes in lighttpd and sysvinit (bnc#559534, bnc#560302). Simplified the init script as a side effect (bnc#560302). Require startproc respecting -p, bnc#559534#c44 Require lighttpd whose postun does not mass kill, bnc#559534#c19 --- webclient/package/yast2-webclient.changes | 9 +++++++++ webclient/package/yast2-webclient.spec | 18 ++++++++++++++++-- webclient/package/yastwc | 12 +++++------- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index fdbefcd..c639c20 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Dec 4 14:25:13 CET 2009 - mvidner@suse.cz + +- Require fixes in other packages so that rclighttpd does not kill + WebYaST. Simplified the init script as a side effect (bnc#560302). + * Require startproc respecting -p, bnc#559534#c44 + * Require lighttpd whose postun does not mass kill, bnc#559534#c19 +- 0.0.28 + +------------------------------------------------------------------- Wed Dec 2 20:41:21 CET 2009 - kkaempf@suse.de - trigger service restart on lighttpd update (bnc#559534) diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index 1ce5122..03ca093 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -11,13 +11,27 @@ Name: yast2-webclient Requires: lighttpd-mod_magnet, ruby-fcgi, sqlite -PreReq: lighttpd, rubygem-rake, rubygem-sqlite3 +PreReq: rubygem-rake, rubygem-sqlite3 PreReq: rubygem-rails-2_3 = 2.3.4 PreReq: rubygem-gettext_rails +%if 0%{?suse_version} == 0 || %suse_version > 1110 +# 11.2 or newer +# Require startproc respecting -p, bnc#559534#c44 +Requires: sysvinit > 2.86-215.2 +# Require lighttpd whose postun does not mass kill, bnc#559534#c19 +# (Updating it later does not work because postun uses the old +# version.) +PreReq: lighttpd > 1.4.20-3.6 +%else +# 11.1 or SLES11 +Requires: sysvinit > 2.86-195.3.1 +PreReq: lighttpd > 1.4.20-2.29.1 +%endif + License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.27 +Version: 0.0.28 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 diff --git a/webclient/package/yastwc b/webclient/package/yastwc index 164dcfa..8030684 100755 --- a/webclient/package/yastwc +++ b/webclient/package/yastwc @@ -126,8 +126,6 @@ test -r $LIGHTTPD_CONFIG || { echo "$LIGHTTPD_CONFIG not existing"; else exit 6; fi; } PID_FILE=/var/run/yastwc.pid -IGNORE_FILE=/var/run/yastws.pid - CERTIFICATEFILE=/etc/lighttpd/certs/webyast.pem CERTKEYFILE=/etc/lighttpd/certs/webyast.key @@ -190,7 +188,7 @@ case "$1" in fi echo -n "Starting yastwc " - startproc -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN -f $LIGHTTPD_CONFIG + startproc -p $PID_FILE $LIGHTTPD_BIN -f $LIGHTTPD_CONFIG # Remember status and be verbose rc_status -v @@ -207,7 +205,7 @@ case "$1" in ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. - killproc -TERM -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + killproc -TERM -p $PID_FILE $LIGHTTPD_BIN # Remember status and be verbose rc_status -v @@ -244,7 +242,7 @@ case "$1" in echo -n "Reload service yastwc " ## if it supports it: - killproc -HUP -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + killproc -HUP -p $PID_FILE $LIGHTTPD_BIN #touch /var/run/lighttpd.pid rc_status -v @@ -258,7 +256,7 @@ case "$1" in # If it supports signaling: echo -n "Reload service yastwc " - killproc -HUP -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + killproc -HUP -p $PID_FILE $LIGHTTPD_BIN #touch /var/run/lighttpd.pid rc_status -v @@ -280,7 +278,7 @@ case "$1" in # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. - checkproc -p $PID_FILE -i $IGNORE_FILE $LIGHTTPD_BIN + checkproc -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 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org