From 7f99ed5fe0746890cc7a734063f34dd5ceb8a1f8 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 15 Aug 2008 12:15:17 +0000 Subject: Update to 1.2.3: 1.2.3: * New UpdateActivationEnvironment bus API (#16669) * Solaris Auditing (ADT) support (#15740) * Various notable bug fixes: #16727, #16294, #15947 #15588 * Other more minor bugs --- sysutils/dbus/Makefile | 7 ++-- sysutils/dbus/distinfo | 14 +++----- sysutils/dbus/patches/patch-ab | 43 +++++++++------------- sysutils/dbus/patches/patch-ad | 82 ------------------------------------------ sysutils/dbus/patches/patch-ag | 24 ------------- sysutils/dbus/patches/patch-ah | 15 -------- sysutils/dbus/patches/patch-aj | 15 -------- 7 files changed, 25 insertions(+), 175 deletions(-) delete mode 100644 sysutils/dbus/patches/patch-ad delete mode 100644 sysutils/dbus/patches/patch-ag delete mode 100644 sysutils/dbus/patches/patch-ah delete mode 100644 sysutils/dbus/patches/patch-aj (limited to 'sysutils/dbus') diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile index a74eb7111a0..8756397b34e 100644 --- a/sysutils/dbus/Makefile +++ b/sysutils/dbus/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2008/06/19 01:56:44 bjs Exp $ +# $NetBSD: Makefile,v 1.31 2008/08/15 12:15:17 wiz Exp $ # -DISTNAME= dbus-1.2.1 -PKGREVISION= 1 +DISTNAME= dbus-1.2.3 CATEGORIES= sysutils MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ @@ -23,6 +22,8 @@ PKGCONFIG_OVERRIDE= dbus-1.pc.in PKG_DESTDIR_SUPPORT= user-destdir +BUILD_DEFS+= VARBASE + .include "../../mk/bsd.prefs.mk" CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo index 8a5821d7190..5e8c0da89d2 100644 --- a/sysutils/dbus/distinfo +++ b/sysutils/dbus/distinfo @@ -1,13 +1,9 @@ -$NetBSD: distinfo,v 1.23 2008/06/19 01:56:44 bjs Exp $ +$NetBSD: distinfo,v 1.24 2008/08/15 12:15:17 wiz Exp $ -SHA1 (dbus-1.2.1.tar.gz) = 2c5b38d51b486e0143faf7749d298e07a8c71223 -RMD160 (dbus-1.2.1.tar.gz) = 88b20e16251e10e205fece57e6b434a7aa43b615 -Size (dbus-1.2.1.tar.gz) = 1406833 bytes +SHA1 (dbus-1.2.3.tar.gz) = ceb8d496bc1a9c2dcdbe559515c01ec9c0cdcf81 +RMD160 (dbus-1.2.3.tar.gz) = d1a207b2a4c744f27c9c01388e80cebdb61f43f0 +Size (dbus-1.2.3.tar.gz) = 1564475 bytes SHA1 (patch-aa) = e527a1a1f937781ce4204a325e3ff7f31fd6afa8 -SHA1 (patch-ab) = a6204676083ab962df12c7860b1facc8ccbd3d96 +SHA1 (patch-ab) = 139feeab7d469140384a30f49d70da80fa4c03bc SHA1 (patch-ac) = afec419973f339e846dc109866148529f80998b3 -SHA1 (patch-ad) = 8f5c8a8a21cf16c8951764f3b5aafc229a5abbc0 -SHA1 (patch-ag) = a96fa42f2635675a7522a2782e949622288dca92 -SHA1 (patch-ah) = 2663883ca34c6d52f520e67b93840661aa9b6537 SHA1 (patch-ai) = a45bd8d29955e9c14a4d8b3f44b42242d70c1cd8 -SHA1 (patch-aj) = a354b0fe5fda70114ff1c0bd717c127663c49085 diff --git a/sysutils/dbus/patches/patch-ab b/sysutils/dbus/patches/patch-ab index 2f9a302093b..507b923bde2 100644 --- a/sysutils/dbus/patches/patch-ab +++ b/sysutils/dbus/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.12 2008/06/19 01:56:44 bjs Exp $ +$NetBSD: patch-ab,v 1.13 2008/08/15 12:15:17 wiz Exp $ ---- dbus/dbus-sysdeps-unix.c.orig 2008-04-04 11:24:08.000000000 -0400 +--- dbus/dbus-sysdeps-unix.c.orig 2008-08-06 17:00:29.000000000 +0000 +++ dbus/dbus-sysdeps-unix.c @@ -35,6 +35,9 @@ #include "dbus-list.h" @@ -12,29 +12,18 @@ $NetBSD: patch-ab,v 1.12 2008/06/19 01:56:44 bjs Exp $ #include #include #include -@@ -786,7 +789,9 @@ _dbus_connect_tcp_socket (const char - fprintf(stderr, "Family %s\n", family ? family : "none"); - hints.ai_protocol = IPPROTO_TCP; - hints.ai_socktype = SOCK_STREAM; -+#ifdef AI_ADDRCONFIG - hints.ai_flags = AI_ADDRCONFIG; -+#endif - - if ((res = getaddrinfo(host, port, &hints, &ai)) != 0) - { -@@ -889,7 +894,11 @@ _dbus_listen_tcp_socket (const char +@@ -79,8 +82,8 @@ + #define O_BINARY 0 + #endif - hints.ai_protocol = IPPROTO_TCP; - hints.ai_socktype = SOCK_STREAM; -+#ifdef AI_ADDRCONFIG - hints.ai_flags = AI_ADDRCONFIG | AI_PASSIVE; -+#else -+ hints.ai_flags = AI_PASSIVE; -+#endif +-#ifndef _AI_ADDRCONFIG +-#define _AI_ADDRCONFIG 0 ++#ifndef AI_ADDRCONFIG ++#define AI_ADDRCONFIG 0 + #endif - redo_lookup_with_port: - if ((res = getaddrinfo(host, port, &hints, &ai)) != 0 || !ai) -@@ -1753,7 +1762,26 @@ _dbus_parse_uid (const DBusString * + #ifndef HAVE_SOCKLEN_T +@@ -1822,7 +1825,26 @@ _dbus_parse_uid (const DBusString * return TRUE; } @@ -47,12 +36,12 @@ $NetBSD: patch-ab,v 1.12 2008/06/19 01:56:44 bjs Exp $ + atomic_inc_uint((unsigned *)&atomic->value); + return old; +} - ++ +dbus_int32_t +_dbus_atomic_dec (DBusAtomic *atomic) +{ + register dbus_int32_t old = atomic->value; -+ + + atomic_dec_uint((unsigned *)&atomic->value); + return old; +} @@ -61,7 +50,7 @@ $NetBSD: patch-ab,v 1.12 2008/06/19 01:56:44 bjs Exp $ _DBUS_DEFINE_GLOBAL_LOCK (atomic); #if DBUS_USE_ATOMIC_INT_486_COND -@@ -1818,6 +1846,7 @@ _dbus_atomic_dec (DBusAtomic *atomic) +@@ -1887,6 +1909,7 @@ _dbus_atomic_dec (DBusAtomic *atomic) return res; #endif } @@ -69,7 +58,7 @@ $NetBSD: patch-ab,v 1.12 2008/06/19 01:56:44 bjs Exp $ #ifdef DBUS_BUILD_TESTS /** Gets our GID -@@ -2711,8 +2740,18 @@ int +@@ -2780,8 +2803,18 @@ int _dbus_printf_string_upper_bound (const char *format, va_list args) { diff --git a/sysutils/dbus/patches/patch-ad b/sysutils/dbus/patches/patch-ad deleted file mode 100644 index 3e5ca5c5d12..00000000000 --- a/sysutils/dbus/patches/patch-ad +++ /dev/null @@ -1,82 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2008/06/19 01:56:44 bjs Exp $ - -git ref: cdca6dbce88fd1e1195e2a81eb6619c782df2fac - Prevent a crash in some applications due to timers - leaking after the DVusPendingCall object was freed. - -git ref: d7bb3cf8dfc162007caf5e28d9c304381de7b8c3 - Fix inverted return value from dbus_connection_read_write() - -also: fix f.d.o. bug 15635 - ---- dbus/dbus-connection.c.orig 2008-04-04 11:24:08.000000000 -0400 -+++ dbus/dbus-connection.c -@@ -965,6 +965,13 @@ _dbus_connection_detach_pending_call_and - _dbus_pending_call_ref_unlocked (pending); - _dbus_hash_table_remove_int (connection->pending_replies, - _dbus_pending_call_get_reply_serial_unlocked (pending)); -+ -+ if (_dbus_pending_call_is_timeout_added_unlocked (pending)) -+ _dbus_connection_remove_timeout_unlocked (connection, -+ _dbus_pending_call_get_timeout_unlocked (pending)); -+ -+ _dbus_pending_call_set_timeout_added_unlocked (pending, FALSE); -+ - _dbus_pending_call_unref_and_unlock (pending); - } - -@@ -1671,21 +1678,26 @@ connection_forget_shared_unlocked (DBusC - if (!connection->shareable) - return; - -+ _DBUS_LOCK (shared_connections); -+ - if (connection->server_guid != NULL) - { - _dbus_verbose ("dropping connection to %s out of the shared table\n", - connection->server_guid); - -- _DBUS_LOCK (shared_connections); -- - if (!_dbus_hash_table_remove_string (shared_connections, - connection->server_guid)) - _dbus_assert_not_reached ("connection was not in the shared table"); - - dbus_free (connection->server_guid); - connection->server_guid = NULL; -- _DBUS_UNLOCK (shared_connections); - } -+ else -+ { -+ _dbus_list_remove (&shared_connections_no_guid, connection); -+ } -+ -+ _DBUS_UNLOCK (shared_connections); - - /* remove our reference held on all shareable connections */ - _dbus_connection_unref_unlocked (connection); -@@ -3405,6 +3417,12 @@ _dbus_connection_read_write_dispatch (DB - { - DBusDispatchStatus dstatus; - dbus_bool_t no_progress_possible; -+ -+ /* Need to grab a ref here in case we're a private connection and -+ * the user drops the last ref in a handler we call; see bug -+ * https://bugs.freedesktop.org/show_bug.cgi?id=15635 -+ */ -+ dbus_connection_ref (connection); - - dstatus = dbus_connection_get_dispatch_status (connection); - -@@ -3444,7 +3462,11 @@ _dbus_connection_read_write_dispatch (DB - connection->disconnect_message_link == NULL; - else - no_progress_possible = _dbus_connection_get_is_connected_unlocked (connection); -+ - CONNECTION_UNLOCK (connection); -+ -+ dbus_connection_unref (connection); -+ - return !no_progress_possible; /* TRUE if we can make more progress */ - } - diff --git a/sysutils/dbus/patches/patch-ag b/sysutils/dbus/patches/patch-ag deleted file mode 100644 index 72da4e8c07b..00000000000 --- a/sysutils/dbus/patches/patch-ag +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2008/06/19 01:56:44 bjs Exp $ - ---- tools/dbus-monitor.c.orig 2008-04-04 11:24:08.000000000 -0400 -+++ tools/dbus-monitor.c -@@ -91,7 +91,7 @@ typedef enum - PROFILE_ATTRIBUTE_FLAG_PATH = 16, - PROFILE_ATTRIBUTE_FLAG_INTERFACE = 32, - PROFILE_ATTRIBUTE_FLAG_MEMBER = 64, -- PROFILE_ATTRIBUTE_FLAG_ERROR_NAME = 128, -+ PROFILE_ATTRIBUTE_FLAG_ERROR_NAME = 128 - } ProfileAttributeFlags; - - static void -@@ -295,8 +295,10 @@ main (int argc, char *argv[]) - exit (1); - } - -+#if 0 /* XXX this doesn't work because the loop around poll() is not left */ - /* we handle SIGINT so exit() is reached and flushes stdout */ - signal (SIGINT, sigint_handler); -+#endif - while (dbus_connection_read_write_dispatch(connection, -1) - && !sigint_received) - ; diff --git a/sysutils/dbus/patches/patch-ah b/sysutils/dbus/patches/patch-ah deleted file mode 100644 index dfad01f45cd..00000000000 --- a/sysutils/dbus/patches/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2008/06/19 01:56:44 bjs Exp $ - -Fix to match config.h.in. - ---- dbus/dbus-userdb-util.c.orig 2008-04-04 11:24:08.000000000 -0400 -+++ dbus/dbus-userdb-util.c -@@ -223,7 +223,7 @@ _dbus_user_database_lookup_group (DBusUs - gid = n; - } - --#ifdef DBUS_ENABLE_USER_CACHE -+#ifdef DBUS_ENABLE_USERDB_CACHE - if (gid != DBUS_GID_UNSET) - info = _dbus_hash_table_lookup_ulong (db->groups, gid); - else diff --git a/sysutils/dbus/patches/patch-aj b/sysutils/dbus/patches/patch-aj deleted file mode 100644 index 641a1701b3b..00000000000 --- a/sysutils/dbus/patches/patch-aj +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2008/06/19 01:56:44 bjs Exp $ - -Fix to match what's in config.h.in. - ---- dbus/dbus-userdb.c.orig 2008-04-04 11:24:08.000000000 -0400 -+++ dbus/dbus-userdb.c -@@ -143,7 +143,7 @@ _dbus_user_database_lookup (DBusUserData - uid = n; - } - --#ifdef DBUS_ENABLE_USER_CACHE -+#ifdef DBUS_ENABLE_USERDB_CACHE - if (uid != DBUS_UID_UNSET) - info = _dbus_hash_table_lookup_ulong (db->users, uid); - else -- cgit v1.2.3