From 25f352679488de6f22486bd068ea3cd448e8f1ac Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 13 Jul 2010 05:01:47 +0200
Subject: [PATCH] client: update libavahi-client so that it can deal with
 auto-activated avahi daemons

---
 avahi-client/client.c | 11 +++++------
 configure.ac          |  2 +-
 docs/NEWS             | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/avahi-client/client.c b/avahi-client/client.c
index 6435723..2b29480 100644
--- a/avahi-client/client.c
+++ b/avahi-client/client.c
@@ -141,9 +141,10 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message,
 
         if (strcmp(name, AVAHI_DBUS_NAME) == 0) {
 
-            if (avahi_client_is_connected(client)) {
+            if (old[0] &&
+                avahi_client_is_connected(client)) {
 
-                /* Regardless if the server lost or acquired its name or
+                /* Regardless if the server lost its name or
                  * if the name was transfered: our services are no longer
                  * available, so we disconnect ourselves */
                 avahi_client_set_errno(client, AVAHI_ERR_DISCONNECTED);
@@ -522,7 +523,7 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags,
         goto fail;
     }
 
-    if (!dbus_connection_add_filter (client->bus, filter_func, client, NULL)) {
+    if (!dbus_connection_add_filter(client->bus, filter_func, client, NULL)) {
         if (ret_error)
             *ret_error = AVAHI_ERR_NO_MEMORY;
         goto fail;
@@ -559,9 +560,7 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags,
     if (dbus_error_is_set(&error))
         goto fail;
 
-
-    if (!(dbus_bus_name_has_owner(client->bus, AVAHI_DBUS_NAME, &error)) ||
-        dbus_error_is_set(&error)) {
+    if (!dbus_bus_start_service_by_name(client->bus, AVAHI_DBUS_NAME, 0, NULL, &error)) {
 
         /* We free the error so its not set, that way the fail target
          * will return the NO_DAEMON error rather than a DBUS error */
diff --git a/configure.ac b/configure.ac
index 4d6b288..2c8ae85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 # USA.
 
 AC_PREREQ(2.63)
-AC_INIT([avahi],[0.6.26],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.6.27],[avahi (at) lists (dot) freedesktop (dot) org])
 AC_CONFIG_SRCDIR([avahi-core/server.c])
 AC_CONFIG_MACRO_DIR([common])
 AC_CONFIG_HEADERS([config.h])
diff --git a/docs/NEWS b/docs/NEWS
index bd22c94..24295fa 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,3 +1,16 @@
+Avahi 0.6.27
+============
+
+This is a bugfix release.
+
+ * Various updates to the systemd integration
+ * Reset all signal handlers and the signal mask on initialization
+ * Don't trip over SIGPIPE
+ * i18n updates
+ * Minor other updates
+
+This release is backwards compatible with Avahi 0.6.x with x < 27.
+
 Avahi 0.6.26
 ============
 
@@ -13,6 +26,8 @@ adds a couple of minor new features.
  * i18n updates
  * Minor other updates
 
+This release is backwards compatible with Avahi 0.6.x with x < 26.
+
 Avahi 0.6.25
 ============
 
-- 
2.39.5