Update to 0.35, and hopefully fix cmsgcred alignment on non-i386 platforms.

10 files changed, 174 insertions, 86 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 7f893846d607..be7c6bc73b76 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	dbus
-PORTVERSION=	0.34
-PORTREVISION?=	4
+PORTVERSION=	0.35
+PORTREVISION?=	0
 CATEGORIES?=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/
 
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index c559ab2e1bed..267bfc655fc8 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,2 +1,2 @@
-MD5 (dbus-0.34.tar.gz) = fd25c4ee2374f6c3ef9e236290667242
-SIZE (dbus-0.34.tar.gz) = 1505592
+MD5 (dbus-0.35.tar.gz) = d3bea98a2efabc4c937a2410b6faf091
+SIZE (dbus-0.35.tar.gz) = 1589061
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps.c b/devel/dbus/files/patch-dbus_dbus-sysdeps.c
index 7e04a09ff0fe..c8e0d0654896 100644
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps.c
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps.c
@@ -1,3 +1,106 @@
+--- dbus/dbus-sysdeps.c.orig	Thu Jun 16 01:51:46 2005
++++ dbus/dbus-sysdeps.c	Sat Jul 16 02:55:41 2005
+@@ -742,16 +742,16 @@ write_credentials_byte (int             
+ {
+   int bytes_written;
+   char buf[1] = { '\0' };
+-#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
+-  struct {
++#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
++  union {
+ 	  struct cmsghdr hdr;
+-	  struct cmsgcred cred;
++	  char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+   } cmsg;
+   struct iovec iov;
+   struct msghdr msg;
+ #endif
+ 
+-#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
++#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
+   iov.iov_base = buf;
+   iov.iov_len = 1;
+ 
+@@ -759,10 +759,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
+@@ -771,7 +771,7 @@ write_credentials_byte (int             
+   
+  again:
+ 
+-#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
++#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
+   bytes_written = sendmsg (server_fd, &msg, 0);
+ #else
+   bytes_written = write (server_fd, buf, 1);
+@@ -829,9 +829,10 @@ _dbus_read_credentials_unix_socket  (int
+   char buf;
+ 
+ #ifdef HAVE_CMSGCRED 
+-  struct {
++  struct cmsgcred *cred;
++  union {
+ 	  struct cmsghdr hdr;
+-	  struct cmsgcred cred;
++	  char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+   } cmsg;
+ #endif
+ 
+@@ -847,7 +848,7 @@ _dbus_read_credentials_unix_socket  (int
+ 
+   _dbus_credentials_clear (credentials);
+ 
+-#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
++#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__)
+   /* Set the socket to receive credentials on the next message */
+   {
+     int on = 1;
+@@ -868,8 +869,8 @@ _dbus_read_credentials_unix_socket  (int
+ 
+ #ifdef HAVE_CMSGCRED
+   memset (&cmsg, 0, sizeof (cmsg));
+-  msg.msg_control = &cmsg;
+-  msg.msg_controllen = sizeof (cmsg);
++  msg.msg_control = (caddr_t) &cmsg;
++  msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+ #endif
+ 
+  again:
+@@ -892,7 +893,8 @@ _dbus_read_credentials_unix_socket  (int
+     }
+ 
+ #ifdef HAVE_CMSGCRED
+-  if (cmsg->hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
++  if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred))
++		  || cmsg.hdr.cmsg_type != SCM_CREDS)
+     {
+       dbus_set_error (error, DBUS_ERROR_FAILED,
+                       "Message from recvmsg() was not SCM_CREDS");
+@@ -920,9 +922,10 @@ _dbus_read_credentials_unix_socket  (int
+ 		       cr_len, (int) sizeof (cr), _dbus_strerror (errno));
+       }
+ #elif defined(HAVE_CMSGCRED)
+-    credentials->pid = cmsg.cred.cmcred_pid;
+-    credentials->uid = cmsg.cred.cmcred_euid;
+-    credentials->gid = cmsg.cred.cmcred_groups[0];
++    cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
++    credentials->pid = cred->cmcred_pid;
++    credentials->uid = cred->cmcred_euid;
++    credentials->gid = cred->cmcred_groups[0];
+ #else /* !SO_PEERCRED && !HAVE_CMSGCRED */
+     _dbus_verbose ("Socket credentials not supported on this OS\n");
+ #endif
 --- dbus/dbus-sysdeps.c.orig	Sat Mar  5 13:38:54 2005
 +++ dbus/dbus-sysdeps.c	Tue Apr 26 01:59:05 2005
 @@ -742,12 +742,40 @@ write_credentials_byte (int             
diff --git a/devel/dbus/files/patch-glib_dbus-gidl.c b/devel/dbus/files/patch-glib_dbus-gidl.c
index a4a5d3fac947..f09505e83325 100644
--- a/devel/dbus/files/patch-glib_dbus-gidl.c
+++ b/devel/dbus/files/patch-glib_dbus-gidl.c
@@ -1,6 +1,6 @@
---- glib/dbus-gidl.c.orig	Fri Apr  8 22:38:35 2005
-+++ glib/dbus-gidl.c	Fri Apr  8 22:37:53 2005
-@@ -661,8 +661,8 @@ property_info_unref (PropertyInfo *info)
+--- glib/dbus-gidl.c.orig	Sat Jul  9 13:52:52 2005
++++ glib/dbus-gidl.c	Sat Jul 16 02:13:02 2005
+@@ -662,8 +662,8 @@ property_info_unref (PropertyInfo *info)
    info->base.refcount -= 1;
    if (info->base.refcount == 0)
      {
@@ -10,13 +10,13 @@
      }
  }
  
-@@ -717,8 +717,8 @@ arg_info_unref (ArgInfo *info)
-   info->base.refcount -= 1;
+@@ -722,8 +722,8 @@ arg_info_unref (ArgInfo *info)
    if (info->base.refcount == 0)
      {
+       g_hash_table_destroy (info->annotations);
 -      base_info_free (info);
        g_free (info->type);
 +      base_info_free (info);
      }
  }
- const char*
+ 
diff --git a/devel/dbus/files/patch-glib_dbus-gvalue.c b/devel/dbus/files/patch-glib_dbus-gvalue.c
index d0144b9e4c90..ef0bfc32dd36 100644
--- a/devel/dbus/files/patch-glib_dbus-gvalue.c
+++ b/devel/dbus/files/patch-glib_dbus-gvalue.c
@@ -1,34 +1,24 @@
---- glib/dbus-gvalue.c.orig	Sat Jul  2 01:08:35 2005
-+++ glib/dbus-gvalue.c	Sat Jul  2 01:10:19 2005
-@@ -213,15 +213,6 @@ dbus_g_value_types_init (void)
+--- glib/dbus-gvalue.c.orig	Mon Jul 11 12:12:49 2005
++++ glib/dbus-gvalue.c	Sat Jul 16 02:15:19 2005
+@@ -189,6 +189,10 @@ dbus_g_value_types_init (void)
  {
    static gboolean types_initialized;
  
--
--  if (types_initialized)
--    return;
--
--  g_assert (sizeof (DBusGValueIterator) >= sizeof (DBusMessageIter));
--
--  dbus_g_type_specialized_init ();
--  dbus_g_type_specialized_builtins_init ();
--  
-   static const DBusGTypeMarshalVtable basic_vtable = {
-     marshal_basic,
-     demarshal_basic
-@@ -234,6 +225,15 @@ dbus_g_value_types_init (void)
-     marshal_map,
-     demarshal_ghashtable
-   };
-+
-+  if (types_initialized)
-+    return;
-+
-+  g_assert (sizeof (DBusGValueIterator) >= sizeof (DBusMessageIter));
-+
-+  dbus_g_type_specialized_init ();
-+  dbus_g_type_specialized_builtins_init ();
-+
++  static const DBusGTypeMarshalVtable basic_vtable = {
++    marshal_basic,
++    demarshal_basic
++  };
+ 
+   if (types_initialized)
+     return;
+@@ -196,10 +200,6 @@ dbus_g_value_types_init (void)
+   dbus_g_type_specialized_init ();
+   dbus_g_type_specialized_builtins_init ();
+   
+-  static const DBusGTypeMarshalVtable basic_vtable = {
+-    marshal_basic,
+-    demarshal_basic
+-  };
  
    /* Register basic types */
    {
diff --git a/devel/dbus/files/patch-mono_doc_Makefile.in b/devel/dbus/files/patch-mono_doc_Makefile.in
deleted file mode 100644
index 49f29bf2b568..000000000000
--- a/devel/dbus/files/patch-mono_doc_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- mono/doc/Makefile.in.orig	Sun Feb 27 16:41:42 2005
-+++ mono/doc/Makefile.in	Sun Feb 27 16:50:51 2005
-@@ -435,10 +435,10 @@
- 
- 
- @ENABLE_MONODOC_TRUE@install-data-local:
--@ENABLE_MONODOC_TRUE@	install -d -m 755 $(DESTDIR)/`monodoc --get-sourcesdir`
--@ENABLE_MONODOC_TRUE@	install -m 644 $(srcdir)/dbus-sharp-docs.source $(DESTDIR)/`monodoc --get-sourcesdir`
--@ENABLE_MONODOC_TRUE@	install -m 644 $(srcdir)/dbus-sharp-docs.tree $(DESTDIR)/`monodoc --get-sourcesdir`
--@ENABLE_MONODOC_TRUE@	install -m 644 $(srcdir)/dbus-sharp-docs.zip $(DESTDIR)/`monodoc --get-sourcesdir`
-+@ENABLE_MONODOC_TRUE@	install -d -m 755 $(DESTDIR)%%LOCALBASE%%/lib/monodoc/sources
-+@ENABLE_MONODOC_TRUE@	install -m 644 $(srcdir)/dbus-sharp-docs.source $(DESTDIR)%%LOCALBASE%%/lib/monodoc/sources
-+@ENABLE_MONODOC_TRUE@	install -m 644 $(srcdir)/dbus-sharp-docs.tree $(DESTDIR)%%LOCALBASE%%/lib/monodoc/sources
-+@ENABLE_MONODOC_TRUE@	install -m 644 $(srcdir)/dbus-sharp-docs.zip $(DESTDIR)%%LOCALBASE%%/lib/monodoc/sources
- 
- @ENABLE_MONODOC_TRUE@uninstall-local:
- @ENABLE_MONODOC_TRUE@	rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/dbus-sharp-docs.source
diff --git a/devel/dbus/files/patch-python_Makefile.in b/devel/dbus/files/patch-python_Makefile.in
index a2ef3198a209..e547d0ecb7a6 100644
--- a/devel/dbus/files/patch-python_Makefile.in
+++ b/devel/dbus/files/patch-python_Makefile.in
@@ -1,21 +1,31 @@
---- python/Makefile.in.orig	Fri Jan 21 19:46:15 2005
-+++ python/Makefile.in	Fri Jan 21 19:47:06 2005
-@@ -51,8 +51,7 @@
- am__installdirs = "$(DESTDIR)$(dbusbindingsdir)" "$(DESTDIR)$(dbusdir)"
+--- python/Makefile.in.orig	Sat Jul 16 02:18:56 2005
++++ python/Makefile.in	Sat Jul 16 02:20:46 2005
+@@ -60,12 +60,12 @@
+ 	"$(DESTDIR)$(dbusdir)"
  dbusbindingsLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(dbusbindings_LTLIBRARIES)
--dbus_bindings_la_DEPENDENCIES = $(top_builddir)/dbus/libdbus-1.la \
--	$(top_builddir)/glib/libdbus-glib-1.la
-+dbus_bindings_la_DEPENDENCIES = -ldbus-1 -ldbus-glib-1
+-dbus_bindings_la_DEPENDENCIES = $(top_builddir)/dbus/libdbus-1.la
++dbus_bindings_la_DEPENDENCIES = -ldbus-1
  nodist_dbus_bindings_la_OBJECTS = dbus_bindings.lo
  dbus_bindings_la_OBJECTS = $(nodist_dbus_bindings_la_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -298,7 +297,7 @@
- dbusbindingsdir = $(pythondir)
- dbusbindings_LTLIBRARIES = dbus_bindings.la
+ dbus_glib_bindings_la_DEPENDENCIES =  \
+-	$(top_builddir)/dbus/libdbus-1.la \
+-	$(top_builddir)/glib/libdbus-glib-1.la
++	-ldbus-1 \
++	-ldbus-glib-1
+ nodist_dbus_glib_bindings_la_OBJECTS =  \
+ 	dbus_glib_bindings_la-dbus_glib_bindings.lo
+ dbus_glib_bindings_la_OBJECTS =  \
+@@ -345,10 +345,10 @@
+ dbusbindingsdir = $(pyexecdir)/dbus
+ dbusbindings_LTLIBRARIES = dbus_bindings.la dbus_glib_bindings.la
  dbus_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_bindings
--dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la
-+dbus_bindings_la_LIBADD = -ldbus-1 -ldbus-glib-1
- nodist_dbus_bindings_la_SOURCES = dbus_bindings.c
+-dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la
++dbus_bindings_la_LIBADD = -ldbus-1
+ nodist_dbus_bindings_la_SOURCES = $(srcdir)/dbus_bindings.c
+ dbus_glib_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_glib_bindings 
+-dbus_glib_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la
++dbus_glib_bindings_la_LIBADD = -ldbus-1 -ldbus-glib-1
+ dbus_glib_bindings_la_CFLAGS = $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS)
+ nodist_dbus_glib_bindings_la_SOURCES = $(srcdir)/dbus_glib_bindings.c
  EXTRA_DIST = \
- 	dbus_h_wrapper.h	\
diff --git a/devel/dbus/files/patch-python_dbus_bindings.pxd.in b/devel/dbus/files/patch-python_dbus_bindings.pxd.in
new file mode 100644
index 000000000000..a61214f15691
--- /dev/null
+++ b/devel/dbus/files/patch-python_dbus_bindings.pxd.in
@@ -0,0 +1,11 @@
+--- python/dbus_bindings.pxd.in.orig	Sat Jul 16 03:30:06 2005
++++ python/dbus_bindings.pxd.in	Sat Jul 16 03:30:03 2005
+@@ -0,0 +1,8 @@
++#include "dbus_h_wrapper.h"
++
++cdef class Connection:
++    cdef DBusConnection *conn
++
++    cdef __cinit__(self, address, DBusConnection *_conn)
++    cdef _set_conn(self, DBusConnection *conn)
++    cdef DBusConnection *_get_conn(self)
diff --git a/devel/dbus/files/patch-python_dbus_bindings.pyx.in b/devel/dbus/files/patch-python_dbus_bindings.pyx.in
deleted file mode 100644
index 4b3d4232c3ab..000000000000
--- a/devel/dbus/files/patch-python_dbus_bindings.pyx.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- python/dbus_bindings.pyx.in.orig	Tue Oct 28 19:06:07 2003
-+++ python/dbus_bindings.pyx.in	Sun Aug  8 13:52:34 2004
-@@ -1,5 +1,13 @@
- # -*- Mode: Python -*-
- 
-+cdef extern from "sys/types.h":
-+    ctypedef size_t
-+    ctypedef __int64_t
-+    ctypedef __uint64_t
-+
-+cdef extern from "sys/cdefs.h":
-+    ctypedef __signed
-+
- #include "dbus_h_wrapper.h"
- 
- cdef extern from "stdlib.h":
diff --git a/devel/dbus/files/patch-python_dbus_h_wrapper.h b/devel/dbus/files/patch-python_dbus_h_wrapper.h
new file mode 100644
index 000000000000..b8c6cd9fd747
--- /dev/null
+++ b/devel/dbus/files/patch-python_dbus_h_wrapper.h
@@ -0,0 +1,7 @@
+--- python/dbus_h_wrapper.h.orig	Sat Jul 16 03:30:40 2005
++++ python/dbus_h_wrapper.h	Sat Jul 16 03:28:47 2005
+@@ -1,3 +1,4 @@
+ #define DBUS_API_SUBJECT_TO_CHANGE 1
++#define lint 1
+ #include <dbus/dbus.h>
+