[59321] trunk/dports/devel/dbus
sharky at macports.org
sharky at macports.org
Tue Oct 13 08:00:47 PDT 2009
Revision: 59321
http://trac.macports.org/changeset/59321
Author: sharky at macports.org
Date: 2009-10-13 08:00:46 -0700 (Tue, 13 Oct 2009)
Log Message:
-----------
dbus: update to version 1.2.16, refresh patches
* update to version 1.2.16
* replace patch-launchd-integration.diff by up-to-date patches
taken from freedesktop.org bugtracker
Modified Paths:
--------------
trunk/dports/devel/dbus/Portfile
Added Paths:
-----------
trunk/dports/devel/dbus/files/0001-make-session-bus-listen-tag-configurable.patch
trunk/dports/devel/dbus/files/0002-add-launchd-implementation.patch
trunk/dports/devel/dbus/files/0003-look-up-DISPLAY-from-launchd-if-not-initialized.patch
trunk/dports/devel/dbus/files/0004-enable-launchd.patch
Removed Paths:
-------------
trunk/dports/devel/dbus/files/patch-launchd-integration.diff
Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile 2009-10-13 14:54:52 UTC (rev 59320)
+++ trunk/dports/devel/dbus/Portfile 2009-10-13 15:00:46 UTC (rev 59321)
@@ -5,8 +5,7 @@
PortGroup muniversal 1.0
name dbus
-version 1.2.14
-revision 1
+version 1.2.16
maintainers mcalhoun openmaintainer
categories devel
platforms darwin
@@ -18,13 +17,16 @@
homepage http://www.freedesktop.org/Software/dbus
master_sites http://dbus.freedesktop.org/releases/dbus
-checksums md5 2c267ccd45d0b18db8c9edacad63ec98 \
- sha1 67909bdd146d3a993131d54e70a143992edbe927 \
- rmd160 abd90d99ba476a060e65008cf8635d427b6a1503
+checksums md5 c7a47b851ebe02f6726b65b78d1b730b \
+ sha1 28aa5c8839e60d82eb9ce934e3e244abdda913f7 \
+ rmd160 7141c483dd4f40c9f7bbfe4cc646d555193a3b08
# There is a proposal to use launchd with dbus (see https://bugs.freedesktop.org/show_bug.cgi?id=14259).
-# patch-launchd-integration.diff is a slightly modified patch from Fink.
-patchfiles patch-launchd-integration.diff
+patchfiles 0001-make-session-bus-listen-tag-configurable.patch \
+ 0002-add-launchd-implementation.patch \
+ 0003-look-up-DISPLAY-from-launchd-if-not-initialized.patch \
+ 0004-enable-launchd.patch
+patch.pre_args -p1
use_autoreconf yes
@@ -69,8 +71,6 @@
depends_build-delete port:autoconf port:automake port:libtool
depends_lib-append port:xorg-libsm port:xorg-libX11
- patchfiles-delete patch-launchd-integration.diff
-
use_autoreconf no
configure.args-delete --without-x \
Added: trunk/dports/devel/dbus/files/0001-make-session-bus-listen-tag-configurable.patch
===================================================================
--- trunk/dports/devel/dbus/files/0001-make-session-bus-listen-tag-configurable.patch (rev 0)
+++ trunk/dports/devel/dbus/files/0001-make-session-bus-listen-tag-configurable.patch 2009-10-13 15:00:46 UTC (rev 59321)
@@ -0,0 +1,41 @@
+From e0809d6c48641ab11e0dc1b3f537e56692208912 Mon Sep 17 00:00:00 2001
+From: Benjamin Reed <rangerrick at befunk.com>
+Date: Sun, 19 Jul 2009 11:30:39 -0400
+Subject: [PATCH 1/7] make session bus <listen> tag configurable
+
+---
+ bus/session.conf.in | 2 +-
+ configure.in | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/bus/session.conf.in b/bus/session.conf.in
+index 85395c5..e121ff9 100644
+--- a/bus/session.conf.in
++++ b/bus/session.conf.in
+@@ -12,7 +12,7 @@
+ the behavior of child processes. -->
+ <keep_umask/>
+
+- <listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen>
++ <listen>@DBUS_SESSION_BUS_DEFAULT_ADDRESS@</listen>
+
+ <standard_session_servicedirs />
+
+diff --git a/configure.in b/configure.in
+index d79d655..5b88385 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1286,6 +1286,10 @@ DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="unix:path=$DBUS_SYSTEM_SOCKET"
+ AC_SUBST(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)
+ AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS, "$DBUS_SYSTEM_BUS_DEFAULT_ADDRESS",[The default D-Bus address of the system bus])
+
++# set up the session bus address
++DBUS_SESSION_BUS_DEFAULT_ADDRESS="unix:tmpdir=$DBUS_SESSION_SOCKET_DIR"
++AC_SUBST(DBUS_SESSION_BUS_DEFAULT_ADDRESS)
++
+ #### Set up the pid file
+ if ! test -z "$with_system_pid_file"; then
+ DBUS_SYSTEM_PID_FILE=$with_system_pid_file
+--
+1.6.3.2
+
Added: trunk/dports/devel/dbus/files/0002-add-launchd-implementation.patch
===================================================================
--- trunk/dports/devel/dbus/files/0002-add-launchd-implementation.patch (rev 0)
+++ trunk/dports/devel/dbus/files/0002-add-launchd-implementation.patch 2009-10-13 15:00:46 UTC (rev 59321)
@@ -0,0 +1,369 @@
+From fe2b03d47790a62bd179e2d443eda194a4f8e4d6 Mon Sep 17 00:00:00 2001
+From: Benjamin Reed <rangerrick at befunk.com>
+Date: Sun, 19 Jul 2009 11:44:50 -0400
+Subject: [PATCH 2/7] add launchd implementation
+
+---
+ dbus/dbus-server-launchd.c | 186 ++++++++++++++++++++++++++++++++++++++++++++
+ dbus/dbus-server-launchd.h | 35 ++++++++
+ dbus/dbus-sysdeps-unix.c | 101 ++++++++++++++++++++++++
+ 3 files changed, 322 insertions(+), 0 deletions(-)
+ create mode 100644 dbus/dbus-server-launchd.c
+ create mode 100644 dbus/dbus-server-launchd.h
+
+Index: dbus-1.2.16/dbus/dbus-server-launchd.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ dbus-1.2.16/dbus/dbus-server-launchd.c 2009-10-13 11:43:14.000000000 +0200
+@@ -0,0 +1,186 @@
++/* dbus-server-launchd.c Server methods for interacting with launchd.
++ * Copyright (C) 2007, Tanner Lovelace <lovelace at wayfarer.org>
++ * Copyright (C) 2008, Colin Walters <walters at verbum.org>
++ * Copyright (C) 2008-2009, Benjamin Reed <rangerrick at befunk.com>
++ * Copyright (C) 2009, Jonas Bähr<jonas.baehr at web.de>
++ *
++ * Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use, copy,
++ * modify, merge, publish, distribute, sublicense, and/or sell copies
++ * of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ */
++
++#include <config.h>
++#include "dbus-server-launchd.h"
++
++/**
++ * @defgroup DBusServerLaunchd DBusServer implementations for Launchd
++ * @ingroup DBusInternals
++ * @brief Implementation details of DBusServer with Launchd support
++ *
++ * @{
++ */
++
++#ifdef DBUS_ENABLE_LAUNCHD
++#include <launch.h>
++#include <errno.h>
++
++#include "dbus-server-socket.h"
++
++/* put other private launchd functions here */
++
++#endif /* DBUS_ENABLE_LAUNCHD */
++
++/**
++ * @brief Creates a new server from launchd.
++ *
++ * launchd has allocaed a socket for us. We now query launchd for the
++ * file descriptor of this socket and create a server on it.
++ * In addition we inherit launchd's environment which holds a variable
++ * containing the path to the socket. This is used to init the server's
++ * address which is passed to autolaunched services.
++ *
++ * @param launchd_env_var the environment variable which holds the unix path to the socket
++ * @param error location to store reason for failure.
++ * @returns the new server, or #NULL on failure.
++ */
++
++DBusServer *
++_dbus_server_new_for_launchd (const char *launchd_env_var, DBusError * error)
++ {
++#ifdef DBUS_ENABLE_LAUNCHD
++ DBusServer *server;
++ DBusString address;
++ int launchd_fd;
++ launch_data_t sockets_dict, checkin_response;
++ launch_data_t checkin_request;
++ launch_data_t listening_fd_array, listening_fd;
++ launch_data_t environment_dict, environment_param;
++ const char *launchd_socket_path;
++
++ launchd_socket_path = _dbus_getenv (launchd_env_var);
++
++ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
++
++ if (launchd_socket_path == NULL || *launchd_socket_path == '\0')
++ {
++ dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS,
++ "launchd's environment variable %s is empty, but should contain a socket path.\n", launchd_env_var);
++ return NULL;
++ }
++
++ if (!_dbus_string_init (&address))
++ {
++ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
++ return NULL;
++ }
++ if (!_dbus_string_append (&address, "unix:path="))
++ {
++ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
++ goto l_failed_0;
++ }
++ if (!_dbus_string_append (&address, launchd_socket_path))
++ {
++ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
++ goto l_failed_0;
++ }
++
++ if ((checkin_request = launch_data_new_string (LAUNCH_KEY_CHECKIN)) == NULL)
++ {
++ dbus_set_error (error, DBUS_ERROR_NO_MEMORY,
++ "launch_data_new_string(\"%s\") Unable to create string.\n",
++ LAUNCH_KEY_CHECKIN);
++ goto l_failed_0;
++ }
++
++ if ((checkin_response = launch_msg (checkin_request)) == NULL)
++ {
++ dbus_set_error (error, DBUS_ERROR_IO_ERROR,
++ "launch_msg(\"%s\") IPC failure: %s\n",
++ LAUNCH_KEY_CHECKIN, strerror (errno));
++ goto l_failed_0;
++ }
++
++ if (LAUNCH_DATA_ERRNO == launch_data_get_type (checkin_response))
++ {
++ dbus_set_error (error, DBUS_ERROR_FAILED, "Check-in failed: %s\n",
++ strerror (launch_data_get_errno (checkin_response)));
++ goto l_failed_0;
++ }
++
++ sockets_dict =
++ launch_data_dict_lookup (checkin_response, LAUNCH_JOBKEY_SOCKETS);
++ if (NULL == sockets_dict)
++ {
++ dbus_set_error (error, DBUS_ERROR_IO_ERROR,
++ "No sockets found to answer requests on!\n");
++ goto l_failed_0;
++ }
++
++ listening_fd_array =
++ launch_data_dict_lookup (sockets_dict, "unix_domain_listener");
++ if (NULL == listening_fd_array)
++ {
++ dbus_set_error (error, DBUS_ERROR_IO_ERROR,
++ "No known sockets found to answer requests on!\n");
++ goto l_failed_0;
++ }
++
++ if (launch_data_array_get_count (listening_fd_array) != 1)
++ {
++ dbus_set_error (error, DBUS_ERROR_LIMITS_EXCEEDED,
++ "Expected 1 socket from launchd, got %d.\n",
++ launch_data_array_get_count (listening_fd_array));
++ goto l_failed_0;
++ }
++
++ listening_fd = launch_data_array_get_index (listening_fd_array, 0);
++ launchd_fd = launch_data_get_fd (listening_fd);
++
++ _dbus_fd_set_close_on_exec (launchd_fd);
++
++ if (launchd_fd < 0)
++ {
++ _DBUS_ASSERT_ERROR_IS_SET (error);
++ goto l_failed_0;
++ }
++
++ server = _dbus_server_new_for_socket (&launchd_fd, 1, &address);
++ if (server == NULL)
++ {
++ dbus_set_error (error, DBUS_ERROR_NO_SERVER,
++ "Unable to listen on launchd fd %d.", launchd_fd);
++ goto l_failed_0;
++ }
++
++ _dbus_string_free (&address);
++
++ return server;
++
++ l_failed_0:
++ _dbus_string_free (&address);
++
++ return NULL;
++#else /* DBUS_ENABLE_LAUNCHD */
++ dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS,
++ "address type 'launchd' requested, but launchd support not compiled in");
++ return NULL;
++#endif
++ }
++
++/** @} */
+Index: dbus-1.2.16/dbus/dbus-server-launchd.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ dbus-1.2.16/dbus/dbus-server-launchd.h 2009-10-13 11:43:14.000000000 +0200
+@@ -0,0 +1,35 @@
++/* dbus-server-launchd.h Server methods for interacting with launchd.
++* Copyright (C) 2008, Benjamin Reed <rangerrick at befunk.com>
++*
++* Permission is hereby granted, free of charge, to any person
++* obtaining a copy of this software and associated documentation
++* files (the "Software"), to deal in the Software without
++* restriction, including without limitation the rights to use, copy,
++* modify, merge, publish, distribute, sublicense, and/or sell copies
++* of the Software, and to permit persons to whom the Software is
++* furnished to do so, subject to the following conditions:
++*
++* The above copyright notice and this permission notice shall be
++* included in all copies or substantial portions of the Software.
++*
++* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++* DEALINGS IN THE SOFTWARE.
++*/
++
++#ifndef DBUS_SERVER_LAUNCHD_H
++#define DBUS_SERVER_LAUNCHD_H
++
++#include <dbus/dbus-internals.h>
++#include <dbus/dbus-server-protected.h>
++
++DBUS_BEGIN_DECLS
++ DBusServer * _dbus_server_new_for_launchd (const char *launchd_env_var, DBusError * error);
++
++DBUS_END_DECLS
++#endif /* DBUS_SERVER_LAUNCHD_H */
+Index: dbus-1.2.16/dbus/dbus-sysdeps-unix.c
+===================================================================
+--- dbus-1.2.16.orig/dbus/dbus-sysdeps-unix.c 2009-10-13 11:43:07.000000000 +0200
++++ dbus-1.2.16/dbus/dbus-sysdeps-unix.c 2009-10-13 11:44:10.000000000 +0200
+@@ -3168,6 +3168,102 @@
+ #define DBUS_UNIX_STANDARD_SYSTEM_SERVICEDIR "/dbus-1/system-services"
+
+ /**
++ * quries launchd for a specific env var which holds the socket path.
++ * @param launchd_env_var the env var to look up
++ * @param error a DBusError to store the error in case of failure
++ * @return the value of the env var
++ */
++dbus_bool_t
++_dbus_lookup_launchd_socket (DBusString *socket_path,
++ const char *launchd_env_var,
++ DBusError *error)
++{
++#ifdef DBUS_ENABLE_LAUNCHD
++ char *argv[4];
++ int i;
++
++ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
++
++ i = 0;
++ argv[i] = "launchctl";
++ ++i;
++ argv[i] = "getenv";
++ ++i;
++ argv[i] = (char*)launchd_env_var;
++ ++i;
++ argv[i] = NULL;
++ ++i;
++
++ _dbus_assert (i == _DBUS_N_ELEMENTS (argv));
++
++ if (!_read_subprocess_line_argv(argv[0], TRUE, argv, socket_path, error))
++ {
++ return FALSE;
++ }
++
++ /* no error, but no result either */
++ if (_dbus_string_get_length(socket_path) == 0)
++ {
++ return FALSE;
++ }
++
++ /* strip the carriage-return */
++ _dbus_string_shorten(socket_path, 1);
++ return TRUE;
++#else /* DBUS_ENABLE_LAUNCHD */
++ dbus_set_error(error, DBUS_ERROR_NOT_SUPPORTED,
++ "can't lookup socket from launchd; launchd support not compiled in");
++ return FALSE;
++#endif
++}
++
++static dbus_bool_t
++_dbus_lookup_session_address_launchd (DBusString *address, DBusError *error)
++{
++ dbus_bool_t valid_socket;
++ DBusString socket_path;
++
++ if (!_dbus_string_init (&socket_path))
++ {
++ _DBUS_SET_OOM (error);
++ return FALSE;
++ }
++
++ valid_socket = _dbus_lookup_launchd_socket (&socket_path, "DBUS_LAUNCHD_SESSION_BUS_SOCKET", error);
++
++ if (dbus_error_is_set(error))
++ {
++ _dbus_string_free(&socket_path);
++ return FALSE;
++ }
++
++ if (!valid_socket)
++ {
++ dbus_set_error(error, "no socket path",
++ "launchd did not provide a socket path, "
++ "verify that org.freedesktop.dbus-session.plist is loaded!");
++ _dbus_string_free(&socket_path);
++ return FALSE;
++ }
++ if (!_dbus_string_append (address, "unix:path="))
++ {
++ _DBUS_SET_OOM (error);
++ _dbus_string_free(&socket_path);
++ return FALSE;
++ }
++ if (!_dbus_string_copy (&socket_path, 0, address,
++ _dbus_string_get_length (address)))
++ {
++ _DBUS_SET_OOM (error);
++ _dbus_string_free(&socket_path);
++ return FALSE;
++ }
++
++ _dbus_string_free(&socket_path);
++ return TRUE;
++}
++
++/**
+ * Determines the address of the session bus by querying a
+ * platform-specific method.
+ *
+@@ -3191,12 +3287,17 @@
+ DBusString *address,
+ DBusError *error)
+ {
++#ifdef DBUS_ENABLE_LAUNCHD
++ *supported = TRUE;
++ return _dbus_lookup_session_address_launchd (address, error);
++#else
+ /* On non-Mac Unix platforms, if the session address isn't already
+ * set in DBUS_SESSION_BUS_ADDRESS environment variable, we punt and
+ * fall back to the autolaunch: global default; see
+ * init_session_address in dbus/dbus-bus.c. */
+ *supported = FALSE;
+ return TRUE;
++#endif
+ }
+
+ /**
Added: trunk/dports/devel/dbus/files/0003-look-up-DISPLAY-from-launchd-if-not-initialized.patch
===================================================================
--- trunk/dports/devel/dbus/files/0003-look-up-DISPLAY-from-launchd-if-not-initialized.patch (rev 0)
+++ trunk/dports/devel/dbus/files/0003-look-up-DISPLAY-from-launchd-if-not-initialized.patch 2009-10-13 15:00:46 UTC (rev 59321)
@@ -0,0 +1,57 @@
+From e487f8a50bddd4de20a79532b0f940b8a0177e43 Mon Sep 17 00:00:00 2001
+From: Benjamin Reed <rangerrick at befunk.com>
+Date: Tue, 21 Jul 2009 10:33:32 -0400
+Subject: [PATCH 3/7] look up DISPLAY from launchd if not initialized
+
+---
+ dbus/dbus-server-launchd.c | 25 ++++++++++++++++++++++++-
+ 1 files changed, 24 insertions(+), 1 deletions(-)
+
+diff --git a/dbus/dbus-server-launchd.c b/dbus/dbus-server-launchd.c
+index bcfb558..52782aa 100644
+--- a/dbus/dbus-server-launchd.c
++++ b/dbus/dbus-server-launchd.c
+@@ -71,9 +71,10 @@ _dbus_server_new_for_launchd (const char *launchd_env_var, DBusError * error)
+ launch_data_t checkin_request;
+ launch_data_t listening_fd_array, listening_fd;
+ launch_data_t environment_dict, environment_param;
+- const char *launchd_socket_path;
++ const char *launchd_socket_path, *display;
+
+ launchd_socket_path = _dbus_getenv (launchd_env_var);
++ display = _dbus_getenv ("DISPLAY");
+
+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
+@@ -158,6 +159,28 @@ _dbus_server_new_for_launchd (const char *launchd_env_var, DBusError * error)
+ {
+ _DBUS_ASSERT_ERROR_IS_SET (error);
+ goto l_failed_0;
++ if (display == NULL || *display == '\0')
++ {
++ environment_dict = launch_data_dict_lookup (checkin_response, LAUNCH_JOBKEY_USERENVIRONMENTVARIABLES);
++ if (NULL == environment_dict)
++ {
++ _dbus_warn ("Unable to retrieve user environment from launchd.");
++ }
++ else
++ {
++ environment_param = launch_data_dict_lookup (environment_dict, "DISPLAY");
++ if (NULL == environment_param)
++ {
++ _dbus_warn ("Unable to retrieve DISPLAY from launchd.");
++ }
++ else
++ {
++ display = launch_data_get_string(environment_param);
++ _dbus_setenv ("DISPLAY", display);
++ }
++ }
++ }
++
+ }
+
+ server = _dbus_server_new_for_socket (&launchd_fd, 1, &address);
+--
+1.6.3.2
+
Added: trunk/dports/devel/dbus/files/0004-enable-launchd.patch
===================================================================
--- trunk/dports/devel/dbus/files/0004-enable-launchd.patch (rev 0)
+++ trunk/dports/devel/dbus/files/0004-enable-launchd.patch 2009-10-13 15:00:46 UTC (rev 59321)
@@ -0,0 +1,397 @@
+From bb7496118f9f640209b4c49c8f5691c497aad381 Mon Sep 17 00:00:00 2001
+From: Benjamin Reed <rangerrick at befunk.com>
+Date: Sun, 19 Jul 2009 11:45:34 -0400
+Subject: [PATCH 4/7] enable launchd
+
+This patch enables support for Mac OS X's launch daemon
+for startup as well as sharing of the DBus session bus
+environment. It includes a LaunchAgent plist for automatic
+start of the session bus.
+---
+ README.launchd | 61 +++++++++++++++++++++++++++++
+ bus/Makefile.am | 8 +++-
+ bus/org.freedesktop.dbus-session.plist.in | 31 +++++++++++++++
+ configure.in | 50 ++++++++++++++++++++++--
+ dbus/Makefile.am | 2 +
+ dbus/dbus-server-unix.c | 23 +++++++++++
+ dbus/dbus-sysdeps-unix.h | 4 ++
+ dbus/dbus-transport-unix.c | 51 ++++++++++++++++++++++++
+ 8 files changed, 225 insertions(+), 5 deletions(-)
+ create mode 100644 README.launchd
+ create mode 100644 bus/org.freedesktop.dbus-session.plist.in
+
+diff --git a/README.launchd b/README.launchd
+new file mode 100644
+index 0000000..701e57d
+--- /dev/null
++++ b/README.launchd
+@@ -0,0 +1,61 @@
++Launchd[1,2] replaces init, inetd and cron on Mac OS X since 10.4 "Tiger".
++dbus uses this service to provide a common session bus address for each user
++and so deprecates the X11 enabled dbus-launcher.
++
++[1] http://developer.apple.com/MacOsX/launchd.html
++[2] http://launchd.macosforge.org/
++
++
++Setup
++===
++
++Configure with --enable-launchd and --without-x (X11 should not harm but it's
++simply not necessary any more)
++After installation, to prevent a reboot, load the dbus session starter into
++launchd by executing:
++$ launchctl load /Library/LaunchAgents/org.freedesktop.dbus-session.plist
++
++You can change the launch agent dir via configure, but it's not recommended.
++Make sure to execute the above line as the actual user for which you want to
++use a session bus since launchd manages its agents on a per user basis.
++
++
++How it works
++===
++
++Launchd allocates a socket and provides the unix path to it via the variable
++DBUS_LAUNCHD_SESSION_BUS_SOCKET in launchd's environment. Every process
++spawned by launchd (or dbus-daemon, if stared by launchd) can access it through
++its own environment. Other processes can query launchd for it by executing:
++$ launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET
++However, this is normally done by the dbus client lib for you.
++
++If launchd start dbus-daemon with a config file containing a "launchd:env=FOO"
++address, as the default session config does with env=DBUS_LAUNCHD_SESSION_BUS_SOCKET,
++the daemon will get the file descriptor from launchd and start listening on it.
++The environment variable is used to get the actual socket path which is passed
++to every service spawned by dbus-daemon as a result from autolaunch messages.
++Please note that it's not possible to start dbus-daemon manually when using a
++"launchd:" address. Only child processes of launchd can access the above
++mentioned file descriptor!
++
++To create custom buses just set up an other launch agent. As a quick start copy
++/Library/LaunchAgents/org.freedesktop.dbus-session.plist, change the label
++to i.e. "org.freedesktop.dbus-foo" and change the SecureSocketWithKey value,
++i.e. to "DBUS_LAUNCHD_FOO_BUS_SOCKET". This environment variable has to be set
++in the config file for your new bus in the <listen> element (see session.config).
++Then edit your /Library/LaunchAgents/org.freedesktop.dbus-foo.plist to start
++dbus-daemon with "--config-file=/opt/local/etc/dbus-1/foo.conf" instead of
++"--session". Now load the new plist onto launchd as described in the setup
++section of this document.
++Executing "launchctl export" should now give you two sockets, one in
++DBUS_LAUNCHD_SESSION_BUS_SOCKET and the new DBUS_LAUNCHD_FOO_BUS_SOCKET.
++To connect to this new bus use "launchd:env=DBUS_LAUNCHD_FOO_BUS_SOCKET".
++
++Since Mac OS X 10.5 "Leopard" you can also configure launchd to start
++dbus-daemon on demand as soon as some process connects to the socket. Since
++it's broken on 10.4 this feature is disabled per default. Look at
++/Library/LaunchAgents/org.freedesktop.dbus-session.plist to change it.
++
++On the client side, the envvar DBUS_SESSION_BUS_ADDRESS can be normally used
++but if it's not set, launchd is queried for the session bus socket.
+diff --git a/bus/Makefile.am b/bus/Makefile.am
+index 3b4f69d..420742b 100644
+--- a/bus/Makefile.am
++++ b/bus/Makefile.am
+@@ -9,12 +9,18 @@ EFENCE=
+
+ CONFIG_IN_FILES= \
+ session.conf.in \
+- system.conf.in
++ system.conf.in \
++ org.freedesktop.dbus-session.plist.in
+
+ config_DATA= \
+ session.conf \
+ system.conf
+
++if DBUS_ENABLE_LAUNCHD
++agentdir=$(LAUNCHD_AGENT_DIR)
++agent_DATA=org.freedesktop.dbus-session.plist
++endif
++
+ if DBUS_USE_LIBXML
+ XML_SOURCES=config-loader-libxml.c
+ endif
+diff --git a/bus/org.freedesktop.dbus-session.plist.in b/bus/org.freedesktop.dbus-session.plist.in
+new file mode 100644
+index 0000000..ac5a9d4
+--- /dev/null
++++ b/bus/org.freedesktop.dbus-session.plist.in
+@@ -0,0 +1,31 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++ <key>Label</key>
++ <string>org.freedesktop.dbus-session</string>
++
++ <key>ServiceIPC</key>
++ <true/>
++
++ <!-- bug in 10.4's launchd - on-demand loading does not work -->
++ <key>OnDemand</key>
++ <false />
++
++ <key>ProgramArguments</key>
++ <array>
++ <string>@DBUS_DAEMONDIR@/dbus-daemon</string>
++ <string>--nofork</string>
++ <string>--session</string>
++ </array>
++
++ <key>Sockets</key>
++ <dict>
++ <key>unix_domain_listener</key>
++ <dict>
++ <key>SecureSocketWithKey</key>
++ <string>DBUS_LAUNCHD_SESSION_BUS_SOCKET</string>
++ </dict>
++ </dict>
++</dict>
++</plist>
+diff --git a/configure.in b/configure.in
+index 5b88385..85c3915 100644
+--- a/configure.in
++++ b/configure.in
+@@ -79,6 +79,7 @@ AC_ARG_ENABLE(inotify, AS_HELP_STRING([--enable-inotify],[build with inotify sup
+ AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)
+ AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
+ AC_ARG_ENABLE(userdb-cache, AS_HELP_STRING([--enable-userdb-cache],[build with userdb-cache support]),enable_userdb_cache=$enableval,enable_userdb_cache=yes)
++AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto)
+
+ AC_ARG_WITH(xml, AS_HELP_STRING([--with-xml=[libxml/expat]],[XML library to use]))
+ AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install]))
+@@ -88,6 +89,7 @@ AC_ARG_WITH(system-pid-file, AS_HELP_STRING([--with-system-pid-file=[pidfile]],[
+ AC_ARG_WITH(system-socket, AS_HELP_STRING([--with-system-socket=[filename]],[UNIX domain socket for systemwide daemon]))
+ AC_ARG_WITH(console-auth-dir, AS_HELP_STRING([--with-console-auth-dir=[dirname]],[directory to check for console ownerhip]))
+ AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner]))
++AC_ARG_WITH(launchd-agent-dir, AS_HELP_STRING([--with-launchd-agent-dir=[dirname]],[directory to put the launchd agent (default: /Library/LaunchAgents)]))
+ AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)]))
+ AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon]))
+
+@@ -817,6 +819,38 @@ fi
+
+ AM_CONDITIONAL(DBUS_BUS_ENABLE_KQUEUE, test x$have_kqueue = xyes)
+
++# launchd checks
++if test x$enable_launchd = xno ; then
++ have_launchd=no
++else
++ have_launchd=yes
++ AC_CHECK_HEADER([launch.h], , have_launchd=no)
++ AC_PATH_PROG([LAUNCHCTL], [launchctl])
++ if test "x$LAUNCHCTL" = "x"; then
++ have_launchd=no
++ fi
++
++ if test x$enable_launchd = xyes && test x$have_launchd = xno ; then
++ AC_MSG_ERROR([launchd support explicitly enabled but not available])
++ fi
++fi
++
++dnl check if launchd is enabled
++if test x$have_launchd = xyes; then
++ AC_DEFINE(DBUS_ENABLE_LAUNCHD,1,[Use launchd autolaunch])
++fi
++
++AM_CONDITIONAL(DBUS_ENABLE_LAUNCHD, test x$have_launchd = xyes)
++
++#### Directory to place launchd agent file
++if test "x$with_launchd_agent_dir" = "x"; then
++ LAUNCHD_AGENT_DIR="/Library/LaunchAgents"
++else
++ LAUNCHD_AGENT_DIR="$with_launchd_agent_dir"
++fi
++
++AC_SUBST(LAUNCHD_AGENT_DIR)
++
+ dnl console owner file
+ if test x$enable_console_owner_file = xno ; then
+ have_console_owner_file=no;
+@@ -1287,7 +1321,11 @@ AC_SUBST(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)
+ AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS, "$DBUS_SYSTEM_BUS_DEFAULT_ADDRESS",[The default D-Bus address of the system bus])
+
+ # set up the session bus address
+-DBUS_SESSION_BUS_DEFAULT_ADDRESS="unix:tmpdir=$DBUS_SESSION_SOCKET_DIR"
++if test x$have_launchd = xyes; then
++ DBUS_SESSION_BUS_DEFAULT_ADDRESS="launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET"
++else
++ DBUS_SESSION_BUS_DEFAULT_ADDRESS="unix:tmpdir=$DBUS_SESSION_SOCKET_DIR"
++fi
+ AC_SUBST(DBUS_SESSION_BUS_DEFAULT_ADDRESS)
+
+ #### Set up the pid file
+@@ -1414,7 +1452,6 @@ else
+ DBUS_SESSION_SOCKET_DIR=$DEFAULT_SOCKET_DIR
+ fi
+ AC_DEFINE_UNQUOTED(DBUS_SESSION_SOCKET_DIR, "$DBUS_SESSION_SOCKET_DIR", [Where per-session bus puts its sockets])
+-AC_SUBST(DBUS_SESSION_SOCKET_DIR)
+
+ AC_DEFINE_UNQUOTED(DBUS_UNIX, "1", [Defined on UNIX and Linux systems and not on Windows])
+
+@@ -1436,6 +1473,7 @@ dbus/dbus-arch-deps.h
+ bus/system.conf
+ bus/session.conf
+ bus/messagebus
++bus/org.freedesktop.dbus-session.plist
+ bus/rc.messagebus
+ bus/dbus-daemon.1
+ Makefile
+@@ -1503,6 +1541,7 @@ echo "
+ Building Doxygen docs: ${enable_doxygen_docs}
+ Building XML docs: ${enable_xml_docs}
+ Building cache support: ${enable_userdb_cache}
++ Building launchd support: ${have_launchd}
+ Gettext libs (empty OK): ${INTLLIBS}
+ Using XML parser: ${with_xml}
+ Init scripts style: ${with_init_scripts}
+@@ -1516,8 +1555,11 @@ echo "
+ Console owner file path: ${DBUS_CONSOLE_OWNER_FILE}
+ System bus user: ${DBUS_USER}
+ Session bus services dir: ${EXPANDED_DATADIR}/dbus-1/services
+- 'make check' socket dir: ${TEST_SOCKET_DIR}
+-"
++ 'make check' socket dir: ${TEST_SOCKET_DIR}"
++if test x$have_launchd = xyes; then
++ echo " launchd agent dir: ${LAUNCHD_AGENT_DIR}"
++fi
++echo
+
+ if test x$enable_tests = xyes; then
+ echo "NOTE: building with unit tests increases the size of the installed library and renders it insecure."
+diff --git a/dbus/Makefile.am b/dbus/Makefile.am
+index e966a43..ed0a4ae 100644
+--- a/dbus/Makefile.am
++++ b/dbus/Makefile.am
+@@ -70,6 +70,8 @@ DBUS_LIB_SOURCES= \
+ dbus-server.c \
+ dbus-server-debug-pipe.c \
+ dbus-server-debug-pipe.h \
++ dbus-server-launchd.c \
++ dbus-server-launchd.h \
+ dbus-server-protected.h \
+ dbus-server-socket.c \
+ dbus-server-socket.h \
+diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c
+index 07800c8..55ed9ab 100644
+--- a/dbus/dbus-server-unix.c
++++ b/dbus/dbus-server-unix.c
+@@ -21,9 +21,11 @@
+ *
+ */
+
++#include <config.h>
+ #include "dbus-internals.h"
+ #include "dbus-server-unix.h"
+ #include "dbus-server-socket.h"
++#include "dbus-server-launchd.h"
+ #include "dbus-transport-unix.h"
+ #include "dbus-connection-internal.h"
+ #include "dbus-sysdeps-unix.h"
+@@ -145,6 +147,27 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
+ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+ }
+ }
++ else if (strcmp (method, "launchd") == 0)
++ {
++ const char *launchd_env_var = dbus_address_entry_get_value (entry, "env");
++ if (launchd_env_var == NULL)
++ {
++ _dbus_set_bad_address (error, "launchd", "env", NULL);
++ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
++ }
++ *server_p = _dbus_server_new_for_launchd (launchd_env_var, error);
++
++ if (*server_p != NULL)
++ {
++ _DBUS_ASSERT_ERROR_IS_CLEAR(error);
++ return DBUS_SERVER_LISTEN_OK;
++ }
++ else
++ {
++ _DBUS_ASSERT_ERROR_IS_SET(error);
++ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
++ }
++ }
+ else
+ {
+ /* If we don't handle the method, we return NULL with the
+diff --git a/dbus/dbus-sysdeps-unix.h b/dbus/dbus-sysdeps-unix.h
+index 96b44e2..8eec96b 100644
+--- a/dbus/dbus-sysdeps-unix.h
++++ b/dbus/dbus-sysdeps-unix.h
+@@ -79,6 +79,10 @@ dbus_bool_t _dbus_read_credentials (int client_fd,
+ dbus_bool_t _dbus_send_credentials (int server_fd,
+ DBusError *error);
+
++dbus_bool_t _dbus_lookup_launchd_socket (DBusString *socket_path,
++ const char *launchd_env_var,
++ DBusError *error);
++
+ /** Information about a UNIX user */
+ typedef struct DBusUserInfo DBusUserInfo;
+ /** Information about a UNIX group */
+diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c
+index 2f2a3da..ce77c57 100644
+--- a/dbus/dbus-transport-unix.c
++++ b/dbus/dbus-transport-unix.c
+@@ -169,6 +169,57 @@ _dbus_transport_open_platform_specific (DBusAddressEntry *entry,
+ return DBUS_TRANSPORT_OPEN_OK;
+ }
+ }
++ else if (strcmp (method, "launchd") == 0)
++ {
++ DBusError tmp_error = DBUS_ERROR_INIT;
++ const char *launchd_env_var = dbus_address_entry_get_value (entry, "env");
++ const char *launchd_socket;
++ DBusString socket_path;
++ dbus_bool_t valid_socket;
++
++ if (!_dbus_string_init (&socket_path))
++ {
++ _DBUS_SET_OOM (error);
++ return FALSE;
++ }
++
++ if (launchd_env_var == NULL)
++ {
++ _dbus_set_bad_address (error, "launchd", "env", NULL);
++ return DBUS_TRANSPORT_OPEN_BAD_ADDRESS;
++ }
++
++ valid_socket = _dbus_lookup_launchd_socket (&socket_path, launchd_env_var, error);
++
++ if (dbus_error_is_set(error))
++ {
++ _dbus_string_free(&socket_path);
++ return DBUS_TRANSPORT_OPEN_DID_NOT_CONNECT;
++ }
++
++ if (!valid_socket)
++ {
++ dbus_set_error(&tmp_error, DBUS_ERROR_BAD_ADDRESS,
++ "launchd's env var %s does not exist", launchd_env_var);
++ dbus_error_free(error);
++ dbus_move_error(&tmp_error, error);
++ return DBUS_TRANSPORT_OPEN_DID_NOT_CONNECT;
++ }
++
++ launchd_socket = _dbus_string_get_const_data(&socket_path);
++ *transport_p = _dbus_transport_new_for_domain_socket (launchd_socket, FALSE, error);
++
++ if (*transport_p == NULL)
++ {
++ _DBUS_ASSERT_ERROR_IS_SET (error);
++ return DBUS_TRANSPORT_OPEN_DID_NOT_CONNECT;
++ }
++ else
++ {
++ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
++ return DBUS_TRANSPORT_OPEN_OK;
++ }
++ }
+ else
+ {
+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+--
+1.6.3.2
+
Deleted: trunk/dports/devel/dbus/files/patch-launchd-integration.diff
===================================================================
--- trunk/dports/devel/dbus/files/patch-launchd-integration.diff 2009-10-13 14:54:52 UTC (rev 59320)
+++ trunk/dports/devel/dbus/files/patch-launchd-integration.diff 2009-10-13 15:00:46 UTC (rev 59321)
@@ -1,1171 +0,0 @@
-diff -Nurd README.launchd dbus-1.2.12-new/README.launchd
---- README.launchd 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.12-new/README.launchd 2009-02-23 08:33:30.000000000 -0500
-@@ -0,0 +1,61 @@
-+Launchd[1,2] replaces init, inetd and cron on Mac OS X since 10.4 "Tiger".
-+dbus uses this service to provide a common session bus address for each user
-+and so deprecates the X11 enabled dbus-launcher.
-+
-+[1] http://developer.apple.com/MacOsX/launchd.html
-+[2] http://launchd.macosforge.org/
-+
-+
-+Setup
-+===
-+
-+Configure with --enable-launchd and --without-x (X11 should not harm but it's
-+simply not necessary any more)
-+After installation, to prevent a reboot, load the dbus session starter into
-+launchd by executing:
-+$ launchctl load /Library/LaunchAgents/org.freedesktop.dbus-session.plist
-+
-+You can change the launch agent dir via configure, but it's not recommended.
-+Make sure to execute the above line as the actual user for which you want to
-+use a session bus since launchd manages its agents on a per user basis.
-+
-+
-+How it works
-+===
-+
-+Launchd allocates a socket and provides the unix path to it via the variable
-+DBUS_LAUNCHD_SESSION_BUS_SOCKET in launchd's environment. Every process
-+spawned by launchd (or dbus-daemon, if stared by launchd) can access it through
-+its own environment. Other processes can query launchd for it by executing:
-+$ launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET
-+However, this is normally done by the dbus client lib for you.
-+
-+If launchd start dbus-daemon with a config file containing a "launchd:env=FOO"
-+address, as the default session config does with env=DBUS_LAUNCHD_SESSION_BUS_SOCKET,
-+the daemon will get the file descriptor from launchd and start listening on it.
-+The environment variable is used to get the actual socket path which is passed
-+to every service spawned by dbus-daemon as a result from autolaunch messages.
-+Please note that it's not possible to start dbus-daemon manually when using a
-+"launchd:" address. Only child processes of launchd can access the above
-+mentioned file descriptor!
-+
-+To create custom buses just set up an other launch agent. As a quick start copy
-+/Library/LaunchAgents/org.freedesktop.dbus-session.plist, change the label
-+to i.e. "org.freedesktop.dbus-foo" and change the SecureSocketWithKey value,
-+i.e. to "DBUS_LAUNCHD_FOO_BUS_SOCKET". This environment variable has to be set
-+in the config file for your new bus in the <listen> element (see session.config).
-+Then edit your /Library/LaunchAgents/org.freedesktop.dbus-foo.plist to start
-+dbus-daemon with "--config-file=/opt/local/etc/dbus-1/foo.conf" instead of
-+"--session". Now load the new plist onto launchd as described in the setup
-+section of this document.
-+Executing "launchctl export" should now give you two sockets, one in
-+DBUS_LAUNCHD_SESSION_BUS_SOCKET and the new DBUS_LAUNCHD_FOO_BUS_SOCKET.
-+To connect to this new bus use "launchd:env=DBUS_LAUNCHD_FOO_BUS_SOCKET".
-+
-+Since Mac OS X 10.5 "Leopard" you can also configure launchd to start
-+dbus-daemon on demand as soon as some process connects to the socket. Since
-+it's broken on 10.4 this feature is disabled per default. Look at
-+/Library/LaunchAgents/org.freedesktop.dbus-session.plist to change it.
-+
-+On the client side, the envvar DBUS_SESSION_BUS_ADDRESS can be normally used
-+but if it's not set, launchd is queried for the session bus socket.
-diff -Nurd bus/Makefile.am dbus-1.2.12-new/bus/Makefile.am
---- bus/Makefile.am 2008-08-07 14:44:35.000000000 -0400
-+++ dbus-1.2.12-new/bus/Makefile.am 2009-02-23 08:33:30.000000000 -0500
-@@ -9,12 +9,18 @@
-
- CONFIG_IN_FILES= \
- session.conf.in \
-- system.conf.in
-+ system.conf.in \
-+ org.freedesktop.dbus-session.plist.in
-
- config_DATA= \
- session.conf \
- system.conf
-
-+if DBUS_ENABLE_LAUNCHD
-+agentdir=$(LAUNCHD_AGENT_DIR)
-+agent_DATA=org.freedesktop.dbus-session.plist
-+endif
-+
- if DBUS_USE_LIBXML
- XML_SOURCES=config-loader-libxml.c
- endif
-diff -Nurd bus/org.freedesktop.dbus-session.plist.in dbus-1.2.12-new/bus/org.freedesktop.dbus-session.plist.in
---- bus/org.freedesktop.dbus-session.plist.in 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.12-new/bus/org.freedesktop.dbus-session.plist.in 2009-02-23 08:33:30.000000000 -0500
-@@ -0,0 +1,31 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+ <key>Label</key>
-+ <string>org.freedesktop.dbus-session</string>
-+
-+ <key>ServiceIPC</key>
-+ <true/>
-+
-+ <!-- bug in 10.4's launchd - on-demand loading does not work -->
-+ <key>OnDemand</key>
-+ <false />
-+
-+ <key>ProgramArguments</key>
-+ <array>
-+ <string>@DBUS_DAEMONDIR@/dbus-daemon</string>
-+ <string>--nofork</string>
-+ <string>--session</string>
-+ </array>
-+
-+ <key>Sockets</key>
-+ <dict>
-+ <key>unix_domain_listener</key>
-+ <dict>
-+ <key>SecureSocketWithKey</key>
-+ <string>DBUS_LAUNCHD_SESSION_BUS_SOCKET</string>
-+ </dict>
-+ </dict>
-+</dict>
-+</plist>
-diff -Nurd bus/session.conf.in dbus-1.2.12-new/bus/session.conf.in
---- bus/session.conf.in 2009-01-06 17:52:22.000000000 -0500
-+++ dbus-1.2.12-new/bus/session.conf.in 2009-02-23 08:33:30.000000000 -0500
-@@ -12,7 +12,7 @@
- the behavior of child processes. -->
- <keep_umask/>
-
-- <listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen>
-+ <listen>@DBUS_SESSION_BUS_DEFAULT_ADDRESS@</listen>
-
- <standard_session_servicedirs />
-
-diff -Nurd configure.in dbus-1.2.12-new/configure.in
---- configure.in 2009-01-06 19:30:26.000000000 -0500
-+++ dbus-1.2.12-new/configure.in 2009-02-23 08:33:30.000000000 -0500
-@@ -78,6 +78,7 @@
- AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)
- AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
- AC_ARG_ENABLE(userdb-cache, AS_HELP_STRING([--enable-userdb-cache],[build with userdb-cache support]),enable_userdb_cache=$enableval,enable_userdb_cache=yes)
-+AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto)
-
- AC_ARG_WITH(xml, AS_HELP_STRING([--with-xml=[libxml/expat]],[XML library to use]))
- AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install]))
-@@ -87,6 +88,7 @@
- AC_ARG_WITH(system-socket, AS_HELP_STRING([--with-system-socket=[filename]],[UNIX domain socket for systemwide daemon]))
- AC_ARG_WITH(console-auth-dir, AS_HELP_STRING([--with-console-auth-dir=[dirname]],[directory to check for console ownerhip]))
- AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner]))
-+AC_ARG_WITH(launchd-agent-dir, AS_HELP_STRING([--with-launchd-agent-dir=[dirname]],[directory to put the launchd agent (default: /Library/LaunchAgents)]))
- AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)]))
- AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon]))
-
-@@ -1026,6 +1028,46 @@
-
- AM_CONDITIONAL(DBUS_BUS_ENABLE_KQUEUE, test x$have_kqueue = xyes)
-
-+# launchd checks
-+if test x$enable_launchd = xno ; then
-+ have_launchd=no
-+else
-+ have_launchd=yes
-+ AC_CHECK_HEADER([launch.h], , have_launchd=no)
-+ AC_PATH_PROG([LAUNCHCTL], [launchctl])
-+ if test "x$LAUNCHCTL" = "x"; then
-+ have_launchd=no
-+ fi
-+
-+ if test x$enable_launchd = xyes -a x$have_launchd = xno ; then
-+ AC_MSG_ERROR([launchd support explicitly enabled but not available])
-+ fi
-+fi
-+
-+dnl check if launchd is enabled
-+if test x$have_launchd = xyes; then
-+ AC_DEFINE(DBUS_ENABLE_LAUNCHD,1,[Use launchd autolaunch])
-+fi
-+
-+AM_CONDITIONAL(DBUS_ENABLE_LAUNCHD, test x$have_launchd = xyes)
-+
-+if test x$have_launchd = xyes; then
-+ DBUS_SESSION_BUS_DEFAULT_ADDRESS="launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET"
-+else
-+ DBUS_SESSION_BUS_DEFAULT_ADDRESS="unix:tmpdir=$DBUS_SESSION_SOCKET_DIR"
-+fi
-+AC_SUBST(DBUS_SESSION_BUS_DEFAULT_ADDRESS)
-+
-+
-+#### Directory to place launchd agent file
-+if test "x$with_launchd_agent_dir" = "x"; then
-+ LAUNCHD_AGENT_DIR="/Library/LaunchAgents"
-+else
-+ LAUNCHD_AGENT_DIR="$with_launchd_agent_dir"
-+fi
-+
-+AC_SUBST(LAUNCHD_AGENT_DIR)
-+
- dnl console owner file
- if test x$enable_console_owner_file = xno ; then
- have_console_owner_file=no;
-@@ -1387,6 +1429,7 @@
- bus/system.conf
- bus/session.conf
- bus/messagebus
-+bus/org.freedesktop.dbus-session.plist
- bus/rc.messagebus
- bus/dbus-daemon.1
- Makefile
-@@ -1454,6 +1497,7 @@
- Building Doxygen docs: ${enable_doxygen_docs}
- Building XML docs: ${enable_xml_docs}
- Building cache support: ${enable_userdb_cache}
-+ Building launchd support: ${have_launchd}
- Gettext libs (empty OK): ${INTLLIBS}
- Using XML parser: ${with_xml}
- Init scripts style: ${with_init_scripts}
-@@ -1467,8 +1511,11 @@
- Console owner file path: ${DBUS_CONSOLE_OWNER_FILE}
- System bus user: ${DBUS_USER}
- Session bus services dir: ${EXPANDED_DATADIR}/dbus-1/services
-- 'make check' socket dir: ${TEST_SOCKET_DIR}
--"
-+ 'make check' socket dir: ${TEST_SOCKET_DIR}"
-+if test x$have_launchd = xyes; then
-+ echo " launchd agent dir: ${LAUNCHD_AGENT_DIR}"
-+fi
-+echo
-
- if test x$enable_tests = xyes; then
- echo "NOTE: building with unit tests increases the size of the installed library and renders it insecure."
-diff -Nurd dbus/Makefile.am dbus-1.2.12-new/dbus/Makefile.am
---- dbus/Makefile.am 2008-08-07 14:44:36.000000000 -0400
-+++ dbus-1.2.12-new/dbus/Makefile.am 2009-02-23 08:33:30.000000000 -0500
-@@ -70,6 +70,8 @@
- dbus-server.c \
- dbus-server-debug-pipe.c \
- dbus-server-debug-pipe.h \
-+ dbus-server-launchd.c \
-+ dbus-server-launchd.h \
- dbus-server-protected.h \
- dbus-server-socket.c \
- dbus-server-socket.h \
-diff -Nurd dbus/dbus-bus.c dbus-1.2.12-new/dbus/dbus-bus.c
---- dbus/dbus-bus.c 2008-08-07 14:44:36.000000000 -0400
-+++ dbus-1.2.12-new/dbus/dbus-bus.c 2009-02-23 08:33:54.000000000 -0500
-@@ -22,6 +22,7 @@
- *
- */
-
-+#include <config.h>
- #include "dbus-bus.h"
- #include "dbus-protocol.h"
- #include "dbus-internals.h"
-@@ -29,7 +30,7 @@
- #include "dbus-marshal-validate.h"
- #include "dbus-threads-internal.h"
- #include "dbus-connection-internal.h"
--#include <string.h>
-+#include "dbus-string.h"
-
- /**
- * @defgroup DBusBus Message bus APIs
-@@ -147,6 +148,63 @@
- }
-
- static dbus_bool_t
-+init_session_address (void)
-+{
-+ dbus_bool_t retval;
-+
-+ retval = FALSE;
-+
-+ /* First, look in the environment. This is the normal case on
-+ * freedesktop.org/Unix systems. */
-+ get_from_env (&bus_connection_addresses[DBUS_BUS_SESSION],
-+ "DBUS_SESSION_BUS_ADDRESS");
-+ if (bus_connection_addresses[DBUS_BUS_SESSION] == NULL)
-+ {
-+ dbus_bool_t supported;
-+ DBusString addr;
-+ DBusError error = DBUS_ERROR_INIT;
-+
-+ if (!_dbus_string_init (&addr))
-+ return FALSE;
-+
-+ supported = FALSE;
-+ /* So it's not in the environment - let's try a platform-specific method.
-+ * On MacOS, this involves asking launchd. On Windows (not specified yet)
-+ * we might do a COM lookup.
-+ * Ignore errors - if we failed, fall back to autolaunch. */
-+ retval = _dbus_lookup_session_address (&supported, &addr, &error);
-+ if (supported && retval)
-+ {
-+ retval =_dbus_string_steal_data (&addr, &bus_connection_addresses[DBUS_BUS_SESSION]);
-+ }
-+ else if (supported && !retval)
-+ {
-+ if (dbus_error_is_set(&error))
-+ _dbus_warn ("Dynamic session lookup supported but failed: %s\n", error.message);
-+ else
-+ _dbus_warn ("Dynamic session lookup supported but failed silently\n");
-+ }
-+ _dbus_string_free (&addr);
-+ }
-+ else
-+ retval = TRUE;
-+
-+ if (!retval)
-+ return FALSE;
-+
-+ /* The DBUS_SESSION_BUS_DEFAULT_ADDRESS should have really been named
-+ * DBUS_SESSION_BUS_FALLBACK_ADDRESS.
-+ */
-+ if (bus_connection_addresses[DBUS_BUS_SESSION] == NULL)
-+ bus_connection_addresses[DBUS_BUS_SESSION] =
-+ _dbus_strdup (DBUS_SESSION_BUS_DEFAULT_ADDRESS);
-+ if (bus_connection_addresses[DBUS_BUS_SESSION] == NULL)
-+ return FALSE;
-+
-+ return TRUE;
-+}
-+
-+static dbus_bool_t
- init_connections_unlocked (void)
- {
- if (!initialized)
-@@ -198,17 +256,9 @@
- {
- _dbus_verbose ("Filling in session bus address...\n");
-
-- if (!get_from_env (&bus_connection_addresses[DBUS_BUS_SESSION],
-- "DBUS_SESSION_BUS_ADDRESS"))
-+ if (!init_session_address ())
- return FALSE;
-
-- if (bus_connection_addresses[DBUS_BUS_SESSION] == NULL)
-- bus_connection_addresses[DBUS_BUS_SESSION] =
-- _dbus_strdup (DBUS_SESSION_BUS_DEFAULT_ADDRESS);
--
-- if (bus_connection_addresses[DBUS_BUS_SESSION] == NULL)
-- return FALSE;
--
- _dbus_verbose (" \"%s\"\n", bus_connection_addresses[DBUS_BUS_SESSION] ?
- bus_connection_addresses[DBUS_BUS_SESSION] : "none set");
- }
-diff -Nurd dbus/dbus-server-launchd.c dbus-1.2.12-new/dbus/dbus-server-launchd.c
---- dbus/dbus-server-launchd.c 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.12-new/dbus/dbus-server-launchd.c 2009-02-23 08:33:55.000000000 -0500
-@@ -0,0 +1,176 @@
-+/* dbus-server-launchd.c Server methods for interacting with launchd.
-+ * Copyright (C) 2007, Tanner Lovelace <lovelace at wayfarer.org>
-+ * Copyright (C) 2008, Benjamin Reed <rangerrick at befunk.com>
-+ *
-+ * Permission is hereby granted, free of charge, to any person
-+ * obtaining a copy of this software and associated documentation
-+ * files (the "Software"), to deal in the Software without
-+ * restriction, including without limitation the rights to use, copy,
-+ * modify, merge, publish, distribute, sublicense, and/or sell copies
-+ * of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be
-+ * included in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#include <config.h>
-+#include "dbus-server-launchd.h"
-+
-+/**
-+ * @defgroup DBusServerLaunchd DBusServer implementations for Launchd
-+ * @ingroup DBusInternals
-+ * @brief Implementation details of DBusServer with Launchd support
-+ *
-+ * @{
-+ */
-+
-+#ifdef DBUS_ENABLE_LAUNCHD
-+#include <launch.h>
-+#include <errno.h>
-+
-+#include "dbus-server-socket.h"
-+
-+/* put other private launchd functions here */
-+
-+#endif /* DBUS_ENABLE_LAUNCHD */
-+
-+/**
-+ * @brief Creates a new server from launchd.
-+ *
-+ * launchd has allocaed a socket for us. We now query launchd for the
-+ * file descriptor of this socket and create a server on it.
-+ * In addition we inherit launchd's environment which holds a variable
-+ * containing the path to the socket. This is used to init the server's
-+ * address which is passed to autolaunched services.
-+ *
-+ * @param launchd_env_var the environment variable which holds the unix path to the socket
-+ * @param error location to store reason for failure.
-+ * @returns the new server, or #NULL on failure.
-+ */
-+
-+DBusServer*
-+_dbus_server_new_for_launchd (const char *launchd_env_var,
-+ DBusError *error)
-+{
-+#ifdef DBUS_ENABLE_LAUNCHD
-+ DBusServer *server;
-+ DBusString address;
-+ int launchd_fd;
-+ launch_data_t sockets_dict, checkin_response;
-+ launch_data_t checkin_request;
-+ launch_data_t listening_fd_array, listening_fd;
-+ const char * launchd_socket_path = _dbus_getenv(launchd_env_var);
-+
-+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
-+
-+ if (launchd_socket_path == NULL || *launchd_socket_path == '\0')
-+ {
-+ dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS,
-+ "launchd's environment variable %s is empty, but should contain a socket path", launchd_env_var);
-+ return NULL;
-+ }
-+
-+ if (!_dbus_string_init (&address))
-+ {
-+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-+ return NULL;
-+ }
-+ if (!_dbus_string_append (&address, "unix:path="))
-+ {
-+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-+ goto l_failed_0;
-+ }
-+ if (!_dbus_string_append (&address, launchd_socket_path))
-+ {
-+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-+ goto l_failed_0;
-+ }
-+
-+ if ((checkin_request = launch_data_new_string (LAUNCH_KEY_CHECKIN)) == NULL)
-+ {
-+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY,
-+ "launch_data_new_string(\"%s\") Unable to create string.\n", LAUNCH_KEY_CHECKIN);
-+ goto l_failed_0;
-+ }
-+
-+ if ((checkin_response = launch_msg (checkin_request)) == NULL)
-+ {
-+ dbus_set_error (error, DBUS_ERROR_IO_ERROR, "launch_msg(\"%s\") IPC failure: %s\n",
-+ LAUNCH_KEY_CHECKIN, strerror (errno));
-+ goto l_failed_0;
-+ }
-+
-+ if (LAUNCH_DATA_ERRNO == launch_data_get_type (checkin_response))
-+ {
-+ dbus_set_error (error, DBUS_ERROR_FAILED, "Check-in failed: %s\n",
-+ strerror (launch_data_get_errno (checkin_response)));
-+ goto l_failed_0;
-+ }
-+
-+ sockets_dict = launch_data_dict_lookup (checkin_response, LAUNCH_JOBKEY_SOCKETS);
-+ if (NULL == sockets_dict)
-+ {
-+ dbus_set_error (error, DBUS_ERROR_IO_ERROR, "No sockets found to answer requests on!\n");
-+ goto l_failed_0;
-+ }
-+
-+ listening_fd_array = launch_data_dict_lookup (sockets_dict, "unix_domain_listener");
-+ if (NULL == listening_fd_array)
-+ {
-+ dbus_set_error (error, DBUS_ERROR_IO_ERROR, "No known sockets found to answer requests on!\n");
-+ goto l_failed_0;
-+ }
-+
-+ if (launch_data_array_get_count (listening_fd_array) != 1)
-+ {
-+ dbus_set_error (error, DBUS_ERROR_LIMITS_EXCEEDED,
-+ "Expected 1 socket from launchd, got %d.\n",
-+ launch_data_array_get_count (listening_fd_array));
-+ goto l_failed_0;
-+ }
-+
-+ listening_fd = launch_data_array_get_index (listening_fd_array, 0);
-+ launchd_fd = launch_data_get_fd (listening_fd);
-+
-+ _dbus_fd_set_close_on_exec (launchd_fd);
-+
-+ if (launchd_fd < 0)
-+ {
-+ _DBUS_ASSERT_ERROR_IS_SET (error);
-+ goto l_failed_0;
-+ }
-+
-+ server = _dbus_server_new_for_socket (&launchd_fd, 1, &address);
-+ if (server == NULL)
-+ {
-+ dbus_set_error (error, DBUS_ERROR_NO_SERVER, "Unable to listen on launchd fd %d.", launchd_fd);
-+ goto l_failed_0;
-+ }
-+
-+ _dbus_string_free (&address);
-+
-+ return server;
-+
-+ l_failed_0:
-+ _dbus_string_free (&address);
-+
-+ return NULL;
-+#else /* DBUS_ENABLE_LAUNCHD */
-+ dbus_set_error(error, DBUS_ERROR_BAD_ADDRESS,
-+ "address type 'launchd' requested, but launchd support not compiled in");
-+ return NULL;
-+#endif
-+}
-+
-+/** @} */
-+
-diff -Nurd dbus/dbus-server-launchd.h dbus-1.2.12-new/dbus/dbus-server-launchd.h
---- dbus/dbus-server-launchd.h 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.12-new/dbus/dbus-server-launchd.h 2009-02-23 08:33:30.000000000 -0500
-@@ -0,0 +1,38 @@
-+/* dbus-server-launchd.h Server methods for interacting with launchd.
-+* Copyright (C) 2008, Benjamin Reed <rangerrick at befunk.com>
-+*
-+* Permission is hereby granted, free of charge, to any person
-+* obtaining a copy of this software and associated documentation
-+* files (the "Software"), to deal in the Software without
-+* restriction, including without limitation the rights to use, copy,
-+* modify, merge, publish, distribute, sublicense, and/or sell copies
-+* of the Software, and to permit persons to whom the Software is
-+* furnished to do so, subject to the following conditions:
-+*
-+* The above copyright notice and this permission notice shall be
-+* included in all copies or substantial portions of the Software.
-+*
-+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+* DEALINGS IN THE SOFTWARE.
-+*/
-+
-+#ifndef DBUS_SERVER_LAUNCHD_H
-+#define DBUS_SERVER_LAUNCHD_H
-+
-+#include <dbus/dbus-internals.h>
-+#include <dbus/dbus-server-protected.h>
-+
-+DBUS_BEGIN_DECLS
-+
-+DBusServer* _dbus_server_new_for_launchd (const char *launchd_env_var,
-+ DBusError *error);
-+
-+DBUS_END_DECLS
-+
-+#endif /* DBUS_SERVER_LAUNCHD_H */
-diff -Nurd dbus/dbus-server-unix.c dbus-1.2.12-new/dbus/dbus-server-unix.c
---- dbus/dbus-server-unix.c 2008-08-07 14:44:36.000000000 -0400
-+++ dbus-1.2.12-new/dbus/dbus-server-unix.c 2009-02-23 08:33:55.000000000 -0500
-@@ -21,9 +21,11 @@
- *
- */
-
-+#include <config.h>
- #include "dbus-internals.h"
- #include "dbus-server-unix.h"
- #include "dbus-server-socket.h"
-+#include "dbus-server-launchd.h"
- #include "dbus-transport-unix.h"
- #include "dbus-connection-internal.h"
- #include "dbus-sysdeps-unix.h"
-@@ -145,6 +147,27 @@
- return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
- }
- }
-+ else if (strcmp (method, "launchd") == 0)
-+ {
-+ const char *launchd_env_var = dbus_address_entry_get_value (entry, "env");
-+ if (launchd_env_var == NULL)
-+ {
-+ _dbus_set_bad_address (error, "launchd", "env", NULL);
-+ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-+ }
-+ *server_p = _dbus_server_new_for_launchd (launchd_env_var, error);
-+
-+ if (*server_p != NULL)
-+ {
-+ _DBUS_ASSERT_ERROR_IS_CLEAR(error);
-+ return DBUS_SERVER_LISTEN_OK;
-+ }
-+ else
-+ {
-+ _DBUS_ASSERT_ERROR_IS_SET(error);
-+ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-+ }
-+ }
- else
- {
- /* If we don't handle the method, we return NULL with the
-diff -Nurd dbus/dbus-sysdeps-unix.c dbus-1.2.12-new/dbus/dbus-sysdeps-unix.c
---- dbus/dbus-sysdeps-unix.c 2009-01-06 17:38:11.000000000 -0500
-+++ dbus-1.2.12-new/dbus/dbus-sysdeps-unix.c 2009-02-23 08:33:55.000000000 -0500
-@@ -1591,8 +1591,10 @@
- gid_t *buf;
- int buf_count;
- int i;
--
-- buf_count = 17;
-+ int initial_buf_count;
-+
-+ initial_buf_count = 17;
-+ buf_count = initial_buf_count;
- buf = dbus_new (gid_t, buf_count);
- if (buf == NULL)
- {
-@@ -1604,7 +1606,29 @@
- info->primary_gid,
- buf, &buf_count) < 0)
- {
-- gid_t *new = dbus_realloc (buf, buf_count * sizeof (buf[0]));
-+ gid_t *new;
-+ /* Presumed cause of negative return code: buf has insufficient
-+ entries to hold the entire group list. The Linux behavior in this
-+ case is to pass back the actual number of groups in buf_count, but
-+ on Mac OS X 10.5, buf_count is unhelpfully left alone.
-+ So as a hack, try to help out a bit by guessing a larger
-+ number of groups, within reason.. might still fail, of course,
-+ but we can at least print a more informative message. I looked up
-+ the "right way" to do this by downloading Apple's own source code
-+ for the "id" command, and it turns out that they use an
-+ undocumented library function getgrouplist_2 (!) which is not
-+ declared in any header in /usr/include (!!). That did not seem
-+ like the way to go here.
-+
-+ I also demoted this problem to a warning as long as errno is 0,
-+ since as far as I could tell from discussion on the web, dbus works
-+ fine even when HAVE_GETGROUPLIST is false and it can only know about
-+ the primary group.
-+ */
-+ if (buf_count == initial_buf_count) {
-+ buf_count *= 16; /* Retry with an arbitrarily scaled-up array */
-+ }
-+ new = dbus_realloc (buf, buf_count * sizeof (buf[0]));
- if (new == NULL)
- {
- dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-@@ -1617,14 +1641,19 @@
- errno = 0;
- if (getgrouplist (username_c, info->primary_gid, buf, &buf_count) < 0)
- {
-- dbus_set_error (error,
-- _dbus_error_from_errno (errno),
-- "Failed to get groups for username \"%s\" primary GID "
-- DBUS_GID_FORMAT ": %s\n",
-- username_c, info->primary_gid,
-- _dbus_strerror (errno));
-- dbus_free (buf);
-- goto failed;
-+ if (errno == 0) {
-+ _dbus_warn("It appears that username \"%s\" is in more than %d groups.\nProceeding with just the first %d groups.",
-+ username_c, buf_count, buf_count);
-+ } else {
-+ dbus_set_error (error,
-+ _dbus_error_from_errno (errno),
-+ "Failed to get groups for username \"%s\" primary GID "
-+ DBUS_GID_FORMAT ": %s\n",
-+ username_c, info->primary_gid,
-+ _dbus_strerror (errno));
-+ dbus_free (buf);
-+ goto failed;
-+ }
- }
- }
-
-@@ -2835,23 +2864,30 @@
- }
-
- /**
-- * Determines the address of the session bus by querying a
-- * platform-specific method.
-+ * Execute a subprocess, returning up to 1024 bytes of output
-+ * into @p result.
- *
-- * If successful, returns #TRUE and appends the address to @p
-- * address. If a failure happens, returns #FALSE and
-+ * If successful, returns #TRUE and appends the output to @p
-+ * result. If a failure happens, returns #FALSE and
- * sets an error in @p error.
- *
-- * @param address a DBusString where the address can be stored
-+ * @note It's not an error if the subprocess terminates normally
-+ * without writing any data to stdout. Verify the @p result length
-+ * before and after this function call to cover this case.
-+ *
-+ * @param progname initial path to exec
-+ * @param argv NULL-terminated list of arguments
-+ * @param result a DBusString where the output can be append
- * @param error a DBusError to store the error in case of failure
- * @returns #TRUE on success, #FALSE if an error happened
- */
--dbus_bool_t
--_dbus_get_autolaunch_address (DBusString *address,
-- DBusError *error)
-+static dbus_bool_t
-+_read_subprocess_line_argv (const char *progpath,
-+ char * const *argv,
-+ DBusString *result,
-+ DBusError *error)
- {
-- static char *argv[6];
-- int address_pipe[2] = { -1, -1 };
-+ int result_pipe[2] = { -1, -1 };
- int errors_pipe[2] = { -1, -1 };
- pid_t pid;
- int ret;
-@@ -2870,48 +2906,26 @@
- return FALSE;
- }
-
-- if (!_dbus_get_local_machine_uuid_encoded (&uuid))
-- {
-- _DBUS_SET_OOM (error);
-- goto out;
-- }
--
-- i = 0;
-- argv[i] = "dbus-launch";
-- ++i;
-- argv[i] = "--autolaunch";
-- ++i;
-- argv[i] = _dbus_string_get_data (&uuid);
-- ++i;
-- argv[i] = "--binary-syntax";
-- ++i;
-- argv[i] = "--close-stderr";
-- ++i;
-- argv[i] = NULL;
-- ++i;
--
-- _dbus_assert (i == _DBUS_N_ELEMENTS (argv));
--
-- orig_len = _dbus_string_get_length (address);
-+ orig_len = _dbus_string_get_length (result);
-
- #define READ_END 0
- #define WRITE_END 1
-- if (pipe (address_pipe) < 0)
-+ if (pipe (result_pipe) < 0)
- {
- dbus_set_error (error, _dbus_error_from_errno (errno),
-- "Failed to create a pipe: %s",
-- _dbus_strerror (errno));
-- _dbus_verbose ("Failed to create a pipe to call dbus-launch: %s\n",
-- _dbus_strerror (errno));
-+ "Failed to create a pipe to call %s: %s",
-+ progpath, _dbus_strerror (errno));
-+ _dbus_verbose ("Failed to create a pipe to call %s: %s\n",
-+ progpath, _dbus_strerror (errno));
- goto out;
- }
- if (pipe (errors_pipe) < 0)
- {
- dbus_set_error (error, _dbus_error_from_errno (errno),
-- "Failed to create a pipe: %s",
-- _dbus_strerror (errno));
-- _dbus_verbose ("Failed to create a pipe to call dbus-launch: %s\n",
-- _dbus_strerror (errno));
-+ "Failed to create a pipe to call %s: %s",
-+ progpath, _dbus_strerror (errno));
-+ _dbus_verbose ("Failed to create a pipe to call %s: %s\n",
-+ progpath, _dbus_strerror (errno));
- goto out;
- }
-
-@@ -2919,10 +2933,10 @@
- if (pid < 0)
- {
- dbus_set_error (error, _dbus_error_from_errno (errno),
-- "Failed to fork(): %s",
-- _dbus_strerror (errno));
-- _dbus_verbose ("Failed to fork() to call dbus-launch: %s\n",
-- _dbus_strerror (errno));
-+ "Failed to fork() to call %s: %s",
-+ progpath, _dbus_strerror (errno));
-+ _dbus_verbose ("Failed to fork() to call %s: %s\n",
-+ progpath, _dbus_strerror (errno));
- goto out;
- }
-
-@@ -2940,7 +2954,7 @@
- _dbus_verbose ("/dev/null fd %d opened\n", fd);
-
- /* set-up stdXXX */
-- close (address_pipe[READ_END]);
-+ close (result_pipe[READ_END]);
- close (errors_pipe[READ_END]);
- close (0); /* close stdin */
- close (1); /* close stdout */
-@@ -2948,7 +2962,7 @@
-
- if (dup2 (fd, 0) == -1)
- _exit (1);
-- if (dup2 (address_pipe[WRITE_END], 1) == -1)
-+ if (dup2 (result_pipe[WRITE_END], 1) == -1)
- _exit (1);
- if (dup2 (errors_pipe[WRITE_END], 2) == -1)
- _exit (1);
-@@ -2963,25 +2977,26 @@
- for (i = 3; i < maxfds; i++)
- close (i);
-
-- execv (DBUS_BINDIR "/dbus-launch", argv);
--
-- /* failed, try searching PATH */
-- execvp ("dbus-launch", argv);
-+ /* If it looks fully-qualified, try execv first */
-+ if (progpath[0] == '/')
-+ execv (progpath, argv);
-+ else
-+ execvp (progpath, argv);
-
- /* still nothing, we failed */
- _exit (1);
- }
-
- /* parent process */
-- close (address_pipe[WRITE_END]);
-+ close (result_pipe[WRITE_END]);
- close (errors_pipe[WRITE_END]);
-- address_pipe[WRITE_END] = -1;
-+ result_pipe[WRITE_END] = -1;
- errors_pipe[WRITE_END] = -1;
-
- ret = 0;
- do
- {
-- ret = _dbus_read (address_pipe[READ_END], address, 1024);
-+ ret = _dbus_read (result_pipe[READ_END], result, 1024);
- }
- while (ret > 0);
-
-@@ -2994,27 +3009,27 @@
-
- /* We succeeded if the process exited with status 0 and
- anything was read */
-- if (!WIFEXITED (status) || WEXITSTATUS (status) != 0 ||
-- _dbus_string_get_length (address) == orig_len)
-+ if (!WIFEXITED (status) || WEXITSTATUS (status) != 0 )
- {
- /* The process ended with error */
- DBusString error_message;
- _dbus_string_init (&error_message);
- ret = 0;
- do
-- {
-- ret = _dbus_read (errors_pipe[READ_END], &error_message, 1024);
-- }
-+ {
-+ ret = _dbus_read (errors_pipe[READ_END], &error_message, 1024);
-+ }
- while (ret > 0);
-
-- _dbus_string_set_length (address, orig_len);
-+ _dbus_string_set_length (result, orig_len);
- if (_dbus_string_get_length (&error_message) > 0)
-- dbus_set_error (error, DBUS_ERROR_SPAWN_EXEC_FAILED,
-- "dbus-launch failed to autolaunch D-Bus session: %s",
-- _dbus_string_get_data (&error_message));
-+ dbus_set_error (error, DBUS_ERROR_SPAWN_EXEC_FAILED,
-+ "%s terminated abnormally with the following error: %s",
-+ progpath, _dbus_string_get_data (&error_message));
- else
-- dbus_set_error (error, DBUS_ERROR_SPAWN_EXEC_FAILED,
-- "Failed to execute dbus-launch to autolaunch D-Bus session");
-+ dbus_set_error (error, DBUS_ERROR_SPAWN_EXEC_FAILED,
-+ "%s terminated abnormally without any error message",
-+ progpath);
- goto out;
- }
-
-@@ -3026,20 +3041,202 @@
- else
- _DBUS_ASSERT_ERROR_IS_SET (error);
-
-- if (address_pipe[0] != -1)
-- close (address_pipe[0]);
-- if (address_pipe[1] != -1)
-- close (address_pipe[1]);
-+ if (result_pipe[0] != -1)
-+ close (result_pipe[0]);
-+ if (result_pipe[1] != -1)
-+ close (result_pipe[1]);
- if (errors_pipe[0] != -1)
- close (errors_pipe[0]);
- if (errors_pipe[1] != -1)
- close (errors_pipe[1]);
-
-+ return retval;
-+}
-+
-+/**
-+ * Returns the address of a new session bus.
-+ *
-+ * If successful, returns #TRUE and appends the address to @p
-+ * address. If a failure happens, returns #FALSE and
-+ * sets an error in @p error.
-+ *
-+ * @param address a DBusString where the address can be stored
-+ * @param error a DBusError to store the error in case of failure
-+ * @returns #TRUE on success, #FALSE if an error happened
-+ */
-+dbus_bool_t
-+_dbus_get_autolaunch_address (DBusString *address,
-+ DBusError *error)
-+{
-+ static char *argv[6];
-+ int i;
-+ DBusString uuid;
-+ dbus_bool_t retval;
-+
-+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
-+ retval = FALSE;
-+
-+ if (!_dbus_string_init (&uuid))
-+ {
-+ _DBUS_SET_OOM (error);
-+ return FALSE;
-+ }
-+
-+ if (!_dbus_get_local_machine_uuid_encoded (&uuid))
-+ {
-+ _DBUS_SET_OOM (error);
-+ goto out;
-+ }
-+
-+ i = 0;
-+ argv[i] = "dbus-launch";
-+ ++i;
-+ argv[i] = "--autolaunch";
-+ ++i;
-+ argv[i] = _dbus_string_get_data (&uuid);
-+ ++i;
-+ argv[i] = "--binary-syntax";
-+ ++i;
-+ argv[i] = "--close-stderr";
-+ ++i;
-+ argv[i] = NULL;
-+ ++i;
-+
-+ _dbus_assert (i == _DBUS_N_ELEMENTS (argv));
-+
-+ retval = _read_subprocess_line_argv (DBUS_BINDIR "/dbus-launch",
-+ argv, address, error);
-+
-+ out:
- _dbus_string_free (&uuid);
- return retval;
- }
-
- /**
-+ * quries launchd for a specific env var which holds the socket path.
-+ * @param launchd_env_var the env var to look up
-+ * @param error a DBusError to store the error in case of failure
-+ * @return the value of the env var
-+ */
-+const char *
-+_dbus_lookup_launchd_socket (const char *launchd_env_var,
-+ DBusError *error)
-+{
-+#ifdef DBUS_ENABLE_LAUNCHD
-+ char *argv[4];
-+ int i;
-+ DBusString socket_path;
-+
-+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
-+
-+ if (!_dbus_string_init (&socket_path))
-+ {
-+ _DBUS_SET_OOM (error);
-+ return FALSE;
-+ }
-+
-+ i = 0;
-+ argv[i] = "launchctl";
-+ ++i;
-+ argv[i] = "getenv";
-+ ++i;
-+ argv[i] = (char*)launchd_env_var;
-+ ++i;
-+ argv[i] = NULL;
-+ ++i;
-+
-+ _dbus_assert (i == _DBUS_N_ELEMENTS (argv));
-+
-+ if (!_read_subprocess_line_argv(argv[0], argv, &socket_path, error))
-+ {
-+ _dbus_string_free(&socket_path);
-+ return NULL;
-+ }
-+
-+ /* no error, but no result either */
-+ if (_dbus_string_get_length(&socket_path) == 0)
-+ {
-+ _dbus_string_free(&socket_path);
-+ return NULL;
-+ }
-+
-+ /* strip the carriage-return */
-+ _dbus_string_shorten(&socket_path, 1);
-+ return _dbus_string_get_const_data(&socket_path);
-+#else /* DBUS_ENABLE_LAUNCHD */
-+ dbus_set_error(error, DBUS_ERROR_NOT_SUPPORTED,
-+ "can't lookup socket from launchd; launchd support not compiled in");
-+ return NULL;
-+#endif
-+}
-+
-+static dbus_bool_t
-+_dbus_lookup_session_address_launchd (DBusString *address,
-+ DBusError *error)
-+{
-+ const char *launchd_socket = _dbus_lookup_launchd_socket ("DBUS_LAUNCHD_SESSION_BUS_SOCKET",
-+ error);
-+ if (dbus_error_is_set(error))
-+ return FALSE;
-+ if (launchd_socket == NULL)
-+ {
-+ dbus_set_error(error, "no socket path",
-+ "launchd did not provide a socket path, "
-+ "verify that org.freedesktop.dbus-session.plist is loaded!");
-+ return FALSE;
-+ }
-+ if (!_dbus_string_append (address, "unix:path="))
-+ {
-+ _DBUS_SET_OOM (error);
-+ return FALSE;
-+ }
-+ if (!_dbus_string_append (address, launchd_socket))
-+ {
-+ _DBUS_SET_OOM (error);
-+ return FALSE;
-+ }
-+
-+ return TRUE;
-+}
-+
-+/**
-+ * Determines the address of the session bus by querying a
-+ * platform-specific method.
-+ *
-+ * The first parameter will be a boolean specifying whether
-+ * or not a dynamic session lookup is supported on this platform.
-+ *
-+ * If supported is TRUE and the return value is #TRUE, the
-+ * address will be appended to @p address.
-+ * If a failure happens, returns #FALSE and sets an error in
-+ * @p error.
-+ *
-+ * If supported is FALSE, ignore the return value.
-+ *
-+ * @param supported returns whether this method is supported
-+ * @param address a DBusString where the address can be stored
-+ * @param error a DBusError to store the error in case of failure
-+ * @returns #TRUE on success, #FALSE if an error happened
-+ */
-+dbus_bool_t
-+_dbus_lookup_session_address (dbus_bool_t *supported,
-+ DBusString *address,
-+ DBusError *error)
-+{
-+#ifdef DBUS_ENABLE_LAUNCHD
-+ *supported = TRUE;
-+ return _dbus_lookup_session_address_launchd (address, error);
-+#else
-+ /* On non-Mac Unix platforms, if the session address isn't already
-+ * set in DBUS_SESSION_BUS_ADDRESS environment variable, we punt and
-+ * fall back to the autolaunch: global default; see
-+ * init_session_address in dbus/dbus-bus.c. */
-+ *supported = FALSE;
-+ return TRUE;
-+#endif
-+}
-+
-+/**
- * Reads the uuid of the machine we're running on from
- * the dbus configuration. Optionally try to create it
- * (only root can do this usually).
-diff -Nurd dbus/dbus-sysdeps-unix.h dbus-1.2.12-new/dbus/dbus-sysdeps-unix.h
---- dbus/dbus-sysdeps-unix.h 2008-12-17 15:58:11.000000000 -0500
-+++ dbus-1.2.12-new/dbus/dbus-sysdeps-unix.h 2009-02-23 08:33:30.000000000 -0500
-@@ -77,6 +77,9 @@
- dbus_bool_t _dbus_send_credentials (int server_fd,
- DBusError *error);
-
-+const char *_dbus_lookup_launchd_socket (const char *launchd_env_var,
-+ DBusError *error);
-+
- /** Information about a UNIX user */
- typedef struct DBusUserInfo DBusUserInfo;
- /** Information about a UNIX group */
-diff -Nurd dbus/dbus-sysdeps.h dbus-1.2.12-new/dbus/dbus-sysdeps.h
---- dbus/dbus-sysdeps.h 2009-01-06 17:52:23.000000000 -0500
-+++ dbus-1.2.12-new/dbus/dbus-sysdeps.h 2009-02-23 08:33:30.000000000 -0500
-@@ -468,6 +468,10 @@
- dbus_bool_t _dbus_get_autolaunch_address (DBusString *address,
- DBusError *error);
-
-+dbus_bool_t _dbus_lookup_session_address (dbus_bool_t *supported,
-+ DBusString *address,
-+ DBusError *error);
-+
- /** Type representing a universally unique ID
- * @todo rename to UUID instead of GUID
- */
-diff -Nurd dbus/dbus-transport-unix.c dbus-1.2.12-new/dbus/dbus-transport-unix.c
---- dbus/dbus-transport-unix.c 2008-08-07 14:44:36.000000000 -0400
-+++ dbus-1.2.12-new/dbus/dbus-transport-unix.c 2009-02-23 08:34:52.000000000 -0500
-@@ -171,6 +171,41 @@
- return DBUS_TRANSPORT_OPEN_OK;
- }
- }
-+ else if (strcmp (method, "launchd") == 0)
-+ {
-+ const char *launchd_env_var = dbus_address_entry_get_value (entry, "env");
-+ DBusError tmp_error = DBUS_ERROR_INIT;
-+ if (launchd_env_var == NULL)
-+ {
-+ _dbus_set_bad_address (error, "launchd", "env", NULL);
-+ return DBUS_TRANSPORT_OPEN_BAD_ADDRESS;
-+ }
-+
-+ const char *launchd_socket = _dbus_lookup_launchd_socket (launchd_env_var, error);
-+ if (launchd_socket)
-+ {
-+ *transport_p = _dbus_transport_new_for_domain_socket (launchd_socket, FALSE,
-+ error);
-+ }
-+ else
-+ {
-+ dbus_set_error(&tmp_error, DBUS_ERROR_BAD_ADDRESS,
-+ "launchd's env var %s does not exist", launchd_env_var);
-+ dbus_error_free(error);
-+ dbus_move_error(&tmp_error, error);
-+ }
-+
-+ if (*transport_p == NULL)
-+ {
-+ _DBUS_ASSERT_ERROR_IS_SET (error);
-+ return DBUS_TRANSPORT_OPEN_DID_NOT_CONNECT;
-+ }
-+ else
-+ {
-+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
-+ return DBUS_TRANSPORT_OPEN_OK;
-+ }
-+ }
- else
- {
- _DBUS_ASSERT_ERROR_IS_CLEAR (error);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091013/80d99af4/attachment-0001.html>
More information about the macports-changes
mailing list