summaryrefslogtreecommitdiff
path: root/devel/dbus/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/dbus/files')
-rw-r--r--devel/dbus/files/patch-configure13
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c75
2 files changed, 0 insertions, 88 deletions
diff --git a/devel/dbus/files/patch-configure b/devel/dbus/files/patch-configure
deleted file mode 100644
index 0161d4625f7d..000000000000
--- a/devel/dbus/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig 2009-01-13 07:43:11.194080000 +0000
-+++ configure 2009-01-13 07:43:26.270082000 +0000
-@@ -20956,10 +20956,6 @@ if test "x$GCC" = "xyes"; then
- *[\ \ ]-Wno-sign-compare[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wno-sign-compare" ;;
- esac
-- case " $CFLAGS " in
-- *[\ \ ]-Wno-pointer-sign[\ \ ]*) ;;
-- *) CFLAGS="$CFLAGS -Wno-pointer-sign" ;;
-- esac
-
- # http://bugs.freedesktop.org/show_bug.cgi?id=19195
- case " $CFLAGS " in
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
deleted file mode 100644
index aa623c158889..000000000000
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- 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)
-- struct {
-+ union {
- struct cmsghdr hdr;
-- struct cmsgcred cred;
-+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
- } cmsg;
- struct iovec iov;
- struct msghdr msg;
-@@ -1054,10 +1054,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
-@@ -1133,9 +1133,9 @@ _dbus_read_credentials_socket (int
- 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_CREDS)
-@@ -1172,8 +1172,8 @@ _dbus_read_credentials_socket (int
-
- #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
- 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:
-@@ -1211,7 +1211,8 @@ _dbus_read_credentials_socket (int
- }
-
- #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
-- 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");
-@@ -1238,8 +1239,11 @@ _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;
- #elif defined(LOCAL_CREDS)
- pid_read = DBUS_PID_UNSET;
- uid_read = cmsg.cred.sc_uid;