Update to 1.6.8:

D-Bus 1.6.8 (2012-09-28)
==

The "Fix one thing, break another" release.

• Follow up to CVE-2012-3524: The additional hardening
  work to use __secure_getenv() as a followup to bug #52202
  broke certain configurations of gnome-keyring.  Given
  the difficulty of making this work without extensive
  changes to gnome-keyring, use of __secure_getenv() is
  deferred.

D-Bus 1.6.6 (2012-09-28)
==

The "Clear the environment in your setuid binaries, please" release.

• CVE-2012-3524: Don't access environment variables (fd.o #52202)
  Thanks to work and input from Colin Walters, Simon McVittie,
  Geoffrey Thomas, and others.
• Unix-specific:
  · Fix compilation on Solaris (fd.o #53286, Jonathan Perkin)
  · Work around interdependent headers on OpenBSD by including sys/types.h
    before each use of sys/socket.h (fd.o #54418, Brad Smith)

4 files changed, 6 insertions, 39 deletions

diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index 34c722884c4..f6ae2fa4b4e 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2012/09/27 19:45:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.57 2012/10/07 21:35:13 wiz Exp $
 
-DISTNAME=	dbus-1.6.4
-PKGREVISION=	1
+DISTNAME=	dbus-1.6.8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index 136f559b5bc..5efd7f0f227 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.41 2012/08/14 19:18:08 abs Exp $
+$NetBSD: distinfo,v 1.42 2012/10/07 21:35:14 wiz Exp $
 
-SHA1 (dbus-1.6.4.tar.gz) = 17e619f008301592b7f01a60e7cf18e2752b5270
-RMD160 (dbus-1.6.4.tar.gz) = 041ad41c26f38647f3da8d7f0cb548c979521def
-Size (dbus-1.6.4.tar.gz) = 1927446 bytes
+SHA1 (dbus-1.6.8.tar.gz) = d9634807d1de9b64727ae2178e3af2227fca0fca
+RMD160 (dbus-1.6.8.tar.gz) = 063d855945bae0124a10b2fa98d64fd09e3b8eda
+Size (dbus-1.6.8.tar.gz) = 1929630 bytes
 SHA1 (patch-aa) = 0c3d145979e3b2358261c9f7f34701d02eb6ecd4
 SHA1 (patch-ab) = 48dd40c59eef3d99e1933a646e23206c7c55bc97
 SHA1 (patch-ak) = fcb0cad1b6e306db03d538d4ca65f4a18d4726ab
 SHA1 (patch-al) = 3f9f793b0c1455bf2bf079cc27b841c22f42c276
 SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8
 SHA1 (patch-ba) = ceb8e0c424c57410f8c3775087e4cae1b44da4c5
-SHA1 (patch-configure) = 829024482acb89fa12fa47fd42b171cc02efbb89
-SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 79ff84b20dff597001e4e150c9ab27b05d6ff2a1
diff --git a/sysutils/dbus/patches/patch-configure b/sysutils/dbus/patches/patch-configure
deleted file mode 100644
index 38d6d30153d..00000000000
--- a/sysutils/dbus/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2012/08/09 10:21:19 jperkin Exp $
-
-Require _XOPEN_SOURCE=600 on Solaris for sockaddr_in6 and sockaddr_storage.
-
---- configure.orig	Thu Aug  9 09:32:17 2012
-+++ configure	Thu Aug  9 09:36:08 2012
-@@ -21706,7 +21706,7 @@
-         # Solaris' C library apparently needs these runes to be threadsafe...
-         CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT"
-         # ... and this opt-in to get file descriptor passing support
--        CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
-+        CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__"
-         ;;
- esac
- 
diff --git a/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-util-unix.c b/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-util-unix.c
deleted file mode 100644
index d57b676505e..00000000000
--- a/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-util-unix.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-dbus_dbus-sysdeps-util-unix.c,v 1.1 2012/08/09 10:21:19 jperkin Exp $
-
-HAVE_DECL_LOG_PERROR is always defined, we care more whether it is 0 or 1.
-
---- dbus/dbus-sysdeps-util-unix.c.orig	Thu Aug  9 10:07:27 2012
-+++ dbus/dbus-sysdeps-util-unix.c	Thu Aug  9 10:07:33 2012
-@@ -424,7 +424,7 @@
- void
- _dbus_init_system_log (void)
- {
--#ifdef HAVE_DECL_LOG_PERROR
-+#if HAVE_DECL_LOG_PERROR
-   openlog ("dbus", LOG_PID | LOG_PERROR, LOG_DAEMON);
- #else
-   openlog ("dbus", LOG_PID, LOG_DAEMON);