Update dbus and dbus-glib to 0.61:

D-BUS 0.61 (24 Febuary 2006)
==
- Documentation all around
- dbus-launch now produces correct sh and csh syntax
- Nested arrays now work correctly
- GLib bindings:
  - Inheriting from DBusGProxy is now possible
  - GPtrArrays can now be marshalled
  - org.freedesktop.DBus.GLib.ClientCSymbol annotation added
  - Openning connections to arbitrary addresses now supported
- Python bindings:
  - sender_keyword and path_keyword keywords added to signal listener API
  - Byte types now demarshal to unsigned char
  - calling methods now do the correct thing
- Qt bindings:
  - both Qt3 and Qt4 bindings can be built at the same time
  - Use the standard org.freedesktop.DBus.Method.NoReply annotation
    for the "async" calls instead of creating one for us.
- Mono bindings:
  - 64bit arch fixes
- Massive bug fixing all around

D-BUS 0.60 (30 November 2005)
==

- major ABI/API changes - sonames changed
- RequestName queuing behavior has changed (refer to dbus-specification)
  - DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT has been removed and
    DBUS_NAME_FLAG_ALLOW_REPLACEMENT has been added to the flags
- signals emitted by the bus now show up in the introspect data
- auth EXTERNAL now supported on BSD varients
- ReleaseName method added to the bus to allow a service
  to remove itself as owner of a bus name
- dbus_connection_read_write added for getting messages off the bus
  in the absence of a mainloop
- Qt4 bindings added and the Qt3 bindings have been depricated
- python bindings:
  - marshal using introspect data if available
  - better exception handling and propigation
  - private connections are now supported
  - UTF-8 cleanups
  - out_signature added to method decorators for specifying
    how the return values should be marshaled
  - sender_keyword added to method decorators for specifying
    and argument to provide the unique name of the method caller
  - async_callbacks added to method decorators
  - multiple inheritance of classes now supported
- GLib bindings:
  - respect NoReply annotations
  - dbus_g_method_return_get_reply and dbus_g_method_return_send_reply
    added to the lowlevel code for use when the dbus-glib marshalling
    code is not adiquate
- numerous bug fixes all around

D-BUS 0.50 (06 September 2005)
===
This is a minor release from 0.36.2.  The series number has changed
not because of any technical reasons but as an indication that we
are moving closer to 1.0.  It is hoped that this will be the last
series to see major changes, most of which will be isolated to the
GLib and Python bindings, as we transition to concentrate more on
bug busting and code auditing.

- D-Bus builds on the Cygwin platform
- Makefile cleanups
- Various bug fixes
- Optimization of the dbus object tree
- Memleaks and GIL crasher bugs have been fixed in the Python bindings

D-BUS 0.36.2 (29 August 2005)
===
- Security: Restrict other users from connecting to another users
  session bus

D-BUS 0.36.1 (24 August 2005)
===
- Python Bindings:
  - fixed to work with hal-device-manager
  - For 64bit builds everything is installed to lib64/python2.4/
    since Python can't handle multilib

D-BUS 0.36 (23 August 2005)
===
- Maximum sized of cached messages have been reduced to 10K
- Match rules now allow matching on arguments inside the message
- introspect.xsl XSLT style sheet added for formatting introspection
  data into XHTML for analysis
- Python bindings:
  - now have working type objects for explicit
    typecasting
  - Variant type has been added
  - Dictionaries, Variants and Arrays can all be passed the signiture or
    type(s) of their children
  - the optional timeout= keyword has been added when making method calls
  - match on args has been implemented
  - a .pth file has been added for dealing with libraries and python files
    being in different directories such as in 64bit installs
  - various bug fixes
- GLib bindings:
  - deeply recursive types now supported
  - many symbols are no longer exported as part of the public API
  - various memleak and other bug fixes

D-BUS 0.35.2 (17 July 2005)
===
- Rename Unix Security Context to SELinux Security Context in API
- Fixed more dist errors that distcheck didn't pick up on
- Fixed various bugs in the python bindings that prevented them from working

D-BUS 0.35.1 (16 July 2005)
===
- Fixed dist error where python/dbus_bindings.pxd was being shipped
  instead of dbus_bindings.pxd.in
- Use this instead of the 0.35 tarball

D-BUS 0.35 (15 July 2005)
===
- --with-dbus-user added to the configure scripts for configuring the
  user the system bus runs on
- --with-console-auth-dir added to configure scripts for configuring the
  directory to look in for console user locks
- service files for auto-starting D-Bus services now has the ability to pass
  in command line arguments to the executable
- Huge auto-start bug squashed which caused some services not to start when
  requested in rapid succession
- SE-Linux security contexts can now be appended to messages for inspection
  by services that enforce their own security policies
