From f50ea3140ed50ac1eb0f6ae51aebf0586f655c6f Mon Sep 17 00:00:00 2001 From: eXeC001er Date: Fri, 11 Nov 2011 11:33:23 +0000 Subject: [PATCH 1/2] Remove some dead code related to fd.o #37258 This would now just attempt to close fd -1, which is useless. [commit message added by smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37258 Reviewed-by: Simon McVittie --- dbus/dbus-sysdeps-unix.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index 98667f24..1a8f6fc2 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -1216,7 +1216,6 @@ _dbus_connect_tcp_socket_with_nonce (const char *host, _dbus_error_from_errno (errno), "Failed to lookup host/port: \"%s:%s\": %s (%d)", host, port, gai_strerror(res), res); - _dbus_close (fd, NULL); return -1; } From 99bd4a517aa34d973829b1fde530090fd4e4e292 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 11 Nov 2011 11:48:20 +0000 Subject: [PATCH 2/2] NEWS so far --- NEWS | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 07cb999b..247aa9fd 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,27 @@ D-Bus 1.4.18 (UNRELEASED) == -… +• Improve cmake build system (Ralf Habacker): + · simplify XML parser dependencies (fd.o #41027) + · generate build timestamp (fd.o #41029) + · only create batch files on Windows + · fix option and cache syntax + · add help-options target + · share dbus-arch-deps.h.in with autotools rather than having our + own version (fd.o #41033) + +• Build tests successfully with older GLib, as found in e.g. Debian 6 + (fd.o #41219, Simon McVittie) + +• Unix-specific: + · Avoid a highly unlikely fd leak (fd.o #29881, Simon McVittie) + · Don't close invalid fd -1 if getaddrinfo fails (fd.o #37258, eXeC001er) +  · Don't touch ~/.dbus and ~/.dbus-keyrings when running 'make installcheck' + (fd.o #41218, Simon McVittie) + +• Windows-specific: + · Find the dbus-daemon executable next to the shared library (fd.o #41558; + Jesper Dam, Ralf Habacker) D-Bus 1.4.16 (2011-09-21) ==