From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 10 Jun 2011 17:52:07 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.4~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c83287898cc99d9dee75cf4211341be46b1ea39f;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

c83287898cc99d9dee75cf4211341be46b1ea39f
diff --cc NEWS
index 323d64eed,9c31a64b1..12ec1429a
--- a/NEWS
+++ b/NEWS
@@@ -1,8 -1,29 +1,29 @@@
 -D-Bus 1.4.12 (UNRELEASED)
 +D-Bus 1.5.4 (UNRELEASED)
  ==
  
+ Security (local denial of service):
+ 
+ • Byte-swap foreign-endian messages correctly, preventing a long-standing
+   local DoS if foreign-endian messages are relayed through the dbus-daemon
+   (backporters: this is git commit c3223ba6c401ba81df1305851312a47c485e6cd7)
+   (fd.o #38120, Debian #629938, no CVE number yet; Simon McVittie)
+ 
+ New things:
+ 
+ • The constant to use for an infinite timeout now has a name,
+   DBUS_TIMEOUT_INFINITE. It is numerically equivalent to 0x7fffffff (INT32_MAX)
+   which can be used for source compatibility with older versions of libdbus.
+ 
+ • If GLib and DBus-GLib are already installed, more tests will be built,
+   providing better coverage. They can be installed via
+       ./configure --enable-installed-tests
+   for system integration testing, if required. (fd.o #34570, Simon McVittie)
+ 
  Changes:
  
+ • Consistently use atomic operations for the DBusConnection's refcount
+   (fd.o #38005, Simon McVittie)
+ 
  • Don't use -Wl,--gc-sections by default: in practice the size decrease is
    small (300KiB on x86-64) and it frequently doesn't work in unusual
    toolchains. To optimize for minimum installed size, you should benchmark
diff --cc cmake/CMakeLists.txt
index 0a3652a8b,7476975b8..1d15d8628
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@@ -223,13 -223,13 +223,13 @@@ ENABLE_TESTING(
  # TODO: take check from configure.in
  
  #AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests],[enable unit test code]),enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE)
 -OPTION(DBUS_BUILD_TESTS "enable unit test code" ON)
 +option (DBUS_BUILD_TESTS "enable unit test code" ON)
   
  if(DBUS_BUILD_TESTS)
-     add_definitions(-DDBUS_BUILD_TESTS)
+     add_definitions(-DDBUS_BUILD_TESTS -DDBUS_ENABLE_EMBEDDED_TESTS)
  endif(DBUS_BUILD_TESTS)
  
 -OPTION(DBUS_USE_OUTPUT_DEBUG_STRING "enable win32 debug port for message output" OFF)
 +option (DBUS_USE_OUTPUT_DEBUG_STRING "enable win32 debug port for message output" OFF)
  if(DBUS_USE_OUTPUT_DEBUG_STRING)
      add_definitions(-DDBUS_USE_OUTPUT_DEBUG_STRING)
  endif(DBUS_USE_OUTPUT_DEBUG_STRING)