Author: ranger
Date: Sat Sep 5 17:04:51 2009
New Revision: 1601
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1601&repname=user%3a+ranger>
Log:
updated dbus for SL and maybe display fix
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=1601&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/dbus.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/dbus.info Sat Sep 5 17:04:51
2009
@@ -1,6 +1,6 @@
Package: dbus
Version: 1.2.16
-Revision: 3
+Revision: 4
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: 5064449a15e6d7683d744119f98270a1
+PatchFile-MD5: 366a487f5a5a8de91746dc3ffb0137f6
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=1601&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/dbus.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/dbus.patch Sat Sep 5 17:04:51
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 13:45:07.000000000 -0400
++++ dbus-1.2.16-new/README.launchd 2009-09-05 08:56:49.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 13:45:07.000000000 -0400
++++ dbus-1.2.16-new/bus/Makefile.am 2009-09-05 08:56:49.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
13:45:07.000000000 -0400
++++ dbus-1.2.16-new/bus/org.freedesktop.dbus-session.plist.in 2009-09-05
08:56:49.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 13:45:07.000000000
-0400
++++ dbus-1.2.16-new/bus/session.conf.in 2009-09-05 08:56:49.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 13:45:07.000000000 -0400
++++ dbus-1.2.16-new/configure.in 2009-09-05 08:56:49.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 13:45:07.000000000 -0400
++++ dbus-1.2.16-new/dbus/Makefile.am 2009-09-05 08:56:49.000000000 -0400
@@ -70,6 +70,8 @@
dbus-server.c \
dbus-server-debug-pipe.c \
@@ -258,8 +258,8 @@
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 13:45:07.000000000
-0400
-@@ -0,0 +1,209 @@
++++ dbus-1.2.16-new/dbus/dbus-server-launchd.c 2009-09-05 10:57:51.000000000
-0400
+@@ -0,0 +1,186 @@
+/* dbus-server-launchd.c Server methods for interacting with launchd.
+ * Copyright (C) 2007, Tanner Lovelace <lovel...@wayfarer.org>
+ * Copyright (C) 2008, Colin Walters <walt...@verbum.org>
@@ -333,10 +333,9 @@
+ 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, *display;
++ const char *launchd_socket_path;
+
+ launchd_socket_path = _dbus_getenv (launchd_env_var);
-+ display = _dbus_getenv ("DISPLAY");
+
+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
@@ -421,30 +420,8 @@
+ {
+ _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);
+ if (server == NULL)
+ {
@@ -471,7 +448,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 13:45:07.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-server-launchd.h 2009-09-05 08:56:49.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 +487,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 13:45:07.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-server-unix.c 2009-09-05 10:57:51.000000000
-0400
@@ -21,9 +21,11 @@
*
*/
@@ -551,10 +528,206 @@
else
{
/* If we don't handle the method, we return NULL with the
+diff -Nurd dbus-1.2.16/dbus/dbus-spawn.c dbus-1.2.16-new/dbus/dbus-spawn.c
+--- dbus-1.2.16/dbus/dbus-spawn.c 2009-07-14 15:39:47.000000000 -0400
++++ dbus-1.2.16-new/dbus/dbus-spawn.c 2009-09-05 10:57:51.000000000 -0400
+@@ -36,6 +36,11 @@
+ #include <errno.h>
+ #endif
+
++#ifdef DBUS_ENABLE_LAUNCHD
++static int _launchd_allocated = 0; /* environ is, or is not, allocated */
++#include <launch.h>
++#endif
++
+ extern char **environ;
+
+ /**
+@@ -879,6 +884,108 @@
+ exit (0);
+ }
+
++#ifdef DBUS_ENABLE_LAUNCHD
++static char *_launchd_cmalloc(int new_len, char *old, int old_len)
++{
++ char *new = malloc(new_len);
++
++ if (new != 0)
++ {
++ memcpy(new, old, old_len);
++ }
++ return (new);
++}
++
++static int _launchd_namelength(char *name)
++{
++ char *equal;
++
++ equal = strchr(name, '=');
++ return ((equal == 0) ? strlen(name) : (equal - name));
++}
++
++static char **_launchd_findenv(char **envp, char *name, int len)
++{
++ char **env;
++
++ for (env = envp; env && *env; env++)
++ {
++ if (strncmp(name, *env, len) == 0 && (*env)[len] == '=')
++ {
++ return (env);
++ }
++ }
++ return (0);
++}
++
++static int _launchd_addenv(char **envp, char *nameval)
++{
++ char **env;
++ int n_used; /* number of environment entries */
++ int l_used; /* bytes used excl. terminator */
++ int l_need; /* bytes needed incl. terminator */
++
++ for (env = envp; env && *env; env++)
++ {
++ n_used = env - envp;
++ l_used = n_used * sizeof(*env);
++ l_need = l_used + 2 * sizeof(*env);
++
++ env = _launchd_allocated ? (char **) realloc((char *) envp, l_need) :
(char **) _launchd_cmalloc(l_need, (char *) envp, l_used);
++ if (env == 0)
++ {
++ return (-1);
++ }
++ else
++ {
++ _launchd_allocated = 1;
++ envp = env;
++ envp[n_used++] = nameval; /* add new entry */
++ envp[n_used] = 0; /* terminate list */
++ return (0);
++ }
++ }
++ return 0;
++}
++
++static int _launchd_setenv(char **envp, char *name, const char *value)
++{
++ char *destination;
++ char **env;
++ int l_name; /* length of name part */
++ int l_nameval; /* length of name=value */
++
++ /* Permit name= and =value. */
++
++ l_name = _launchd_namelength(name);
++ env = _launchd_findenv(envp, name, l_name);
++ if (env != 0)
++ {
++ return (0);
++ }
++ if (*value == '=')
++ {
++ value++;
++ }
++ l_nameval = l_name + strlen(value) + 1;
++
++ /*
++ * Use available memory if the old value is long enough. Never free an
++ * old name=value entry because it may not be allocated.
++ */
++
++ destination = (env != 0 && strlen(*env) >= l_nameval) ? *env :
malloc(l_nameval + 1);
++ if (destination == 0)
++ {
++ return (-1);
++ }
++ strncpy(destination, name, l_name);
++ destination[l_name] = '=';
++ strcpy(destination + l_name + 1, value);
++ return ((env == 0) ? _launchd_addenv(env, destination) : (*env =
destination, 0));
++}
++#endif
++
+ static void
+ do_exec (int child_err_report_fd,
+ char **argv,
+@@ -890,6 +997,13 @@
+ int i, max_open;
+ #endif
+
++#ifdef DBUS_ENABLE_LAUNCHD
++ const char *display;
++ const char **env;
++ launch_data_t checkin_request, checkin_response;
++ launch_data_t environment_dict, environment_param;
++#endif
++
+ _dbus_verbose_reset ();
+ _dbus_verbose ("Child process has PID " DBUS_PID_FORMAT "\n",
+ _dbus_getpid ());
+@@ -921,6 +1035,48 @@
+ envp = environ;
+ }
+
++#ifdef DBUS_ENABLE_LAUNCHD
++ display = _dbus_getenv ("DISPLAY");
++ if (display == NULL || *display == '\0')
++ {
++ if ((checkin_request = launch_data_new_string (LAUNCH_KEY_CHECKIN)) ==
NULL)
++ {
++ _dbus_warn ("Unable to create checkin string.");
++ goto launchd_display_failed;
++ }
++
++ if ((checkin_response = launch_msg (checkin_request)) == NULL)
++ {
++ _dbus_warn ("launch_msg IPC failure");
++ goto launchd_display_failed;
++ }
++
++ if (LAUNCH_DATA_ERRNO == launch_data_get_type (checkin_response))
++ {
++ _dbus_warn ("launchd check-in failed");
++ goto launchd_display_failed;
++ }
++
++ environment_dict = launch_data_dict_lookup (checkin_response,
LAUNCH_JOBKEY_USERENVIRONMENTVARIABLES);
++ if (NULL == environment_dict)
++ {
++ _dbus_warn ("Unable to retrieve user environment from launchd.");
++ goto launchd_display_failed;
++ }
++
++ environment_param = launch_data_dict_lookup (environment_dict,
"DISPLAY");
++ if (NULL == environment_param)
++ {
++ _dbus_warn ("Unable to retrieve DISPLAY from launchd.");
++ goto launchd_display_failed;
++ }
++
++ display = launch_data_get_string(environment_param);
++ _launchd_setenv(envp, "DISPLAY", display);
++ }
++ launchd_display_failed:
++#endif
++
+ execve (argv[0], argv, envp);
+
+ /* Exec failed */
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 13:45:07.000000000
-0400
-@@ -3168,6 +3168,102 @@
++++ dbus-1.2.16-new/dbus/dbus-sysdeps-unix.c 2009-09-05 11:03:28.000000000
-0400
+@@ -1643,7 +1643,7 @@
+ {
+ if (errno == 0)
+ {
+- _dbus_warn ("It appears that username \"%s\" is in more than
%d groups.\nProceeding with just the first %d groups.",
++ _dbus_warn ("It appears that username \"%s\" is in more than
%d groups.\nProceeding with just the first %d groups.\n",
+ username_c, buf_count, buf_count);
+ }
+ else
+@@ -3168,6 +3168,104 @@
#define DBUS_UNIX_STANDARD_SYSTEM_SERVICEDIR "/dbus-1/system-services"
/**
@@ -591,6 +764,8 @@
+ return FALSE;
+ }
+
++/* _DBUS_ASSERT_ERROR_IS_CLEAR (error); */
++
+ /* no error, but no result either */
+ if (_dbus_string_get_length(socket_path) == 0)
+ {
@@ -611,19 +786,19 @@
+_dbus_lookup_session_address_launchd (DBusString *address, DBusError *error)
+{
+ dbus_bool_t valid_socket;
-+ DBusString *socket_path;
-+
-+ if (!_dbus_string_init (socket_path))
++ 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);
++ valid_socket = _dbus_lookup_launchd_socket (&socket_path,
"DBUS_FINK_SESSION_BUS_SOCKET", error);
+
+ if (dbus_error_is_set(error))
+ {
-+ _dbus_string_free(socket_path);
++ _dbus_string_free(&socket_path);
+ return FALSE;
+ }
+
@@ -631,25 +806,25 @@
+ {
+ 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);
++ "verify that org.finkproject.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);
++ _dbus_string_free(&socket_path);
+ return FALSE;
+ }
-+ if (!_dbus_string_copy (socket_path, 0, address,
++ if (!_dbus_string_copy (&socket_path, 0, address,
+ _dbus_string_get_length (address)))
+ {
+ _DBUS_SET_OOM (error);
-+ _dbus_string_free(socket_path);
++ _dbus_string_free(&socket_path);
+ return FALSE;
+ }
+
-+ _dbus_string_free(socket_path);
++ _dbus_string_free(&socket_path);
+ return TRUE;
+}
+
@@ -657,7 +832,7 @@
* Determines the address of the session bus by querying a
* platform-specific method.
*
-@@ -3191,12 +3287,17 @@
+@@ -3191,12 +3289,17 @@
DBusString *address,
DBusError *error)
{
@@ -677,7 +852,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 13:45:07.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-sysdeps-unix.h 2009-09-05 08:56:49.000000000
-0400
@@ -77,6 +77,10 @@
dbus_bool_t _dbus_send_credentials (int server_fd,
DBusError *error);
@@ -691,7 +866,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 13:45:07.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-transport-unix.c 2009-09-05 10:57:51.000000000
-0400
@@ -171,6 +171,57 @@
return DBUS_TRANSPORT_OPEN_OK;
}
@@ -752,7 +927,7 @@
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
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-29
13:45:07.000000000 -0400
++++ dbus-1.2.16-new/dbus-glib-0.82/tools/Makefile.in 2009-09-05
08:56:49.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
@@ -764,7 +939,7 @@
# 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-29 13:46:05.000000000 -0400
++++ dbus-1.2.16-new/dbus-xinitrc.sh 2009-09-05 08:56:49.000000000 -0400
@@ -0,0 +1,8 @@
+#!/bin/sh
+
@@ -776,7 +951,7 @@
+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-29 13:46:15.000000000
-0400
++++ dbus-1.2.16-new/start-session-bus.sh 2009-09-05 08:56:49.000000000
-0400
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
@@ -787,7 +962,7 @@
+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-29 13:46:24.000000000
-0400
++++ dbus-1.2.16-new/start-system-bus.sh 2009-09-05 08:56:49.000000000
-0400
@@ -0,0 +1,17 @@
+#!/bin/sh
+
@@ -808,7 +983,7 @@
+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
++++ dbus-1.2.16-new/test/name-test/Makefile.am 2009-09-05 08:56:49.000000000
-0400
@@ -16,7 +16,7 @@
## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
@@ -832,7 +1007,7 @@
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
++++ dbus-1.2.16-new/test/name-test/run-test.sh 2009-09-05 08:56:49.000000000
-0400
@@ -50,3 +50,6 @@
echo "running test-shutdown"
@@ -842,7 +1017,7 @@
+${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
++++ dbus-1.2.16-new/test/name-test/test-autolaunch.c 2009-09-05
08:56:49.000000000 -0400
@@ -0,0 +1,31 @@
+#include <stdio.h>
+#include <stdlib.h>
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=1601&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/dbus.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/dbus.info Sat Sep 5 17:04:51
2009
@@ -1,6 +1,6 @@
Package: dbus
Version: 1.2.16
-Revision: 3
+Revision: 4
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: 5064449a15e6d7683d744119f98270a1
+PatchFile-MD5: 366a487f5a5a8de91746dc3ffb0137f6
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=1601&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/dbus.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/dbus.patch Sat Sep 5 17:04:51
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 13:45:07.000000000 -0400
++++ dbus-1.2.16-new/README.launchd 2009-09-05 08:56:49.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 13:45:07.000000000 -0400
++++ dbus-1.2.16-new/bus/Makefile.am 2009-09-05 08:56:49.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
13:45:07.000000000 -0400
++++ dbus-1.2.16-new/bus/org.freedesktop.dbus-session.plist.in 2009-09-05
08:56:49.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 13:45:07.000000000
-0400
++++ dbus-1.2.16-new/bus/session.conf.in 2009-09-05 08:56:49.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 13:45:07.000000000 -0400
++++ dbus-1.2.16-new/configure.in 2009-09-05 08:56:49.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 13:45:07.000000000 -0400
++++ dbus-1.2.16-new/dbus/Makefile.am 2009-09-05 08:56:49.000000000 -0400
@@ -70,6 +70,8 @@
dbus-server.c \
dbus-server-debug-pipe.c \
@@ -258,8 +258,8 @@
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 13:45:07.000000000
-0400
-@@ -0,0 +1,209 @@
++++ dbus-1.2.16-new/dbus/dbus-server-launchd.c 2009-09-05 10:57:51.000000000
-0400
+@@ -0,0 +1,186 @@
+/* dbus-server-launchd.c Server methods for interacting with launchd.
+ * Copyright (C) 2007, Tanner Lovelace <lovel...@wayfarer.org>
+ * Copyright (C) 2008, Colin Walters <walt...@verbum.org>
@@ -333,10 +333,9 @@
+ 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, *display;
++ const char *launchd_socket_path;
+
+ launchd_socket_path = _dbus_getenv (launchd_env_var);
-+ display = _dbus_getenv ("DISPLAY");
+
+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
@@ -421,30 +420,8 @@
+ {
+ _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);
+ if (server == NULL)
+ {
@@ -471,7 +448,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 13:45:07.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-server-launchd.h 2009-09-05 08:56:49.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 +487,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 13:45:07.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-server-unix.c 2009-09-05 10:57:51.000000000
-0400
@@ -21,9 +21,11 @@
*
*/
@@ -551,10 +528,206 @@
else
{
/* If we don't handle the method, we return NULL with the
+diff -Nurd dbus-1.2.16/dbus/dbus-spawn.c dbus-1.2.16-new/dbus/dbus-spawn.c
+--- dbus-1.2.16/dbus/dbus-spawn.c 2009-07-14 15:39:47.000000000 -0400
++++ dbus-1.2.16-new/dbus/dbus-spawn.c 2009-09-05 10:57:51.000000000 -0400
+@@ -36,6 +36,11 @@
+ #include <errno.h>
+ #endif
+
++#ifdef DBUS_ENABLE_LAUNCHD
++static int _launchd_allocated = 0; /* environ is, or is not, allocated */
++#include <launch.h>
++#endif
++
+ extern char **environ;
+
+ /**
+@@ -879,6 +884,108 @@
+ exit (0);
+ }
+
++#ifdef DBUS_ENABLE_LAUNCHD
++static char *_launchd_cmalloc(int new_len, char *old, int old_len)
++{
++ char *new = malloc(new_len);
++
++ if (new != 0)
++ {
++ memcpy(new, old, old_len);
++ }
++ return (new);
++}
++
++static int _launchd_namelength(char *name)
++{
++ char *equal;
++
++ equal = strchr(name, '=');
++ return ((equal == 0) ? strlen(name) : (equal - name));
++}
++
++static char **_launchd_findenv(char **envp, char *name, int len)
++{
++ char **env;
++
++ for (env = envp; env && *env; env++)
++ {
++ if (strncmp(name, *env, len) == 0 && (*env)[len] == '=')
++ {
++ return (env);
++ }
++ }
++ return (0);
++}
++
++static int _launchd_addenv(char **envp, char *nameval)
++{
++ char **env;
++ int n_used; /* number of environment entries */
++ int l_used; /* bytes used excl. terminator */
++ int l_need; /* bytes needed incl. terminator */
++
++ for (env = envp; env && *env; env++)
++ {
++ n_used = env - envp;
++ l_used = n_used * sizeof(*env);
++ l_need = l_used + 2 * sizeof(*env);
++
++ env = _launchd_allocated ? (char **) realloc((char *) envp, l_need) :
(char **) _launchd_cmalloc(l_need, (char *) envp, l_used);
++ if (env == 0)
++ {
++ return (-1);
++ }
++ else
++ {
++ _launchd_allocated = 1;
++ envp = env;
++ envp[n_used++] = nameval; /* add new entry */
++ envp[n_used] = 0; /* terminate list */
++ return (0);
++ }
++ }
++ return 0;
++}
++
++static int _launchd_setenv(char **envp, char *name, const char *value)
++{
++ char *destination;
++ char **env;
++ int l_name; /* length of name part */
++ int l_nameval; /* length of name=value */
++
++ /* Permit name= and =value. */
++
++ l_name = _launchd_namelength(name);
++ env = _launchd_findenv(envp, name, l_name);
++ if (env != 0)
++ {
++ return (0);
++ }
++ if (*value == '=')
++ {
++ value++;
++ }
++ l_nameval = l_name + strlen(value) + 1;
++
++ /*
++ * Use available memory if the old value is long enough. Never free an
++ * old name=value entry because it may not be allocated.
++ */
++
++ destination = (env != 0 && strlen(*env) >= l_nameval) ? *env :
malloc(l_nameval + 1);
++ if (destination == 0)
++ {
++ return (-1);
++ }
++ strncpy(destination, name, l_name);
++ destination[l_name] = '=';
++ strcpy(destination + l_name + 1, value);
++ return ((env == 0) ? _launchd_addenv(env, destination) : (*env =
destination, 0));
++}
++#endif
++
+ static void
+ do_exec (int child_err_report_fd,
+ char **argv,
+@@ -890,6 +997,13 @@
+ int i, max_open;
+ #endif
+
++#ifdef DBUS_ENABLE_LAUNCHD
++ const char *display;
++ const char **env;
++ launch_data_t checkin_request, checkin_response;
++ launch_data_t environment_dict, environment_param;
++#endif
++
+ _dbus_verbose_reset ();
+ _dbus_verbose ("Child process has PID " DBUS_PID_FORMAT "\n",
+ _dbus_getpid ());
+@@ -921,6 +1035,48 @@
+ envp = environ;
+ }
+
++#ifdef DBUS_ENABLE_LAUNCHD
++ display = _dbus_getenv ("DISPLAY");
++ if (display == NULL || *display == '\0')
++ {
++ if ((checkin_request = launch_data_new_string (LAUNCH_KEY_CHECKIN)) ==
NULL)
++ {
++ _dbus_warn ("Unable to create checkin string.");
++ goto launchd_display_failed;
++ }
++
++ if ((checkin_response = launch_msg (checkin_request)) == NULL)
++ {
++ _dbus_warn ("launch_msg IPC failure");
++ goto launchd_display_failed;
++ }
++
++ if (LAUNCH_DATA_ERRNO == launch_data_get_type (checkin_response))
++ {
++ _dbus_warn ("launchd check-in failed");
++ goto launchd_display_failed;
++ }
++
++ environment_dict = launch_data_dict_lookup (checkin_response,
LAUNCH_JOBKEY_USERENVIRONMENTVARIABLES);
++ if (NULL == environment_dict)
++ {
++ _dbus_warn ("Unable to retrieve user environment from launchd.");
++ goto launchd_display_failed;
++ }
++
++ environment_param = launch_data_dict_lookup (environment_dict,
"DISPLAY");
++ if (NULL == environment_param)
++ {
++ _dbus_warn ("Unable to retrieve DISPLAY from launchd.");
++ goto launchd_display_failed;
++ }
++
++ display = launch_data_get_string(environment_param);
++ _launchd_setenv(envp, "DISPLAY", display);
++ }
++ launchd_display_failed:
++#endif
++
+ execve (argv[0], argv, envp);
+
+ /* Exec failed */
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 13:45:07.000000000
-0400
-@@ -3168,6 +3168,102 @@
++++ dbus-1.2.16-new/dbus/dbus-sysdeps-unix.c 2009-09-05 11:03:28.000000000
-0400
+@@ -1643,7 +1643,7 @@
+ {
+ if (errno == 0)
+ {
+- _dbus_warn ("It appears that username \"%s\" is in more than
%d groups.\nProceeding with just the first %d groups.",
++ _dbus_warn ("It appears that username \"%s\" is in more than
%d groups.\nProceeding with just the first %d groups.\n",
+ username_c, buf_count, buf_count);
+ }
+ else
+@@ -3168,6 +3168,104 @@
#define DBUS_UNIX_STANDARD_SYSTEM_SERVICEDIR "/dbus-1/system-services"
/**
@@ -591,6 +764,8 @@
+ return FALSE;
+ }
+
++/* _DBUS_ASSERT_ERROR_IS_CLEAR (error); */
++
+ /* no error, but no result either */
+ if (_dbus_string_get_length(socket_path) == 0)
+ {
@@ -611,19 +786,19 @@
+_dbus_lookup_session_address_launchd (DBusString *address, DBusError *error)
+{
+ dbus_bool_t valid_socket;
-+ DBusString *socket_path;
-+
-+ if (!_dbus_string_init (socket_path))
++ 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);
++ valid_socket = _dbus_lookup_launchd_socket (&socket_path,
"DBUS_FINK_SESSION_BUS_SOCKET", error);
+
+ if (dbus_error_is_set(error))
+ {
-+ _dbus_string_free(socket_path);
++ _dbus_string_free(&socket_path);
+ return FALSE;
+ }
+
@@ -631,25 +806,25 @@
+ {
+ 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);
++ "verify that org.finkproject.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);
++ _dbus_string_free(&socket_path);
+ return FALSE;
+ }
-+ if (!_dbus_string_copy (socket_path, 0, address,
++ if (!_dbus_string_copy (&socket_path, 0, address,
+ _dbus_string_get_length (address)))
+ {
+ _DBUS_SET_OOM (error);
-+ _dbus_string_free(socket_path);
++ _dbus_string_free(&socket_path);
+ return FALSE;
+ }
+
-+ _dbus_string_free(socket_path);
++ _dbus_string_free(&socket_path);
+ return TRUE;
+}
+
@@ -657,7 +832,7 @@
* Determines the address of the session bus by querying a
* platform-specific method.
*
-@@ -3191,12 +3287,17 @@
+@@ -3191,12 +3289,17 @@
DBusString *address,
DBusError *error)
{
@@ -677,7 +852,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 13:45:07.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-sysdeps-unix.h 2009-09-05 08:56:49.000000000
-0400
@@ -77,6 +77,10 @@
dbus_bool_t _dbus_send_credentials (int server_fd,
DBusError *error);
@@ -691,7 +866,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 13:45:07.000000000
-0400
++++ dbus-1.2.16-new/dbus/dbus-transport-unix.c 2009-09-05 10:57:51.000000000
-0400
@@ -171,6 +171,57 @@
return DBUS_TRANSPORT_OPEN_OK;
}
@@ -752,7 +927,7 @@
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
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-29
13:45:07.000000000 -0400
++++ dbus-1.2.16-new/dbus-glib-0.82/tools/Makefile.in 2009-09-05
08:56:49.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
@@ -764,7 +939,7 @@
# 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-29 13:46:05.000000000 -0400
++++ dbus-1.2.16-new/dbus-xinitrc.sh 2009-09-05 08:56:49.000000000 -0400
@@ -0,0 +1,8 @@
+#!/bin/sh
+
@@ -776,7 +951,7 @@
+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-29 13:46:15.000000000
-0400
++++ dbus-1.2.16-new/start-session-bus.sh 2009-09-05 08:56:49.000000000
-0400
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
@@ -787,7 +962,7 @@
+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-29 13:46:24.000000000
-0400
++++ dbus-1.2.16-new/start-system-bus.sh 2009-09-05 08:56:49.000000000
-0400
@@ -0,0 +1,17 @@
+#!/bin/sh
+
@@ -808,7 +983,7 @@
+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
++++ dbus-1.2.16-new/test/name-test/Makefile.am 2009-09-05 08:56:49.000000000
-0400
@@ -16,7 +16,7 @@
## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
@@ -832,7 +1007,7 @@
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
++++ dbus-1.2.16-new/test/name-test/run-test.sh 2009-09-05 08:56:49.000000000
-0400
@@ -50,3 +50,6 @@
echo "running test-shutdown"
@@ -842,7 +1017,7 @@
+${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
++++ dbus-1.2.16-new/test/name-test/test-autolaunch.c 2009-09-05
08:56:49.000000000 -0400
@@ -0,0 +1,31 @@
+#include <stdio.h>
+#include <stdlib.h>
------------------------------------------------------------------------------
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
