@@ -1,18 +1,11 @@
-$NetBSD: distinfo,v 1.38 2012/03/30 14:28:29 obache Exp $
+$NetBSD: distinfo,v 1.39 2012/08/01 17:52:21 drochner Exp $
 
-SHA1 (dbus-1.2.4.6permissive.tar.gz) = f71219624885fe2ec1990bb8bdd599e184dd5774
-RMD160 (dbus-1.2.4.6permissive.tar.gz) = 05d1c5fae8ae763a9beb8c7d6f390f3ff54e9c30
-Size (dbus-1.2.4.6permissive.tar.gz) = 1575270 bytes
-SHA1 (patch-CVE-2010-4352-1) = bc83f7a2b56558b6514de8de2d6319ad84f84fce
-SHA1 (patch-CVE-2010-4352-2) = 1427c2c4aea6cd21f5d19aa8fad90b87282b232b
-SHA1 (patch-CVE-2010-4352-3) = d5598dab11bad66c2f586e418a8b409ac5fc67d5
-SHA1 (patch-CVE-2010-4352-4) = 82a43bc19bf4ef73d6e2909dd1c948798585135d
-SHA1 (patch-CVE-2011-2200) = 99e991dd51312fb7181f12c1c5d3b87897e417ac
-SHA1 (patch-aa) = fd7cc2e11e15e13885e882e8de51e17af8a63d70
-SHA1 (patch-ab) = e08250a12e6c04c69278c03078a817159592b3d0
-SHA1 (patch-ac) = 63aab0ffac02a9cb85a80e31bbb1234534db378b
-SHA1 (patch-ag) = 999071b782982c12329025ea8e393bfed940b654
-SHA1 (patch-ai) = a45bd8d29955e9c14a4d8b3f44b42242d70c1cd8
-SHA1 (patch-ak) = 56c0a917e770b8d6ffc37ec7ab8beb631dd8ef72
-SHA1 (patch-al) = fad2f4df4537b2a3e21aaef29138060724ba8286
+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 (patch-aa) = 0c3d145979e3b2358261c9f7f34701d02eb6ecd4
+SHA1 (patch-ab) = 1edd2dfd566b96a8908af2efa37d905919f07713
+SHA1 (patch-ak) = fcb0cad1b6e306db03d538d4ca65f4a18d4726ab
+SHA1 (patch-al) = 3f9f793b0c1455bf2bf079cc27b841c22f42c276
 SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8
+SHA1 (patch-ba) = ceb8e0c424c57410f8c3775087e4cae1b44da4c5

@@ -1,35 +1,42 @@
-$NetBSD: patch-aa,v 1.10 2009/01/07 19:11:36 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2012/08/01 17:52:22 drochner Exp $
 
---- bus/Makefile.in.orig	2008-12-18 21:47:13.000000000 +0100
+--- bus/Makefile.in.orig	2012-07-26 16:39:09.000000000 +0000
 +++ bus/Makefile.in
-@@ -415,9 +415,10 @@ target_vendor = @target_vendor@
+@@ -500,7 +500,8 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -configdir = $(sysconfdir)/dbus-1
 +etcconfigdir = $(sysconfdir)/dbus-1
 +configdir = $(datadir)/examples/@PACKAGE@
- INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@		\
--	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"	\
-+	-DDBUS_SYSTEM_CONFIG_FILE=\""$(etcconfigdir)/system.conf"\"	\
- 	-DDAEMON_NAME=\"dbus-daemon\"  -DDBUS_COMPILATION
+ dbus_daemon_execdir = $(DBUS_DAEMONDIR)
+ DBUS_BUS_LIBS = \
+ 	$(XML_LIBS) \
+@@ -519,7 +520,7 @@ DBUS_LAUNCHER_LIBS = \
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
+ 	$(XML_CFLAGS) \
+-	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
++	-DDBUS_SYSTEM_CONFIG_FILE=\""$(etcconfigdir)/system.conf"\" \
+ 	-DDBUS_COMPILATION \
+ 	-DDBUS_STATIC_BUILD \
+ 	$(NULL)
+@@ -1510,9 +1511,6 @@ clean-local:
+ 	/bin/rm *.bb *.bbg *.da *.gcov || true
  
- EFENCE = 
-@@ -1294,16 +1295,13 @@ install-data-hook:
- 		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
- 	fi
- 	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
+ install-data-hook:
 -	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
 -	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
 -	$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
  	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
  	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
