cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix update to dbus-1.6.4.

Browse Source
This commit is contained in:
ajacoutot 2012-08-15 08:03:43 +00:00
parent 7c4c7e381b
commit b6e1b836ac
4 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/dbus/Makefile
View File

@ -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 COMMENT= message bus system
DISTNAME= dbus-1.6.2 DISTNAME= dbus-1.6.4
REVISION= 1
EPOCH= 0 EPOCH= 0
SHARED_LIBS += dbus-1 10.2 # .10.2 SHARED_LIBS += dbus-1 10.2 # 10.2
CATEGORIES= x11 CATEGORIES= x11
HOMEPAGE= http://dbus.freedesktop.org/ HOMEPAGE= http://dbus.freedesktop.org/

7
x11/dbus/distinfo
View File

@ -1,5 +1,2 @@
MD5 (dbus-1.6.2.tar.gz) = f7+Hftb/fabfkPBxWDc4KQ== SHA256 (dbus-1.6.4.tar.gz) = X7prekFddhqEP7jgructthzxMFep74zceV5dNp3HTPE=
RMD160 (dbus-1.6.2.tar.gz) = vRK0bfg43sFuOzr2CGeeGSn8tyc= SIZE (dbus-1.6.4.tar.gz) = 1927446
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

20
x11/dbus/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.20 2012/07/05 07:19:48 ajacoutot Exp $ $OpenBSD: patch-configure,v 1.21 2012/08/15 08:03:43 ajacoutot Exp $
--- configure.orig Wed Jun 27 18:49:58 2012 --- configure.orig Wed Jul 18 19:22:20 2012
+++ configure Thu Jul 5 07:47:00 2012 +++ configure Wed Aug 15 09:51:07 2012
@@ -19039,7 +19039,8 @@ fi @@ -19040,7 +19040,8 @@ fi
done 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 : if test "x$ac_cv_have_decl_MSG_NOSIGNAL" = xyes; then :
ac_have_decl=1 ac_have_decl=1
@@ -19594,13 +19595,13 @@ fi @@ -19595,13 +19596,13 @@ fi
# Thread lib detection # Thread lib detection
ac_fn_c_check_func "$LINENO" "pthread_cond_timedwait" "ac_cv_func_pthread_cond_timedwait" 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 : 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 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* 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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_cond_timedwait" >&5
$as_echo "$ac_cv_lib_pthread_pthread_cond_timedwait" >&6; } $as_echo "$ac_cv_lib_pthread_pthread_cond_timedwait" >&6; }
if test "x$ac_cv_lib_pthread_pthread_cond_timedwait" = xyes; then : 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
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 ac_res=$ac_cv_search_clock_getres
if test "$ac_res" != no; then : if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" 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 fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_MONOTONIC" >&5 { $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 : if test "x$ac_cv_func_pthread_create" = xyes; then :
else 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 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* 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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : 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
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 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */

10
x11/dbus/patches/patch-dbus_dbus-sysdeps-util-unix_c
View File

@ -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 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 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". 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.orig Thu Jun 28 16:49:23 2012
+++ dbus/dbus-sysdeps-util-unix.c Thu Jul 5 07:47:00 2012 +++ dbus/dbus-sysdeps-util-unix.c Wed Aug 15 09:51:07 2012
@@ -1103,6 +1103,7 @@ _dbus_command_for_pid (unsigned long pid, @@ -1104,6 +1104,7 @@ _dbus_command_for_pid (unsigned long pid,
int max_len, int max_len,
DBusError *error) 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 */ /* This is all Linux-specific for now */
DBusString path; DBusString path;
DBusString cmdline; DBusString cmdline;
@@ -1162,4 +1163,7 @@ fail: @@ -1163,4 +1164,7 @@ fail:
_dbus_string_free (&cmdline); _dbus_string_free (&cmdline);
_dbus_string_free (&path); _dbus_string_free (&path);
return FALSE; return FALSE;