diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/dbus/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/dbus/distinfo | 10 | ||||
| -rw-r--r-- | sysutils/dbus/patches/patch-ab | 24 |
3 files changed, 19 insertions, 19 deletions
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile index d44a072bf11..4415e2ecd6b 100644 --- a/sysutils/dbus/Makefile +++ b/sysutils/dbus/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.59 2013/01/06 03:55:51 ryoon Exp $ +# $NetBSD: Makefile,v 1.60 2013/05/26 18:06:04 wiz Exp $ -DISTNAME= dbus-1.6.8 +DISTNAME= dbus-1.6.10 CATEGORIES= sysutils MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo index 5efd7f0f227..73d50545da5 100644 --- a/sysutils/dbus/distinfo +++ b/sysutils/dbus/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.42 2012/10/07 21:35:14 wiz Exp $ +$NetBSD: distinfo,v 1.43 2013/05/26 18:06:04 wiz Exp $ -SHA1 (dbus-1.6.8.tar.gz) = d9634807d1de9b64727ae2178e3af2227fca0fca -RMD160 (dbus-1.6.8.tar.gz) = 063d855945bae0124a10b2fa98d64fd09e3b8eda -Size (dbus-1.6.8.tar.gz) = 1929630 bytes +SHA1 (dbus-1.6.10.tar.gz) = d27641d6162965ab6267ff7abb45138148ea549a +RMD160 (dbus-1.6.10.tar.gz) = 7d694e7237347ae8bf6eee4d8531a6b5dfa75bff +Size (dbus-1.6.10.tar.gz) = 1930118 bytes SHA1 (patch-aa) = 0c3d145979e3b2358261c9f7f34701d02eb6ecd4 -SHA1 (patch-ab) = 48dd40c59eef3d99e1933a646e23206c7c55bc97 +SHA1 (patch-ab) = 77eb92f31e849789448ae80990caf9f573aa87a7 SHA1 (patch-ak) = fcb0cad1b6e306db03d538d4ca65f4a18d4726ab SHA1 (patch-al) = 3f9f793b0c1455bf2bf079cc27b841c22f42c276 SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8 diff --git a/sysutils/dbus/patches/patch-ab b/sysutils/dbus/patches/patch-ab index a31f40dfd37..ec9a0e6fa50 100644 --- a/sysutils/dbus/patches/patch-ab +++ b/sysutils/dbus/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.20 2012/08/14 19:18:08 abs Exp $ +$NetBSD: patch-ab,v 1.21 2013/05/26 18:06:04 wiz Exp $ _dbus_poll: Set the timeout value argument to poll to -1 whenever it is less than -1 to avoid kde4 session start hang ---- dbus/dbus-sysdeps-unix.c.orig 2012-07-03 18:02:45.000000000 +0000 +--- dbus/dbus-sysdeps-unix.c.orig 2013-04-22 14:10:32.000000000 +0000 +++ dbus/dbus-sysdeps-unix.c @@ -22,6 +22,8 @@ * @@ -14,8 +14,8 @@ it is less than -1 to avoid kde4 session start hang #include <config.h> #include "dbus-internals.h" -@@ -72,6 +74,10 @@ - #include <ucred.h> +@@ -75,6 +77,10 @@ + #include <alloca.h> #endif +#ifdef __NetBSD__ @@ -25,7 +25,7 @@ it is less than -1 to avoid kde4 session start hang #ifdef HAVE_ADT #include <bsm/adt.h> #endif -@@ -122,6 +128,32 @@ +@@ -125,6 +131,32 @@ #endif /* Solaris */ @@ -58,7 +58,7 @@ it is less than -1 to avoid kde4 session start hang static dbus_bool_t _dbus_open_socket (int *fd_p, int domain, -@@ -969,7 +1001,7 @@ _dbus_set_local_creds (int fd, dbus_bool +@@ -972,7 +1004,7 @@ _dbus_set_local_creds (int fd, dbus_bool { dbus_bool_t retval = TRUE; @@ -67,7 +67,7 @@ it is less than -1 to avoid kde4 session start hang /* NOOP just to make sure only one codepath is used * and to prefer CMSGCRED */ -@@ -1674,6 +1706,11 @@ _dbus_read_credentials_socket (int +@@ -1677,6 +1709,11 @@ _dbus_read_credentials_socket (int char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; } cmsg; @@ -79,7 +79,7 @@ it is less than -1 to avoid kde4 session start hang #elif defined(LOCAL_CREDS) struct { struct cmsghdr hdr; -@@ -1709,10 +1746,15 @@ _dbus_read_credentials_socket (int +@@ -1712,10 +1749,15 @@ _dbus_read_credentials_socket (int msg.msg_iov = &iov; msg.msg_iovlen = 1; @@ -96,7 +96,7 @@ it is less than -1 to avoid kde4 session start hang #endif again: -@@ -1749,9 +1791,13 @@ _dbus_read_credentials_socket (int +@@ -1752,9 +1794,13 @@ _dbus_read_credentials_socket (int return FALSE; } @@ -111,7 +111,7 @@ it is less than -1 to avoid kde4 session start hang { dbus_set_error (error, DBUS_ERROR_FAILED, "Message from recvmsg() was not SCM_CREDS"); -@@ -1787,6 +1833,16 @@ _dbus_read_credentials_socket (int +@@ -1790,6 +1836,16 @@ _dbus_read_credentials_socket (int cred = (struct cmsgcred *) CMSG_DATA (&cmsg.hdr); pid_read = cred->cmcred_pid; uid_read = cred->cmcred_euid; @@ -128,7 +128,7 @@ it is less than -1 to avoid kde4 session start hang #elif defined(LOCAL_CREDS) pid_read = DBUS_PID_UNSET; uid_read = cmsg.cred.sc_uid; -@@ -1848,7 +1904,7 @@ _dbus_read_credentials_socket (int +@@ -1851,7 +1907,7 @@ _dbus_read_credentials_socket (int } if (ucred != NULL) ucred_free (ucred); @@ -137,7 +137,7 @@ it is less than -1 to avoid kde4 session start hang _dbus_verbose ("Socket credentials not supported on this OS\n"); #endif } -@@ -2525,6 +2581,10 @@ _dbus_poll (DBusPollFD *fds, +@@ -2528,6 +2584,10 @@ _dbus_poll (DBusPollFD *fds, _DBUS_STRUCT_OFFSET (DBusPollFD, revents) == _DBUS_STRUCT_OFFSET (struct pollfd, revents)) { |