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

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-08-30 16:30:05 +0000 (Wed, 30 Aug 2006)
New Revision: 983

Added:
   packages/unstable/avahi/debian/patches/02_static-hosts.patch
Modified:
   packages/unstable/avahi/debian/changelog
Log:
* fix a assertion failure


Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog	2006-08-30 16:26:56 UTC (rev 982)
+++ packages/unstable/avahi/debian/changelog	2006-08-30 16:30:05 UTC (rev 983)
@@ -1,3 +1,11 @@
+avahi (0.6.13-2) unstable; urgency=low
+
+  * debian/patches/02_static-hosts.patch:
+    + Fix assertion failure when using static hosts (Closes: #385297)
+      Patch from upstream SVN (r1285)
+
+ -- Sebastian Dröge <slomo at ubuntu.com>  Wed, 30 Aug 2006 18:29:10 +0200
+
 avahi (0.6.13-1) unstable; urgency=low
 
   * New upstream release

Added: packages/unstable/avahi/debian/patches/02_static-hosts.patch
===================================================================
--- packages/unstable/avahi/debian/patches/02_static-hosts.patch	                        (rev 0)
+++ packages/unstable/avahi/debian/patches/02_static-hosts.patch	2006-08-30 16:30:05 UTC (rev 983)
@@ -0,0 +1,31 @@
+Index: trunk/avahi-daemon/static-hosts.c
+===================================================================
+--- trunk/avahi-daemon/static-hosts.c (revision 1167)
++++ trunk/avahi-daemon/static-hosts.c (revision 1285)
+@@ -99,5 +99,6 @@
+     AVAHI_LLIST_REMOVE(StaticHost, hosts, hosts, s);
+ 
+-    avahi_s_entry_group_free (s->group);
++    if (s->group)
++        avahi_s_entry_group_free (s->group);
+ 
+     avahi_free(s->host);
+@@ -113,5 +114,8 @@
+ 
+     if (!h->group)
+-        h->group = avahi_s_entry_group_new (avahi_server, entry_group_callback, h);
++        if (!(h->group = avahi_s_entry_group_new (avahi_server, entry_group_callback, h))) {
++            avahi_log_error("avahi_s_entry_group_new() failed: %s", avahi_strerror(err));
++            return;
++        }
+ 
+     if (!avahi_address_parse (h->ip, AVAHI_PROTO_UNSPEC, &a)) {
+@@ -130,5 +134,6 @@
+ static void remove_static_host_from_server(StaticHost *h)
+ {
+-    avahi_s_entry_group_reset (h->group);
++    if (h->group)
++        avahi_s_entry_group_reset (h->group);
+ }
+  
+