Date: Tue, 29 Nov 2011 16:52:52 GMT From: Mark Atkinson <atkin901@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/162949: [Update] devel/dbus: update to 1.5.8 Message-ID: <201111291652.pATGqqum042908@red.freebsd.org> Resent-Message-ID: <201111291700.pATH0Lxj025047@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 162949 >Category: ports >Synopsis: [Update] devel/dbus: update to 1.5.8 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Nov 29 17:00:20 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Mark Atkinson >Release: 10.0-CURRENT >Organization: >Environment: FreeBSD 10.0-CURRENT #7 r228073 i386 >Description: Update of dbus to version 1.5.8 Fixes one socket leak among other things. http://dbus.freedesktop.org/doc/NEWS I updated all the patches, tested recompilation of devel/dbus-glib and devel/dbus-qt4, devel/qt4-qdbusviewer. My qdbus konsole automation still appears to work as well. I am not 100% sure of the ramifications of updating this (example, maybe qt3-dbus requires the 1.4.x or something), but appears to work fine on my system. $ pkg_info |grep dbus dbus-1.5.8 A message bus system for inter-application communication dbus-glib-0.94 GLib bindings for the D-BUS messaging system eggdbus-0.6_1 D-Bus bindings for GObject libdbusmenu-qt-0.9.0 Qt4 implementation of the DBusMenu protocol py26-dbus-0.84.0 Python bindings for the D-BUS messaging system py26-qt4-dbus-4.8.5,1 Python bindings for the Qt4 toolkit, D-BUS module qt4-dbus-4.7.4 Qt4 bindings for the D-BUS messaging system qt4-qdbusviewer-4.7.4 Qt4 D-BUS viewer >How-To-Repeat: >Fix: Patch attached with submission follows: diff -rBdu /usr/ports/devel/dbus/Makefile ./Makefile --- /usr/ports/devel/dbus/Makefile 2011-09-23 15:21:53.000000000 -0700 +++ ./Makefile 2011-11-29 07:01:45.000000000 -0800 @@ -7,8 +7,7 @@ # PORTNAME= dbus -PORTVERSION= 1.4.14 -PORTREVISION= 1 +PORTVERSION= 1.5.8 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ diff -rBdu /usr/ports/devel/dbus/distinfo ./distinfo --- /usr/ports/devel/dbus/distinfo 2011-09-13 09:05:17.000000000 -0700 +++ ./distinfo 2011-11-29 06:47:26.000000000 -0800 @@ -1,2 +1,2 @@ -SHA256 (dbus-1.4.14.tar.gz) = 47f27efc29aa9d1cc64b74e374204084d6fd53191e70dd584b604181059e5877 -SIZE (dbus-1.4.14.tar.gz) = 1880298 +SHA256 (dbus-1.5.8.tar.gz) = 6e1cd5248562b5362e9a1ad8314459fe2f60ee3b9622ce0afd68cc9df8ae7c5e +SIZE (dbus-1.5.8.tar.gz) = 1904708 diff -rBdu /usr/ports/devel/dbus/files/patch-bus__session.conf.in ./files/patch-bus__session.conf.in --- /usr/ports/devel/dbus/files/patch-bus__session.conf.in 2010-09-01 11:04:06.000000000 -0700 +++ ./files/patch-bus__session.conf.in 2011-11-29 08:05:45.000000000 -0800 @@ -1,5 +1,5 @@ ---- ./bus/session.conf.in.orig 2010-03-23 22:01:27.000000000 +0300 -+++ ./bus/session.conf.in 2010-09-01 19:47:37.427994122 +0400 +--- bus/session.conf.in.orig 2011-09-14 08:58:18.000000000 -0700 ++++ bus/session.conf.in 2011-11-29 08:01:42.000000000 -0800 @@ -32,6 +32,7 @@ <!-- This is included last so local configuration can override what's in this standard file --> diff -rBdu /usr/ports/devel/dbus/files/patch-dbus-1.pc.in ./files/patch-dbus-1.pc.in --- /usr/ports/devel/dbus/files/patch-dbus-1.pc.in 2010-10-22 15:32:20.000000000 -0700 +++ ./files/patch-dbus-1.pc.in 2011-11-29 08:01:26.000000000 -0800 @@ -1,8 +1,8 @@ ---- dbus-1.pc.in.orig 2010-08-31 21:44:19.000000000 +0000 -+++ dbus-1.pc.in 2010-09-18 17:52:00.000000000 +0000 -@@ -13,4 +13,4 @@ Name: dbus - Description: Free desktop message bus +--- dbus-1.pc.in.orig 2011-09-21 10:20:06.000000000 -0700 ++++ dbus-1.pc.in 2011-11-29 08:00:01.000000000 -0800 +@@ -14,4 +14,4 @@ Version: @VERSION@ - Libs: -L${libdir} -ldbus-1 @DBUS_CLIENT_LIBS@ + Libs: -L${libdir} -ldbus-1 + Libs.private: @LIBDBUS_LIBS@ -Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include +Cflags: -I${includedir}/dbus-1.0 -I${includedir}/dbus-1.0/include diff -rBdu /usr/ports/devel/dbus/files/patch-dbus_Makefile.in ./files/patch-dbus_Makefile.in --- /usr/ports/devel/dbus/files/patch-dbus_Makefile.in 2005-01-21 17:01:00.000000000 -0800 +++ ./files/patch-dbus_Makefile.in 2011-11-29 08:10:58.000000000 -0800 @@ -1,11 +1,11 @@ ---- dbus/Makefile.in.orig Fri Jan 21 19:43:46 2005 -+++ dbus/Makefile.in Fri Jan 21 19:44:43 2005 -@@ -360,7 +360,7 @@ - @HAVE_GLIB_TRUE@ $(DBUS_GLIB_BUILT_INCLUDES) - +--- dbus/Makefile.in.orig 2011-11-29 08:01:42.000000000 -0800 ++++ dbus/Makefile.in 2011-11-29 08:10:37.000000000 -0800 +@@ -562,7 +562,7 @@ + # if assertions are enabled, improve backtraces + AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ dbusincludedir = $(includedir)/dbus-1.0/dbus -dbusarchincludedir = $(libdir)/dbus-1.0/include/dbus +dbusarchincludedir = $(includedir)/dbus-1.0/include/dbus lib_LTLIBRARIES = libdbus-1.la - dbusinclude_HEADERS = \ - dbus.h \ + + # diff -rBdu /usr/ports/devel/dbus/files/patch-dbus_dbus-connection.c ./files/patch-dbus_dbus-connection.c --- /usr/ports/devel/dbus/files/patch-dbus_dbus-connection.c 2010-10-22 15:32:20.000000000 -0700 +++ ./files/patch-dbus_dbus-connection.c 2011-11-29 08:15:11.000000000 -0800 @@ -1,6 +1,6 @@ ---- dbus/dbus-connection.c.orig 2010-08-31 21:44:19.000000000 +0000 -+++ dbus/dbus-connection.c 2010-09-18 18:01:19.000000000 +0000 -@@ -2364,7 +2364,7 @@ _dbus_connection_block_pending_call (DBu +--- dbus/dbus-connection.c.orig 2011-09-21 10:20:06.000000000 -0700 ++++ dbus/dbus-connection.c 2011-11-29 08:01:42.000000000 -0800 +@@ -2357,7 +2357,7 @@ _dbus_connection_block_pending_call (DBu DBusConnection *connection; dbus_uint32_t client_serial; DBusTimeout *timeout; @@ -9,7 +9,7 @@ _dbus_assert (pending != NULL); -@@ -2445,7 +2445,11 @@ _dbus_connection_block_pending_call (DBu +@@ -2438,7 +2438,11 @@ _dbus_connection_block_pending_call (DBu _dbus_get_current_time (&tv_sec, &tv_usec); elapsed_milliseconds = (tv_sec - start_tv_sec) * 1000 + (tv_usec - start_tv_usec) / 1000; @@ -22,7 +22,7 @@ if (!_dbus_connection_get_is_connected_unlocked (connection)) { DBusMessage *error_msg; -@@ -2471,7 +2475,7 @@ _dbus_connection_block_pending_call (DBu +@@ -2464,7 +2468,7 @@ _dbus_connection_block_pending_call (DBu */ _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n"); @@ -31,7 +31,7 @@ } else { -@@ -2480,7 +2484,7 @@ _dbus_connection_block_pending_call (DBu +@@ -2473,7 +2477,7 @@ _dbus_connection_block_pending_call (DBu pending, DBUS_ITERATION_DO_READING | DBUS_ITERATION_BLOCK, @@ -40,7 +40,7 @@ } goto recheck_status; -@@ -2489,7 +2493,7 @@ _dbus_connection_block_pending_call (DBu +@@ -2482,7 +2486,7 @@ _dbus_connection_block_pending_call (DBu _dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n"); else if (elapsed_milliseconds < timeout_milliseconds) { @@ -49,7 +49,7 @@ if (status == DBUS_DISPATCH_NEED_MEMORY) { -@@ -2499,7 +2503,7 @@ _dbus_connection_block_pending_call (DBu +@@ -2492,7 +2496,7 @@ _dbus_connection_block_pending_call (DBu */ _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n"); @@ -58,7 +58,7 @@ } else { -@@ -2508,7 +2512,7 @@ _dbus_connection_block_pending_call (DBu +@@ -2501,7 +2505,7 @@ _dbus_connection_block_pending_call (DBu NULL, DBUS_ITERATION_DO_READING | DBUS_ITERATION_BLOCK, diff -rBdu /usr/ports/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c ./files/patch-dbus_dbus-sysdeps-util-unix.c --- /usr/ports/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c 2009-01-09 21:21:17.000000000 -0800 +++ ./files/patch-dbus_dbus-sysdeps-util-unix.c 2011-11-29 08:17:21.000000000 -0800 @@ -1,10 +1,10 @@ ---- dbus/dbus-sysdeps-util-unix.c.orig 2008-12-21 14:51:17.000000000 -0500 -+++ dbus/dbus-sysdeps-util-unix.c 2008-12-21 14:51:37.000000000 -0500 -@@ -38,6 +38,7 @@ +--- dbus/dbus-sysdeps-util-unix.c.orig 2011-09-21 10:20:06.000000000 -0700 ++++ dbus/dbus-sysdeps-util-unix.c 2011-11-29 08:01:42.000000000 -0800 +@@ -41,6 +41,7 @@ #include <stdio.h> #include <errno.h> #include <fcntl.h> +#include <syslog.h> #include <sys/stat.h> - #include <grp.h> - #include <sys/socket.h> + #ifdef HAVE_SYS_RESOURCE_H + #include <sys/resource.h> diff -rBdu /usr/ports/devel/dbus/files/patch-doc_Makefile.in ./files/patch-doc_Makefile.in --- /usr/ports/devel/dbus/files/patch-doc_Makefile.in 2011-09-13 09:05:17.000000000 -0700 +++ ./files/patch-doc_Makefile.in 2011-11-29 08:18:28.000000000 -0800 @@ -1,6 +1,6 @@ ---- doc/Makefile.in.orig 2011-08-14 11:28:23.000000000 +0200 -+++ doc/Makefile.in 2011-08-14 11:28:47.000000000 +0200 -@@ -604,8 +604,8 @@ info: info-am +--- doc/Makefile.in.orig 2011-11-29 08:01:42.000000000 -0800 ++++ doc/Makefile.in 2011-11-29 08:01:42.000000000 -0800 +@@ -618,8 +618,8 @@ info: info-am info-am: >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111291652.pATGqqum042908>