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

Bugfix update to dbus-1.4.14.

Browse Source
This commit is contained in:
ajacoutot 2011-09-09 09:00:25 +00:00
parent 1149b4f57a
commit 3b1fac67e8
7 changed files with 44 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/dbus/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.70 2011/08/31 15:09:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.71 2011/09/09 09:00:25 ajacoutot Exp $
# OpenBSD has support for monotonic clock (CLOCK_MONOTONIC), however we
# currently don't have most of the _POSIX_* defines in unistd.h (e.g.
@ -10,11 +10,9 @@
COMMENT= message bus system
DISTNAME= dbus-1.4.12
DISTNAME= dbus-1.4.14
EPOCH= 0
REVISION= 0
SHARED_LIBS += dbus-1 9.1 # .8.6
CATEGORIES= x11
@ -28,7 +26,7 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
WANTLIB= ICE X11 Xau Xdmcp SM c expat pthread pthread-stubs xcb
WANTLIB += ICE SM X11 c expat pthread xcb
MASTER_SITES= ${HOMEPAGE}/releases/dbus/

10
x11/dbus/distinfo
View File

@ -1,5 +1,5 @@
MD5 (dbus-1.4.12.tar.gz) = EE8uqUwQqJbfse3stXFMsQ==
RMD160 (dbus-1.4.12.tar.gz) = TFxxgRfr9FOER0P208NSXXWT1yI=
SHA1 (dbus-1.4.12.tar.gz) = Yoiggm/gLQLdvmKvA8lAFQHmnMI=
SHA256 (dbus-1.4.12.tar.gz) = 2jyX/VRmEFWNWIeZ4nxPqBEB51SsvNNHR6QsEx8w2+c=
SIZE (dbus-1.4.12.tar.gz) = 1878025
MD5 (dbus-1.4.14.tar.gz) = rm3iVipXUWz6uvVpAzdbqQ==
RMD160 (dbus-1.4.14.tar.gz) = /khGXHUFt/D5a01MHrgBlNIare0=
SHA1 (dbus-1.4.14.tar.gz) = QMy2/3tvegGM8CD+98BhMfflhxw=
SHA256 (dbus-1.4.14.tar.gz) = R/J+/CmqnRzGS3TjdCBAhNb9UxkecN1YS2BBgQWeWHc=
SIZE (dbus-1.4.14.tar.gz) = 1880298

10
x11/dbus/patches/patch-bus_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-bus_Makefile_in,v 1.13 2011/06/15 16:26:07 ajacoutot Exp $
--- bus/Makefile.in.orig Fri Jun 10 22:57:24 2011
+++ bus/Makefile.in Wed Jun 15 18:17:02 2011
@@ -2579,7 +2579,6 @@ clean-local:
$OpenBSD: patch-bus_Makefile_in,v 1.14 2011/09/09 09:00:25 ajacoutot Exp $
--- bus/Makefile.in.orig Fri Jul 29 15:05:28 2011
+++ bus/Makefile.in Fri Sep 9 10:51:12 2011
@@ -2485,7 +2485,6 @@ clean-local:
/bin/rm *.bb *.bbg *.da *.gcov || true
install-data-hook:
@ -9,7 +9,7 @@ $OpenBSD: patch-bus_Makefile_in,v 1.13 2011/06/15 16:26:07 ajacoutot Exp $
$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
@@ -2596,13 +2595,6 @@ install-data-hook:
@@ -2502,13 +2501,6 @@ install-data-hook:
@HAVE_SYSTEMD_TRUE@ ln -fs ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service
@DBUS_UNIX_TRUE@install-exec-hook:

