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

Bugfix update to dbus-1.4.1.

Browse Source
This commit is contained in:
ajacoutot 2010-12-21 14:59:49 +00:00
parent b49d4efa43
commit 85a3e00edb
11 changed files with 102 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/dbus/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.54 2010/12/21 05:57:42 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.55 2010/12/21 14:59:49 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
DISTNAME= dbus-1.4.1
EPOCH= 0
SHARED_LIBS += dbus-1 9.0 # .8.2
@ -53,6 +53,6 @@ CONFIGURE_ARGS= --localstatedir=/var \
FAKE_FLAGS= sysconfdir=${TRUEPREFIX}/share/examples/dbus
pre-configure:
@${SUBST_CMD} ${WRKSRC}/bus/dbus-daemon.1 ${WRKSRC}/tools/dbus-uuidgen.1
@${SUBST_CMD} ${WRKSRC}/doc/dbus-daemon.1 ${WRKSRC}/doc/dbus-uuidgen.1
.include <bsd.port.mk>

10
x11/dbus/distinfo
View File

@ -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.4.1.tar.gz) = mcsFdwDARV+2j41XkC93rA==
RMD160 (dbus-1.4.1.tar.gz) = CQdARphysxwkqvtOTUDmkBhLFYA=
SHA1 (dbus-1.4.1.tar.gz) = ESJ5/1gwUCcpT+DrW+5gD2jPC1A=
SHA256 (dbus-1.4.1.tar.gz) = yqGg3tLQ8ulcHU7H48i9RINJKMWw7UGnGJlj81k5g70=
SIZE (dbus-1.4.1.tar.gz) = 1850139

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

