Author: ranger
Date: Wed Jul 29 20:02:11 2009
New Revision: 1594
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1594&repname=user%3a+ranger>
Log:
more dbus fixes
Modified:
trunk/experimental/10.4/main/finkinfo/libs/dbus.info
trunk/experimental/10.4/main/finkinfo/libs/dbus.patch
trunk/experimental/common/main/finkinfo/libs/dbus.info
trunk/experimental/common/main/finkinfo/libs/dbus.patch
Modified: trunk/experimental/10.4/main/finkinfo/libs/dbus.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/dbus.info&rev=1594&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/dbus.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/dbus.info Wed Jul 29 20:02:11
2009
@@ -1,6 +1,6 @@
Package: dbus
Version: 1.2.16
-Revision: 2
+Revision: 3
Description: Message bus system for applications
License: OSI-Approved
Maintainer: Benjamin Reed <d...@fink.racoonfink.com>
@@ -40,7 +40,7 @@
autoreconf -fvi
<<
PatchFile: %n.patch
-PatchFile-MD5: 0fb3583aecb232bad59bc28b005ce65e
+PatchFile-MD5: 5064449a15e6d7683d744119f98270a1
SetCFLAGS: -Os -g
ConfigureParams: <<
Modified: trunk/experimental/10.4/main/finkinfo/libs/dbus.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/dbus.patch&rev=1594&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/dbus.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/dbus.patch Wed Jul 29 20:02:11
2009
@@ -1,6 +1,6 @@
diff -Nurd dbus-1.2.16/README.launchd dbus-1.2.16-new/README.launchd
--- dbus-1.2.16/README.launchd 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.16-new/README.launchd 2009-07-29 09:34:23.000000000 -0400
++++ dbus-1.2.16-new/README.launchd 2009-07-29 13:45:07.000000000 -0400
@@ -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
@@ -65,7 +65,7 @@
+but if it's not set, launchd is queried for the session bus socket.
diff -Nurd dbus-1.2.16/bus/Makefile.am dbus-1.2.16-new/bus/Makefile.am
--- dbus-1.2.16/bus/Makefile.am 2009-07-13 12:23:26.000000000 -0400
-+++ dbus-1.2.16-new/bus/Makefile.am 2009-07-29 09:34:23.000000000 -0400
++++ dbus-1.2.16-new/bus/Makefile.am 2009-07-29 13:45:07.000000000 -0400
@@ -9,12 +9,18 @@
CONFIG_IN_FILES= \
@@ -88,7 +88,7 @@
endif
diff -Nurd dbus-1.2.16/bus/org.freedesktop.dbus-session.plist.in
dbus-1.2.16-new/bus/org.freedesktop.dbus-session.plist.in
--- dbus-1.2.16/bus/org.freedesktop.dbus-session.plist.in 1969-12-31
19:00:00.000000000 -0500
-+++ dbus-1.2.16-new/bus/org.freedesktop.dbus-session.plist.in 2009-07-29
09:34:23.000000000 -0400
++++ dbus-1.2.16-new/bus/org.freedesktop.dbus-session.plist.in 2009-07-29
13:45:07.000000000 -0400
@@ -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";>
@@ -123,7 +123,7 @@
+</plist>
diff -Nurd dbus-1.2.16/bus/session.conf.in dbus-1.2.16-new/bus/session.conf.in
--- dbus-1.2.16/bus/session.conf.in 2009-07-14 15:38:33.000000000 -0400
-+++ dbus-1.2.16-new/bus/session.conf.in 2009-07-29 09:34:22.000000000
-0400
++++ dbus-1.2.16-new/bus/session.conf.in 2009-07-29 13:45:07.000000000
-0400
@@ -12,7 +12,7 @@
the behavior of child processes. -->
<keep_umask/>
@@ -135,7 +135,7 @@
diff -Nurd dbus-1.2.16/configure.in dbus-1.2.16-new/configure.in
--- dbus-1.2.16/configure.in 2009-07-14 15:42:51.000000000 -0400
-+++ dbus-1.2.16-new/configure.in 2009-07-29 09:34:23.000000000 -0400
++++ dbus-1.2.16-new/configure.in 2009-07-29 13:45:07.000000000 -0400
@@ -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)
@@ -246,7 +246,7 @@
echo "NOTE: building with unit tests increases the size of the
installed library and renders it insecure."
diff -Nurd dbus-1.2.16/dbus/Makefile.am dbus-1.2.16-new/dbus/Makefile.am
--- dbus-1.2.16/dbus/Makefile.am 2009-07-13 12:23:26.000000000 -0400
-+++ dbus-1.2.16-new/dbus/Makefile.am 2009-07-29 09:34:23.000000000 -0400
++++ dbus-1.2.16-new/dbus/Makefile.am 2009-07-29 13:45:07.000000000 -0400
@@ -70,6 +70,8 @@
dbus-server.c \
dbus-server-debug-pipe.c \
@@ -258,7 +258,7 @@
dbus-server-socket.h \
diff -Nurd dbus-1.2.16/dbus/dbus-server-launchd.c
dbus-1.2.16-new/dbus/dbus-server-launchd.c
--- dbus-1.2.16/dbus/dbus-server-launchd.c 1969-12-31 19:00:00.000000000
-0500
-+++ dbus-1.2.16-new/dbus/dbus-server-launchd.c 2009-07-29 09:34:23.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-server-launchd.c 2009-07-29 13:45:07.000000000
-0400
@@ -0,0 +1,209 @@
+/* dbus-server-launchd.c Server methods for interacting with launchd.
+ * Copyright (C) 2007, Tanner Lovelace <lovel...@wayfarer.org>
@@ -471,7 +471,7 @@
+/** @} */
diff -Nurd dbus-1.2.16/dbus/dbus-server-launchd.h
dbus-1.2.16-new/dbus/dbus-server-launchd.h
--- dbus-1.2.16/dbus/dbus-server-launchd.h 1969-12-31 19:00:00.000000000
-0500
-+++ dbus-1.2.16-new/dbus/dbus-server-launchd.h 2009-07-29 09:34:23.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-server-launchd.h 2009-07-29 13:45:07.000000000
-0400
@@ -0,0 +1,35 @@
+/* dbus-server-launchd.h Server methods for interacting with launchd.
+* Copyright (C) 2008, Benjamin Reed <rangerr...@befunk.com>
@@ -510,7 +510,7 @@
+#endif /* DBUS_SERVER_LAUNCHD_H */
diff -Nurd dbus-1.2.16/dbus/dbus-server-unix.c
dbus-1.2.16-new/dbus/dbus-server-unix.c
--- dbus-1.2.16/dbus/dbus-server-unix.c 2009-07-14 15:39:47.000000000
-0400
-+++ dbus-1.2.16-new/dbus/dbus-server-unix.c 2009-07-29 09:34:23.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-server-unix.c 2009-07-29 13:45:07.000000000
-0400
@@ -21,9 +21,11 @@
*
*/
@@ -553,7 +553,7 @@
/* If we don't handle the method, we return NULL with the
diff -Nurd dbus-1.2.16/dbus/dbus-sysdeps-unix.c
dbus-1.2.16-new/dbus/dbus-sysdeps-unix.c
--- dbus-1.2.16/dbus/dbus-sysdeps-unix.c 2009-07-14 15:42:38.000000000
-0400
-+++ dbus-1.2.16-new/dbus/dbus-sysdeps-unix.c 2009-07-29 09:34:23.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-sysdeps-unix.c 2009-07-29 13:45:07.000000000
-0400
@@ -3168,6 +3168,102 @@
#define DBUS_UNIX_STANDARD_SYSTEM_SERVICEDIR "/dbus-1/system-services"
@@ -677,7 +677,7 @@
/**
diff -Nurd dbus-1.2.16/dbus/dbus-sysdeps-unix.h
dbus-1.2.16-new/dbus/dbus-sysdeps-unix.h
--- dbus-1.2.16/dbus/dbus-sysdeps-unix.h 2009-07-14 15:39:47.000000000
-0400
-+++ dbus-1.2.16-new/dbus/dbus-sysdeps-unix.h 2009-07-29 09:34:23.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-sysdeps-unix.h 2009-07-29 13:45:07.000000000
-0400
@@ -77,6 +77,10 @@
dbus_bool_t _dbus_send_credentials (int server_fd,
DBusError *error);
@@ -691,7 +691,7 @@
/** Information about a UNIX group */
diff -Nurd dbus-1.2.16/dbus/dbus-transport-unix.c
dbus-1.2.16-new/dbus/dbus-transport-unix.c
--- dbus-1.2.16/dbus/dbus-transport-unix.c 2009-07-14 15:39:47.000000000
-0400
-+++ dbus-1.2.16-new/dbus/dbus-transport-unix.c 2009-07-29 09:34:23.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-transport-unix.c 2009-07-29 13:45:07.000000000
-0400
@@ -171,6 +171,57 @@
return DBUS_TRANSPORT_OPEN_OK;
}
@@ -750,78 +750,9 @@
else
{
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-diff -Nurd dbus-1.2.16/test/name-test/Makefile.am
dbus-1.2.16-new/test/name-test/Makefile.am
---- dbus-1.2.16/test/name-test/Makefile.am 2009-07-14 15:38:42.000000000
-0400
-+++ dbus-1.2.16-new/test/name-test/Makefile.am 2009-07-29 09:34:23.000000000
-0400
-@@ -16,7 +16,7 @@
-
- ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
- ## build even when not doing "make check"
--noinst_PROGRAMS=test-names test-pending-call-dispatch
test-pending-call-timeout test-threads-init test-ids test-shutdown
test-privserver test-privserver-client
-+noinst_PROGRAMS=test-names test-pending-call-dispatch
test-pending-call-timeout test-threads-init test-ids test-shutdown
test-privserver test-privserver-client test-autolaunch
-
- test_names_SOURCES= \
- test-names.c
-@@ -69,4 +69,11 @@
- test_privserver_client_LDADD=$(top_builddir)/dbus/libdbus-convenience.la
../libdbus-testutils.la $(DBUS_TEST_LIBS)
- test_privserver_client_ldfla...@r_dynamic_ldflag@
-
-+test_autolaunch_SOURCES = \
-+ test-autolaunch.c
-+
-+test_autolaunch_CFLAGS=
-+test_autolaunch_LDADD=$(top_builddir)/dbus/libdbus-convenience.la
../libdbus-testutils.la $(DBUS_TEST_LIBS)
-+test_autolaunch_ldfla...@r_dynamic_ldflag@
-+
- endif
-diff -Nurd dbus-1.2.16/test/name-test/run-test.sh
dbus-1.2.16-new/test/name-test/run-test.sh
---- dbus-1.2.16/test/name-test/run-test.sh 2009-07-14 15:38:42.000000000
-0400
-+++ dbus-1.2.16-new/test/name-test/run-test.sh 2009-07-29 09:34:23.000000000
-0400
-@@ -50,3 +50,6 @@
-
- echo "running test-shutdown"
- ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG
$DBUS_TOP_BUILDDIR/test/name-test/test-shutdown || die "test-shutdown failed"
-+
-+echo "running test-autolaunch"
-+${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG
$DBUS_TOP_BUILDDIR/test/name-test/test-autolaunch || die "test-autolaunch
failed"
-diff -Nurd dbus-1.2.16/test/name-test/test-autolaunch.c
dbus-1.2.16-new/test/name-test/test-autolaunch.c
---- dbus-1.2.16/test/name-test/test-autolaunch.c 1969-12-31
19:00:00.000000000 -0500
-+++ dbus-1.2.16-new/test/name-test/test-autolaunch.c 2009-07-29
09:34:23.000000000 -0400
-@@ -0,0 +1,31 @@
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include <dbus/dbus.h>
-+#include "dbus/dbus-sysdeps.h"
-+
-+int
-+main (int argc, char *argv[])
-+{
-+ DBusConnection *conn = NULL;
-+ DBusError error;
-+
-+ _dbus_setenv ("DBUS_SESSION_BUS_ADDRESS", NULL);
-+
-+ dbus_error_init (&error);
-+
-+ conn = dbus_bus_get (DBUS_BUS_SESSION, &error);
-+ if (dbus_error_is_set (&error))
-+ {
-+ fprintf (stderr, "*** Failed to autolaunch session bus: %s\n",
-+ error.message);
-+ dbus_error_free (&error);
-+ return 1;
-+ }
-+
-+ return 0;
-+}
diff -Nurd dbus-1.2.16/dbus-glib-0.82/tools/Makefile.in
dbus-1.2.16-new/dbus-glib-0.82/tools/Makefile.in
--- dbus-1.2.16/dbus-glib-0.82/tools/Makefile.in 2009-07-16
13:45:34.000000000 -0400
-+++ dbus-1.2.16-new/dbus-glib-0.82/tools/Makefile.in 2009-07-21
10:42:25.000000000 -0400
++++ dbus-1.2.16-new/dbus-glib-0.82/tools/Makefile.in 2009-07-29
13:45:07.000000000 -0400
@@ -522,7 +522,7 @@
@use_introspect_xml_t...@dbus-bus-introspect.xml: $(INTROSPECT_XML_PATH)
@USE_INTROSPECT_XML_TRUE@ cp $(INTROSPECT_XML_PATH)
dbus-bus-introspect.xml
@@ -833,30 +764,30 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nurd dbus-1.2.16/dbus-xinitrc.sh dbus-1.2.16-new/dbus-xinitrc.sh
--- dbus-1.2.16/dbus-xinitrc.sh 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.16-new/dbus-xinitrc.sh 2009-07-21 10:43:56.000000000 -0400
++++ dbus-1.2.16-new/dbus-xinitrc.sh 2009-07-29 13:46:05.000000000 -0400
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -n "$DISPLAY" ]; then
-+ LDISPLAY=`launchctl getenv DISPLAY`
++ LDISPLAY=`TMPDIR=/tmp launchctl getenv DISPLAY`
+ if [ -z "$LDISPLAY" ]; then
-+ launchctl setenv DISPLAY "$DISPLAY"
++ TMPDIR=/tmp launchctl setenv DISPLAY "$DISPLAY"
+ fi
+fi
diff -Nurd dbus-1.2.16/start-session-bus.sh
dbus-1.2.16-new/start-session-bus.sh
--- dbus-1.2.16/start-session-bus.sh 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.16-new/start-session-bus.sh 2009-07-21 10:41:53.000000000
-0400
++++ dbus-1.2.16-new/start-session-bus.sh 2009-07-29 13:46:15.000000000
-0400
@@ -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"
++if [ `TMPDIR=/tmp launchctl list 2>/dev/null | grep -c
org.finkproject.dbus-session` -eq 0 ]; then
++ TMPDIR=/tmp launchctl load
"@FINKPREFIX@/share/dbus/launchd/org.finkproject.dbus-session.plist"
+fi
+
+exit 0
diff -Nurd dbus-1.2.16/start-system-bus.sh dbus-1.2.16-new/start-system-bus.sh
--- dbus-1.2.16/start-system-bus.sh 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.16-new/start-system-bus.sh 2009-07-21 10:41:53.000000000
-0400
++++ dbus-1.2.16-new/start-system-bus.sh 2009-07-29 13:46:24.000000000
-0400
@@ -0,0 +1,17 @@
+#!/bin/sh
+
@@ -875,3 +806,72 @@
+fi
+
+exit 0
+diff -Nurd dbus-1.2.16/test/name-test/Makefile.am
dbus-1.2.16-new/test/name-test/Makefile.am
+--- dbus-1.2.16/test/name-test/Makefile.am 2009-07-14 15:38:42.000000000
-0400
++++ dbus-1.2.16-new/test/name-test/Makefile.am 2009-07-29 13:45:07.000000000
-0400
+@@ -16,7 +16,7 @@
+
+ ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
+ ## build even when not doing "make check"
+-noinst_PROGRAMS=test-names test-pending-call-dispatch
test-pending-call-timeout test-threads-init test-ids test-shutdown
test-privserver test-privserver-client
++noinst_PROGRAMS=test-names test-pending-call-dispatch
test-pending-call-timeout test-threads-init test-ids test-shutdown
test-privserver test-privserver-client test-autolaunch
+
+ test_names_SOURCES= \
+ test-names.c
+@@ -69,4 +69,11 @@
+ test_privserver_client_LDADD=$(top_builddir)/dbus/libdbus-convenience.la
../libdbus-testutils.la $(DBUS_TEST_LIBS)
+ test_privserver_client_ldfla...@r_dynamic_ldflag@
+
++test_autolaunch_SOURCES = \
++ test-autolaunch.c
++
++test_autolaunch_CFLAGS=
++test_autolaunch_LDADD=$(top_builddir)/dbus/libdbus-convenience.la
../libdbus-testutils.la $(DBUS_TEST_LIBS)
++test_autolaunch_ldfla...@r_dynamic_ldflag@
++
+ endif
+diff -Nurd dbus-1.2.16/test/name-test/run-test.sh
dbus-1.2.16-new/test/name-test/run-test.sh
+--- dbus-1.2.16/test/name-test/run-test.sh 2009-07-14 15:38:42.000000000
-0400
++++ dbus-1.2.16-new/test/name-test/run-test.sh 2009-07-29 13:45:07.000000000
-0400
+@@ -50,3 +50,6 @@
+
+ echo "running test-shutdown"
+ ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG
$DBUS_TOP_BUILDDIR/test/name-test/test-shutdown || die "test-shutdown failed"
++
++echo "running test-autolaunch"
++${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG
$DBUS_TOP_BUILDDIR/test/name-test/test-autolaunch || die "test-autolaunch
failed"
+diff -Nurd dbus-1.2.16/test/name-test/test-autolaunch.c
dbus-1.2.16-new/test/name-test/test-autolaunch.c
+--- dbus-1.2.16/test/name-test/test-autolaunch.c 1969-12-31
19:00:00.000000000 -0500
++++ dbus-1.2.16-new/test/name-test/test-autolaunch.c 2009-07-29
13:45:07.000000000 -0400
+@@ -0,0 +1,31 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
++#include <dbus/dbus.h>
++#include "dbus/dbus-sysdeps.h"
++
++int
++main (int argc, char *argv[])
++{
++ DBusConnection *conn = NULL;
++ DBusError error;
++
++ _dbus_setenv ("DBUS_SESSION_BUS_ADDRESS", NULL);
++
++ dbus_error_init (&error);
++
++ conn = dbus_bus_get (DBUS_BUS_SESSION, &error);
++ if (dbus_error_is_set (&error))
++ {
++ fprintf (stderr, "*** Failed to autolaunch session bus: %s\n",
++ error.message);
++ dbus_error_free (&error);
++ return 1;
++ }
++
++ return 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=1594&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/dbus.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/dbus.info Wed Jul 29 20:02:11
2009
@@ -1,6 +1,6 @@
Package: dbus
Version: 1.2.16
-Revision: 2
+Revision: 3
Description: Message bus system for applications
License: OSI-Approved
# dual license: Academic Free License, GPL2
@@ -37,7 +37,7 @@
Source3ExtractDir: %n-%v
PatchFile: %n.patch
-PatchFile-MD5: 0fb3583aecb232bad59bc28b005ce65e
+PatchFile-MD5: 5064449a15e6d7683d744119f98270a1
PatchScript: <<
/usr/bin/sed -e
's,org.freedesktop.dbus-session,org.finkproject.dbus-session,g' -e
's,@FINKPREFIX@,%p,g' %{PatchFile} | /usr/bin/patch -p1
Modified: trunk/experimental/common/main/finkinfo/libs/dbus.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/dbus.patch&rev=1594&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/dbus.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/dbus.patch Wed Jul 29 20:02:11
2009
@@ -1,6 +1,6 @@
diff -Nurd dbus-1.2.16/README.launchd dbus-1.2.16-new/README.launchd
--- dbus-1.2.16/README.launchd 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.16-new/README.launchd 2009-07-29 09:34:23.000000000 -0400
++++ dbus-1.2.16-new/README.launchd 2009-07-29 13:45:07.000000000 -0400
@@ -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
@@ -65,7 +65,7 @@
+but if it's not set, launchd is queried for the session bus socket.
diff -Nurd dbus-1.2.16/bus/Makefile.am dbus-1.2.16-new/bus/Makefile.am
--- dbus-1.2.16/bus/Makefile.am 2009-07-13 12:23:26.000000000 -0400
-+++ dbus-1.2.16-new/bus/Makefile.am 2009-07-29 09:34:23.000000000 -0400
++++ dbus-1.2.16-new/bus/Makefile.am 2009-07-29 13:45:07.000000000 -0400
@@ -9,12 +9,18 @@
CONFIG_IN_FILES= \
@@ -88,7 +88,7 @@
endif
diff -Nurd dbus-1.2.16/bus/org.freedesktop.dbus-session.plist.in
dbus-1.2.16-new/bus/org.freedesktop.dbus-session.plist.in
--- dbus-1.2.16/bus/org.freedesktop.dbus-session.plist.in 1969-12-31
19:00:00.000000000 -0500
-+++ dbus-1.2.16-new/bus/org.freedesktop.dbus-session.plist.in 2009-07-29
09:34:23.000000000 -0400
++++ dbus-1.2.16-new/bus/org.freedesktop.dbus-session.plist.in 2009-07-29
13:45:07.000000000 -0400
@@ -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";>
@@ -123,7 +123,7 @@
+</plist>
diff -Nurd dbus-1.2.16/bus/session.conf.in dbus-1.2.16-new/bus/session.conf.in
--- dbus-1.2.16/bus/session.conf.in 2009-07-14 15:38:33.000000000 -0400
-+++ dbus-1.2.16-new/bus/session.conf.in 2009-07-29 09:34:22.000000000
-0400
++++ dbus-1.2.16-new/bus/session.conf.in 2009-07-29 13:45:07.000000000
-0400
@@ -12,7 +12,7 @@
the behavior of child processes. -->
<keep_umask/>
@@ -135,7 +135,7 @@
diff -Nurd dbus-1.2.16/configure.in dbus-1.2.16-new/configure.in
--- dbus-1.2.16/configure.in 2009-07-14 15:42:51.000000000 -0400
-+++ dbus-1.2.16-new/configure.in 2009-07-29 09:34:23.000000000 -0400
++++ dbus-1.2.16-new/configure.in 2009-07-29 13:45:07.000000000 -0400
@@ -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)
@@ -246,7 +246,7 @@
echo "NOTE: building with unit tests increases the size of the
installed library and renders it insecure."
diff -Nurd dbus-1.2.16/dbus/Makefile.am dbus-1.2.16-new/dbus/Makefile.am
--- dbus-1.2.16/dbus/Makefile.am 2009-07-13 12:23:26.000000000 -0400
-+++ dbus-1.2.16-new/dbus/Makefile.am 2009-07-29 09:34:23.000000000 -0400
++++ dbus-1.2.16-new/dbus/Makefile.am 2009-07-29 13:45:07.000000000 -0400
@@ -70,6 +70,8 @@
dbus-server.c \
dbus-server-debug-pipe.c \
@@ -258,7 +258,7 @@
dbus-server-socket.h \
diff -Nurd dbus-1.2.16/dbus/dbus-server-launchd.c
dbus-1.2.16-new/dbus/dbus-server-launchd.c
--- dbus-1.2.16/dbus/dbus-server-launchd.c 1969-12-31 19:00:00.000000000
-0500
-+++ dbus-1.2.16-new/dbus/dbus-server-launchd.c 2009-07-29 09:34:23.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-server-launchd.c 2009-07-29 13:45:07.000000000
-0400
@@ -0,0 +1,209 @@
+/* dbus-server-launchd.c Server methods for interacting with launchd.
+ * Copyright (C) 2007, Tanner Lovelace <lovel...@wayfarer.org>
@@ -471,7 +471,7 @@
+/** @} */
diff -Nurd dbus-1.2.16/dbus/dbus-server-launchd.h
dbus-1.2.16-new/dbus/dbus-server-launchd.h
--- dbus-1.2.16/dbus/dbus-server-launchd.h 1969-12-31 19:00:00.000000000
-0500
-+++ dbus-1.2.16-new/dbus/dbus-server-launchd.h 2009-07-29 09:34:23.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-server-launchd.h 2009-07-29 13:45:07.000000000
-0400
@@ -0,0 +1,35 @@
+/* dbus-server-launchd.h Server methods for interacting with launchd.
+* Copyright (C) 2008, Benjamin Reed <rangerr...@befunk.com>
@@ -510,7 +510,7 @@
+#endif /* DBUS_SERVER_LAUNCHD_H */
diff -Nurd dbus-1.2.16/dbus/dbus-server-unix.c
dbus-1.2.16-new/dbus/dbus-server-unix.c
--- dbus-1.2.16/dbus/dbus-server-unix.c 2009-07-14 15:39:47.000000000
-0400
-+++ dbus-1.2.16-new/dbus/dbus-server-unix.c 2009-07-29 09:34:23.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-server-unix.c 2009-07-29 13:45:07.000000000
-0400
@@ -21,9 +21,11 @@
*
*/
@@ -553,7 +553,7 @@
/* If we don't handle the method, we return NULL with the
diff -Nurd dbus-1.2.16/dbus/dbus-sysdeps-unix.c
dbus-1.2.16-new/dbus/dbus-sysdeps-unix.c
--- dbus-1.2.16/dbus/dbus-sysdeps-unix.c 2009-07-14 15:42:38.000000000
-0400
-+++ dbus-1.2.16-new/dbus/dbus-sysdeps-unix.c 2009-07-29 09:34:23.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-sysdeps-unix.c 2009-07-29 13:45:07.000000000
-0400
@@ -3168,6 +3168,102 @@
#define DBUS_UNIX_STANDARD_SYSTEM_SERVICEDIR "/dbus-1/system-services"
@@ -677,7 +677,7 @@
/**
diff -Nurd dbus-1.2.16/dbus/dbus-sysdeps-unix.h
dbus-1.2.16-new/dbus/dbus-sysdeps-unix.h
--- dbus-1.2.16/dbus/dbus-sysdeps-unix.h 2009-07-14 15:39:47.000000000
-0400
-+++ dbus-1.2.16-new/dbus/dbus-sysdeps-unix.h 2009-07-29 09:34:23.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-sysdeps-unix.h 2009-07-29 13:45:07.000000000
-0400
@@ -77,6 +77,10 @@
dbus_bool_t _dbus_send_credentials (int server_fd,
DBusError *error);
@@ -691,7 +691,7 @@
/** Information about a UNIX group */
diff -Nurd dbus-1.2.16/dbus/dbus-transport-unix.c
dbus-1.2.16-new/dbus/dbus-transport-unix.c
--- dbus-1.2.16/dbus/dbus-transport-unix.c 2009-07-14 15:39:47.000000000
-0400
-+++ dbus-1.2.16-new/dbus/dbus-transport-unix.c 2009-07-29 09:34:23.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-transport-unix.c 2009-07-29 13:45:07.000000000
-0400
@@ -171,6 +171,57 @@
return DBUS_TRANSPORT_OPEN_OK;
}
@@ -750,78 +750,9 @@
else
{
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-diff -Nurd dbus-1.2.16/test/name-test/Makefile.am
dbus-1.2.16-new/test/name-test/Makefile.am
---- dbus-1.2.16/test/name-test/Makefile.am 2009-07-14 15:38:42.000000000
-0400
-+++ dbus-1.2.16-new/test/name-test/Makefile.am 2009-07-29 09:34:23.000000000
-0400
-@@ -16,7 +16,7 @@
-
- ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
- ## build even when not doing "make check"
--noinst_PROGRAMS=test-names test-pending-call-dispatch
test-pending-call-timeout test-threads-init test-ids test-shutdown
test-privserver test-privserver-client
-+noinst_PROGRAMS=test-names test-pending-call-dispatch
test-pending-call-timeout test-threads-init test-ids test-shutdown
test-privserver test-privserver-client test-autolaunch
-
- test_names_SOURCES= \
- test-names.c
-@@ -69,4 +69,11 @@
- test_privserver_client_LDADD=$(top_builddir)/dbus/libdbus-convenience.la
../libdbus-testutils.la $(DBUS_TEST_LIBS)
- test_privserver_client_ldfla...@r_dynamic_ldflag@
-
-+test_autolaunch_SOURCES = \
-+ test-autolaunch.c
-+
-+test_autolaunch_CFLAGS=
-+test_autolaunch_LDADD=$(top_builddir)/dbus/libdbus-convenience.la
../libdbus-testutils.la $(DBUS_TEST_LIBS)
-+test_autolaunch_ldfla...@r_dynamic_ldflag@
-+
- endif
-diff -Nurd dbus-1.2.16/test/name-test/run-test.sh
dbus-1.2.16-new/test/name-test/run-test.sh
---- dbus-1.2.16/test/name-test/run-test.sh 2009-07-14 15:38:42.000000000
-0400
-+++ dbus-1.2.16-new/test/name-test/run-test.sh 2009-07-29 09:34:23.000000000
-0400
-@@ -50,3 +50,6 @@
-
- echo "running test-shutdown"
- ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG
$DBUS_TOP_BUILDDIR/test/name-test/test-shutdown || die "test-shutdown failed"
-+
-+echo "running test-autolaunch"
-+${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG
$DBUS_TOP_BUILDDIR/test/name-test/test-autolaunch || die "test-autolaunch
failed"
-diff -Nurd dbus-1.2.16/test/name-test/test-autolaunch.c
dbus-1.2.16-new/test/name-test/test-autolaunch.c
---- dbus-1.2.16/test/name-test/test-autolaunch.c 1969-12-31
19:00:00.000000000 -0500
-+++ dbus-1.2.16-new/test/name-test/test-autolaunch.c 2009-07-29
09:34:23.000000000 -0400
-@@ -0,0 +1,31 @@
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include <dbus/dbus.h>
-+#include "dbus/dbus-sysdeps.h"
-+
-+int
-+main (int argc, char *argv[])
-+{
-+ DBusConnection *conn = NULL;
-+ DBusError error;
-+
-+ _dbus_setenv ("DBUS_SESSION_BUS_ADDRESS", NULL);
-+
-+ dbus_error_init (&error);
-+
-+ conn = dbus_bus_get (DBUS_BUS_SESSION, &error);
-+ if (dbus_error_is_set (&error))
-+ {
-+ fprintf (stderr, "*** Failed to autolaunch session bus: %s\n",
-+ error.message);
-+ dbus_error_free (&error);
-+ return 1;
-+ }
-+
-+ return 0;
-+}
diff -Nurd dbus-1.2.16/dbus-glib-0.82/tools/Makefile.in
dbus-1.2.16-new/dbus-glib-0.82/tools/Makefile.in
--- dbus-1.2.16/dbus-glib-0.82/tools/Makefile.in 2009-07-16
13:45:34.000000000 -0400
-+++ dbus-1.2.16-new/dbus-glib-0.82/tools/Makefile.in 2009-07-21
10:42:25.000000000 -0400
++++ dbus-1.2.16-new/dbus-glib-0.82/tools/Makefile.in 2009-07-29
13:45:07.000000000 -0400
@@ -522,7 +522,7 @@
@use_introspect_xml_t...@dbus-bus-introspect.xml: $(INTROSPECT_XML_PATH)
@USE_INTROSPECT_XML_TRUE@ cp $(INTROSPECT_XML_PATH)
dbus-bus-introspect.xml
@@ -833,30 +764,30 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nurd dbus-1.2.16/dbus-xinitrc.sh dbus-1.2.16-new/dbus-xinitrc.sh
--- dbus-1.2.16/dbus-xinitrc.sh 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.16-new/dbus-xinitrc.sh 2009-07-21 10:43:56.000000000 -0400
++++ dbus-1.2.16-new/dbus-xinitrc.sh 2009-07-29 13:46:05.000000000 -0400
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -n "$DISPLAY" ]; then
-+ LDISPLAY=`launchctl getenv DISPLAY`
++ LDISPLAY=`TMPDIR=/tmp launchctl getenv DISPLAY`
+ if [ -z "$LDISPLAY" ]; then
-+ launchctl setenv DISPLAY "$DISPLAY"
++ TMPDIR=/tmp launchctl setenv DISPLAY "$DISPLAY"
+ fi
+fi
diff -Nurd dbus-1.2.16/start-session-bus.sh
dbus-1.2.16-new/start-session-bus.sh
--- dbus-1.2.16/start-session-bus.sh 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.16-new/start-session-bus.sh 2009-07-21 10:41:53.000000000
-0400
++++ dbus-1.2.16-new/start-session-bus.sh 2009-07-29 13:46:15.000000000
-0400
@@ -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"
++if [ `TMPDIR=/tmp launchctl list 2>/dev/null | grep -c
org.finkproject.dbus-session` -eq 0 ]; then
++ TMPDIR=/tmp launchctl load
"@FINKPREFIX@/share/dbus/launchd/org.finkproject.dbus-session.plist"
+fi
+
+exit 0
diff -Nurd dbus-1.2.16/start-system-bus.sh dbus-1.2.16-new/start-system-bus.sh
--- dbus-1.2.16/start-system-bus.sh 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.16-new/start-system-bus.sh 2009-07-21 10:41:53.000000000
-0400
++++ dbus-1.2.16-new/start-system-bus.sh 2009-07-29 13:46:24.000000000
-0400
@@ -0,0 +1,17 @@
+#!/bin/sh
+
@@ -875,3 +806,72 @@
+fi
+
+exit 0
+diff -Nurd dbus-1.2.16/test/name-test/Makefile.am
dbus-1.2.16-new/test/name-test/Makefile.am
+--- dbus-1.2.16/test/name-test/Makefile.am 2009-07-14 15:38:42.000000000
-0400
++++ dbus-1.2.16-new/test/name-test/Makefile.am 2009-07-29 13:45:07.000000000
-0400
+@@ -16,7 +16,7 @@
+
+ ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
+ ## build even when not doing "make check"
+-noinst_PROGRAMS=test-names test-pending-call-dispatch
test-pending-call-timeout test-threads-init test-ids test-shutdown
test-privserver test-privserver-client
++noinst_PROGRAMS=test-names test-pending-call-dispatch
test-pending-call-timeout test-threads-init test-ids test-shutdown
test-privserver test-privserver-client test-autolaunch
+
+ test_names_SOURCES= \
+ test-names.c
+@@ -69,4 +69,11 @@
+ test_privserver_client_LDADD=$(top_builddir)/dbus/libdbus-convenience.la
../libdbus-testutils.la $(DBUS_TEST_LIBS)
+ test_privserver_client_ldfla...@r_dynamic_ldflag@
+
++test_autolaunch_SOURCES = \
++ test-autolaunch.c
++
++test_autolaunch_CFLAGS=
++test_autolaunch_LDADD=$(top_builddir)/dbus/libdbus-convenience.la
../libdbus-testutils.la $(DBUS_TEST_LIBS)
++test_autolaunch_ldfla...@r_dynamic_ldflag@
++
+ endif
+diff -Nurd dbus-1.2.16/test/name-test/run-test.sh
dbus-1.2.16-new/test/name-test/run-test.sh
+--- dbus-1.2.16/test/name-test/run-test.sh 2009-07-14 15:38:42.000000000
-0400
++++ dbus-1.2.16-new/test/name-test/run-test.sh 2009-07-29 13:45:07.000000000
-0400
+@@ -50,3 +50,6 @@
+
+ echo "running test-shutdown"
+ ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG
$DBUS_TOP_BUILDDIR/test/name-test/test-shutdown || die "test-shutdown failed"
++
++echo "running test-autolaunch"
++${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG
$DBUS_TOP_BUILDDIR/test/name-test/test-autolaunch || die "test-autolaunch
failed"
+diff -Nurd dbus-1.2.16/test/name-test/test-autolaunch.c
dbus-1.2.16-new/test/name-test/test-autolaunch.c
+--- dbus-1.2.16/test/name-test/test-autolaunch.c 1969-12-31
19:00:00.000000000 -0500
++++ dbus-1.2.16-new/test/name-test/test-autolaunch.c 2009-07-29
13:45:07.000000000 -0400
+@@ -0,0 +1,31 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
++#include <dbus/dbus.h>
++#include "dbus/dbus-sysdeps.h"
++
++int
++main (int argc, char *argv[])
++{
++ DBusConnection *conn = NULL;
++ DBusError error;
++
++ _dbus_setenv ("DBUS_SESSION_BUS_ADDRESS", NULL);
++
++ dbus_error_init (&error);
++
++ conn = dbus_bus_get (DBUS_BUS_SESSION, &error);
++ if (dbus_error_is_set (&error))
++ {
++ fprintf (stderr, "*** Failed to autolaunch session bus: %s\n",
++ error.message);
++ dbus_error_free (&error);
++ return 1;
++ }
++
++ return 0;
++}
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
