From 6f32add9a75efb180e462ffbdb0b080bc88088e3 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Mon, 24 Mar 2008 03:52:36 +0000 Subject: The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for FreeBSD. The official GNOME 2.22 release notes can be found at http://library.gnome.org/misc/release-notes/2.22/ . On the FreeBSD front, this release features an updated hal port with support for video4linux devices, DRM (Direct Rendering), and better support of removable media. Work is also underway to tie webkit more closely into GNOME. As part of the GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well. Be sure to consult UPDATING on the proper steps to upgrade all of your GNOME ports. This release would not have been possible without the contributions and testing efforts of the following people: Pawel Worach kan edwin Peter Ulrich Kruppa J. W. Ballantine Yasuda Keisuke Andriy Gapon --- devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c | 56 ++++++++++--------------- 1 file changed, 22 insertions(+), 34 deletions(-) (limited to 'devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c') diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c index 83b1c33d72be..bd0353d36d62 100644 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c +++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c @@ -1,12 +1,10 @@ ---- dbus/dbus-sysdeps-unix.c.orig Wed Nov 1 18:30:46 2006 -+++ dbus/dbus-sysdeps-unix.c Sun Nov 5 21:57:27 2006 -@@ -834,10 +834,10 @@ write_credentials_byte (int - { +--- 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 int bytes_written; char buf[1] = { '\0' }; --#if defined(HAVE_CMSGCRED) + #if defined(HAVE_CMSGCRED) - struct { -+#if defined(HAVE_CMSGCRED) + union { struct cmsghdr hdr; - struct cmsgcred cred; @@ -14,7 +12,7 @@ } cmsg; struct iovec iov; struct msghdr msg; -@@ -848,10 +848,10 @@ write_credentials_byte (int +@@ -1045,10 +1045,10 @@ write_credentials_byte (int msg.msg_iov = &iov; msg.msg_iovlen = 1; @@ -28,20 +26,19 @@ cmsg.hdr.cmsg_level = SOL_SOCKET; cmsg.hdr.cmsg_type = SCM_CREDS; #endif -@@ -918,9 +918,10 @@ _dbus_read_credentials_unix_socket (int - char buf; - +@@ -1124,9 +1124,9 @@ _dbus_read_credentials_socket (int + pid_read = DBUS_PID_UNSET; + #ifdef HAVE_CMSGCRED - struct { -+ struct cmsgcred *cred; + union { - struct cmsghdr hdr; -- struct cmsgcred cred; -+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; + struct cmsghdr hdr; +- struct cmsgcred cred; ++ char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; } cmsg; #elif defined(LOCAL_CREDS) -@@ -957,8 +958,8 @@ _dbus_read_credentials_unix_socket (int +@@ -1163,8 +1163,8 @@ _dbus_read_credentials_socket (int #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) memset (&cmsg, 0, sizeof (cmsg)); @@ -52,7 +49,7 @@ #endif again: -@@ -981,7 +982,8 @@ _dbus_read_credentials_unix_socket (int +@@ -1202,7 +1202,8 @@ _dbus_read_credentials_socket (int } #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) @@ -62,26 +59,17 @@ { dbus_set_error (error, DBUS_ERROR_FAILED, "Message from recvmsg() was not SCM_CREDS"); -@@ -1009,9 +1011,10 @@ _dbus_read_credentials_unix_socket (int +@@ -1229,8 +1230,11 @@ _dbus_read_credentials_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]; +- pid_read = cmsg.cred.cmcred_pid; +- uid_read = cmsg.cred.cmcred_euid; ++ struct cmsgcred *cred; ++ + cred = (struct cmsgcred *) CMSG_DATA (&cmsg); -+ credentials->pid = cred->cmcred_pid; -+ credentials->uid = cred->cmcred_euid; -+ credentials->gid = cred->cmcred_groups[0]; ++ pid_read = cred->cmcred_pid; ++ uid_read = cred->cmcred_euid; #elif defined(LOCAL_CREDS) - credentials->pid = DBUS_PID_UNSET; - credentials->uid = cmsg.cred.sc_uid; -@@ -2687,7 +2690,7 @@ _dbus_get_standard_session_servicedirs ( - } - else - { -- if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:")) -+ if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/X11R6/share:/usr/share:")) - goto oom; - } - + pid_read = DBUS_PID_UNSET; + uid_read = cmsg.cred.sc_uid; -- cgit v1.2.3