4 files changed, 24 insertions, 13 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index c5a63e7e2b0d..89df6ae07e7a 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	dbus
-PORTVERSION?=	1.2.1
+PORTVERSION?=	1.2.4.2
 PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
+DISTNAME=	dbus-${PORTVERSION}permissive
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A message bus system for inter-application communication
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_GNOME?=	gnomehack gnometarget libxml2 ltverhack
+USE_GNOME?=	gnomehack libxml2 ltverhack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 19b7feafa05f..00cc4ea6a0c2 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-1.2.1.tar.gz) = b57aa1ba0834cbbb1e7502dc2cbfacc2
-SHA256 (dbus-1.2.1.tar.gz) = 8016540602189e1dca6aca6b7c0735706387e4f85ced75217c6a874980fd0e86
-SIZE (dbus-1.2.1.tar.gz) = 1406833
+MD5 (dbus-1.2.4.2permissive.tar.gz) = 92418f1d2932c2f4980b815e00c993cc
+SHA256 (dbus-1.2.4.2permissive.tar.gz) = 1d384f4d1c7d2e022e68e421f980c3e60557016d44999560f2136d2a58f7c9c9
+SIZE (dbus-1.2.4.2permissive.tar.gz) = 1574034
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
index bd0353d36d62..aa623c158889 100644
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
@@ -1,6 +1,6 @@
---- dbus/dbus-sysdeps-unix.c.orig	2008-02-15 20:26:46.000000000 -0500
-+++ dbus/dbus-sysdeps-unix.c	2008-02-15 20:28:46.000000000 -0500
-@@ -1032,9 +1032,9 @@ write_credentials_byte (int             
+--- dbus/dbus-sysdeps-unix.c.orig	2008-08-06 13:00:29.000000000 -0400
++++ dbus/dbus-sysdeps-unix.c	2008-08-10 15:04:32.000000000 -0400
+@@ -1041,9 +1041,9 @@ write_credentials_byte (int             
    int bytes_written;
    char buf[1] = { '\0' };
  #if defined(HAVE_CMSGCRED) 
@@ -12,7 +12,7 @@
    } cmsg;
    struct iovec iov;
    struct msghdr msg;
-@@ -1045,10 +1045,10 @@ write_credentials_byte (int             
+@@ -1054,10 +1054,10 @@ write_credentials_byte (int             
    msg.msg_iov = &iov;
    msg.msg_iovlen = 1;
  
@@ -26,7 +26,7 @@
    cmsg.hdr.cmsg_level = SOL_SOCKET;
    cmsg.hdr.cmsg_type = SCM_CREDS;
  #endif
-@@ -1124,9 +1124,9 @@ _dbus_read_credentials_socket  (int     
+@@ -1133,9 +1133,9 @@ _dbus_read_credentials_socket  (int     
    pid_read = DBUS_PID_UNSET;
    
  #ifdef HAVE_CMSGCRED 
@@ -38,7 +38,7 @@
    } cmsg;
  
  #elif defined(LOCAL_CREDS)
-@@ -1163,8 +1163,8 @@ _dbus_read_credentials_socket  (int     
+@@ -1172,8 +1172,8 @@ _dbus_read_credentials_socket  (int     
  
  #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
    memset (&cmsg, 0, sizeof (cmsg));
@@ -49,7 +49,7 @@
  #endif
  
   again:
-@@ -1202,7 +1202,8 @@ _dbus_read_credentials_socket  (int     
+@@ -1211,7 +1211,8 @@ _dbus_read_credentials_socket  (int     
      }
  
  #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
@@ -59,7 +59,7 @@
      {
        dbus_set_error (error, DBUS_ERROR_FAILED,
                        "Message from recvmsg() was not SCM_CREDS");
-@@ -1229,8 +1230,11 @@ _dbus_read_credentials_socket  (int     
+@@ -1238,8 +1239,11 @@ _dbus_read_credentials_socket  (int     
  		       cr_len, (int) sizeof (cr), _dbus_strerror (errno));
        }
  #elif defined(HAVE_CMSGCRED)
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
new file mode 100644
index 000000000000..cdf6eaf0796d
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
@@ -0,0 +1,10 @@
+--- dbus/dbus-sysdeps-util-unix.c.orig	2008-12-21 14:51:17.000000000 -0500
++++ dbus/dbus-sysdeps-util-unix.c	2008-12-21 14:51:37.000000000 -0500
+@@ -38,6 +38,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <syslog.h>
+ #include <sys/stat.h>
+ #include <grp.h>
+ #include <sys/socket.h>