Author: ranger
Date: Wed Jul 8 00:57:08 2009
New Revision: 1586
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1586&repname=user%3a+ranger>
Log:
dbus
Added:
trunk/experimental/10.4/main/finkinfo/libs/dbus.info
trunk/experimental/10.4/main/finkinfo/libs/dbus.patch
Modified:
trunk/experimental/common/main/finkinfo/libs/dbus.info
trunk/experimental/generate-infofiles.pl
Added: trunk/experimental/10.4/main/finkinfo/libs/dbus.info
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/libs/dbus.info&rev=1586&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/dbus.info (added)
+++ trunk/experimental/10.4/main/finkinfo/libs/dbus.info Wed Jul 8 00:57:08
2009
@@ -1,0 +1,223 @@
+Package: dbus
+Version: 1.2.14
+Revision: 2
+Description: Message bus system for applications
+License: OSI-Approved
+Maintainer: Benjamin Reed <d...@fink.racoonfink.com>
+
+Depends: <<
+ %N-shlibs (>= %v-%r),
+ daemonic,
+ expat1-shlibs
+<<
+BuildDepends: <<
+ autoconf (>= 2.63-1),
+ automake1.10,
+ expat1,
+ fink (>= 0.29.7-1),
+ gettext-tools,
+ glib2-dev (>= 2.18.4-1),
+ gtk-doc (>= 1.8-1),
+ libgettext3-dev,
+ libiconv-dev,
+ libtool2,
+ passwd (>= 20060201-1),
+ pkgconfig (>= 0.22-1)
+<<
+
+Source: http://%n.freedesktop.org/releases/%n/%n-%v.tar.gz
+Source-MD5: 2c267ccd45d0b18db8c9edacad63ec98
+Source2: http://%n.freedesktop.org/releases/%n-0.62.tar.gz
+Source2-MD5: ba7692f63d0e9f1ef06703dff56cb650
+Source2ExtractDir: %n-%v
+Source3: http://%n.freedesktop.org/releases/%n-glib/%n-glib-0.80.tar.gz
+Source3-MD5: 86ea60ba2118a1b9deafe8257f6a6a1a
+Source3ExtractDir: %n-%v
+PatchScript: <<
+ /usr/bin/sed -e
's,DBUS_LAUNCHD_SESSION_BUS_SOCKET,DBUS_FINK_SESSION_BUS_SOCKET,g' -e
's,org.freedesktop.dbus-session,org.finkproject.dbus-session,g' -e
's,@FINKPREFIX@,%p,g' %{PatchFile} | /usr/bin/patch -p1
+ perl -pi -e
's,DBUS_LAUNCHD_SESSION_BUS_SOCKET,DBUS_FINK_SESSION_BUS_SOCKET,g;
s,org.freedesktop.dbus-session,org.finkproject.dbus-session,g' dbus/*.c dbus/*.h
+ autoreconf -fvi
+<<
+PatchFile: %n.patch
+PatchFile-MD5: 0289367faf03ac4a4b40f69f35e09a84
+
+SetCFLAGS: -Os -g
+ConfigureParams: <<
+ --mandir=%p/share/man \
+ --libexecdir=%p/sbin \
+ --disable-static \
+ --with-dbus-user=messagebus \
+ --with-dbus-daemondir=%p/bin \
+ --enable-console-owner-file \
+ --disable-asserts \
+ --disable-tests \
+ --enable-checks \
+ --enable-kqueue \
+ --enable-launchd \
+ --with-launchd-agent-dir=%p/share/dbus/launchd \
+ --disable-userdb-cache \
+ --disable-ansi \
+ --with-xml=expat \
+ --disable-xml-docs \
+ --disable-doxygen-docs \
+ --disable-dependency-tracking \
+ --without-x \
+ ac_cv_func_poll=no
+<<
+CompileScript: <<
+#!/bin/sh -ev
+
+ MBID=`id -u messagebus 2>/dev/null || echo 0`
+ if [ $MBID -eq 0 ]; then
+ echo "You must install the 'passwd' package for D-Bus to build
properly."
+ exit 1
+ fi
+
+ # D-Bus 0.62 for backwards-compatibility
+ pushd dbus-0.62
+ ./configure %c
+ pushd dbus
+ make
+ popd
+ popd
+
+ # D-Bus %v
+ ./configure %c
+ make
+ # temporary, for the glib bindings
+ make -j1 install DESTDIR="%b/tmproot"
+
+ # D-Bus GLib bindings
+ pushd dbus-glib*
+ PKG_CONFIG_PATH="%b/tmproot%p/lib/pkgconfig" ./configure %c
--enable-gtk-doc
+ DYLD_LIBRARY_PATH="%b/tmproot%p/lib:$DYLD_LIBRARY_PATH" make
DBUS_CFLAGS="-I%b/tmproot%p/include/dbus-1.0
-I%b/tmproot%p/lib/dbus-1.0/include" DBUS_LIBS="%b/dbus/libdbus-1.la"
+ popd
+<<
+
+InstallScript: <<
+#!/bin/sh -ev
+
+ # D-Bus 0.62
+ pushd dbus-0.62/dbus
+ make -j1 install DESTDIR="%d"
+ popd
+
+ # D-Bus %v
+ make -j1 install DESTDIR="%d"
+
+ # D-Bus GLib bindings
+ pushd dbus-glib*
+ make -j1 install DESTDIR="%d"
+ popd
+
+ perl -pi -e 's,%b/tmproot,,' %i/lib/*.la
+
+ install -d -m 755 "%i/var/lib/dbus" "%i/var/run/dbus" "%i/share/dbus-1"
"%i/etc/dbus-1"
+
+ # the rest
+ install -c -m 755 start-*-bus.sh %i/bin/
+
+ install -d -m 755 %i/etc/profile.d
+ echo "%p/bin/start-session-bus.sh" > %i/etc/profile.d/%N.sh
+ echo "%p/bin/start-session-bus.sh" > %i/etc/profile.d/%N.csh
+ chmod 755 %i/etc/profile.d/*
+
+ install -d -m 755 %i/share/%N
+ mv %i/bin/dbus-uuidgen %i/share/%N
+<<
+DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README*
+RuntimeVars: DBUS_SESSION_BUS_ADDRESS: launchd:env=DBUS_FINK_SESSION_BUS_SOCKET
+SplitOff: <<
+ Package: %N-shlibs
+ Depends: <<
+ glib2-shlibs (>= 2.18.4-1),
+ libgettext3-shlibs,
+ libiconv,
+ passwd (>= 20060201-1)
+ <<
+ DocFiles: COPYING
+ Files: <<
+ lib/libdbus-1.*.dylib
+ lib/libdbus-glib-1.*.dylib
+ share/%N/dbus-uuidgen
+ <<
+ Shlibs: <<
+ %p/lib/libdbus-1.2.dylib 3.0.0 %n (>= 0.60-1)
+ %p/lib/libdbus-1.3.dylib 8.0.0 %n (>= 1.2.1-1)
+ %p/lib/libdbus-glib-1.2.dylib 4.0.0 %n (>= 0.74-1)
+ <<
+ PostInstScript: <<
+if [ "$1" = "configure" ]; then
+ %p/share/%N/dbus-uuidgen --ensure >>/tmp/%N-postinst.log 2>&1 || :
+fi
+ <<
+<<
+SplitOff2: <<
+ Package: %N-dev
+ Depends: <<
+ %N-shlibs (= %v-%r),
+ pkgconfig (>= 0.22-1)
+ <<
+ Replaces: %N (<< %v-%r)
+ BuildDependsOnly: true
+ DocFiles: COPYING
+ Files: <<
+ bin/dbus-binding-tool
+ include
+ lib
+ share/gtk-doc
+ <<
+<<
+
+PreInstScript: <<
+echo "*** WARNING ***"
+echo ""
+echo "D-Bus starts a system and session bus on your system by default,"
+echo "or a lot of stuff would break. If you don't want it to do that,"
+echo "touch the file '%p/etc/dbus-1/disable-dbus'. Be warned that many"
+echo "Gnome (and other) packages will fail without D-Bus."
+echo ""
+echo "If you want to disable the system bus, you can run:"
+echo " %p/bin/daemonic disable %N"
+echo ""
+read -t 10 FOO || :
+exit 0
+<<
+PostInstScript: <<
+ if [ "$1" = "configure" ]; then
+ if [ -x "%p/bin/daemonic" ]; then
+ %p/bin/daemonic install %N >/dev/null 2>&1 || :
+ %p/bin/daemonic enable %N >/dev/null 2>&1 || :
+ fi
+ fi
+ chown -R messagebus:messagebus "%p/var/lib/dbus" "%p/var/run/dbus"
"%p/share/dbus" "%p/share/dbus-1" "%p/etc/dbus-1"
+ chown root:wheel
%p/share/dbus/launchd/org.finkproject.dbus-session.plist
+ chmod 644
%p/share/dbus/launchd/org.finkproject.dbus-session.plist
+ %p/bin/start-system-bus.sh >/tmp/dbus-postinst.log 2>&1 || :
+<<
+PostRmScript: <<
+ if [ "$1" = "remove" ]; then
+ if [ ! -x "%p/bin/daemonic" ]; then
+ %p/bin/daemonic disable %N >/dev/null 2>&1 || :
+ %p/bin/daemonic remove %N >/dev/null 2>&1 || :
+ fi
+ fi
+<<
+DaemonicFile: <<
+ <service>
+ <description>D-Bus System Bus</description>
+ <message>D-Bus System Bus</message>
+ <daemon name="%N">
+ <executable
background="no">%p/bin/start-system-bus.sh</executable>
+ </daemon>
+ </service>
+<<
+
+Homepage: http://dbus.freedesktop.org/
+DescDetail: <<
+By default, D-Bus will enable the session bus whenever you create a
+fink-enabled shell (ie, use %p/bin/init.sh). You can disable this
+by touching the file %p/etc/dbus-1/disable-dbus -- the D-Bus
+startup scripts will then do nothing.
+<<
+
Added: trunk/experimental/10.4/main/finkinfo/libs/dbus.patch
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/libs/dbus.patch&rev=1586&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/dbus.patch (added)
+++ trunk/experimental/10.4/main/finkinfo/libs/dbus.patch Wed Jul 8 00:57:08
2009
@@ -1,0 +1,1215 @@
+diff -Nurd dbus-1.2.12/README.launchd dbus-1.2.12-new/README.launchd
+--- dbus-1.2.12/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 dbus-1.2.12/bus/Makefile.am dbus-1.2.12-new/bus/Makefile.am
+--- dbus-1.2.12/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 dbus-1.2.12/bus/org.freedesktop.dbus-session.plist.in
dbus-1.2.12-new/bus/org.freedesktop.dbus-session.plist.in
+--- dbus-1.2.12/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 dbus-1.2.12/bus/session.conf.in dbus-1.2.12-new/bus/session.conf.in
+--- dbus-1.2.12/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:tmpd...@dbus_session_socket_dir@</listen>
++ <listen>@DBUS_SESSION_BUS_DEFAULT_ADDRESS@</listen>
+
+ <standard_session_servicedirs />
+
+diff -Nurd dbus-1.2.12/configure.in dbus-1.2.12-new/configure.in
+--- dbus-1.2.12/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-1.2.12/dbus/Makefile.am dbus-1.2.12-new/dbus/Makefile.am
+--- dbus-1.2.12/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-1.2.12/dbus/dbus-bus.c dbus-1.2.12-new/dbus/dbus-bus.c
+--- dbus-1.2.12/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-1.2.12/dbus/dbus-server-launchd.c
dbus-1.2.12-new/dbus/dbus-server-launchd.c
+--- dbus-1.2.12/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 <lovel...@wayfarer.org>
++ * Copyright (C) 2008, Benjamin Reed <rangerr...@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 == '\0')
++ {
++ dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS,
++ "launchd's environment variable %s is empty, but should
contain a socket path");
++ 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-1.2.12/dbus/dbus-server-launchd.h
dbus-1.2.12-new/dbus/dbus-server-launchd.h
+--- dbus-1.2.12/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 <rangerr...@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-1.2.12/dbus/dbus-server-unix.c
dbus-1.2.12-new/dbus/dbus-server-unix.c
+--- dbus-1.2.12/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-1.2.12/dbus/dbus-sysdeps-unix.c
dbus-1.2.12-new/dbus/dbus-sysdeps-unix.c
+--- dbus-1.2.12/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-1.2.12/dbus/dbus-sysdeps-unix.h
dbus-1.2.12-new/dbus/dbus-sysdeps-unix.h
+--- dbus-1.2.12/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-1.2.12/dbus/dbus-sysdeps.h dbus-1.2.12-new/dbus/dbus-sysdeps.h
+--- dbus-1.2.12/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-1.2.12/dbus/dbus-transport-unix.c
dbus-1.2.12-new/dbus/dbus-transport-unix.c
+--- dbus-1.2.12/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);
+diff -Nurd dbus-1.2.12/dbus-glib-0.80/tools/Makefile.in
dbus-1.2.12-new/dbus-glib-0.80/tools/Makefile.in
+--- dbus-1.2.12/dbus-glib-0.80/tools/Makefile.in 2009-02-02
15:41:24.000000000 -0500
++++ dbus-1.2.12-new/dbus-glib-0.80/tools/Makefile.in 2009-02-23
08:33:30.000000000 -0500
+@@ -486,7 +486,7 @@
+ @use_introspect_xml_t...@dbus-bus-introspect.xml: $(INTROSPECT_XML_PATH)
+ @USE_INTROSPECT_XML_TRUE@ cp $(INTROSPECT_XML_PATH)
dbus-bus-introspect.xml
+ @use_introspect_xml_fa...@dbus-bus-introspect.xml:
+...@use_introspect_xml_false@ DBUS_TOP_BUILDDIR=$(top_builddir)
@dbus_daemon...@dbus-daemon --introspect > dbus-bus-introspect.xml.tmp && mv
dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
+...@use_introspect_xml_false@ DBUS_TOP_BUILDDIR=$(top_builddir)
../../bus/dbus-daemon --introspect > dbus-bus-introspect.xml.tmp && mv
dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -Nurd dbus-1.2.12/start-session-bus.sh
dbus-1.2.12-new/start-session-bus.sh
+--- dbus-1.2.12/start-session-bus.sh 1969-12-31 19:00:00.000000000 -0500
++++ dbus-1.2.12-new/start-session-bus.sh 2009-02-23 08:33:30.000000000
-0500
+@@ -0,0 +1,7 @@
++#!/bin/sh -e
++
++if [ `launchctl list 2>/dev/null | grep -c org.finkproject.dbus-session` -eq
0 ]; then
++ launchctl load
"@FINKPREFIX@/share/dbus/launchd/org.finkproject.dbus-session.plist"
++fi
++
++exit 0
+diff -Nurd dbus-1.2.12/start-system-bus.sh dbus-1.2.12-new/start-system-bus.sh
+--- dbus-1.2.12/start-system-bus.sh 1969-12-31 19:00:00.000000000 -0500
++++ dbus-1.2.12-new/start-system-bus.sh 2009-02-23 08:33:30.000000000
-0500
+@@ -0,0 +1,17 @@
++#!/bin/sh
++
++if [ -f "@FINKPREFIX@/etc/dbus-1/disable-dbus" ]; then
++ exit 0
++fi
++
++if [ -f "@FINKPREFIX@/var/run/dbus/pid" ]; then
++ PID=`cat "@FINKPREFIX@/var/run/dbus/pid"`
++ if [ `/bin/ps -p "${PID}" 2>/dev/null | grep -c "^ *${PID} "` -eq 0 ];
then
++ rm -f "@FINKPREFIX@/var/run/dbus/pid"
++ exec "@FINKPREFIX@/bin/dbus-daemon" --system
++ fi
++else
++ exec "@FINKPREFIX@/bin/dbus-daemon" --system
++fi
++
++exit 0
Modified: trunk/experimental/common/main/finkinfo/libs/dbus.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/dbus.info&rev=1586&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/dbus.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/dbus.info Wed Jul 8 00:57:08
2009
@@ -1,6 +1,6 @@
Package: dbus
Version: 1.2.14
-Revision: 1
+Revision: 2
Description: Message bus system for applications
License: OSI-Approved
# dual license: Academic Free License, GPL2
@@ -163,6 +163,7 @@
bin/dbus-binding-tool
include
lib
+ share/gtk-doc
<<
DocFiles: COPYING
<<
Modified: trunk/experimental/generate-infofiles.pl
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/generate-infofiles.pl&rev=1586&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/generate-infofiles.pl (original)
+++ trunk/experimental/generate-infofiles.pl Wed Jul 8 00:57:08 2009
@@ -34,6 +34,7 @@
'blitz',
'boson',
'clucene',
+ 'dbus',
'digikam',
'doxygen1.3',
'dpkg',
@@ -123,7 +124,7 @@
'all' => {
'^akonadi-.*?(-dev|-shlibs)?$' => [ '1.1.95', '1'
],
'^arts(-dev|-shlibs)?$' => [ '1.5.10', '1'
],
- '^autoconf$' => [ '2.60', '1'
],
+ '^autoconf$' => [ '2.63', '1'
],
'^automoc-.*$' => [ '0.9.89', '0'
],
'^blitz-(mac|x11)(-dev|-shlibs)?$' => [ '0.0.4', '3'
],
'^cairo(-dev|-shlibs)?$' => [ '1.8.6', '1'
],
@@ -133,8 +134,8 @@
'^fink$' => [ '0.29.7', '1'
],
'^freetype219(-shlibs)?$' => [ '2.3.7', '7'
],
'^glew(-shlibs)?$' => [ '1.5.1', '1'
],
- '^glib2(-dev|-shlibs)?$' => [ '2.14.0', '1'
],
- '^gtk.2(-dev|-shlibs)?$' => [ '2.14.3', '1'
],
+ '^glib2(-dev|-shlibs)?$' => [ '2.18.4', '1'
],
+ '^gtk.2(-dev|-shlibs)?$' => [ '2.14.7', '1'
],
'^gtk-doc$' => [ '1.8', '1'
],
'^gtk-sharp(2|-monodoc)$' => [ '2.12.8', '2'
],
'^kde4-buildenv$' => [ '4.2.4', '2'
],
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
