summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-16 15:03:46 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-16 15:31:22 +0100
commit6dea6c050dd2353678126138c0bdaebbfdc33b05 (patch)
treec0c6aaaa21a05d12bf268882a1055a763378838c
parentb47d50623b6642f15737b750f941901e6168bf3d (diff)
downloaddbus-6dea6c050dd2353678126138c0bdaebbfdc33b05.tar.gz
fix NEWS mis-merge
-rw-r--r--NEWS20
1 files changed, 5 insertions, 15 deletions
diff --git a/NEWS b/NEWS
index 7dae9f94..b79d57cd 100644
--- a/NEWS
+++ b/NEWS
@@ -18,21 +18,6 @@ Build-time configuration changes:
assertions. It has been renamed to DBUS_DISABLE_ASSERT to be consistent
with the Autotools build system. (fd.o #66142, Chengwei Yang)
-• Fix a NULL pointer dereference on an unlikely error path
- (fd.o #69327, Sviatoslav Chagaev)
-
-• Unix-specific:
- · If accept4() fails with EINVAL, as it can on older Linux kernels
- with newer glibc, try accept() instead of going into a busy-loop.
- (fd.o #69026, Chengwei Yang)
- · If socket() or socketpair() fails with EINVAL or EPROTOTYPE,
- for instance on Hurd or older Linux with a new glibc, try without
- SOCK_CLOEXEC. (fd.o #69073; Pino Toscano, Chengwei Yang)
- · Fix a file descriptor leak on an error code path.
- (fd.o #69182, Sviatoslav Chagaev)
- · Fix compilation if writev() is unavailable (fd.o #69409,
- Vasiliy Balyasnyy)
-
Dependencies:
• GNU make is now (documented to be) required. (fd.o #48277, Simon McVittie)
@@ -104,6 +89,9 @@ Fixes:
• Make "make -j check" work (fd.o #68852, Simon McVittie)
+• Fix a NULL pointer dereference on an unlikely error path
+ (fd.o #69327, Sviatoslav Chagaev)
+
• Unix-specific:
· If accept4() fails with EINVAL, as it can on older Linux kernels
with newer glibc, try accept() instead of going into a busy-loop.
@@ -119,6 +107,8 @@ Fixes:
· Don't fail the autolaunch test if there is no DISPLAY (fd.o #40352, Simon)
· Use dbus-launch from the builddir for testing, not the installed copy
(fd.o #37849, Chengwei Yang)
+ · Fix compilation if writev() is unavailable (fd.o #69409,
+ Vasiliy Balyasnyy)
• Windows-specific:
· Remove unavailable command-line options from 'dbus-daemon --help'