Update dbus and dbus-glib to 0.23.4:

D-BUS 0.23.4 (11 Mar 2005)
===
- fix a failed assertion when trying to get replies from certain
  pending calls

D-BUS 0.23.3 (9 Mar 2005)
===
- add back dbus_pending_call_get_reply() which was removed accidentally.
- fix a memory leak in return messages
- fix many memory leaks and lifecycle issues in the mono bindings.

D-BUS 0.23.2 (18 Feb 2005)
===
- shuffle some code around in the mono bindings to deterministically
  finalize classes so that delegates are unregistered correctly.
- backport a bunch of thread locking-related fixes from HEAD.

D-BUS 0.23.1 (11 Feb 2005)
===
- fix a bug in which the bus daemon wouldn't recognize that a service
  owner quit
- fix a bug in the mono bindings that would cause unmanaged code to
  call back into a delegate that had been garbage collected and
  crashed.

D-BUS 0.23 (11 Jan 2005)
===

- add setgroups() to drop supplementary groups
- updated SELinux support
- add an "at console" security policy
- fix a bug where org.freedesktop.DBus wasn't recognized as an existing
  service.
- error out if --enable-mono is explicitly set and mono libs can't be found
- set the max_match_rules_per_connection limit from the config file.
- removed dbus_bug_get_with_g_main since it's been replaced by
  dbus_g_bus_get
- fix fd leaks in socket code
- lots and lots of mono binding updates, including fixes to make it
  compatible with Mono 1.1.3
- added --nofork option to override config file setting at runtime
- added support for int64 and uint64 to the python bindings
- lots of python binding updates
- config file DTD updates
- use SerivceOwnerChanges signal instead of ServiceCreated and
  ServiceDeleted
- fixes to the authentication code
- new init script for Slackware
- print out the pid even when --fork is passed
- increase preallocation sizes in DBusMessage to heavily reduce
  reallocs
- lots of performance enhancements
- lots more small bug fixes

9 files changed, 34 insertions, 35 deletions

diff --git a/sysutils/dbus-glib/Makefile b/sysutils/dbus-glib/Makefile
index c8966bb6400..04d548d0243 100644
--- a/sysutils/dbus-glib/Makefile
+++ b/sysutils/dbus-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/12 08:30:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2005/03/22 10:55:13 jmmv Exp $
 #
 
 DBUS_INTERFACE=	glib
@@ -6,8 +6,6 @@ DBUS_DIRS=	dbus glib tools
 
 .include "../../sysutils/dbus/Makefile.common"
 
-PKGREVISION=	1
-
 # We can't install from within the 'dbus' nor 'tools' directory automatically
 # because we'd get a lot of other stuff installed (overriding files in the
 # dbus package).
