Hello community,

here is the log from the commit of package dbus-1 for openSUSE:Factory checked 
in at 2014-05-06 13:39:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old)
 and      /work/SRC/openSUSE:Factory/.dbus-1.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dbus-1"

Changes:
--------
--- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes        2014-01-23 
15:41:18.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1-x11.changes   2014-05-06 
13:39:29.000000000 +0200
@@ -1,0 +2,20 @@
+Sat May  3 17:21:00 UTC 2014 - [email protected]
+
+- Update to 1.8.2:
+  + Enhancements:
+    - in the CMake build system, add some hints for Linux users
+      cross-compiling Windows D-Bus binaries to be able to run
+      tests under Wine (fdo#41252)
+    - add Documentation key to dbus.service (fdo#77447)
+  + Fixes:
+    - in "dbus-uuidgen --ensure", try to copy systemd's
+      /etc/machine-id to /var/lib/dbus/machine-id instead
+      of generating an entirely new ID (fdo#77941)
+    - if dbus-launch receives an X error very quickly, do not kill
+      unrelated processes (fdo#74698)
+    - on Windows, allow up to 8K connections to the dbus-daemon,
+      instead of the previous 64 (fdo#71297)
+    - cope with \r\n newlines in regression tests, since on
+      Windows, dbus-daemon.exe uses text mode (fdo#75863)
+  
+-------------------------------------------------------------------
dbus-1.changes: same change

Old:
----
  dbus-1.8.0.tar.gz

New:
----
  dbus-1.8.2.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dbus-1-x11.spec ++++++
--- /var/tmp/diff_new_pack.AGRlAu/_old  2014-05-06 13:39:30.000000000 +0200
+++ /var/tmp/diff_new_pack.AGRlAu/_new  2014-05-06 13:39:30.000000000 +0200
@@ -46,7 +46,7 @@
 BuildRequires:  libexpat-devel
 BuildRequires:  libtool
 BuildRequires:  pkg-config
-Version:        1.8.0
+Version:        1.8.2
 Release:        0
 #
 Source0:        
http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz

dbus-1.spec: same change
++++++ dbus-1.8.0.tar.gz -> dbus-1.8.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/NEWS new/dbus-1.8.2/NEWS
--- old/dbus-1.8.0/NEWS 2014-01-20 15:25:29.000000000 +0100
+++ new/dbus-1.8.2/NEWS 2014-04-30 20:49:38.000000000 +0200
@@ -1,3 +1,31 @@
+D-Bus 1.8.2 (2014-04-30)
+==
+
+The “nobody wants red” release.
+
+Enhancements:
+
+• in the CMake build system, add some hints for Linux users cross-compiling
+  Windows D-Bus binaries to be able to run tests under Wine
+  (fd.o #41252, Ralf Habacker)
+
+• add Documentation key to dbus.service (fd.o #77447, Cameron Norman)
+
+Fixes:
+
+• in "dbus-uuidgen --ensure", try to copy systemd's /etc/machine-id
+  to /var/lib/dbus/machine-id instead of generating an entirely new ID
+  (fd.o #77941, Simon McVittie)
+
+• if dbus-launch receives an X error very quickly, do not kill
+  unrelated processes (fd.o #74698, Роман Донченко)
+
+• on Windows, allow up to 8K connections to the dbus-daemon, instead of the
+  previous 64 (fd.o #71297; Cristian Onet, Ralf Habacker)
+
+• cope with \r\n newlines in regression tests, since on Windows,
+  dbus-daemon.exe uses text mode (fd.o #75863, Руслан Ижбулатов)
+
 D-Bus 1.8.0 (2014-01-20)
 ==
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/aclocal.m4 new/dbus-1.8.2/aclocal.m4
--- old/dbus-1.8.0/aclocal.m4   2014-01-20 15:10:25.000000000 +0100
+++ new/dbus-1.8.2/aclocal.m4   2014-04-30 21:14:37.000000000 +0200
@@ -573,7 +573,8 @@
 END
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi
-fi])
+fi
+])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/bus/dbus.service.in 
new/dbus-1.8.2/bus/dbus.service.in
--- old/dbus-1.8.0/bus/dbus.service.in  2013-10-08 19:40:39.000000000 +0200
+++ new/dbus-1.8.2/bus/dbus.service.in  2014-04-28 16:41:32.000000000 +0200
@@ -1,5 +1,6 @@
 [Unit]
 Description=D-Bus System Message Bus
+Documentation=man:dbus-daemon(1)
 Requires=dbus.socket
 
 [Service]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/cmake/CMakeLists.txt 
new/dbus-1.8.2/cmake/CMakeLists.txt
--- old/dbus-1.8.0/cmake/CMakeLists.txt 2014-01-17 18:15:36.000000000 +0100
+++ new/dbus-1.8.2/cmake/CMakeLists.txt 2014-03-03 16:41:30.000000000 +0100
@@ -107,6 +107,10 @@
 
 option (DBUS_ENABLE_STATS "enable bus daemon usage statistics" OFF)
 
+if(WIN32)
+    set(FD_SETSIZE "8192" CACHE STRING "The maximum number of connections that 
can be handled at once")
+endif()
+
 find_package(EXPAT)
 find_package(X11)
 find_package(GLib2)
@@ -597,6 +601,11 @@
 if (DBUS_DISABLE_CHECKS)
     message("NOTE: building without checks for arguments passed to public API 
makes it harder to debug apps using D-BUS, but will slightly decrease D-BUS 
library size and _very_ slightly improve performance.")
 endif(DBUS_DISABLE_CHECKS)
+
+foreach(_note ${FOOTNOTES})
+    message(${_note})
+endforeach()
+
 MESSAGE(" ")
 
 INCLUDE(modules/CPackInstallConfig.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/cmake/config.h.cmake 
new/dbus-1.8.2/cmake/config.h.cmake
--- old/dbus-1.8.0/cmake/config.h.cmake 2014-01-14 11:57:36.000000000 +0100
+++ new/dbus-1.8.2/cmake/config.h.cmake 2014-03-03 16:41:30.000000000 +0100
@@ -196,6 +196,8 @@
 /* Define to 1 if you have struct cmsgred */
 #cmakedefine    HAVE_CMSGCRED 1
 
+#cmakedefine FD_SETSIZE @FD_SETSIZE@
+
 // system type defines
 #if defined(_WIN32) || defined(_WIN64) || defined (_WIN32_WCE)
 # define DBUS_WIN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/cmake/modules/Macros.cmake 
new/dbus-1.8.2/cmake/modules/Macros.cmake
--- old/dbus-1.8.0/cmake/modules/Macros.cmake   2014-01-14 11:57:36.000000000 
+0100
+++ new/dbus-1.8.2/cmake/modules/Macros.cmake   2014-03-03 16:41:30.000000000 
+0100
@@ -1,3 +1,29 @@
+if(DBUS_BUILD_TESTS AND CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_NAME STREQUAL 
"Windows")
+    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+        find_file(WINE_EXECUTABLE
+            NAMES wine
+            PATHS /usr/bin /usr/local/bin
+            NO_CMAKE_FIND_ROOT_PATH
+        )
+        find_file(HAVE_BINFMT_WINE_SUPPORT
+            NAMES DOSWin wine Wine windows Windows
+            PATHS /proc/sys/fs/binfmt_misc
+            NO_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH
+        )
+        if(WINE_EXECUTABLE AND HAVE_BINFMT_WINE_SUPPORT)
+            list(APPEND FOOTNOTES "NOTE: The requirements to run cross 
compiled applications on your host system are achieved. You may run 'make 
check'.")
+        endif()
+        if(NOT WINE_EXECUTABLE)
+            list(APPEND FOOTNOTES "NOTE: You may install the Windows emulator 
'wine' to be able to run cross compiled test applications.")
+        endif()
+        if(NOT HAVE_BINFMT_WINE_SUPPORT)
+            list(APPEND FOOTNOTES "NOTE: You may activate binfmt_misc support 
for wine to be able to run cross compiled test applications.")
+        endif()
+    else()
+        list(APPEND FOOTNOTES "NOTE: You will not be able to run cross 
compiled applications on your host system.")
+    endif()
+endif()
+
 MACRO(TIMESTAMP RESULT)
     if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
         EXECUTE_PROCESS(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE DATE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/config.h.in new/dbus-1.8.2/config.h.in
--- old/dbus-1.8.0/config.h.in  2014-01-20 15:10:27.000000000 +0100
+++ new/dbus-1.8.2/config.h.in  2014-04-30 21:14:39.000000000 +0200
@@ -129,6 +129,9 @@
 /* Define if GLib, GObject, GIO are available */
 #undef DBUS_WITH_GLIB
 
+/* The maximum number of connections that can be handled at once */
+#undef FD_SETSIZE
+
 /* The name of the gettext domain */
 #undef GETTEXT_PACKAGE
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/configure new/dbus-1.8.2/configure
--- old/dbus-1.8.0/configure    2014-01-20 15:10:26.000000000 +0100
+++ new/dbus-1.8.2/configure    2014-04-30 21:14:38.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dbus 1.8.0.
+# Generated by GNU Autoconf 2.69 for dbus 1.8.2.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=dbus>.
 #
@@ -591,8 +591,8 @@
 # Identity of this package.
 PACKAGE_NAME='dbus'
 PACKAGE_TARNAME='dbus'
-PACKAGE_VERSION='1.8.0'
-PACKAGE_STRING='dbus 1.8.0'
+PACKAGE_VERSION='1.8.2'
+PACKAGE_STRING='dbus 1.8.2'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=dbus'
 PACKAGE_URL=''
 
@@ -1512,7 +1512,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dbus 1.8.0 to adapt to many kinds of systems.
+\`configure' configures dbus 1.8.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1586,7 +1586,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dbus 1.8.0:";;
+     short | recursive ) echo "Configuration of dbus 1.8.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1783,7 +1783,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dbus configure 1.8.0
+dbus configure 1.8.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2502,7 +2502,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dbus $as_me 1.8.0, which was
+It was created by dbus $as_me 1.8.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3442,7 +3442,7 @@
 
 # Define the identity of the package.
  PACKAGE='dbus'
- VERSION='1.8.0'
+ VERSION='1.8.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3651,6 +3651,7 @@
   fi
 fi
 
+
 GETTEXT_PACKAGE=dbus-1
 
 
@@ -3741,7 +3742,7 @@
 
 ## increment any time the source changes; set to
 ##  0 if you increment CURRENT
-LT_REVISION=3
+LT_REVISION=4
 
 ## increment if any interfaces have been added; set to 0
 ## if any interfaces have been changed or removed. removal has
@@ -3754,8 +3755,8 @@
 
 DBUS_MAJOR_VERSION=1
 DBUS_MINOR_VERSION=8
-DBUS_MICRO_VERSION=0
-DBUS_VERSION=1.8.0
+DBUS_MICRO_VERSION=2
+DBUS_VERSION=1.8.2
 
 
 
@@ -16526,6 +16527,11 @@
 
 $as_echo "#define DBUS_WIN 1" >>confdefs.h
 
+    # Yes, on Windows it really does work like this.
+    # http://support.microsoft.com/kb/111855
+
+$as_echo "#define FD_SETSIZE 8192" >>confdefs.h
+
     BUILD_TIMESTAMP=`date --iso-8601=minutes`
 
     # Assume DBUS_VERSION is always three numbers
@@ -23260,7 +23266,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dbus $as_me 1.8.0, which was
+This file was extended by dbus $as_me 1.8.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23326,7 +23332,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dbus config.status 1.8.0
+dbus config.status 1.8.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/configure.ac new/dbus-1.8.2/configure.ac
--- old/dbus-1.8.0/configure.ac 2014-01-20 14:40:59.000000000 +0100
+++ new/dbus-1.8.2/configure.ac 2014-04-30 20:48:29.000000000 +0200
@@ -3,7 +3,7 @@
 
 m4_define([dbus_major_version], [1])
 m4_define([dbus_minor_version], [8])
-m4_define([dbus_micro_version], [0])
+m4_define([dbus_micro_version], [2])
 m4_define([dbus_version],
           [dbus_major_version.dbus_minor_version.dbus_micro_version])
 
AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus])
@@ -37,7 +37,7 @@
 
 ## increment any time the source changes; set to
 ##  0 if you increment CURRENT
-LT_REVISION=3
+LT_REVISION=4
 
 ## increment if any interfaces have been added; set to 0
 ## if any interfaces have been changed or removed. removal has
@@ -99,6 +99,9 @@
 # Special defines for certain platforms
 if test "$dbus_win" = yes; then
     AC_DEFINE(DBUS_WIN,1,[Defined if we run on a W32 API based system])
+    # Yes, on Windows it really does work like this.
+    # http://support.microsoft.com/kb/111855
+    AC_DEFINE(FD_SETSIZE,8192,[The maximum number of connections that can be 
handled at once])
     BUILD_TIMESTAMP=`date --iso-8601=minutes`
     AC_SUBST(BUILD_TIMESTAMP)
     # Assume DBUS_VERSION is always three numbers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/dbus/dbus-internals.c 
new/dbus-1.8.2/dbus/dbus-internals.c
--- old/dbus-1.8.0/dbus/dbus-internals.c        2013-10-08 19:40:39.000000000 
+0200
+++ new/dbus-1.8.2/dbus/dbus-internals.c        2014-04-28 15:59:29.000000000 
+0200
@@ -745,10 +745,18 @@
   return FALSE;
 }
 
-static dbus_bool_t
-_dbus_create_uuid_file_exclusively (const DBusString *filename,
-                                    DBusGUID         *uuid,
-                                    DBusError        *error)
+/**
+ * Write the give UUID to a file.
+ *
+ * @param filename the file to write
+ * @param uuid the UUID to save
+ * @param error used to raise an error
+ * @returns #FALSE on error
+ */
+dbus_bool_t
+_dbus_write_uuid_file (const DBusString *filename,
+                       const DBusGUID   *uuid,
+                       DBusError        *error)
 {
   DBusString encoded;
 
@@ -757,8 +765,6 @@
       _DBUS_SET_OOM (error);
       return FALSE;
     }
-
-  _dbus_generate_uuid (uuid);
   
   if (!_dbus_uuid_encode (uuid, &encoded))
     {
@@ -825,7 +831,8 @@
   else
     {
       dbus_error_free (&read_error);
-      return _dbus_create_uuid_file_exclusively (filename, uuid, error);
+      _dbus_generate_uuid (uuid);
+      return _dbus_write_uuid_file (filename, uuid, error);
     }
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/dbus/dbus-internals.h 
new/dbus-1.8.2/dbus/dbus-internals.h
--- old/dbus-1.8.0/dbus/dbus-internals.h        2013-10-08 19:40:39.000000000 
+0200
+++ new/dbus-1.8.2/dbus/dbus-internals.h        2014-04-28 15:59:29.000000000 
+0200
@@ -361,6 +361,10 @@
                                   dbus_bool_t       create_if_not_found,
                                   DBusError        *error);
 
+dbus_bool_t _dbus_write_uuid_file (const DBusString *filename,
+                                   const DBusGUID   *uuid,
+                                   DBusError        *error);
+
 dbus_bool_t _dbus_get_local_machine_uuid_encoded (DBusString *uuid_str);
 
 #define _DBUS_PASTE2(a, b) a ## b
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/dbus/dbus-sysdeps-unix.c 
new/dbus-1.8.2/dbus/dbus-sysdeps-unix.c
--- old/dbus-1.8.0/dbus/dbus-sysdeps-unix.c     2014-01-17 17:59:48.000000000 
+0100
+++ new/dbus-1.8.2/dbus/dbus-sysdeps-unix.c     2014-04-28 15:59:54.000000000 
+0200
@@ -3579,7 +3579,7 @@
 
   _dbus_string_init_const (&filename, DBUS_MACHINE_UUID_FILE);
 
-  b = _dbus_read_uuid_file (&filename, machine_id, create_if_not_found, error);
+  b = _dbus_read_uuid_file (&filename, machine_id, FALSE, error);
   if (b)
     return TRUE;
 
@@ -3587,7 +3587,26 @@
 
   /* Fallback to the system machine ID */
   _dbus_string_init_const (&filename, "/etc/machine-id");
-  return _dbus_read_uuid_file (&filename, machine_id, FALSE, error);
+  b = _dbus_read_uuid_file (&filename, machine_id, FALSE, error);
+
+  if (b)
+    {
+      /* try to copy it to the DBUS_MACHINE_UUID_FILE, but do not
+       * complain if that isn't possible for whatever reason */
+      _dbus_string_init_const (&filename, DBUS_MACHINE_UUID_FILE);
+      _dbus_write_uuid_file (&filename, machine_id, NULL);
+
+      return TRUE;
+    }
+
+  if (!create_if_not_found)
+    return FALSE;
+
+  /* if none found, try to make a new one */
+  dbus_error_free (error);
+  _dbus_string_init_const (&filename, DBUS_MACHINE_UUID_FILE);
+  _dbus_generate_uuid (machine_id);
+  return _dbus_write_uuid_file (&filename, machine_id, error);
 }
 
 /**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/doc/dbus-specification.xml 
new/dbus-1.8.2/doc/dbus-specification.xml
--- old/dbus-1.8.0/doc/dbus-specification.xml   2014-01-20 14:40:30.000000000 
+0100
+++ new/dbus-1.8.2/doc/dbus-specification.xml   2014-03-13 13:14:13.000000000 
+0100
@@ -63,9 +63,8 @@
         <firstname>David</firstname>
         <surname>Zeuthen</surname>
         <affiliation>
-          <orgname>Red Hat, Inc.</orgname>
           <address>
-            <email>[email protected]</email>
+            <email>[email protected]</email>
           </address>
         </affiliation>
       </author>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/ltmain.sh new/dbus-1.8.2/ltmain.sh
--- old/dbus-1.8.0/ltmain.sh    2014-01-20 15:10:21.000000000 +0100
+++ new/dbus-1.8.2/ltmain.sh    2014-04-30 21:14:33.000000000 +0200
@@ -70,7 +70,7 @@
 #         compiler:            $LTCC
 #         compiler flags:              $LTCFLAGS
 #         linker:              $LD (gnu? $with_gnu_ld)
-#         $progname:   (GNU libtool) 2.4.2 Debian-2.4.2-1.6
+#         $progname:   (GNU libtool) 2.4.2 Debian-2.4.2-1.7
 #         automake:    $automake_version
 #         autoconf:    $autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.6"
+VERSION="2.4.2 Debian-2.4.2-1.7"
 TIMESTAMP=""
 package_revision=1.3337
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/test/dbus-daemon-eavesdrop.c 
new/dbus-1.8.2/test/dbus-daemon-eavesdrop.c
--- old/dbus-1.8.0/test/dbus-daemon-eavesdrop.c 2014-01-14 11:57:36.000000000 
+0100
+++ new/dbus-1.8.2/test/dbus-daemon-eavesdrop.c 2014-04-30 20:42:07.000000000 
+0200
@@ -151,6 +151,8 @@
 
       if (newline != NULL)
         {
+          if ((newline > address->str) && ('\r' == newline[-1]))
+            newline -= 1;
           g_string_truncate (address, newline - address->str);
           break;
         }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/test/dbus-daemon.c 
new/dbus-1.8.2/test/dbus-daemon.c
--- old/dbus-1.8.0/test/dbus-daemon.c   2014-01-14 11:57:36.000000000 +0100
+++ new/dbus-1.8.2/test/dbus-daemon.c   2014-04-30 20:42:07.000000000 +0200
@@ -119,6 +119,8 @@
 
       if (newline != NULL)
         {
+          if ((newline > address->str) && ('\r' == newline[-1]))
+            newline -= 1;
           g_string_truncate (address, newline - address->str);
           break;
         }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/dbus-1.8.0/tools/dbus-launch.c 
new/dbus-1.8.2/tools/dbus-launch.c
--- old/dbus-1.8.0/tools/dbus-launch.c  2013-10-08 19:40:40.000000000 +0200
+++ new/dbus-1.8.2/tools/dbus-launch.c  2014-04-30 20:11:08.000000000 +0200
@@ -406,6 +406,9 @@
 static void
 kill_bus(void)
 {
+  if (bus_pid_to_kill <= 0)
+    return;
+
   verbose ("Killing message bus and exiting babysitter\n");
   kill (bus_pid_to_kill, SIGTERM);
   sleep (3);
@@ -1275,6 +1278,10 @@
 
       bus_pid = val;
 
+      /* Have to initialize bus_pid_to_kill ASAP, so that the
+         X error callback can kill it if an error happens. */
+      bus_pid_to_kill = bus_pid;
+
       close (bus_pid_to_launcher_pipe[READ_END]);
 
 #ifdef DBUS_ENABLE_X11_AUTOLAUNCH
@@ -1291,7 +1298,6 @@
                 {
                   char *address = NULL;
                   /* another window got added. Return its address */
-                  bus_pid_to_kill = bus_pid;
                   if (x11_get_address (&address, &bus_pid, &wid)
                        && address != NULL)
                     {

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to