[Pkg-utopia-commits] r758 - in packages/unstable/avahi/debian: . patches

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-03-22 00:16:07 +0000 (Wed, 22 Mar 2006)
New Revision: 758

Added:
   packages/unstable/avahi/debian/patches/04_initscript_log_end_msg.patch
   packages/unstable/avahi/debian/patches/05_empty_service_directory.patch
Modified:
   packages/unstable/avahi/debian/changelog
Log:
* added fixes for #355615 and #358190 in avahi


Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog	2006-03-20 12:33:55 UTC (rev 757)
+++ packages/unstable/avahi/debian/changelog	2006-03-22 00:16:07 UTC (rev 758)
@@ -1,9 +1,20 @@
 avahi (0.6.9-6) UNRELEASED; urgency=low
 
+  [ Sjoerd Simons ]
   * Also ship docs/NEWS (Closes: #355267)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Thu, 16 Mar 2006 23:15:59 +0100
+  [ Sebastian Dröge ]
+  * debian/patches/04_initscript_log_end_msg.patch:
+    + Replace exit statements with return, otherwise log_end_msg might not
+      be called after d_start. Patch by Benjamin Leipold. (Closes: #358190)
+  * debian/patches/05_empty_service_directory.patch:
+    + Change the error message that is printed when running the daemon with an
+      empty or non-existing /etc/avahi/services directory to an informational
+      message as we have no service files installed by default. Also add  that
+      this could be caused by an empty service directory. (Closes: #355615)
 
+ -- Sebastian Dröge <slomo at ubuntu.com>  Wed, 22 Mar 2006 01:08:18 +0100
+
 avahi (0.6.9-5) unstable; urgency=low
 
   * debian/patches/03_cmsg_too_large.patch

Added: packages/unstable/avahi/debian/patches/04_initscript_log_end_msg.patch
===================================================================
--- packages/unstable/avahi/debian/patches/04_initscript_log_end_msg.patch	2006-03-20 12:33:55 UTC (rev 757)
+++ packages/unstable/avahi/debian/patches/04_initscript_log_end_msg.patch	2006-03-22 00:16:07 UTC (rev 758)
@@ -0,0 +1,44 @@
+--- initscript/debian/avahi-daemon.in.old	2006-03-22 00:57:22.145098912 +0100
++++ initscript/debian/avahi-daemon.in	2006-03-22 00:57:35.576057096 +0100
+@@ -93,8 +93,7 @@
+ d_start() {
+     modprobe capability >/dev/null 2>&1 || true
+ 
+-    $DAEMON -c
+-    [ $? = 0 ] && exit 0
++    $DAEMON -c && return 0
+ 
+     if [ -s /etc/localtime ]; then
+ 	if [ ! -d /etc/avahi/etc ]; then
+@@ -110,28 +109,21 @@
+ #       Function that stops the daemon/service.
+ #
+ d_stop() {
+-    $DAEMON -c
+-    [ $? != 0 ] && exit 0
+-
+-    $DAEMON -k
++    $DAEMON -c && $DAEMON -k
+ }
+ 
+ #
+ #       Function that reload the config file for the daemon/service.
+ #
+ d_reload() {
+-    $DAEMON -c
+-    [ $? != 0 ] && exit 0
+-
+-    $DAEMON -r
++    $DAEMON -c && $DAEMON -r
+ }
+ 
+ #
+ #       Function that check the status of the daemon/service.
+ #
+ d_status() {
+-    $DAEMON -c
+-    [ $? = 0 ]  && echo "$DESC is running" || echo "$DESC is not running"
++    $DAEMON -c && echo "$DESC is running" || echo "$DESC is not running"
+ }
+ 
+ case "$1" in

Added: packages/unstable/avahi/debian/patches/05_empty_service_directory.patch
===================================================================
--- packages/unstable/avahi/debian/patches/05_empty_service_directory.patch	2006-03-20 12:33:55 UTC (rev 757)
+++ packages/unstable/avahi/debian/patches/05_empty_service_directory.patch	2006-03-22 00:16:07 UTC (rev 758)
@@ -0,0 +1,11 @@
+--- avahi-daemon/static-services.c.old	2006-03-22 01:06:03.487842768 +0100
++++ avahi-daemon/static-services.c	2006-03-22 01:07:21.197029176 +0100
+@@ -682,7 +682,7 @@
+ 
+     memset(&globbuf, 0, sizeof(globbuf));
+     if (glob(in_chroot ? "/services/*.service" : AVAHI_SERVICE_DIR "/*.service", GLOB_ERR, NULL, &globbuf) != 0)
+-        avahi_log_error("Failed to read service directory.");
++        avahi_log_info("Failed to read service directory or no service files in service directory.");
+     else {
+         for (p = globbuf.gl_pathv; *p; p++)
+             load_file(*p);