Update dbus to 1.10.6. Document patches.

D-Bus 1.10.6 (2015-12-01)
==

The “marzipan beetles” release.

Fixes:

• On Unix when running tests as root, don't assert that root and
  the dbus-daemon user can still call UpdateActivationEnvironment;
  assert that those privileged users can call BecomeMonitor instead
  (fd.o #93036, Simon McVittie)

• On Windows, fix a memory leak in the autolaunch transport (fd.o #92899,
  Simon McVittie)

• On Windows Autotools builds, don't run tests that rely on
  dbus-run-session and other Unix-specifics (fd.o #92899, Simon McVittie)

6 files changed, 38 insertions, 17 deletions

diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index e35b176421a..fdca326b8b3 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2015/11/22 23:31:29 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2015/12/06 11:35:55 wiz Exp $
 
-DISTNAME=	dbus-1.10.4
+DISTNAME=	dbus-1.10.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
@@ -70,8 +70,8 @@ CONFIGURE_ARGS+=	--disable-selinux
 PLIST_VARS+=    	linux launchd
 
 DBUS_CONF_DIR+=		${PKG_SYSCONFBASE}/dbus-1
-OWN_DIRS+=		${DBUS_CONF_DIR}/services 
-OWN_DIRS+=		${DBUS_CONF_DIR}/system-services 
+OWN_DIRS+=		${DBUS_CONF_DIR}/services
+OWN_DIRS+=		${DBUS_CONF_DIR}/system-services
 OWN_DIRS+=		${DBUS_CONF_DIR}/session.d
 OWN_DIRS+=		${DBUS_CONF_DIR}/system.d
 
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index 6593f59633e..04e2f4c5d95 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.70 2015/11/22 23:31:29 wiz Exp $
+$NetBSD: distinfo,v 1.71 2015/12/06 11:35:55 wiz Exp $
 
-SHA1 (dbus-1.10.4.tar.gz) = ec1921a09199c81ea20b20448237146a414d51ae
-RMD160 (dbus-1.10.4.tar.gz) = b31e4269db9f8ab207d7e3f4d022cd83ea518229
-SHA512 (dbus-1.10.4.tar.gz) = 75f4564d89f6dca32090ba23526d91b1fe8139769b5d92aa2de9f1571bd70bd4730b079aeba69a78d32ef96b4c8dab665057df39c248f19dbe73764889241001
-Size (dbus-1.10.4.tar.gz) = 1951832 bytes
-SHA1 (patch-ak) = 9f84b015ae706ebfe8230fe315a92c6960a84a60
-SHA1 (patch-al) = 08d49257c3eea7b6ae0a3fe2682dba977ba06951
-SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8
+SHA1 (dbus-1.10.6.tar.gz) = 4247d7f86a0164d7dd3eb18a74670eb863ac342c
+RMD160 (dbus-1.10.6.tar.gz) = afaac55b06050bd4b80f7557fe69029dc3a820b0
+SHA512 (dbus-1.10.6.tar.gz) = 56108dde5097b063b25ef6e42e573b7e1affd5b5a6ce3c745e2de21b434d86542ac6b7c384572826f867a5c471692cc7468c74c4b0cf4a1f60a1a41b0394fb3c
+Size (dbus-1.10.6.tar.gz) = 1952608 bytes
+SHA1 (patch-ak) = ebb0c291297577a9cff246e7bc71412bf6157254
+SHA1 (patch-al) = c70be84ae79698cc4d83087427646bfb0500f194
+SHA1 (patch-am) = ed334bc76911c9db9f5472c58fb762c56255c5b4
 SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 9c967cdac585220a3e65443dc9642e7d4478567c
-SHA1 (patch-tools_dbus-print-message.c) = 9b03707332b6174f1c84b848605783b532d10623
+SHA1 (patch-tools_dbus-print-message.c) = 96267d3cff2c5207911615735748ef81604a69ec
diff --git a/sysutils/dbus/patches/patch-ak b/sysutils/dbus/patches/patch-ak
index 1f96acfaa8d..6947b58af0d 100644
--- a/sysutils/dbus/patches/patch-ak
+++ b/sysutils/dbus/patches/patch-ak
@@ -1,4 +1,6 @@
-$NetBSD: patch-ak,v 1.4 2015/08/30 15:08:00 wiz Exp $
+$NetBSD: patch-ak,v 1.5 2015/12/06 11:35:55 wiz Exp $
+
+Adapt path for pkgsrc.
 
 --- dbus/Makefile.in.orig	2015-08-25 15:52:09.000000000 +0000
 +++ dbus/Makefile.in
diff --git a/sysutils/dbus/patches/patch-al b/sysutils/dbus/patches/patch-al
index b7db95e8047..b9fec8cdca5 100644
--- a/sysutils/dbus/patches/patch-al
+++ b/sysutils/dbus/patches/patch-al
@@ -1,4 +1,6 @@
-$NetBSD: patch-al,v 1.4 2015/07/26 22:51:23 wiz Exp $
+$NetBSD: patch-al,v 1.5 2015/12/06 11:35:55 wiz Exp $
+
+Adapt path for pkgsrc.
 
 --- tools/Makefile.in.orig	2015-07-21 16:32:32.000000000 +0000
 +++ tools/Makefile.in
diff --git a/sysutils/dbus/patches/patch-am b/sysutils/dbus/patches/patch-am
index 3ba58e51336..d8292d2a9f6 100644
--- a/sysutils/dbus/patches/patch-am
+++ b/sysutils/dbus/patches/patch-am
@@ -1,4 +1,19 @@
-$NetBSD: patch-am,v 1.1 2008/11/15 03:59:10 chuck Exp $
+$NetBSD: patch-am,v 1.2 2015/12/06 11:35:55 wiz Exp $
+
+on darwin configure script picks up private per-user tmp directory
+in /var/folders/xx/...+++... via the TMPDIR environment and cheerfully
+installs it in /usr/pkg/etc/dbus-1/session.conf meaning that only the
+user who installed the package will be able to write to that directory...
+except that dbus rejects directories with "+"'s in the filename so it
+won't work anyway.   use configure --with-session-socket-dir=/tmp
+to work around this.   found a description of this issue here:
+http://wiki.gnucash.org/wiki/MacOSX/Quartz in the
+"Running from the commandline" section.
+
+dbus also cannot cope with $DISPLAY containing "/" chars (like in
+darwin ... /tmp/launch-kcvznx/:0 ) so get rid of the ":" as described
+here:
+ https://trac.macports.org/attachment/ticket/16833/patch-dbus-launch-x11.c.diff
 
 --- tools/dbus-launch-x11.c.orig	2008-11-14 22:45:04.000000000 -0500
 +++ tools/dbus-launch-x11.c	2008-11-14 22:45:44.000000000 -0500
diff --git a/sysutils/dbus/patches/patch-tools_dbus-print-message.c b/sysutils/dbus/patches/patch-tools_dbus-print-message.c
index b76c23f9e40..14ac515e57d 100644
--- a/sysutils/dbus/patches/patch-tools_dbus-print-message.c
+++ b/sysutils/dbus/patches/patch-tools_dbus-print-message.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-tools_dbus-print-message.c,v 1.1 2015/10/08 14:32:08 joerg Exp $
+$NetBSD: patch-tools_dbus-print-message.c,v 1.2 2015/12/06 11:35:55 wiz Exp $
+
+Fix build on NetBSD 5.x and 6.x.
 
 --- tools/dbus-print-message.c.orig	2015-10-07 20:10:37.000000000 +0000
 +++ tools/dbus-print-message.c