- Colin says the GLib binding are ready for general consumption
- New GLib tutorial
- New GLib example code
- Python bindings are now version (0,42,0)
- Python bindings API has changed on the service side
- dbus.service has been split out as a seperate module
- dbus.service.Service is renamed to dbus.service.BusName
- dbus.service.Object has swapped the bus_name and object_path constructor
  parameters to make it easier to do inheritance over the bus
- dbus.glib has been seperated out in order to lessen the dependency on glib
  and to allow other mainloops to be integrated with the bindings including
  a planned generic mainloop for non-gui apps.
- Python bindings now aquire the GIL when calling back into the python
  interpreter.  Fixes crashes when using threading and other random segfaults.
- New Python tutorial
- Numerous D-Bus bug fixes all around

D-BUS 0.34 (15 June 2005)
===
- dbus_connection_disconnect is deprecated in favor of dbus_connection_close
- The bus can now use D_NOTIFY (if available) to check when configuration files
  have changed and reload them
- New dbus_message_has_path/member/interface API added
- The Ping message from the org.freedesktop.DBus.Peer interface is now handled
- Complete glib bindings overhaul (and are still under construction)
- Tutorial now has an updated GLib section
- GLib bindings can now send/receive hash tables, arrays and other complex types
- Python bindings overhaul (most public facing API's done)
- Python bindings have been split up into separate files
- Python added new type classes for hinting to the marshaler what type
  to send over the wire
- Python bindings now have decorators for specifying exported methods and signals
- Numerous bug fixes

D-BUS 0.33 (25 Apr 2005)
===

- downgrade requirement from GTK+-2.6 to 2.4 for building gtk components
- python binding API's have been overhalled to be more "pythonic" and cleaner
- python bindings now export dbus.version which is set to (0,40,0)
- python bindings now implement the org.freedesktop.DBus.Introspectable interface
- python binding match rules are now more flexable
- make check has been fixed
- many, many major bug fixes

D-BUS 0.32 (29 Mar 2005)
===

- mono bindings now compiles correctly
- mono binding cleanups
- glib bindings generates wrappers for bus methods in dbus-glib-bindings.h
- glib binding cleanus
- users and groups can now be specified by UID and GID in config files
- numerous memory leak fixes
- various other fixes

D-BUS 0.31 (07 Mar 2005)
===

- land the new message args API and recursive type system
- add docs and fixed Doxygen warnings throught source
- split out some functions not needed in libdbus to *-util.c source files
- take out type convienience functions
- libdbus now back below 150K
- booleans are now 32-bit instead of 8-bit
- specification updated
- grand renaming to strip out the use of "service"
  just say "name" instead (or "bus name" when ambiguous)
- rename dbus-daemon-1 to dbus-daemon throughout
- rename activation to auto-start
- auto-start on by default now
- note that libdbus is the low-level API
- python bindings updated to the new API
- mono bindings updated to the new API
- add 16 bit types
- dictionaries are now ARRAYS of DICT_ENTRY
- dbus-glib-tool renamed to dbus-binding-tool
- massive rewrite of the glib bindings
- saner names for the dbus interface, object path and service defines
- new functions for handling type signitures
- bump sonames for libdbus and libdbus-glib
- various small fixes

9 files changed, 73 insertions, 58 deletions

diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index 2619e7f6da1..f61dbd3e6af 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:10:49 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/30 20:57:08 jmmv Exp $
 #
 
 .include "Makefile.common"
-PKGREVISION=	2
 
 PKG_USERS=	messagebus:messagebus::System\ message\ bus:${VARBASE}/run/dbus:${NOLOGIN}
 PKG_GROUPS=	messagebus
diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common
index f942ca359e0..3ac7a09c2a7 100644
--- a/sysutils/dbus/Makefile.common
+++ b/sysutils/dbus/Makefile.common
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile.common,v 1.12 2006/02/11 14:30:29 rxg Exp $
+# $NetBSD: Makefile.common,v 1.13 2006/03/30 20:57:08 jmmv Exp $
 #
 
-# 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
+DBUS_VERSION=	0.61
 
 DISTNAME=	dbus-${DBUS_VERSION}
 CATEGORIES=	sysutils
@@ -21,20 +18,26 @@ GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 
-PKGCONFIG_OVERRIDE=	dbus-1.pc
-PKGCONFIG_OVERRIDE+=	dbus-glib-1.pc
-PKGCONFIG_OVERRIDE+=	dbus-sharp.pc
+PKGCONFIG_OVERRIDE=	dbus-1.pc.in
+PKGCONFIG_OVERRIDE+=	dbus-glib-1.pc.in
+PKGCONFIG_OVERRIDE+=	dbus-sharp.pc.in
 
-CONFIGURE_ARGS+=	--disable-qt
-CONFIGURE_ARGS+=	--disable-glib
-CONFIGURE_ARGS+=	--disable-gtk
-CONFIGURE_ARGS+=	--disable-xml-docs
+CONFIGURE_ARGS+=	--disable-asserts
+CONFIGURE_ARGS+=	--disable-dnotify
 CONFIGURE_ARGS+=	--disable-doxygen-docs
 CONFIGURE_ARGS+=	--disable-gcj
+CONFIGURE_ARGS+=	--disable-gcov
+CONFIGURE_ARGS+=	--disable-glib
+CONFIGURE_ARGS+=	--disable-gtk
 CONFIGURE_ARGS+=	--disable-mono
 CONFIGURE_ARGS+=	--disable-mono-docs
 CONFIGURE_ARGS+=	--disable-python
+CONFIGURE_ARGS+=	--disable-qt
+CONFIGURE_ARGS+=	--disable-qt-debug
+CONFIGURE_ARGS+=	--disable-qt3
 CONFIGURE_ARGS+=	--disable-selinux
+CONFIGURE_ARGS+=	--disable-tests
+CONFIGURE_ARGS+=	--disable-xml-docs
 CONFIGURE_ARGS+=	--enable-checks
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/sysutils/dbus/PLIST b/sysutils/dbus/PLIST
index 5b2c40c9fce..d45b047d793 100644
--- a/sysutils/dbus/PLIST
+++ b/sysutils/dbus/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/02 20:34:05 reed Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/30 20:57:08 jmmv Exp $
 bin/dbus-cleanup-sockets
-bin/dbus-daemon-1
+bin/dbus-daemon
 bin/dbus-launch
 bin/dbus-send
 include/dbus-1.0/dbus/dbus-address.h
@@ -21,7 +21,7 @@ lib/dbus-1.0/include/dbus/dbus-arch-deps.h
 lib/libdbus-1.la
 lib/pkgconfig/dbus-1.pc
 man/man1/dbus-cleanup-sockets.1
-man/man1/dbus-daemon-1.1
+man/man1/dbus-daemon.1
 man/man1/dbus-launch.1
 man/man1/dbus-send.1
 share/examples/dbus/session.conf
diff --git a/sysutils/dbus/buildlink3.mk b/sysutils/dbus/buildlink3.mk
index 1750bbbad47..1e46e7546e9 100644
--- a/sysutils/dbus/buildlink3.mk
+++ b/sysutils/dbus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/03/30 20:57:08 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DBUS_BUILDLINK3_MK:=	${DBUS_BUILDLINK3_MK}+
@@ -11,9 +11,11 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndbus}
 BUILDLINK_PACKAGES+=	dbus
 
 .if !empty(DBUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbus+=	dbus>=0.23.4
-BUILDLINK_RECOMMENDED.dbus?=	dbus>=0.23.4nb2
+BUILDLINK_DEPENDS.dbus+=	dbus>=0.61
 BUILDLINK_PKGSRCDIR.dbus?=	../../sysutils/dbus
+
+PRINT_PLIST_AWK+=	/^@dirrm share\/dbus-1\/services/ \
+				{ print "@comment in dbus: " $$0; next }
 .endif	# DBUS_BUILDLINK3_MK
 
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index 3fc9fd0756d..edcd8ea22f3 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2006/02/26 21:42:33 joerg Exp $
+$NetBSD: distinfo,v 1.6 2006/03/30 20:57:08 jmmv Exp $
 
-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
-SHA1 (patch-ac) = 7117c0384360702cd725c24f522d275127e65556
+SHA1 (dbus-0.61.tar.gz) = fdddc695dad64974fb4138fcb04a77a66f1f47f8
+RMD160 (dbus-0.61.tar.gz) = 67306e1a632c1986460e8ead311ae642447cdcc3
+Size (dbus-0.61.tar.gz) = 1735729 bytes
+SHA1 (patch-aa) = 9dd1f74cbed3ef973612f9a1b1336732a88cd819
+SHA1 (patch-ab) = 302e0fe5c1f8482de43de2ad09ba4f15d1ce935d
+SHA1 (patch-ac) = 901af7a6a43776f784917bef267786446009ee41
 SHA1 (patch-ad) = 31f0321c85296d6431d2db157ff8cc53f8351a04
diff --git a/sysutils/dbus/files/dbus.sh b/sysutils/dbus/files/dbus.sh
index fd03828e166..9d8c272bcec 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.2 2004/10/12 08:15:35 jmmv Exp $
+# $NetBSD: dbus.sh,v 1.3 2006/03/30 20:57:08 jmmv Exp $
 #
 # PROVIDE: dbus
 # REQUIRE: DAEMON
@@ -10,7 +10,7 @@
 
 name="dbus"
 rcvar=$name
-command="@PREFIX@/bin/dbus-daemon-1"
+command="@PREFIX@/bin/dbus-daemon"
 command_args="--system"
 pidfile="@VARBASE@/run/dbus/pid"
 start_precmd=dbus_prestart
diff --git a/sysutils/dbus/patches/patch-aa b/sysutils/dbus/patches/patch-aa
index 6316aa2199c..751faf026e2 100644
--- a/sysutils/dbus/patches/patch-aa
+++ b/sysutils/dbus/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2005/03/22 10:55:13 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2006/03/30 20:57:08 jmmv Exp $
 
---- bus/Makefile.in.orig	2005-01-12 23:21:12.000000000 +0100
+--- bus/Makefile.in.orig	2006-02-24 17:36:50.000000000 +0100
 +++ bus/Makefile.in
-@@ -337,11 +337,11 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -374,11 +374,11 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
 -configdir = $(sysconfdir)/dbus-1
 +configdir = $(datadir)/examples/@PACKAGE@
  INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS)				\
