ref: refs/heads/master
commit 4ab3fbcea1b5aaf42edfdf7a26a1c94fa1d218a0
Author: Martin Vidner
Date: Fri Dec 4 13:33:29 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
---
webservice/package/yast2-webservice.changes | 9 +++++++++
webservice/package/yast2-webservice.spec | 11 +++++++++--
webservice/package/yastws | 11 +++++------
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/webservice/package/yast2-webservice.changes b/webservice/package/yast2-webservice.changes
index c9319be..3343b79 100644
--- a/webservice/package/yast2-webservice.changes
+++ b/webservice/package/yast2-webservice.changes
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Fri Dec 4 14:28:39 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.19
+
+-------------------------------------------------------------------
Wed Dec 2 20:41:21 CET 2009 - kkaempf@suse.de
- trigger service restart on lighttpd update (bnc#559534)
diff --git a/webservice/package/yast2-webservice.spec b/webservice/package/yast2-webservice.spec
index 99f4b15..4d81a13 100644
--- a/webservice/package/yast2-webservice.spec
+++ b/webservice/package/yast2-webservice.spec
@@ -14,9 +14,16 @@ Name: yast2-webservice
%if 0%{?suse_version} == 0 || %suse_version > 1110
# 11.2 or newer
Requires: yast2-core >= 2.18.10
+# 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: yast2-core >= 2.17.30.1
+Requires: sysvinit > 2.86-195.3.1
+PreReq: lighttpd > 1.4.20-2.29.1
%endif
Requires: lighttpd-mod_magnet, ruby-fcgi, ruby-dbus, sqlite
@@ -24,13 +31,13 @@ Requires: rubygem-yast2-webservice-tasks
Requires: yast2-dbus-server
# gamin gives problems with lighttpd, so better conflict with it for now
Conflicts: gamin
-PreReq: lighttpd, PolicyKit, PackageKit, rubygem-rake, rubygem-sqlite3
+PreReq: PolicyKit, PackageKit, rubygem-rake, rubygem-sqlite3
PreReq: rubygem-rails-2_3 = 2.3.4
PreReq: ruby-rpam, ruby-polkit, rubygem-test-unit
License: LGPL v2.1 only
Group: Productivity/Networking/Web/Utilities
Autoreqprov: on
-Version: 0.0.18
+Version: 0.0.19
Release: 0
Summary: YaST2 - Webservice
Source: www.tar.bz2
diff --git a/webservice/package/yastws b/webservice/package/yastws
index 128650d..35f8307 100755
--- a/webservice/package/yastws
+++ b/webservice/package/yastws
@@ -126,7 +126,6 @@ test -r $LIGHTTPD_CONFIG || { echo "$LIGHTTPD_CONFIG not existing";
else exit 6; fi; }
PID_FILE=/var/run/yastws.pid
-IGNORE_FILE=/var/run/yastwc.pid
# Source LSB init functions
# providing start_daemon, killproc, pidofproc,
@@ -176,7 +175,7 @@ case "$1" in
#Waiting for yastwc until he has really written his pid file (currently just a hack)
sleep 4
- 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
@@ -185,7 +184,7 @@ case "$1" in
echo -n "Shutting down yastws "
## 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
@@ -222,7 +221,7 @@ case "$1" in
echo -n "Reload service yastws "
## 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
@@ -236,7 +235,7 @@ case "$1" in
# If it supports signaling:
echo -n "Reload service yastws "
- 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 +257,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
Martin Vidner