diff --git a/sysutils/dbus-glib/buildlink3.mk b/sysutils/dbus-glib/buildlink3.mk
index 9a483b95a86..2ff36084920 100644
--- a/sysutils/dbus-glib/buildlink3.mk
+++ b/sysutils/dbus-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/03/16 21:14:46 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/03/22 10:55:13 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 DBUS_GLIB_BUILDLINK3_MK:=	${DBUS_GLIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndbus-glib}
 BUILDLINK_PACKAGES+=	dbus-glib
 
 .if !empty(DBUS_GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbus-glib+=	dbus-glib>=0.22
+BUILDLINK_DEPENDS.dbus-glib+=	dbus-glib>=0.23.4
 BUILDLINK_PKGSRCDIR.dbus-glib?=	../../sysutils/dbus-glib
 .endif	# DBUS_GLIB_BUILDLINK3_MK
 
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index fbe66c62138..8c876f42b1d 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:50 reed Exp $
+# $NetBSD: Makefile,v 1.4 2005/03/22 10:55:13 jmmv Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	2
-
 PKG_USERS=	messagebus:messagebus::System\\ message\\ bus:${VARBASE}/run/dbus:/sbin/nologin
 PKG_GROUPS=	messagebus
 
diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common
index 0dc2de1cbc9..fbffebdd860 100644
--- a/sysutils/dbus/Makefile.common
+++ b/sysutils/dbus/Makefile.common
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile.common,v 1.2 2004/11/26 17:22:54 sketch Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/03/22 10:55:13 jmmv Exp $
 #
 
-DBUS_VERSION=	0.22
+# XXX Do not update to 0.30 or above yet.  The API in the 0.2x series is
+# XXX the most commonly used ATM.
+
+DBUS_VERSION=	0.23.4
 
 DISTNAME=	dbus-${DBUS_VERSION}
 CATEGORIES=	sysutils
diff --git a/sysutils/dbus/PLIST b/sysutils/dbus/PLIST
index 9dbf5b60639..d5bc046a037 100644
--- a/sysutils/dbus/PLIST
+++ b/sysutils/dbus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/11 17:45:26 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/03/22 10:55:13 jmmv Exp $
 bin/dbus-cleanup-sockets
 bin/dbus-daemon-1
 bin/dbus-launch
@@ -27,8 +27,9 @@ man/man1/dbus-send.1
 share/examples/dbus/session.conf
 share/examples/dbus/system.conf
 @dirrm share/examples/dbus
-@exec ${MKDIR} %D/lib/dbus-1.0/services
-@dirrm lib/dbus-1.0/services
+@exec ${MKDIR} %D/share/dbus-1/services
+@dirrm share/dbus-1/services
+@dirrm share/dbus-1
 @dirrm lib/dbus-1.0/include/dbus
 @dirrm lib/dbus-1.0/include
 @dirrm lib/dbus-1.0
diff --git a/sysutils/dbus/buildlink3.mk b/sysutils/dbus/buildlink3.mk
index fb495c941a6..2cf31be56e2 100644
--- a/sysutils/dbus/buildlink3.mk
+++ b/sysutils/dbus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/10/11 17:45:27 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/03/22 10:55:13 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DBUS_BUILDLINK3_MK:=	${DBUS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndbus}
 BUILDLINK_PACKAGES+=	dbus
 
 .if !empty(DBUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbus+=	dbus>=0.22
+BUILDLINK_DEPENDS.dbus+=	dbus>=0.23.4
 BUILDLINK_PKGSRCDIR.dbus?=	../../sysutils/dbus
 .endif	# DBUS_BUILDLINK3_MK
 
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index dfa0893d6d1..fb7c8045177 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 13:40:52 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/03/22 10:55:13 jmmv Exp $
 
-SHA1 (dbus-0.22.tar.gz) = 9a32a9c9e92a43461235f5016c8d350da20cd588
-RMD160 (dbus-0.22.tar.gz) = a0898779af5016bb3b4304bb7f98950f4fcbcd36
-Size (dbus-0.22.tar.gz) = 1248780 bytes
-SHA1 (patch-aa) = e33a2f700f085d38de24b54c14029238e9c3d5fe
-SHA1 (patch-ab) = 19ec14e421d0dc0ffa9f057634f7ec458941f088
+SHA1 (dbus-0.23.4.tar.gz) = 57ea3dd1a0ef520b1f891932e7ccd6b8d59eaca9
+RMD160 (dbus-0.23.4.tar.gz) = 94c6ed261cbf41695b7cc15c99ef929868f8645d
+Size (dbus-0.23.4.tar.gz) = 1288374 bytes
+SHA1 (patch-aa) = 4f03adb4bf41359a6eed93965786b93d4c92f87d
+SHA1 (patch-ab) = e0f5955a2b54e557e636f23715fbb6484c479e1f
diff --git a/sysutils/dbus/patches/patch-aa b/sysutils/dbus/patches/patch-aa
index cd2038fde7c..6316aa2199c 100644
--- a/sysutils/dbus/patches/patch-aa
+++ b/sysutils/dbus/patches/patch-aa
@@ -1,14 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/11 17:45:27 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2005/03/22 10:55:13 jmmv Exp $
 
---- bus/Makefile.in.orig	2004-08-13 00:58:01.000000000 +0200
+--- bus/Makefile.in.orig	2005-01-12 23:21:12.000000000 +0100
 +++ bus/Makefile.in
-@@ -243,12 +243,12 @@ sharedstatedir = @sharedstatedir@
+@@ -337,11 +337,11 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- 
 -configdir = $(sysconfdir)/dbus-1
 +configdir = $(datadir)/examples/@PACKAGE@
- 
  INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS)				\
  	-DDAEMON_NAME=\"dbus-daemon-1\"  -DDBUS_COMPILATION		\
 -	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"	\
@@ -16,14 +15,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/10/11 17:45:27 jmmv Exp $
 +	-DDBUS_SYSTEM_CONFIG_FILE=\""$(sysconfdir)/system.conf"\"	\
 +	-DDBUS_SESSION_CONFIG_FILE=\""$(sysconfdir)/session.conf"\"
  
- 
  EFENCE = 
-@@ -890,8 +890,6 @@ clean-local:
+ CONFIG_IN_FILES = \
+@@ -899,8 +899,6 @@ clean-local:
  	/bin/rm *.bb *.bbg *.da *.gcov || true
  
  install-data-hook:
 -	$(mkinstalldirs) $(DESTDIR)/$(localstatedir)/run/dbus
 -	$(mkinstalldirs) $(DESTDIR)/$(configdir)/system.d
- 	$(mkinstalldirs) $(DESTDIR)/$(libdir)/dbus-1.0/services
+ 	$(mkinstalldirs) $(DESTDIR)/$(datadir)/dbus-1/services
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/sysutils/dbus/patches/patch-ab b/sysutils/dbus/patches/patch-ab
index 159929a084e..68cdce8255f 100644
--- a/sysutils/dbus/patches/patch-ab
+++ b/sysutils/dbus/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/10/11 17:45:27 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2005/03/22 10:55:13 jmmv Exp $
 
---- tools/Makefile.in.orig	2004-08-13 00:58:07.000000000 +0200
+--- tools/Makefile.in.orig	2005-01-12 23:21:22.000000000 +0100
 +++ tools/Makefile.in
-@@ -283,7 +283,7 @@ dbus_monitor_LDADD = $(top_builddir)/gli
+@@ -344,7 +344,7 @@ dbus_send_LDADD = $(top_builddir)/dbus/l
+ dbus_monitor_LDADD = $(top_builddir)/glib/libdbus-glib-1.la
  dbus_launch_LDADD = $(DBUS_X_LIBS)
  dbus_viewer_LDADD = $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_LIBS)
- 
 -man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
 +man_MANS = dbus-send.1 dbus-launch.1 dbus-cleanup-sockets.1
  EXTRA_DIST = $(man_MANS)
- subdir = tools
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ all: all-am
+