- 	-DDAEMON_NAME=\"dbus-daemon-1\"  -DDBUS_COMPILATION		\
+ 	-DDAEMON_NAME=\"dbus-daemon\"  -DDBUS_COMPILATION		\
 -	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"	\
 -	-DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\"
 +	-DDBUS_SYSTEM_CONFIG_FILE=\""$(sysconfdir)/system.conf"\"	\
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.2 2005/03/22 10:55:13 jmmv Exp $
  
  EFENCE = 
  CONFIG_IN_FILES = \
-@@ -899,8 +899,6 @@ clean-local:
+@@ -939,8 +939,6 @@ clean-local:
  	/bin/rm *.bb *.bbg *.da *.gcov || true
  
  install-data-hook:
diff --git a/sysutils/dbus/patches/patch-ab b/sysutils/dbus/patches/patch-ab
index 68cdce8255f..6d98f97ebb4 100644
--- a/sysutils/dbus/patches/patch-ab
+++ b/sysutils/dbus/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2005/03/22 10:55:13 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2006/03/30 20:57:08 jmmv Exp $
 
---- tools/Makefile.in.orig	2005-01-12 23:21:22.000000000 +0100
+--- tools/Makefile.in.orig	2006-02-24 17:36:59.000000000 +0100
 +++ tools/Makefile.in