20
x11/dbus/patches/patch-dbus_dbus-connection_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-dbus_dbus-connection_c,v 1.8 2011/06/15 16:26:07 ajacoutot Exp $
$OpenBSD: patch-dbus_dbus-connection_c,v 1.9 2011/09/09 09:00:25 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.
OpenBSD will only accept INFTIM (-1). Make sure we do not pass an
arbitrary negative number to poll(2) to avoid an infinite EINVAL loop.
--- dbus/dbus-connection.c.orig Fri Jun 10 21:37:21 2011
+++ dbus/dbus-connection.c Wed Jun 15 18:17:02 2011
@@ -2354,7 +2354,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
--- dbus/dbus-connection.c.orig Fri Jul 29 15:03:47 2011
+++ dbus/dbus-connection.c Fri Sep 9 10:51:13 2011
@@ -2356,7 +2356,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
DBusConnection *connection;
dbus_uint32_t client_serial;
DBusTimeout *timeout;
@ -17,7 +17,7 @@ arbitrary negative number to poll(2) to avoid an infinite EINVAL loop.
_dbus_assert (pending != NULL);
@@ -2435,7 +2435,11 @@ _dbus_connection_block_pending_call (DBusPendingCall *
@@ -2437,7 +2437,11 @@ _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;
@ -30,7 +30,7 @@ arbitrary negative number to poll(2) to avoid an infinite EINVAL loop.
if (!_dbus_connection_get_is_connected_unlocked (connection))
{
DBusMessage *error_msg;
@@ -2461,7 +2465,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
@@ -2463,7 +2467,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
*/
_dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
@ -39,7 +39,7 @@ arbitrary negative number to poll(2) to avoid an infinite EINVAL loop.
}
else
{
@@ -2470,7 +2474,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
@@ -2472,7 +2476,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
pending,
DBUS_ITERATION_DO_READING |
DBUS_ITERATION_BLOCK,
@ -48,7 +48,7 @@ arbitrary negative number to poll(2) to avoid an infinite EINVAL loop.
}
goto recheck_status;
@@ -2479,7 +2483,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
@@ -2481,7 +2485,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 +57,7 @@ arbitrary negative number to poll(2) to avoid an infinite EINVAL loop.
if (status == DBUS_DISPATCH_NEED_MEMORY)
{
@@ -2489,7 +2493,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
@@ -2491,7 +2495,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
*/
_dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
@ -66,7 +66,7 @@ arbitrary negative number to poll(2) to avoid an infinite EINVAL loop.
}
else
{
@@ -2498,7 +2502,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
@@ -2500,7 +2504,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
NULL,
DBUS_ITERATION_DO_READING |
DBUS_ITERATION_BLOCK,

15
x11/dbus/patches/patch-doc_Makefile_in
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-doc_Makefile_in,v 1.14 2011/06/15 16:26:07 ajacoutot Exp $
Don't install apidir since we disable doxygen docs.
--- doc/Makefile.in.orig Fri Jun 10 22:57:25 2011
+++ doc/Makefile.in Wed Jun 15 18:17:02 2011
@@ -552,7 +552,7 @@ info: info-am
info-am:
-install-data-am: install-apiDATA install-data-local install-man
+install-data-am: install-data-local install-man
install-dvi: install-dvi-am

24
x11/dbus/patches/patch-doc_dbus-uuidgen_1
View File

@ -1,29 +1,29 @@
$OpenBSD: patch-doc_dbus-uuidgen_1,v 1.2 2011/06/03 16:51:23 ajacoutot Exp $
--- doc/dbus-uuidgen.1.orig Wed May 25 18:40:28 2011
+++ doc/dbus-uuidgen.1 Fri Jun 3 18:18:58 2011
@@ -30,7 +30,7 @@ script of a D-Bus package like this:
$OpenBSD: patch-doc_dbus-uuidgen_1,v 1.3 2011/09/09 09:00:25 ajacoutot Exp $
--- doc/dbus-uuidgen.1.orig Fri Jul 29 12:04:33 2011
+++ doc/dbus-uuidgen.1 Fri Sep 9 10:54:58 2011
@@ -30,7 +30,7 @@ script of a D\-Bus package like this:
.fi
.PP
-This will ensure that /var/lib/dbus/machine-id exists and has the uuid in it.
+This will ensure that /var/db/dbus/machine-id exists and has the uuid in it.
-This will ensure that /var/lib/dbus/machine\-id exists and has the uuid in it.
+This will ensure that /var/db/dbus/machine\-id exists and has the uuid in it.
It won't overwrite an existing uuid, since this id should remain fixed
for a single machine until the next reboot at least.
@@ -64,14 +64,14 @@ because there are two different kernels.
The following options are supported:
.TP
.I "--get[=FILENAME]"
-If a filename is not given, defaults to localstatedir/lib/dbus/machine-id
+If a filename is not given, defaults to localstatedir/db/dbus/machine-id.
.I "\-\-get[=FILENAME]"
-If a filename is not given, defaults to localstatedir/lib/dbus/machine\-id
+If a filename is not given, defaults to localstatedir/db/dbus/machine\-id
(localstatedir is usually /var). If this file exists and is valid, the
uuid in the file is printed on stdout. Otherwise, the command exits
with a nonzero status.
.TP
.I "--ensure[=FILENAME]"
-If a filename is not given, defaults to localstatedir/lib/dbus/machine-id
+If a filename is not given, defaults to localstatedir/db/dbus/machine-id.
.I "\-\-ensure[=FILENAME]"
-If a filename is not given, defaults to localstatedir/lib/dbus/machine\-id
+If a filename is not given, defaults to localstatedir/db/dbus/machine\-id
(localstatedir is usually /var). If this file exists then it will be
validated, and a failure code returned if it contains the wrong thing.
If the file does not exist, it will be created with a new uuid in it.

10
x11/dbus/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2011/06/15 16:26:07 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.12 2011/09/09 09:00:25 ajacoutot Exp $
@newgroup _dbus:572
@newuser _dbus:572:_dbus:daemon:dbus user:/nonexistent:/sbin/nologin
%%SHARED%%
@ -49,6 +49,14 @@ lib/pkgconfig/dbus-1.pc
share/dbus-1/
share/dbus-1/services/
share/dbus-1/system-services/
share/doc/dbus/
share/doc/dbus/dbus-faq.html
share/doc/dbus/dbus-specification.html
share/doc/dbus/dbus-test-plan.html
share/doc/dbus/dbus-tutorial.html
share/doc/dbus/diagram.png
share/doc/dbus/diagram.svg
share/doc/dbus/system-activation.txt
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/dbus/
share/examples/dbus/dbus-1/