- 	$(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1
+ # Install dbus.socket as default implementation of a D-Bus stack.
- 	$(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir)
+@@ -1529,7 +1527,7 @@ install-data-hook:
- 	if test `id -u` -eq 0; then \
+ @DBUS_UNIX_TRUE@install-exec-hook:
- 		chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
+ @DBUS_UNIX_TRUE@	if test `id -u` -eq 0; then \
--		chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
+ @DBUS_UNIX_TRUE@		chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
-+		chmod 4550 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
+-@DBUS_UNIX_TRUE@		chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
- 	else \
++@DBUS_UNIX_TRUE@		chmod 4550 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
- 		echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \
+ @DBUS_UNIX_TRUE@	else \
- 		echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \
+ @DBUS_UNIX_TRUE@		echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \
+ @DBUS_UNIX_TRUE@		echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \

@@ -1,26 +1,17 @@
-$NetBSD: patch-ab,v 1.18 2012/03/30 14:28:29 obache Exp $
+$NetBSD: patch-ab,v 1.19 2012/08/01 17:52:22 drochner Exp $
 
---- dbus/dbus-sysdeps-unix.c.orig	2009-05-05 20:51:37.000000000 +0000
+--- dbus/dbus-sysdeps-unix.c.orig	2012-07-03 18:02:45.000000000 +0000
 +++ dbus/dbus-sysdeps-unix.c
-@@ -23,6 +23,7 @@
+@@ -22,6 +22,8 @@
+  *
   */
  
- #define _GNU_SOURCE 
 +#define _NETBSD_SOURCE
++
+ #include <config.h>
  
  #include "dbus-internals.h"
- #include "dbus-sysdeps.h"
-@@ -35,6 +36,9 @@
- #include "dbus-list.h"
- #include "dbus-credentials.h"
- 
-+#ifdef HAVE_NETBSD_ATOMIC_OPS
-+#include <sys/atomic.h>
-+#endif
- #include <sys/types.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -71,6 +75,10 @@
+@@ -72,6 +74,10 @@
  #include <ucred.h>
  #endif
  
@@ -31,10 +22,10 @@
  #ifdef HAVE_ADT
  #include <bsm/adt.h>
  #endif
-@@ -87,6 +95,32 @@
- #define socklen_t int
- #endif
+@@ -122,6 +128,32 @@
  
+ #endif /* Solaris */
+ 
 +#ifdef LOCAL_PEEREID
 +static dbus_bool_t
 +dbus_nb_getpeereid(int fd, pid_t *pid, uid_t *uid, gid_t *gid)
@@ -56,7 +47,7 @@
 +    *gid = cred.unp_egid;
 +
 +  _dbus_verbose ("dbus_nb_getpeereid: returning TRUE, pid=%d uid=%d gid=%d\n",
-+		 cred.unp_pid, cred.unp_euid, cred.unp_egid);
++                cred.unp_pid, cred.unp_euid, cred.unp_egid);
 +  return TRUE;
 +}
 +#endif
