From b6e1b836ac27a12ee98f50eec9c2eef60cf49685 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 15 Aug 2012 08:03:43 +0000 Subject: [PATCH] Bugfix update to dbus-1.6.4. --- x11/dbus/Makefile | 8 ++++---- x11/dbus/distinfo | 7 ++----- x11/dbus/patches/patch-configure | 20 +++++++++---------- .../patch-dbus_dbus-sysdeps-util-unix_c | 10 +++++----- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/x11/dbus/Makefile b/x11/dbus/Makefile index 74332589a23..8e0b07cb42b 100644 --- a/x11/dbus/Makefile +++ b/x11/dbus/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.84 2012/08/05 06:55:11 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.85 2012/08/15 08:03:43 ajacoutot Exp $ COMMENT= message bus system -DISTNAME= dbus-1.6.2 -REVISION= 1 +DISTNAME= dbus-1.6.4 EPOCH= 0 -SHARED_LIBS += dbus-1 10.2 # .10.2 +SHARED_LIBS += dbus-1 10.2 # 10.2 + CATEGORIES= x11 HOMEPAGE= http://dbus.freedesktop.org/ diff --git a/x11/dbus/distinfo b/x11/dbus/distinfo index 11c8732ce0f..6c8007f6893 100644 --- a/x11/dbus/distinfo +++ b/x11/dbus/distinfo @@ -1,5 +1,2 @@ -MD5 (dbus-1.6.2.tar.gz) = f7+Hftb/fabfkPBxWDc4KQ== -RMD160 (dbus-1.6.2.tar.gz) = vRK0bfg43sFuOzr2CGeeGSn8tyc= -SHA1 (dbus-1.6.2.tar.gz) = CdVaxOpMzw0jMHCQlJQCj1pOHmM= -SHA256 (dbus-1.6.2.tar.gz) = K/IQ5Un7+AH+8yuhMihLzRACHR2eUvwpCX/hMztUwuo= -SIZE (dbus-1.6.2.tar.gz) = 1927211 +SHA256 (dbus-1.6.4.tar.gz) = X7prekFddhqEP7jgructthzxMFep74zceV5dNp3HTPE= +SIZE (dbus-1.6.4.tar.gz) = 1927446 diff --git a/x11/dbus/patches/patch-configure b/x11/dbus/patches/patch-configure index 27f7e344fc2..8dbabaa44d8 100644 --- a/x11/dbus/patches/patch-configure +++ b/x11/dbus/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.20 2012/07/05 07:19:48 ajacoutot Exp $ ---- configure.orig Wed Jun 27 18:49:58 2012 -+++ configure Thu Jul 5 07:47:00 2012 -@@ -19039,7 +19039,8 @@ fi +$OpenBSD: patch-configure,v 1.21 2012/08/15 08:03:43 ajacoutot Exp $ +--- configure.orig Wed Jul 18 19:22:20 2012 ++++ configure Wed Aug 15 09:51:07 2012 +@@ -19040,7 +19040,8 @@ fi done @@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.20 2012/07/05 07:19:48 ajacoutot Exp $ " if test "x$ac_cv_have_decl_MSG_NOSIGNAL" = xyes; then : ac_have_decl=1 -@@ -19594,13 +19595,13 @@ fi +@@ -19595,13 +19596,13 @@ fi # Thread lib detection ac_fn_c_check_func "$LINENO" "pthread_cond_timedwait" "ac_cv_func_pthread_cond_timedwait" if test "x$ac_cv_func_pthread_cond_timedwait" = xyes; then : @@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.20 2012/07/05 07:19:48 ajacoutot Exp $ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -19631,7 +19632,7 @@ fi +@@ -19632,7 +19633,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_cond_timedwait" >&5 $as_echo "$ac_cv_lib_pthread_pthread_cond_timedwait" >&6; } if test "x$ac_cv_lib_pthread_pthread_cond_timedwait" = xyes; then : @@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.20 2012/07/05 07:19:48 ajacoutot Exp $ fi fi -@@ -19699,7 +19700,7 @@ $as_echo "$ac_cv_search_clock_getres" >&6; } +@@ -19700,7 +19701,7 @@ $as_echo "$ac_cv_search_clock_getres" >&6; } ac_res=$ac_cv_search_clock_getres if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" @@ -46,7 +46,7 @@ $OpenBSD: patch-configure,v 1.20 2012/07/05 07:19:48 ajacoutot Exp $ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_MONOTONIC" >&5 -@@ -19848,13 +19849,13 @@ if test x$have_selinux = xyes ; then +@@ -19849,13 +19850,13 @@ if test x$have_selinux = xyes ; then if test "x$ac_cv_func_pthread_create" = xyes; then : else @@ -63,7 +63,7 @@ $OpenBSD: patch-configure,v 1.20 2012/07/05 07:19:48 ajacoutot Exp $ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -19885,7 +19886,7 @@ fi +@@ -19886,7 +19887,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : @@ -72,7 +72,7 @@ $OpenBSD: patch-configure,v 1.20 2012/07/05 07:19:48 ajacoutot Exp $ fi fi -@@ -20418,6 +20419,7 @@ $as_echo_n "checking for SCM_RIGHTS... " >&6; } +@@ -20419,6 +20420,7 @@ $as_echo_n "checking for SCM_RIGHTS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/x11/dbus/patches/patch-dbus_dbus-sysdeps-util-unix_c b/x11/dbus/patches/patch-dbus_dbus-sysdeps-util-unix_c index cdb1515700f..f2838b0e219 100644 --- a/x11/dbus/patches/patch-dbus_dbus-sysdeps-util-unix_c +++ b/x11/dbus/patches/patch-dbus_dbus-sysdeps-util-unix_c @@ -1,12 +1,12 @@ -$OpenBSD: patch-dbus_dbus-sysdeps-util-unix_c,v 1.3 2012/07/05 07:19:48 ajacoutot Exp $ +$OpenBSD: patch-dbus_dbus-sysdeps-util-unix_c,v 1.4 2012/08/15 08:03:43 ajacoutot Exp $ Don't try to use /proc; we don't provide a replacement because this function is only called once for logging purpose, its return code is not checked and as the code says: "This string <...> may not be trusted". ---- dbus/dbus-sysdeps-util-unix.c.orig Wed Jun 6 12:45:55 2012 -+++ dbus/dbus-sysdeps-util-unix.c Thu Jul 5 07:47:00 2012 -@@ -1103,6 +1103,7 @@ _dbus_command_for_pid (unsigned long pid, +--- dbus/dbus-sysdeps-util-unix.c.orig Thu Jun 28 16:49:23 2012 ++++ dbus/dbus-sysdeps-util-unix.c Wed Aug 15 09:51:07 2012 +@@ -1104,6 +1104,7 @@ _dbus_command_for_pid (unsigned long pid, int max_len, DBusError *error) { @@ -14,7 +14,7 @@ checked and as the code says: "This string <...> may not be trusted". /* This is all Linux-specific for now */ DBusString path; DBusString cmdline; -@@ -1162,4 +1163,7 @@ fail: +@@ -1163,4 +1164,7 @@ fail: _dbus_string_free (&cmdline); _dbus_string_free (&path); return FALSE;