diff options
| -rw-r--r-- | sysutils/dbus/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/dbus/patches/patch-ab | 32 |
2 files changed, 24 insertions, 12 deletions
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo index e12b8f36c26..ec3e9c65116 100644 --- a/sysutils/dbus/distinfo +++ b/sysutils/dbus/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.37 2011/06/13 22:06:39 tez Exp $ +$NetBSD: distinfo,v 1.38 2012/03/30 14:28:29 obache Exp $ SHA1 (dbus-1.2.4.6permissive.tar.gz) = f71219624885fe2ec1990bb8bdd599e184dd5774 RMD160 (dbus-1.2.4.6permissive.tar.gz) = 05d1c5fae8ae763a9beb8c7d6f390f3ff54e9c30 @@ -9,7 +9,7 @@ SHA1 (patch-CVE-2010-4352-3) = d5598dab11bad66c2f586e418a8b409ac5fc67d5 SHA1 (patch-CVE-2010-4352-4) = 82a43bc19bf4ef73d6e2909dd1c948798585135d SHA1 (patch-CVE-2011-2200) = 99e991dd51312fb7181f12c1c5d3b87897e417ac SHA1 (patch-aa) = fd7cc2e11e15e13885e882e8de51e17af8a63d70 -SHA1 (patch-ab) = b2761914edfe2c7666c5412abf79c5d7b87a2006 +SHA1 (patch-ab) = e08250a12e6c04c69278c03078a817159592b3d0 SHA1 (patch-ac) = 63aab0ffac02a9cb85a80e31bbb1234534db378b SHA1 (patch-ag) = 999071b782982c12329025ea8e393bfed940b654 SHA1 (patch-ai) = a45bd8d29955e9c14a4d8b3f44b42242d70c1cd8 diff --git a/sysutils/dbus/patches/patch-ab b/sysutils/dbus/patches/patch-ab index 4981fd4aac2..c2cea5581ca 100644 --- a/sysutils/dbus/patches/patch-ab +++ b/sysutils/dbus/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.17 2009/01/09 21:47:32 he Exp $ +$NetBSD: patch-ab,v 1.18 2012/03/30 14:28:29 obache Exp $ ---- dbus/dbus-sysdeps-unix.c.orig 2008-12-18 22:35:53 +0200 -+++ dbus/dbus-sysdeps-unix.c 2009-01-09 13:49:43 +0200 +--- dbus/dbus-sysdeps-unix.c.orig 2009-05-05 20:51:37.000000000 +0000 ++++ dbus/dbus-sysdeps-unix.c @@ -23,6 +23,7 @@ */ @@ -162,7 +162,19 @@ $NetBSD: patch-ab,v 1.17 2009/01/09 21:47:32 he Exp $ { dbus_set_error (error, DBUS_ERROR_FAILED, "Message from recvmsg() was not SCM_CREDS"); -@@ -1238,8 +1284,21 @@ _dbus_read_credentials_socket (int +@@ -1223,7 +1269,11 @@ _dbus_read_credentials_socket (int + + { + #ifdef SO_PEERCRED ++#ifdef __OpenBSD__ ++ struct sockpeercred cr; ++#else + struct ucred cr; ++#endif + int cr_len = sizeof (cr); + + if (getsockopt (client_fd, SOL_SOCKET, SO_PEERCRED, &cr, &cr_len) == 0 && +@@ -1238,8 +1288,21 @@ _dbus_read_credentials_socket (int cr_len, (int) sizeof (cr), _dbus_strerror (errno)); } #elif defined(HAVE_CMSGCRED) @@ -186,7 +198,7 @@ $NetBSD: patch-ab,v 1.17 2009/01/09 21:47:32 he Exp $ #elif defined(LOCAL_CREDS) pid_read = DBUS_PID_UNSET; uid_read = cmsg.cred.sc_uid; -@@ -1301,7 +1360,7 @@ _dbus_read_credentials_socket (int +@@ -1301,7 +1364,7 @@ _dbus_read_credentials_socket (int } if (ucred != NULL) ucred_free (ucred); @@ -195,7 +207,7 @@ $NetBSD: patch-ab,v 1.17 2009/01/09 21:47:32 he Exp $ _dbus_verbose ("Socket credentials not supported on this OS\n"); #endif } -@@ -1826,7 +1885,26 @@ _dbus_parse_uid (const DBusString * +@@ -1826,7 +1889,26 @@ _dbus_parse_uid (const DBusString * return TRUE; } @@ -204,7 +216,7 @@ $NetBSD: patch-ab,v 1.17 2009/01/09 21:47:32 he Exp $ +_dbus_atomic_inc (DBusAtomic *atomic) +{ + register dbus_int32_t old = atomic->value; -+ + + atomic_inc_uint((unsigned *)&atomic->value); + return old; +} @@ -213,7 +225,7 @@ $NetBSD: patch-ab,v 1.17 2009/01/09 21:47:32 he Exp $ +_dbus_atomic_dec (DBusAtomic *atomic) +{ + register dbus_int32_t old = atomic->value; - ++ + atomic_dec_uint((unsigned *)&atomic->value); + return old; +} @@ -222,7 +234,7 @@ $NetBSD: patch-ab,v 1.17 2009/01/09 21:47:32 he Exp $ _DBUS_DEFINE_GLOBAL_LOCK (atomic); #if DBUS_USE_ATOMIC_INT_486_COND -@@ -1891,6 +1969,7 @@ _dbus_atomic_dec (DBusAtomic *atomic) +@@ -1891,6 +1973,7 @@ _dbus_atomic_dec (DBusAtomic *atomic) return res; #endif } @@ -230,7 +242,7 @@ $NetBSD: patch-ab,v 1.17 2009/01/09 21:47:32 he Exp $ #ifdef DBUS_BUILD_TESTS /** Gets our GID -@@ -2792,8 +2871,18 @@ int +@@ -2792,8 +2875,18 @@ int _dbus_printf_string_upper_bound (const char *format, va_list args) { |