@@ -64,132 +55,68 @@
  static dbus_bool_t
  _dbus_open_socket (int              *fd_p,
                     int               domain,
-@@ -581,7 +615,7 @@ _dbus_set_local_creds (int fd, dbus_bool
+@@ -969,7 +1001,7 @@ _dbus_set_local_creds (int fd, dbus_bool
  {
    dbus_bool_t retval = TRUE;
  
 -#if defined(HAVE_CMSGCRED)
 +#if defined(HAVE_CMSGCRED) || defined(LOCAL_PEEREID)
-   /* NOOP just to make sure only one codepath is used 
+   /* NOOP just to make sure only one codepath is used
     *      and to prefer CMSGCRED
     */
-@@ -1041,9 +1075,9 @@ write_credentials_byte (int             
-   int bytes_written;
-   char buf[1] = { '\0' };
- #if defined(HAVE_CMSGCRED) 
--  struct {
-+  union {
- 	  struct cmsghdr hdr;
--	  struct cmsgcred cred;
-+	  char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+@@ -1674,6 +1706,11 @@ _dbus_read_credentials_socket  (int     
+     char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
    } cmsg;
-   struct iovec iov;
-   struct msghdr msg;
-@@ -1054,10 +1088,10 @@ write_credentials_byte (int             
-   msg.msg_iov = &iov;
-   msg.msg_iovlen = 1;
  
--  msg.msg_control = &cmsg;
--  msg.msg_controllen = sizeof (cmsg);
-+  msg.msg_control = (caddr_t) &cmsg;
-+  msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
-   memset (&cmsg, 0, sizeof (cmsg));
--  cmsg.hdr.cmsg_len = sizeof (cmsg);
-+  cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
-   cmsg.hdr.cmsg_level = SOL_SOCKET;
-   cmsg.hdr.cmsg_type = SCM_CREDS;
- #endif
-@@ -1129,15 +1163,15 @@ _dbus_read_credentials_socket  (int     
-   dbus_pid_t pid_read;
-   int bytes_read;
-   
--  uid_read = DBUS_UID_UNSET;
--  pid_read = DBUS_PID_UNSET;
--  
- #ifdef HAVE_CMSGCRED 
--  struct {
-+  union {
-     struct cmsghdr hdr;
--    struct cmsgcred cred;
-+    char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
-   } cmsg;
- 
 +#elif defined(LOCAL_PEEREID)
-+  pid_t sockpid, sockuid, sockgid;
++  pid_t sockpid;
++  uid_t sockuid;
++  gid_t sockgid;
 +
  #elif defined(LOCAL_CREDS)
    struct {
      struct cmsghdr hdr;
-@@ -1145,6 +1179,9 @@ _dbus_read_credentials_socket  (int     
-   } cmsg;
- #endif
- 
-+  uid_read = DBUS_UID_UNSET;
-+  pid_read = DBUS_PID_UNSET;
-+
-   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
-   
-   /* The POSIX spec certainly doesn't promise this, but
-@@ -1170,11 +1207,16 @@ _dbus_read_credentials_socket  (int     
+@@ -1709,10 +1746,15 @@ _dbus_read_credentials_socket  (int     
    msg.msg_iov = &iov;
    msg.msg_iovlen = 1;
  
 -#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
 +#if (defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)) && !defined(LOCAL_PEEREID)
-   memset (&cmsg, 0, sizeof (cmsg));
+   _DBUS_ZERO(cmsg);
 +#ifdef HAVE_CMSGCRED
-+  msg.msg_control = (caddr_t) &cmsg;
-+  msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+   msg.msg_control = (caddr_t) &cmsg;
+   msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
 +#else /* defined(LOCAL_CREDS) */
-   msg.msg_control = &cmsg;
-   msg.msg_controllen = sizeof (cmsg);
- #endif
++  msg.msg_control = &cmsg;
++  msg.msg_controllen = sizeof (cmsg);
 +#endif
+ #endif
  
   again:
-   bytes_read = recvmsg (client_fd, &msg, 0);
-@@ -1210,8 +1252,12 @@ _dbus_read_credentials_socket  (int     
+@@ -1749,9 +1791,13 @@ _dbus_read_credentials_socket  (int     
        return FALSE;
      }
  
 -#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
 +#if (defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)) && !defined(LOCAL_PEEREID)
 +#ifdef HAVE_CMSGCRED
-+  if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)) || cmsg.hdr.cmsg_type != SCM_CREDS)
+   if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred))
+ 		  || cmsg.hdr.cmsg_type != SCM_CREDS)
 +#else /* defined(LOCAL_CREDS) */
-   if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
++  if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
 +#endif
      {
        dbus_set_error (error, DBUS_ERROR_FAILED,
                        "Message from recvmsg() was not SCM_CREDS");
-@@ -1223,7 +1269,11 @@ _dbus_read_credentials_socket  (int     
- 
-   {
- #ifdef SO_PEERCRED
-+#ifdef __OpenBSD__
-+    struct sockpeercred cr;   
-+#else
-     struct ucred cr;   
-+#endif
-     int cr_len = sizeof (cr);
-     
-     if (getsockopt (client_fd, SOL_SOCKET, SO_PEERCRED, &cr, &cr_len) == 0 &&
-@@ -1238,8 +1288,21 @@ _dbus_read_credentials_socket  (int     
- 		       cr_len, (int) sizeof (cr), _dbus_strerror (errno));
-       }
- #elif defined(HAVE_CMSGCRED)
--    pid_read = cmsg.cred.cmcred_pid;
--    uid_read = cmsg.cred.cmcred_euid;
-+    struct cmsgcred *cred;
-+
-+    cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
-+    pid_read = cred->cmcred_pid;
-+    uid_read = cred->cmcred_euid;
+@@ -1787,6 +1833,16 @@ _dbus_read_credentials_socket  (int     
+     cred = (struct cmsgcred *) CMSG_DATA (&cmsg.hdr);
+     pid_read = cred->cmcred_pid;
+     uid_read = cred->cmcred_euid;
 +#elif defined(LOCAL_PEEREID)
 +    if (dbus_nb_getpeereid(client_fd, &sockpid, &sockuid, &sockgid) == TRUE)
 +      {
-+	pid_read = sockpid;
-+	uid_read = sockuid;
++       pid_read = sockpid;
++       uid_read = sockuid;
 +      }
 +    else
 +      {
@@ -198,66 +125,12 @@
  #elif defined(LOCAL_CREDS)
      pid_read = DBUS_PID_UNSET;
      uid_read = cmsg.cred.sc_uid;
-@@ -1301,7 +1364,7 @@ _dbus_read_credentials_socket  (int     
+@@ -1848,7 +1904,7 @@ _dbus_read_credentials_socket  (int     
        }
      if (ucred != NULL)
        ucred_free (ucred);
 -#else /* !SO_PEERCRED && !HAVE_CMSGCRED && !HAVE_GETPEEREID && !HAVE_GETPEERUCRED */
-+#else /* !SO_PEERCRED && !HAVE_CMSGCRED && !HAVE_GETPEEREID && !HAVE_GETPEERUCRED && !LOCAL_PEEREID*/
++#else /* !SO_PEERCRED && !HAVE_CMSGCRED && !HAVE_GETPEEREID && !HAVE_GETPEERUCRED && !LOCAL_PEEREID */
      _dbus_verbose ("Socket credentials not supported on this OS\n");
  #endif
    }
-@@ -1826,7 +1889,26 @@ _dbus_parse_uid (const DBusString      *
-   return TRUE;
- }
- 
-+#ifdef HAVE_NETBSD_ATOMIC_OPS
-+dbus_int32_t
-+_dbus_atomic_inc (DBusAtomic *atomic)
-+{
-+	register dbus_int32_t old = atomic->value;
- 
-+	atomic_inc_uint((unsigned *)&atomic->value);
-+	return old;
-+}
-+
-+dbus_int32_t
-+_dbus_atomic_dec (DBusAtomic *atomic)
-+{
-+	register dbus_int32_t old = atomic->value;
-+
-+	atomic_dec_uint((unsigned *)&atomic->value);
-+  	return old;
-+}
-+_DBUS_DEFINE_GLOBAL_LOCK (atomic);
-+#else
- _DBUS_DEFINE_GLOBAL_LOCK (atomic);
- 
- #if DBUS_USE_ATOMIC_INT_486_COND
-@@ -1891,6 +1973,7 @@ _dbus_atomic_dec (DBusAtomic *atomic)
-   return res;
- #endif
- }
-+#endif /* HAVE_NETBSD_ATOMIC_OPS */
- 
- #ifdef DBUS_BUILD_TESTS
- /** Gets our GID
-@@ -2792,8 +2875,18 @@ int
- _dbus_printf_string_upper_bound (const char *format,
-                                  va_list     args)
- {
-+#if defined(__hpux) || defined(__sgi)
-+/* this code from libnbcompat's vsnprintf */
-+  static FILE *devnull = 0;
-+  if (!devnull) {
-+    devnull = fopen("/dev/null", "w");
-+    if (!devnull) return -1;
-+  }
-+  return vfprintf(devnull, format, args);
-+#else
-   char c;
-   return vsnprintf (&c, 1, format, args);
-+#endif
- }
- 
- /**

@@ -1,24 +1,25 @@
-$NetBSD: patch-al,v 1.1 2008/09/24 11:37:31 taca Exp $
+$NetBSD: patch-al,v 1.2 2012/08/01 17:52:22 drochner Exp $
 
---- tools/Makefile.in.orig	2008-08-07 04:43:39.000000000 +0900
+--- tools/Makefile.in.orig	2012-07-26 16:45:13.000000000 +0000
 +++ tools/Makefile.in
-@@ -301,7 +301,7 @@ target_vendor = @target_vendor@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- configdir = $(sysconfdir)/dbus-1
--INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
-+INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\"
- dbus_send_SOURCES = \
- 	dbus-print-message.c			\
- 	dbus-print-message.h			\
-@@ -337,8 +337,8 @@ CLEANFILES = \
- 	run-with-tmp-session-bus.conf
+@@ -358,7 +358,7 @@ AM_CPPFLAGS = \
+ 	$(DBUS_STATIC_BUILD_CPPFLAGS) \
+ 	$(DBUS_X_CFLAGS) \
+ 	-DDBUS_COMPILATION \
+-	-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
++	-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \
+ 	$(NULL)
  
  
--#create the /var/lib/data directory for dbus-uuidgen
--localstatelibdir = $(localstatedir)/lib/dbus
-+#create the /var/db/dbus directory for dbus-uuidgen
-+localstatelibdir = $(localstatedir)/db/dbus
- localstatelib_DATA = 
- all: all-am
+@@ -756,9 +756,9 @@ uninstall-am: uninstall-binPROGRAMS
+ 	uninstall-binPROGRAMS
  
+ 
+-# create the /var/lib/dbus directory for dbus-uuidgen
++# create the /var/db/dbus directory for dbus-uuidgen
+ install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/dbus
++	$(MKDIR_P) $(DESTDIR)$(localstatedir)/db/dbus
+ 
+ installcheck-local:
+ 	test -d $(DESTDIR)$(localstatedir)/lib/dbus