diff options
| -rw-r--r-- | network/avahi/0001-Check-if-the-deamon-isn-t-already-running.patch | 69 | ||||
| -rw-r--r-- | network/avahi/README | 22 | ||||
| -rw-r--r-- | network/avahi/avahi.SlackBuild | 7 | ||||
| -rw-r--r-- | network/avahi/avahi.info | 8 |
4 files changed, 17 insertions, 89 deletions
diff --git a/network/avahi/0001-Check-if-the-deamon-isn-t-already-running.patch b/network/avahi/0001-Check-if-the-deamon-isn-t-already-running.patch deleted file mode 100644 index 7a384db38d..0000000000 --- a/network/avahi/0001-Check-if-the-deamon-isn-t-already-running.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 55c732acd013b6ac979b6e1f5432a301481879ca Mon Sep 17 00:00:00 2001 -From: Sjoerd Simons <sjoerd.simons@collabora.co.uk> -Date: Sun, 15 Aug 2010 22:56:49 +0100 -Subject: [PATCH] Check if the deamon isn't already running - ---- - avahi-client/client.c | 29 +++++++++++++++++++++++++---- - 1 files changed, 25 insertions(+), 4 deletions(-) - -diff --git a/avahi-client/client.c b/avahi-client/client.c -index be675ad..c7ece4a 100644 ---- a/avahi-client/client.c -+++ b/avahi-client/client.c -@@ -478,6 +478,7 @@ static DBusConnection* avahi_dbus_bus_get(DBusError *error) { - AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags, AvahiClientCallback callback, void *userdata, int *ret_error) { - AvahiClient *client = NULL; - DBusError error; -+ int daemon_running = 0; - - avahi_init_i18n(); - -@@ -560,12 +561,33 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags, - if (dbus_error_is_set(&error)) - goto fail; - -- 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 */ -+ /* Check if the process already exists on the bus, otherwise try to start -+ * it. */ -+ if (!dbus_bus_name_has_owner (client->bus, AVAHI_DBUS_NAME, &error)) { -+ dbus_error_free(&error); -+ daemon_running = 0; -+ } else { -+ daemon_running = 1; -+ } -+ -+ if (!daemon_running && -+ !dbus_bus_start_service_by_name(client->bus, -+ AVAHI_DBUS_NAME, 0, NULL, &error)) { - dbus_error_free(&error); -+ } else { -+ daemon_running = 1; -+ } - -+ /* Re-check something else didn't start the daemon */ -+ if (!daemon_running && -+ !dbus_bus_name_has_owner (client->bus, AVAHI_DBUS_NAME, &error)) { -+ dbus_error_free(&error); -+ } else { -+ daemon_running = 1; -+ } -+ -+ if (!daemon_running) { - if (!(flags & AVAHI_CLIENT_NO_FAIL)) { - - if (ret_error) -@@ -577,7 +599,6 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags, - /* The user doesn't want this call to fail if the daemon is not - * available, so let's return succesfully */ - client_set_state(client, AVAHI_CLIENT_CONNECTING); -- - } else { - - if (init_server(client, ret_error) < 0) --- -1.7.1 - diff --git a/network/avahi/README b/network/avahi/README index 6d736c9e4d..b28ab8ca5c 100644 --- a/network/avahi/README +++ b/network/avahi/README @@ -1,17 +1,17 @@ -Avahi is an implementation of the DNS Service Discovery and Multicast DNS -specifications for Zeroconf Computing. It uses D-BUS for communication -between user applications and a system daemon. The daemon is used to -coordinate application efforts in caching replies, necessary to minimize the -traffic imposed on networks. This kind of technology is already found in -Apple MacOS X (branded Rendezvous Bonjour and sometimes Zeroconf) and is very -convenient. +Avahi is an implementation of the DNS Service Discovery and Multicast DNS +specifications for Zeroconf Computing. It uses D-BUS for communication +between user applications and a system daemon. The daemon is used to +coordinate application efforts in caching replies, necessary to minimize +the traffic imposed on networks. This kind of technology is already +found in Apple MacOS X (branded Rendezvous Bonjour and sometimes Zeroconf) +and is very convenient. You will need to have an "avahi" user and group on the target system -prior to installing the avahi package. See README.SBo in this -directory (it is also installed to the package docmentation directory) -for more information and for setup notes. +prior to installing the avahi package. See README.SBo in this directory +(it is also installed to the package docmentation directory) for more +information and for setup notes. -This requires libdaemon. +This requires libdaemon. mono is an optional dependency that also requires gtk-sharp - enable it with the following: "MONO=yes ./avahi.SlackBuild" diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild index bb08877593..eb84934b9e 100644 --- a/network/avahi/avahi.SlackBuild +++ b/network/avahi/avahi.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=avahi -VERSION=0.6.27 -BUILD=${BUILD:-2} +VERSION=0.6.28 +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -88,9 +88,6 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R a-s,u+w,go+r-w . -# Bug fix http://avahi.org/ticket/319 -patch -p1 < $CWD/0001-Check-if-the-deamon-isn-t-already-running.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/avahi/avahi.info b/network/avahi/avahi.info index 1d2265951c..49df5abc66 100644 --- a/network/avahi/avahi.info +++ b/network/avahi/avahi.info @@ -1,10 +1,10 @@ PRGNAM="avahi" -VERSION="0.6.27" +VERSION="0.6.28" HOMEPAGE="http://avahi.org/" -DOWNLOAD="http://avahi.org/download/avahi-0.6.27.tar.gz" -MD5SUM="74b40f87aeab07fc77af25f725b32f04" +DOWNLOAD="http://avahi.org/download/avahi-0.6.28.tar.gz" +MD5SUM="d0143a5aa3265019072e53ab497818d0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="David Somero" EMAIL="dsomero@hotmail.com" -APPROVED="Erik Hanson" +APPROVED="Niels Horn" |