update to 1.0.2

changes:
-Fix bug where calling dbus_threads_init_default would assert
-Fix UUID output to match the spec
-Clear up documentation on UUIDs
-Fix security bug CVE-2006-6107 match rules can be removed by apps that
 did not create them
-pthread fix

pkgsrc changes:
-create /var/lib/dbus on startup
-build against X11 to get the automatic startup of the session bus
 (can be switched off per pkgsrc option)

4 files changed, 23 insertions, 15 deletions

diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index 3bff7d044a1..f2ce7be418d 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2006/11/29 10:11:53 ghen Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/15 19:06:00 drochner Exp $
 #
 
-DISTNAME=	dbus-1.0.0
+DISTNAME=	dbus-1.0.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
@@ -35,11 +35,10 @@ CONFIGURE_ARGS+=	--enable-checks
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-xml=expat
-CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--with-dbus-user=${DBUS_USER}
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dbus
-PKG_SUPPORTED_OPTIONS+=	debug
+PKG_SUPPORTED_OPTIONS+=	debug nox11
 
 .include "../../mk/bsd.options.mk"
 
@@ -49,6 +48,12 @@ CONFIGURE_ARGS+=	--enable-tests
 CONFIGURE_ARGS+=	--enable-verbose-mode
 .endif
 
+.if !empty(PKG_OPTIONS:Mnox11)
+CONFIGURE_ARGS+=	--without-x
+.else
+.include "../../mk/x11.buildlink3.mk"
+.endif
+
 PKG_SYSCONFSUBDIR=	dbus-1
 MAKE_DIRS=		${PKG_SYSCONFDIR}/event.d
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/system.d
diff --git a/sysutils/dbus/PLIST b/sysutils/dbus/PLIST
index 5805536316c..2803daddaa8 100644
--- a/sysutils/dbus/PLIST
+++ b/sysutils/dbus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/11/13 15:16:20 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/12/15 19:06:00 drochner Exp $
 bin/dbus-cleanup-sockets
 bin/dbus-daemon
 bin/dbus-launch
@@ -12,6 +12,7 @@ include/dbus-1.0/dbus/dbus-errors.h
 include/dbus-1.0/dbus/dbus-macros.h
 include/dbus-1.0/dbus/dbus-memory.h
 include/dbus-1.0/dbus/dbus-message.h
+include/dbus-1.0/dbus/dbus-misc.h
 include/dbus-1.0/dbus/dbus-pending-call.h
 include/dbus-1.0/dbus/dbus-protocol.h
 include/dbus-1.0/dbus/dbus-server.h
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index a6b17f77910..ec4eb2cc5a8 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2006/12/12 13:45:07 dmcmahill Exp $
+$NetBSD: distinfo,v 1.15 2006/12/15 19:06:00 drochner Exp $
 
-SHA1 (dbus-1.0.0.tar.gz) = dbc3adcb3ae7abbcdf5b0b3e1623a140042e1491
-RMD160 (dbus-1.0.0.tar.gz) = d4cfc0dafc5c0bcc283f55267bb24b351b8bf377
-Size (dbus-1.0.0.tar.gz) = 1405045 bytes
+SHA1 (dbus-1.0.2.tar.gz) = 2870efd6ea0b5b0d14e52195f560238a74bb1e0e
+RMD160 (dbus-1.0.2.tar.gz) = d5eddfb058c4c026d4a9f091ad90abcc6e54861a
+Size (dbus-1.0.2.tar.gz) = 1400278 bytes
 SHA1 (patch-aa) = 4d66a0083384448dc89fefe00eb82eeb3aaf13b1
 SHA1 (patch-ac) = eae0564535d36cb0082dd2e66d74fea808800d4e
 SHA1 (patch-ag) = 469993db97a74da50c61449454c02c8a7c69e7bd
diff --git a/sysutils/dbus/files/dbus.sh b/sysutils/dbus/files/dbus.sh
index 61c5632fd40..77de76013bd 100644
--- a/sysutils/dbus/files/dbus.sh
+++ b/sysutils/dbus/files/dbus.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbus.sh,v 1.6 2006/11/29 10:11:53 ghen Exp $
+# $NetBSD: dbus.sh,v 1.7 2006/12/15 19:06:00 drochner Exp $
 #
 # PROVIDE: dbus
 # REQUIRE: DAEMON
@@ -16,11 +16,13 @@ pidfile="@VARBASE@/run/dbus/pid"
 start_precmd=dbus_prestart
 
 dbus_prestart() {
-	if @TEST@ ! -d "@VARBASE@/run/dbus"; then
-		@MKDIR@ "@VARBASE@/run/dbus"
-		@CHMOD@ 0755 "@VARBASE@/run/dbus"
-		@CHOWN@ @DBUS_USER@:@DBUS_GROUP@ "@VARBASE@/run/dbus"
-	fi
+	for f in "@VARBASE@/lib/dbus" "@VARBASE@/run/dbus"; do
+		if @TEST@ ! -d $f; then
+			@MKDIR@ $f
+			@CHMOD@ 0755 $f
+			@CHOWN@ @DBUS_USER@:@DBUS_GROUP@ $f
+		fi
+	done
 	@PREFIX@/bin/dbus-uuidgen --ensure
 }