ref: refs/heads/master commit d9313ec2a7a0b36c14ba1ac1f139c104d5dadbf6 Author: Martin Vidner <mvidner@suse.cz> Date: Thu Oct 29 12:36:37 2009 +0100 Removed avahi usage (zeroconf). It is not necessary for appliances and it drags in a dependency that's not in SLE 11. --- webservice/package/yast2-webservice.changes | 6 ++++ webservice/package/yast2-webservice.spec | 5 +-- webservice/package/yastws | 40 --------------------------- 3 files changed, 8 insertions(+), 43 deletions(-) diff --git a/webservice/package/yast2-webservice.changes b/webservice/package/yast2-webservice.changes index 1abf385..965889d 100644 --- a/webservice/package/yast2-webservice.changes +++ b/webservice/package/yast2-webservice.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 29 12:37:42 CET 2009 - mvidner@suse.cz + +- Removed avahi (zeroconf) usage. +- 0.0.11 + +------------------------------------------------------------------- Thu Oct 29 10:55:32 CET 2009 - jreidinger@suse.cz - generate secret key for session during installation (bnc#550635) diff --git a/webservice/package/yast2-webservice.spec b/webservice/package/yast2-webservice.spec index 2d323ce..c890bc4 100644 --- a/webservice/package/yast2-webservice.spec +++ b/webservice/package/yast2-webservice.spec @@ -21,7 +21,6 @@ Requires: yast2-core >= 2.17.31 Requires: lighttpd-mod_magnet, ruby-fcgi, ruby-dbus, sqlite Requires: rubygem-yast2-webservice-tasks -Recommends: avahi-utils Requires: yast2-dbus-server # gamin gives problems with lighttpd, so better conflict with it for now Conflicts: gamin @@ -31,7 +30,7 @@ PreReq: ruby-rpam, ruby-polkit, rubygem-test-unit License: MIT Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.10 +Version: 0.0.11 Release: 0 Summary: YaST2 - Webservice Source: www.tar.bz2 @@ -49,7 +48,7 @@ BuildRequires: ruby, pkg-config, rubygem-mocha # if we run the tests during build, we need most of Requires here too, # except for deployment specific stuff BuildRequires: rubygem-yast2-webservice-tasks, rubygem-restility -BuildRequires: yast2-core, yast2-dbus-server, ruby-dbus, sqlite, avahi-utils dbus-1 +BuildRequires: yast2-core, yast2-dbus-server, ruby-dbus, sqlite, dbus-1 BuildRequires: PolicyKit, PackageKit, rubygem-sqlite3 BuildRequires: rubygem-rails-2_3 = 2.3.4 BuildRequires: ruby-rpam, ruby-polkit diff --git a/webservice/package/yastws b/webservice/package/yastws index 8faf1d7..fcce221 100755 --- a/webservice/package/yastws +++ b/webservice/package/yastws @@ -125,40 +125,6 @@ test -r $LIGHTTPD_CONFIG || { echo "$LIGHTTPD_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } -# -# Activate/Deactivate AVAHI -# -DOMAIN="$(domainname)" -if [ "$DOMAIN" = "" ]; then - HOSTNAME="$(hostname)" -else - HOSTNAME="$(hostname).$DOMAIN" -fi - -function avahi_stop () { - RUNNING=$(ps ux | grep avahi-publish-service | grep yastws | grep $HOSTNAME >/dev/null) - if [ $? = 0 ]; then - kill $(ps ux | grep avahi-publish-service | grep yastws | grep $HOSTNAME | awk '" " { print $2 }') >/dev/null - fi -} -function avahi_announce () { - PORT="$(netstat -npl|grep yastws| grep tcp| awk '{print $4}'| awk -F : '{print $NF}')" - HTTPS="$(grep -v '#' /etc/yastws/lighttpd.conf|grep ssl.engine|grep enable )" - PROTOCOL="https" - if [ "$HTTPS" = "" ]; then - PROTOCOL="http" - fi - RUNNING=$(netstat -ap|grep yastws|grep localhost >/dev/null) - if [ $? = 1 ]; then - if [ -x /usr/bin/avahi-publish-service ]; then - if [ -f /var/run/avahi-daemon/pid ]; then - avahi-publish-service "YaST Webservice $PROTOCOL://$HOSTNAME:$PORT" _yastws._tcp $PORT >/dev/null 2>/dev/null & - fi - fi - fi -} - - PID_FILE=/var/run/yastws.pid IGNORE_FILE=/var/run/yastwc.pid @@ -210,9 +176,6 @@ case "$1" in # Remember status and be verbose rc_status -v - - # Make it public if it is needed (AVAHI) - avahi_announce ;; stop) echo -n "Shutting down yastws " @@ -222,9 +185,6 @@ case "$1" in # Remember status and be verbose rc_status -v - - #Stopping AVAHI - avahi_stop ;; try-restart|condrestart) ## Do a restart only if the service was active before. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org