-@@ -344,7 +344,7 @@ dbus_send_LDADD = $(top_builddir)/dbus/l
+@@ -395,7 +395,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)
+ dbus_viewer_LDADD = $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_THREADS_LIBS) $(DBUS_GLIB_TOOL_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)
- all: all-am
- 
+ EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh
+ CLEANFILES = \
+ 	run-with-tmp-session-bus.conf	\
diff --git a/sysutils/dbus/patches/patch-ac b/sysutils/dbus/patches/patch-ac
index 3317ce3f59b..3ecf95b58e0 100644
--- a/sysutils/dbus/patches/patch-ac
+++ b/sysutils/dbus/patches/patch-ac
@@ -1,15 +1,26 @@
-$NetBSD: patch-ac,v 1.1 2005/12/07 15:18:33 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2006/03/30 20:57:08 jmmv Exp $
 
---- dbus/dbus-sysdeps.c.orig	2005-12-03 01:22:01.000000000 +0000
-+++ dbus/dbus-sysdeps.c
-@@ -862,8 +862,8 @@ _dbus_read_credentials_unix_socket  (int
- #ifdef HAVE_CMSGCRED
-   if (cmsg->cmsg_len < sizeof (cmsgmem) || cmsg->cmsg_type != SCM_CREDS)
-     {
--      dbus_set_error (error, DBUS_ERROR_FAILED);
--      _dbus_verbose ("Message from recvmsg() was not SCM_CREDS\n");
-+      dbus_set_error (error, DBUS_ERROR_FAILED,
-+    		      "Message from recvmsg() was not SCM_CREDS");
-       return FALSE;
-     }
- #endif
+--- tools/run-with-tmp-session-bus.sh.orig	2005-03-17 18:48:29.000000000 +0100
++++ tools/run-with-tmp-session-bus.sh
+@@ -1,10 +1,10 @@
+-#! /bin/bash
++#! /bin/sh
+ 
+ SCRIPTNAME=$0
+ WRAPPED_SCRIPT=$1
+ shift
+ 
+-function die() 
++die() 
+ {
+     if ! test -z "$DBUS_SESSION_BUS_PID" ; then
+         echo "killing message bus "$DBUS_SESSION_BUS_PID >&2
+@@ -19,7 +19,7 @@ if test -z "$DBUS_TOP_BUILDDIR" ; then
+ fi
+ 
+ ## convenient to be able to ctrl+C without leaking the message bus process
+-trap 'die "Received SIGINT"' SIGINT
++trap 'die "Received SIGINT"' INT
+ 
+ CONFIG_FILE=./run-with-tmp-session-bus.conf
+ SERVICE_DIR="$DBUS_TOP_BUILDDIR/test/data/valid-service-files"