@ -1,7 +1,7 @@
$OpenBSD: patch-bus_Makefile_in,v 1.9 2010/12/21 05:57:42 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:
$OpenBSD: patch-bus_Makefile_in,v 1.10 2010/12/21 14:59:49 ajacoutot Exp $
--- bus/Makefile.in.orig Mon Dec 20 22:39:49 2010
+++ bus/Makefile.in Tue Dec 21 15:09:50 2010
@@ -2534,7 +2534,6 @@ uninstall-hook:
rm -f $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT)
install-data-hook:
@ -9,7 +9,7 @@ $OpenBSD: patch-bus_Makefile_in,v 1.9 2010/12/21 05:57:42 ajacoutot Exp $
$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
@@ -2576,13 +2575,6 @@ install-data-hook:
@@ -2547,13 +2546,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); \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.8 2010/12/21 05:57:42 ajacoutot Exp $
--- configure.orig Mon Sep 6 14:52:24 2010
+++ configure Mon Dec 13 10:45:09 2010
@@ -18447,13 +18447,13 @@ fi
$OpenBSD: patch-configure,v 1.9 2010/12/21 14:59:49 ajacoutot Exp $
--- configure.orig Mon Dec 20 22:39:51 2010
+++ configure Tue Dec 21 15:09:50 2010
@@ -18015,13 +18015,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 :
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.8 2010/12/21 05:57:42 ajacoutot Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -18484,7 +18484,7 @@ fi
@@ -18052,7 +18052,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" = x""yes; then :
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.8 2010/12/21 05:57:42 ajacoutot Exp $
fi
fi
@@ -18699,13 +18699,13 @@ if test x$have_selinux = xyes ; then
@@ -18267,13 +18267,13 @@ if test x$have_selinux = xyes ; then
if test "x$ac_cv_func_pthread_create" = x""yes; then :
else
@ -44,7 +44,7 @@ $OpenBSD: patch-configure,v 1.8 2010/12/21 05:57:42 ajacoutot Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -18736,7 +18736,7 @@ fi
@@ -18304,7 +18304,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 :
@ -53,7 +53,7 @@ $OpenBSD: patch-configure,v 1.8 2010/12/21 05:57:42 ajacoutot Exp $
fi
fi
@@ -19954,7 +19954,10 @@ if test "x$GCC" = "xyes"; then
@@ -19608,7 +19608,10 @@ if test "x$GCC" = "xyes"; then
;;
esac
@ -65,7 +65,7 @@ $OpenBSD: patch-configure,v 1.8 2010/12/21 05:57:42 ajacoutot Exp $
*[\ \ ]-fPIE[\ \ ]*) ;;
*) if test x$dbus_win = xno && cc_supports_flag -fPIE; then
PIE_CFLAGS="-fPIE"
@@ -19966,6 +19969,7 @@ if test "x$GCC" = "xyes"; then
@@ -19620,6 +19623,7 @@ if test "x$GCC" = "xyes"; then
fi
;;
esac
@ -73,7 +73,7 @@ $OpenBSD: patch-configure,v 1.8 2010/12/21 05:57:42 ajacoutot Exp $
### Disabled warnings, and compiler flag overrides
@@ -19982,13 +19986,6 @@ if test "x$GCC" = "xyes"; then
@@ -19636,13 +19640,6 @@ if test "x$GCC" = "xyes"; then
case " $CFLAGS " in
*[\ \ ]-Wno-sign-compare[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wno-sign-compare" ;;

8
x11/dbus/patches/patch-dbus_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-dbus_Makefile_in,v 1.9 2010/12/21 05:57:42 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.10 2010/12/21 14:59:49 ajacoutot Exp $
--- dbus/Makefile.in.orig Mon Dec 20 22:39:49 2010
+++ dbus/Makefile.in Tue Dec 21 15:09:50 2010
@@ -547,7 +547,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 \

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

@ -1,4 +1,4 @@
$OpenBSD: patch-dbus_dbus-connection_c,v 1.4 2010/12/21 05:57:42 ajacoutot Exp $
$OpenBSD: patch-dbus_dbus-connection_c,v 1.5 2010/12/21 14:59:49 ajacoutot Exp $
From FreeBSD:
Linux is more relaxed when it comes to the timeout argument to poll(2).
@ -6,8 +6,8 @@ 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 20 19:17:01 2010
--- dbus/dbus-connection.c.orig Mon Dec 13 16:16:13 2010
+++ dbus/dbus-connection.c Tue Dec 21 15:09:50 2010
@@ -233,7 +233,7 @@ struct DBusPreallocatedSend
DBusList *counter_link; /**< Preallocated link in the resource counter */
};
@ -17,7 +17,7 @@ to poll(2) to avoid an infinite EINVAL loop.
static dbus_bool_t _dbus_modify_sigpipe = FALSE;
#else
static dbus_bool_t _dbus_modify_sigpipe = TRUE;
@@ -2364,7 +2364,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
@@ -2361,7 +2361,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
DBusConnection *connection;
dbus_uint32_t client_serial;
DBusTimeout *timeout;
@ -26,7 +26,7 @@ to poll(2) to avoid an infinite EINVAL loop.
_dbus_assert (pending != NULL);
@@ -2445,7 +2445,11 @@ _dbus_connection_block_pending_call (DBusPendingCall *
@@ -2442,7 +2442,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;
@ -39,7 +39,7 @@ to poll(2) to avoid an infinite EINVAL loop.
if (!_dbus_connection_get_is_connected_unlocked (connection))
{
DBusMessage *error_msg;
@@ -2471,7 +2475,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
@@ -2468,7 +2472,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
*/
_dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
@ -48,7 +48,7 @@ to poll(2) to avoid an infinite EINVAL loop.
}
else
{
@@ -2480,7 +2484,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
@@ -2477,7 +2481,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
pending,
DBUS_ITERATION_DO_READING |
DBUS_ITERATION_BLOCK,
@ -57,7 +57,7 @@ to poll(2) to avoid an infinite EINVAL loop.
}
goto recheck_status;
@@ -2489,7 +2493,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
@@ -2486,7 +2490,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)
{
@ -66,7 +66,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 *
@@ -2496,7 +2500,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
*/
_dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
@ -75,7 +75,7 @@ to poll(2) to avoid an infinite EINVAL loop.
}
else
{
@@ -2508,7 +2512,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
@@ -2505,7 +2509,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *
NULL,
DBUS_ITERATION_DO_READING |
DBUS_ITERATION_BLOCK,

51
x11/dbus/patches/patch-dbus_dbus-sysdeps-unix_c
View File

@ -1,7 +1,50 @@
$OpenBSD: patch-dbus_dbus-sysdeps-unix_c,v 1.8 2010/12/21 05:57:42 ajacoutot Exp $
--- dbus/dbus-sysdeps-unix.c.orig Mon Sep 6 19:30:26 2010
+++ dbus/dbus-sysdeps-unix.c Mon Dec 20 19:16:38 2010
@@ -1650,7 +1650,11 @@ _dbus_read_credentials_socket (int clien
$OpenBSD: patch-dbus_dbus-sysdeps-unix_c,v 1.9 2010/12/21 14:59:49 ajacoutot Exp $
--- dbus/dbus-sysdeps-unix.c.orig Thu Dec 16 14:53:48 2010
+++ dbus/dbus-sysdeps-unix.c Tue Dec 21 15:18:05 2010
@@ -204,7 +204,7 @@ _dbus_write_socket (int fd,
int start,
int len)
{
-#ifdef HAVE_DECL_MSG_NOSIGNAL
+#if HAVE_DECL_MSG_NOSIGNAL
const char *data;
int bytes_written;
@@ -442,7 +442,7 @@ _dbus_write_socket_with_unix_fds_two(int
again:
bytes_written = sendmsg (fd, &m, 0
-#ifdef HAVE_DECL_MSG_NOSIGNAL
+#if HAVE_DECL_MSG_NOSIGNAL
|MSG_NOSIGNAL
#endif
);
@@ -481,7 +481,7 @@ _dbus_write_socket_two (int fd,
int start2,
int len2)
{
-#ifdef HAVE_DECL_MSG_NOSIGNAL
+#if HAVE_DECL_MSG_NOSIGNAL
struct iovec vectors[2];
const char *data1;
const char *data2;
@@ -1494,13 +1494,13 @@ write_credentials_byte (int server_fd,
#if defined(HAVE_CMSGCRED)
bytes_written = sendmsg (server_fd, &msg, 0
-#ifdef HAVE_DECL_MSG_NOSIGNAL
+#if HAVE_DECL_MSG_NOSIGNAL
|MSG_NOSIGNAL
#endif
);
#else
bytes_written = send (server_fd, buf, 1, 0
-#ifdef HAVE_DECL_MSG_NOSIGNAL
+#if HAVE_DECL_MSG_NOSIGNAL
|MSG_NOSIGNAL
#endif
);
@@ -1658,7 +1658,11 @@ _dbus_read_credentials_socket (int clien
{
#ifdef SO_PEERCRED

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

@ -1,8 +1,8 @@
$OpenBSD: patch-doc_Makefile_in,v 1.9 2010/12/21 05:57:42 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:
@DBUS_XML_DOCS_ENABLED_TRUE@all-local: $(HTML_FILES)
$OpenBSD: patch-doc_Makefile_in,v 1.10 2010/12/21 14:59:49 ajacoutot Exp $
--- doc/Makefile.in.orig Mon Dec 20 22:39:49 2010
+++ doc/Makefile.in Tue Dec 21 15:09:50 2010
@@ -590,16 +590,16 @@ uninstall-man: uninstall-man1
@DBUS_XML_DOCS_ENABLED_TRUE@all-local:: $(HTML_FILES)
@DBUS_XML_DOCS_ENABLED_TRUE@dbus-specification.html: dbus-specification.xml
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
@ -20,5 +20,5 @@ $OpenBSD: patch-doc_Makefile_in,v 1.9 2010/12/21 05:57:42 ajacoutot Exp $
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $(srcdir)/dbus-faq.xml
maintainer-clean-local:
rm -f $(HTML_FILES)
@DBUS_DOXYGEN_DOCS_ENABLED_TRUE@all-local:: $(DOXYGEN_HTML_INDEX)

6
x11/dbus/patches/patch-bus_dbus-daemon_1 → x11/dbus/patches/patch-doc_dbus-daemon_1
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-bus_dbus-daemon_1,v 1.7 2010/12/21 05:57:42 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
$OpenBSD: patch-doc_dbus-daemon_1,v 1.1 2010/12/21 14:59:49 ajacoutot Exp $
--- doc/dbus-daemon.1.orig Mon Dec 20 22:39:55 2010
+++ doc/dbus-daemon.1 Tue Dec 21 15:10:24 2010
@@ -27,9 +27,9 @@ per-user-login-session message bus (started each time
a different configuration file.
.PP

6
x11/dbus/patches/patch-tools_dbus-uuidgen_1 → x11/dbus/patches/patch-doc_dbus-uuidgen_1
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-tools_dbus-uuidgen_1,v 1.3 2008/10/12 22:08:04 brad Exp $
--- tools/dbus-uuidgen.1.orig Mon Dec 11 20:21:26 2006
+++ tools/dbus-uuidgen.1 Thu Mar 20 16:51:27 2008
$OpenBSD: patch-doc_dbus-uuidgen_1,v 1.1 2010/12/21 14:59:49 ajacoutot Exp $
--- doc/dbus-uuidgen.1.orig Fri Nov 5 19:17:24 2010
+++ doc/dbus-uuidgen.1 Tue Dec 21 15:10:24 2010
@@ -30,7 +30,7 @@ script of a D-Bus package like this:
.fi

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

@ -1,7 +1,7 @@
$OpenBSD: patch-tools_Makefile_in,v 1.9 2010/12/21 05:57:42 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.10 2010/12/21 14:59:49 ajacoutot Exp $
--- tools/Makefile.in.orig Mon Dec 20 22:39:50 2010
+++ tools/Makefile.in Tue Dec 21 15:09:50 2010
@@ -357,7 +357,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
configdir = $(sysconfdir)/dbus-1
@ -10,7 +10,7 @@ $OpenBSD: patch-tools_Makefile_in,v 1.9 2010/12/21 05:57:42 ajacoutot Exp $
extra_bin_programs = $(am__append_1)
dbus_send_SOURCES = \
dbus-print-message.c \
@@ -396,8 +396,8 @@ CLEANFILES = \
@@ -397,8 +397,8 @@ CLEANFILES = \
run-with-tmp-session-bus.conf