There seems to be an annoying runtime regression with session bus after
the last update which I failed to see in my tests. While this is being worked on, let's revert for now so that people don't run into it. Other parts of the D-DBus gang update are fine (glib and python). Also keep the recent rc script tweak. Sorry about that...
This commit is contained in:
ajacoutot
parent
7b088557ab
commit
4f3d0498f5
@ -1,14 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.52 2010/12/14 18:45:54 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.53 2010/12/16 07:13:58 ajacoutot Exp $
|
||||
|
||||
# XXX patches/patch-configure_in disables PIE on arm/hppa. This is just a
|
||||
# temporary workaround until PIE works.
|
||||
|
||||
COMMENT= message bus system
|
||||
|
||||
DISTNAME= dbus-1.4.0
|
||||
REVISION= 0
|
||||
DISTNAME= dbus-1.2.24
|
||||
EPOCH= 0
|
||||
|
||||
SHARED_LIBS += dbus-1 8.0 # .8.2
|
||||
REVISION= 14
|
||||
|
||||
SHARED_LIBS += dbus-1 8.0 # .7.0
|
||||
CATEGORIES= x11
|
||||
|
||||
HOMEPAGE= http://dbus.freedesktop.org/
|
||||
@ -40,11 +42,7 @@ CONFIGURE_ARGS= --localstatedir=/var \
|
||||
--disable-silent-rules \
|
||||
--disable-xml-docs \
|
||||
--disable-doxygen-docs \
|
||||
--disable-abstract-sockets \
|
||||
--disable-selinux \
|
||||
--disable-libaudit \
|
||||
--disable-dnotify \
|
||||
--disable-inotify
|
||||
--disable-abstract-sockets
|
||||
|
||||
# Tests are disabled as they change the final dbus binaries
|
||||
#CONFIGURE_ARGS+= --enable-tests
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (dbus-1.4.0.tar.gz) = 9ZYYsY0vsr0fzp4cWioygg==
|
||||
RMD160 (dbus-1.4.0.tar.gz) = 49RCCPOdfEob+RZSfcEh0wl6gtA=
|
||||
SHA1 (dbus-1.4.0.tar.gz) = S+MoEAWp749SH1VHEowpomMssdc=
|
||||
SHA256 (dbus-1.4.0.tar.gz) = yW0vhtQOFY4r9AWSWgpCzOBTOoRmCY4vIjiqFhSSZlI=
|
||||
SIZE (dbus-1.4.0.tar.gz) = 1800347
|
||||
MD5 (dbus-1.2.24.tar.gz) = VlNGzs2c/s8UY1QMYIbMLA==
|
||||
RMD160 (dbus-1.2.24.tar.gz) = L1He94QFa8FvvsLdw74iwCKpT7U=
|
||||
SHA1 (dbus-1.2.24.tar.gz) = lZNxc0jqNroii0bxZbtnwSfBK+g=
|
||||
SHA256 (dbus-1.2.24.tar.gz) = 8Sx0j0pwNlXj1MPblM31p1KgzQs2lYxxWAQ3O9NZXEg=
|
||||
SIZE (dbus-1.2.24.tar.gz) = 1673774
|
||||
|
||||
@ -1,25 +1,24 @@
|
||||
$OpenBSD: patch-bus_Makefile_in,v 1.7 2010/12/13 10:41:22 ajacoutot Exp $
|
||||
--- bus/Makefile.in.orig Mon Sep 6 14:52:22 2010
|
||||
+++ bus/Makefile.in Mon Dec 13 10:39:09 2010
|
||||
@@ -2563,7 +2563,6 @@ uninstall-hook:
|
||||
rm -f $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT)
|
||||
|
||||
install-data-hook:
|
||||
$OpenBSD: patch-bus_Makefile_in,v 1.8 2010/12/16 07:13:58 ajacoutot Exp $
|
||||
--- bus/Makefile.in.orig Tue Mar 23 20:11:23 2010
|
||||
+++ bus/Makefile.in Tue Apr 20 16:38:21 2010
|
||||
@@ -1438,20 +1438,12 @@ install-data-hook:
|
||||
chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
|
||||
fi
|
||||
$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
|
||||
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
|
||||
$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
|
||||
$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
|
||||
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
|
||||
@@ -2576,13 +2575,6 @@ install-data-hook:
|
||||
@DBUS_UNIX_TRUE@ $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1
|
||||
@DBUS_UNIX_TRUE@ if test -f dbus-daemon-launch-helper$(EXEEXT) ; then \
|
||||
@DBUS_UNIX_TRUE@ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) dbus-daemon-launch-helper$(EXEEXT) $(DESTDIR)$(libexecdir); \
|
||||
-@DBUS_UNIX_TRUE@ if test `id -u` -eq 0; then \
|
||||
-@DBUS_UNIX_TRUE@ chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
|
||||
-@DBUS_UNIX_TRUE@ chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
|
||||
-@DBUS_UNIX_TRUE@ else \
|
||||
-@DBUS_UNIX_TRUE@ echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \
|
||||
-@DBUS_UNIX_TRUE@ echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \
|
||||
-@DBUS_UNIX_TRUE@ fi \
|
||||
@DBUS_UNIX_TRUE@ fi
|
||||
# Install dbus.socket as default implementation of a D-Bus stack
|
||||
@HAVE_SYSTEMD_TRUE@ $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants
|
||||
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
|
||||
$(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1
|
||||
$(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir)
|
||||
- if test `id -u` -eq 0; then \
|
||||
- chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
|
||||
- chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
|
||||
- else \
|
||||
- echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \
|
||||
- echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \
|
||||
- fi
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
|
||||
@ -1,67 +1,58 @@
|
||||
$OpenBSD: patch-bus_dbus-daemon_1,v 1.5 2010/12/13 10:41:22 ajacoutot Exp $
|
||||
--- bus/dbus-daemon.1.orig Mon Sep 6 14:52:32 2010
|
||||
+++ bus/dbus-daemon.1 Mon Dec 13 10:42:07 2010
|
||||
@@ -27,9 +27,9 @@ per-user-login-session message bus (started each time
|
||||
a different configuration file.
|
||||
$OpenBSD: patch-bus_dbus-daemon_1,v 1.6 2010/12/16 07:13:58 ajacoutot Exp $
|
||||
--- bus/dbus-daemon.1.orig Sat Oct 10 12:48:43 2009
|
||||
+++ bus/dbus-daemon.1 Sat Oct 10 12:50:45 2009
|
||||
@@ -30,9 +30,9 @@ a different configuration file.
|
||||
|
||||
.PP
|
||||
The \-\-session option is equivalent to
|
||||
-"\-\-config-file=/usr/local/etc/dbus-1/session.conf" and the \-\-system
|
||||
-"\-\-config-file=/src/build/dbus/etc/dbus-1/session.conf" and the \-\-system
|
||||
+"\-\-config-file=${SYSCONFDIR}/dbus-1/session.conf" and the \-\-system
|
||||
option is equivalent to
|
||||
-"\-\-config-file=/usr/local/etc/dbus-1/system.conf". By creating
|
||||
+"\-\-config-file=${SYSCONFDIR}/dbus-1/system.conf". By creating
|
||||
-"\-\-config-file=/src/build/dbus/etc/dbus-1/system.conf". By creating
|
||||
+"\-\-config-file=${SYSCONFDIR}/dbus-1/system.conf". By creating
|
||||
additional configuration files and using the \-\-config-file option,
|
||||
additional special-purpose message bus daemons could be created.
|
||||
.PP
|
||||
@@ -110,8 +110,8 @@ specification and its backward compatibility is not gu
|
||||
document is documentation, not specification.
|
||||
|
||||
@@ -106,8 +106,8 @@ document is documentation, not specification.
|
||||
|
||||
.PP
|
||||
The standard systemwide and per-session message bus setups are
|
||||
-configured in the files "/usr/local/etc/dbus-1/system.conf" and
|
||||
-"/usr/local/etc/dbus-1/session.conf". These files normally
|
||||
-configured in the files "/src/build/dbus/etc/dbus-1/system.conf" and
|
||||
-"/src/build/dbus/etc/dbus-1/session.conf". These files normally
|
||||
+configured in the files "${SYSCONFDIR}/dbus-1/system.conf" and
|
||||
+"${SYSCONFDIR}/dbus-1/session.conf". These files normally
|
||||
<include> a system-local.conf or session-local.conf; you can put local
|
||||
overrides in those files to avoid modifying the primary configuration
|
||||
files.
|
||||
@@ -187,7 +187,7 @@ Only files ending in ".conf" are included.
|
||||
This is intended to allow extension of the system bus by particular
|
||||
packages. For example, if CUPS wants to be able to send out
|
||||
notification of printer queue changes, it could install a file to
|
||||
-/usr/local/etc/dbus-1/system.d that allowed all apps to receive
|
||||
+${SYSCONFDIR}/dbus-1/system.d that allowed all apps to receive
|
||||
this message and allowed the printer daemon user to send it.
|
||||
|
||||
.TP
|
||||
@@ -323,7 +323,7 @@ otherwise try your favorite search engine.
|
||||
@@ -319,7 +319,7 @@ otherwise try your favorite search engine.
|
||||
.PP
|
||||
The <standard_session_servicedirs/> option is only relevant to the
|
||||
per-user-session bus daemon defined in
|
||||
-/usr/local/etc/dbus-1/session.conf. Putting it in any other
|
||||
-/src/build/dbus/etc/dbus-1/session.conf. Putting it in any other
|
||||
+${SYSCONFDIR}/dbus-1/session.conf. Putting it in any other
|
||||
configuration file would probably be nonsense.
|
||||
|
||||
.TP
|
||||
@@ -332,12 +332,12 @@ configuration file would probably be nonsense.
|
||||
@@ -328,12 +328,12 @@ configuration file would probably be nonsense.
|
||||
.PP
|
||||
<standard_system_servicedirs/> specifies the standard system-wide
|
||||
activation directories that should be searched for service files.
|
||||
-This option defaults to /usr/local/share/dbus-1/system-services.
|
||||
-This option defaults to /src/build/dbus/share/dbus-1/system-services.
|
||||
+This option defaults to ${PREFIX}/share/dbus-1/system-services.
|
||||
|
||||
.PP
|
||||
The <standard_system_servicedirs/> option is only relevant to the
|
||||
per-system bus daemon defined in
|
||||
-/usr/local/etc/dbus-1/system.conf. Putting it in any other
|
||||
-/src/build/dbus/etc/dbus-1/system.conf. Putting it in any other
|
||||
+${SYSCONFDIR}/dbus-1/system.conf. Putting it in any other
|
||||
configuration file would probably be nonsense.
|
||||
|
||||
.TP
|
||||
@@ -350,7 +350,7 @@ the dbus-daemon-launch-helper executable in located in
|
||||
@@ -346,7 +346,7 @@ the dbus-daemon-launch-helper executable in located in
|
||||
|
||||
.PP
|
||||
The <servicehelper/> option is only relevant to the per-system bus daemon
|
||||
-defined in /usr/local/etc/dbus-1/system.conf. Putting it in any other
|
||||
-defined in /src/build/dbus/etc/dbus-1/system.conf. Putting it in any other
|
||||
+defined in ${SYSCONFDIR}/dbus-1/system.conf. Putting it in any other
|
||||
configuration file would probably be nonsense.
|
||||
|
||||
|
||||
12
x11/dbus/patches/patch-bus_dir-watch-kqueue_c
Normal file
12
x11/dbus/patches/patch-bus_dir-watch-kqueue_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-bus_dir-watch-kqueue_c,v 1.3 2010/12/16 07:13:58 ajacoutot Exp $
|
||||
--- bus/dir-watch-kqueue.c.orig Tue Apr 20 16:39:43 2010
|
||||
+++ bus/dir-watch-kqueue.c Tue Apr 20 16:40:09 2010
|
||||
@@ -169,7 +169,7 @@ bus_set_watched_dirs (BusContext *context, DBusList **
|
||||
*/
|
||||
for (i = 0; new_dirs[i]; i++)
|
||||
{
|
||||
- for (j = 0; i < num_fds; j++)
|
||||
+ for (j = 0; j < num_fds; j++)
|
||||
{
|
||||
if (dirs[j] && strcmp (new_dirs[i], dirs[j]) == 0)
|
||||
{
|
||||
@ -1,59 +1,33 @@
|
||||
$OpenBSD: patch-configure,v 1.6 2010/12/13 10:41:22 ajacoutot Exp $
|
||||
--- configure.orig Mon Sep 6 14:52:24 2010
|
||||
+++ configure Mon Dec 13 10:45:09 2010
|
||||
@@ -18447,13 +18447,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" = x""yes; then :
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_cond_timedwait in -lpthread" >&5
|
||||
$OpenBSD: patch-configure,v 1.7 2010/12/16 07:13:58 ajacoutot Exp $
|
||||
--- configure.orig Tue Mar 23 20:11:22 2010
|
||||
+++ configure Tue Apr 20 16:38:22 2010
|
||||
@@ -22230,13 +22230,13 @@ fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_pthread_cond_timedwait" >&5
|
||||
$as_echo "$ac_cv_func_pthread_cond_timedwait" >&6; }
|
||||
if test "x$ac_cv_func_pthread_cond_timedwait" = x""yes; then
|
||||
- { $as_echo "$as_me:$LINENO: checking for pthread_cond_timedwait in -lpthread" >&5
|
||||
-$as_echo_n "checking for pthread_cond_timedwait in -lpthread... " >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_cond_timedwait in -pthread" >&5
|
||||
+ { $as_echo "$as_me:$LINENO: checking for pthread_cond_timedwait in -pthread" >&5
|
||||
+$as_echo_n "checking for pthread_cond_timedwait in -pthread... " >&6; }
|
||||
if test "${ac_cv_lib_pthread_pthread_cond_timedwait+set}" = set; then :
|
||||
if test "${ac_cv_lib_pthread_pthread_cond_timedwait+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
+LIBS="-pthread $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -18484,7 +18484,7 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_cond_timedwait" >&5
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -22296,7 +22296,7 @@ fi
|
||||
{ $as_echo "$as_me:$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" = x""yes; then :
|
||||
if test "x$ac_cv_lib_pthread_pthread_cond_timedwait" = x""yes; then
|
||||
- THREAD_LIBS="-lpthread"
|
||||
+ THREAD_LIBS="-pthread"
|
||||
fi
|
||||
|
||||
fi
|
||||
@@ -18699,13 +18699,13 @@ if test x$have_selinux = xyes ; then
|
||||
if test "x$ac_cv_func_pthread_create" = x""yes; then :
|
||||
|
||||
else
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
|
||||
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
|
||||
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
|
||||
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
+LIBS="-pthread $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -18736,7 +18736,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" = x""yes; then :
|
||||
- SELINUX_THREAD_LIBS="-lpthread"
|
||||
+ SELINUX_THREAD_LIBS="-pthread"
|
||||
fi
|
||||
|
||||
fi
|
||||
@@ -19954,7 +19954,10 @@ if test "x$GCC" = "xyes"; then
|
||||
@@ -25294,7 +25294,10 @@ if test "x$GCC" = "xyes"; then
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -63,9 +37,9 @@ $OpenBSD: patch-configure,v 1.6 2010/12/13 10:41:22 ajacoutot Exp $
|
||||
+ hppa-*-openbsd*) ;;
|
||||
+ *) case " $CFLAGS " in
|
||||
*[\ \ ]-fPIE[\ \ ]*) ;;
|
||||
*) if test x$dbus_win = xno && cc_supports_flag -fPIE; then
|
||||
*) if cc_supports_flag -fPIE; then
|
||||
PIE_CFLAGS="-fPIE"
|
||||
@@ -19966,6 +19969,7 @@ if test "x$GCC" = "xyes"; then
|
||||
@@ -25306,6 +25309,7 @@ if test "x$GCC" = "xyes"; then
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
@ -73,7 +47,7 @@ $OpenBSD: patch-configure,v 1.6 2010/12/13 10:41:22 ajacoutot Exp $
|
||||
|
||||
### Disabled warnings, and compiler flag overrides
|
||||
|
||||
@@ -19982,13 +19986,6 @@ if test "x$GCC" = "xyes"; then
|
||||
@@ -25322,13 +25326,6 @@ if test "x$GCC" = "xyes"; then
|
||||
case " $CFLAGS " in
|
||||
*[\ \ ]-Wno-sign-compare[\ \ ]*) ;;
|
||||
*) CFLAGS="$CFLAGS -Wno-sign-compare" ;;
|
||||
|
||||
11
x11/dbus/patches/patch-dbus-1_pc_in
Normal file
11
x11/dbus/patches/patch-dbus-1_pc_in
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-dbus-1_pc_in,v 1.6 2010/12/16 07:13:58 ajacoutot Exp $
|
||||
--- dbus-1.pc.in.orig Fri Apr 4 11:24:08 2008
|
||||
+++ dbus-1.pc.in Fri Jul 4 21:14:27 2008
|
||||
@@ -10,6 +10,6 @@ daemondir=@DBUS_DAEMONDIR@
|
||||
Name: dbus
|
||||
Description: Free desktop message bus
|
||||
Version: @VERSION@
|
||||
-Libs: -L${libdir} -ldbus-1 @DBUS_CLIENT_LIBS@
|
||||
+Libs: -L${libdir} -ldbus-1 -pthread @DBUS_CLIENT_LIBS@
|
||||
Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-dbus_Makefile_in,v 1.7 2010/12/13 10:41:22 ajacoutot Exp $
|
||||
--- dbus/Makefile.in.orig Mon Sep 6 14:52:23 2010
|
||||
+++ dbus/Makefile.in Mon Dec 13 10:36:44 2010
|
||||
@@ -536,7 +536,7 @@ top_builddir = @top_builddir@
|
||||
$OpenBSD: patch-dbus_Makefile_in,v 1.8 2010/12/16 07:13:58 ajacoutot Exp $
|
||||
--- dbus/Makefile.in.orig Tue Mar 23 20:11:23 2010
|
||||
+++ dbus/Makefile.in Tue Apr 20 16:38:22 2010
|
||||
@@ -350,7 +350,7 @@ top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
configdir = $(sysconfdir)/dbus-1
|
||||
INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) @PIC_CFLAGS@ -DDBUS_COMPILATION \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-dbus_dbus-connection_c,v 1.2 2010/12/13 10:41:22 ajacoutot Exp $
|
||||
$OpenBSD: patch-dbus_dbus-connection_c,v 1.3 2010/12/16 07:13:58 ajacoutot Exp $
|
||||
|
||||
From FreeBSD:
|
||||
Linux is more relaxed when it comes to the timeout argument to poll(2).
|
||||
@ -6,9 +6,9 @@ Linux will accept aby negative number to mean an infinite timeout. FreeBSD
|
||||
will only accept -1. Make sure we do not pass an aribtrary negative number
|
||||
to poll(2) to avoid an infinite EINVAL loop.
|
||||
|
||||
--- dbus/dbus-connection.c.orig Tue Aug 31 23:44:19 2010
|
||||
+++ dbus/dbus-connection.c Mon Dec 13 10:48:47 2010
|
||||
@@ -2364,7 +2364,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
--- dbus/dbus-connection.c.orig Tue Mar 23 20:01:32 2010
|
||||
+++ dbus/dbus-connection.c Tue Apr 20 19:43:43 2010
|
||||
@@ -2287,7 +2287,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
DBusConnection *connection;
|
||||
dbus_uint32_t client_serial;
|
||||
DBusTimeout *timeout;
|
||||
@ -17,20 +17,18 @@ to poll(2) to avoid an infinite EINVAL loop.
|
||||
|
||||
_dbus_assert (pending != NULL);
|
||||
|
||||
@@ -2445,7 +2445,11 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
@@ -2367,6 +2367,10 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
_dbus_get_current_time (&tv_sec, &tv_usec);
|
||||
elapsed_milliseconds = (tv_sec - start_tv_sec) * 1000 +
|
||||
(tv_usec - start_tv_usec) / 1000;
|
||||
-
|
||||
+ if (timeout_milliseconds != -1)
|
||||
+ remain_milliseconds = timeout_milliseconds - elapsed_milliseconds;
|
||||
+ else
|
||||
+ remain_milliseconds = -1;
|
||||
+
|
||||
|
||||
if (!_dbus_connection_get_is_connected_unlocked (connection))
|
||||
{
|
||||
DBusMessage *error_msg;
|
||||
@@ -2471,7 +2475,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
@@ -2393,7 +2397,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
*/
|
||||
_dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
|
||||
|
||||
@ -39,8 +37,8 @@ to poll(2) to avoid an infinite EINVAL loop.
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2480,7 +2484,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
pending,
|
||||
@@ -2401,7 +2405,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
_dbus_connection_do_iteration_unlocked (connection,
|
||||
DBUS_ITERATION_DO_READING |
|
||||
DBUS_ITERATION_BLOCK,
|
||||
- timeout_milliseconds - elapsed_milliseconds);
|
||||
@ -48,7 +46,7 @@ to poll(2) to avoid an infinite EINVAL loop.
|
||||
}
|
||||
|
||||
goto recheck_status;
|
||||
@@ -2489,7 +2493,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
@@ -2410,7 +2414,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
_dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n");
|
||||
else if (elapsed_milliseconds < timeout_milliseconds)
|
||||
{
|
||||
@ -57,7 +55,7 @@ to poll(2) to avoid an infinite EINVAL loop.
|
||||
|
||||
if (status == DBUS_DISPATCH_NEED_MEMORY)
|
||||
{
|
||||
@@ -2499,7 +2503,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
@@ -2420,7 +2424,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
*/
|
||||
_dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
|
||||
|
||||
@ -66,8 +64,8 @@ to poll(2) to avoid an infinite EINVAL loop.
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2508,7 +2512,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
NULL,
|
||||
@@ -2428,7 +2432,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
|
||||
_dbus_connection_do_iteration_unlocked (connection,
|
||||
DBUS_ITERATION_DO_READING |
|
||||
DBUS_ITERATION_BLOCK,
|
||||
- timeout_milliseconds - elapsed_milliseconds);
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
$OpenBSD: patch-dbus_dbus-sysdeps-unix_c,v 1.6 2010/12/13 10:41:22 ajacoutot Exp $
|
||||
--- dbus/dbus-sysdeps-unix.c.orig Mon Sep 6 19:30:26 2010
|
||||
+++ dbus/dbus-sysdeps-unix.c Mon Dec 13 10:44:38 2010
|
||||
@@ -1650,7 +1650,11 @@ _dbus_read_credentials_socket (int clien
|
||||
$OpenBSD: patch-dbus_dbus-sysdeps-unix_c,v 1.7 2010/12/16 07:13:58 ajacoutot Exp $
|
||||
--- dbus/dbus-sysdeps-unix.c.orig Tue Mar 23 20:01:27 2010
|
||||
+++ dbus/dbus-sysdeps-unix.c Wed Jun 30 21:41:34 2010
|
||||
@@ -1224,7 +1224,11 @@ _dbus_read_credentials_socket (int clien
|
||||
|
||||
{
|
||||
#ifdef SO_PEERCRED
|
||||
+#ifndef __OpenBSD__
|
||||
struct ucred cr;
|
||||
struct ucred cr;
|
||||
+#else
|
||||
+ struct sockpeercred cr;
|
||||
+#endif
|
||||
int cr_len = sizeof (cr);
|
||||
|
||||
|
||||
if (getsockopt (client_fd, SOL_SOCKET, SO_PEERCRED, &cr, &cr_len) == 0 &&
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-doc_Makefile_in,v 1.7 2010/12/13 10:41:22 ajacoutot Exp $
|
||||
--- doc/Makefile.in.orig Mon Sep 6 14:52:23 2010
|
||||
+++ doc/Makefile.in Mon Dec 13 10:36:45 2010
|
||||
@@ -454,16 +454,16 @@ uninstall-am:
|
||||
$OpenBSD: patch-doc_Makefile_in,v 1.8 2010/12/16 07:13:58 ajacoutot Exp $
|
||||
--- doc/Makefile.in.orig Tue Mar 23 20:11:23 2010
|
||||
+++ doc/Makefile.in Tue Apr 20 16:38:22 2010
|
||||
@@ -444,16 +444,16 @@ uninstall-am:
|
||||
@DBUS_XML_DOCS_ENABLED_TRUE@all-local: $(HTML_FILES)
|
||||
|
||||
@DBUS_XML_DOCS_ENABLED_TRUE@dbus-specification.html: dbus-specification.xml
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-tools_Makefile_in,v 1.7 2010/12/13 10:41:22 ajacoutot Exp $
|
||||
--- tools/Makefile.in.orig Mon Sep 6 14:52:23 2010
|
||||
+++ tools/Makefile.in Mon Dec 13 10:38:09 2010
|
||||
@@ -355,7 +355,7 @@ top_build_prefix = @top_build_prefix@
|
||||
$OpenBSD: patch-tools_Makefile_in,v 1.8 2010/12/16 07:13:59 ajacoutot Exp $
|
||||
--- tools/Makefile.in.orig Tue Mar 23 20:11:23 2010
|
||||
+++ tools/Makefile.in Tue Apr 20 16:38:22 2010
|
||||
@@ -339,7 +339,7 @@ top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
configdir = $(sysconfdir)/dbus-1
|
||||
-INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
|
||||
+INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(configdir)/machine-id"\"
|
||||
extra_bin_programs = $(am__append_1)
|
||||
-INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
|
||||
+INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(configdir)/machine-id"\"
|
||||
dbus_send_SOURCES = \
|
||||
dbus-print-message.c \
|
||||
@@ -396,8 +396,8 @@ CLEANFILES = \
|
||||
dbus-print-message.h \
|
||||
@@ -375,8 +375,8 @@ CLEANFILES = \
|
||||
run-with-tmp-session-bus.conf
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $OpenBSD: dbus_daemon.rc,v 1.4 2010/12/14 18:45:54 ajacoutot Exp $
|
||||
# $OpenBSD: dbus_daemon.rc,v 1.5 2010/12/16 07:13:59 ajacoutot Exp $
|
||||
|
||||
. /etc/rc.d/rc.subr
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user