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

Update to dbus-1.6.16.

Browse Source
This commit is contained in:
ajacoutot 2013-10-09 11:10:46 +00:00
parent 9eead3dd44
commit 983e697146
13 changed files with 29 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/dbus/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.103 2013/08/10 15:47:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.104 2013/10/09 11:10:46 ajacoutot Exp $
# DPB: not parallel-safe
COMMENT= message bus system
DISTNAME= dbus-1.6.12
DISTNAME= dbus-1.6.16
EPOCH= 0
REVISION= 1
SHARED_LIBS += dbus-1 10.2 # 10.3

4
x11/dbus/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (dbus-1.6.12.tar.gz) = 9np6v9bQRcHp66K7pBmdMBg2vAxuinJ8dlkTq6eA7pI=
SIZE (dbus-1.6.12.tar.gz) = 1933805
SHA256 (dbus-1.6.16.tar.gz) = Rj9Chzqvzecz3jEF5tFmcJpCvJYftOPvJ2V9/VWBNXM=
SIZE (dbus-1.6.16.tar.gz) = 1948266

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

@ -1,10 +1,10 @@
$OpenBSD: patch-bus_Makefile_in,v 1.19 2013/06/13 13:08:53 ajacoutot Exp $
$OpenBSD: patch-bus_Makefile_in,v 1.20 2013/10/09 11:10:47 ajacoutot Exp $
XXX -lkvm push upstream (cf. patch-dbus_dbus-sysdeps-util-unix_c)
--- bus/Makefile.in.orig Wed Jun 12 15:02:41 2013
+++ bus/Makefile.in Thu Jun 13 15:03:02 2013
@@ -383,7 +383,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--- bus/Makefile.in.orig Tue Oct 8 14:26:27 2013
+++ bus/Makefile.in Wed Oct 9 12:43:49 2013
@@ -428,7 +428,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LAUNCHCTL = @LAUNCHCTL@
LAUNCHD_AGENT_DIR = @LAUNCHD_AGENT_DIR@
LD = @LD@
@ -13,7 +13,7 @@ XXX -lkvm push upstream (cf. patch-dbus_dbus-sysdeps-util-unix_c)
LIBDBUS_LIBS = @LIBDBUS_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -1532,7 +1532,6 @@ clean-local:
@@ -1575,7 +1575,6 @@ clean-local:
/bin/rm *.bb *.bbg *.da *.gcov || true
install-data-hook:
@ -21,7 +21,7 @@ XXX -lkvm push upstream (cf. patch-dbus_dbus-sysdeps-util-unix_c)
$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
@@ -1549,13 +1548,6 @@ install-data-hook:
@@ -1592,13 +1591,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:

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

@ -1,7 +1,7 @@
$OpenBSD: patch-dbus_Makefile_in,v 1.16 2013/06/13 13:08:53 ajacoutot Exp $
--- dbus/Makefile.in.orig Wed Jun 12 15:02:41 2013
+++ dbus/Makefile.in Thu Jun 13 15:03:02 2013
@@ -599,7 +599,7 @@ AM_CPPFLAGS = \
$OpenBSD: patch-dbus_Makefile_in,v 1.17 2013/10/09 11:10:47 ajacoutot Exp $
--- dbus/Makefile.in.orig Tue Oct 8 14:26:27 2013
+++ dbus/Makefile.in Wed Oct 9 12:43:49 2013
@@ -644,7 +644,7 @@ AM_CPPFLAGS = \
$(SYSTEMD_CFLAGS) \
$(VALGRIND_CFLAGS) \
-DDBUS_COMPILATION \

49
x11/dbus/patches/patch-dbus_dbus-address_c
View File

@ -1,49 +0,0 @@
$OpenBSD: patch-dbus_dbus-address_c,v 1.1 2013/07/20 13:10:29 ajacoutot Exp $
From 32e5cab56a6707cf897f918999720ff7e455255e Mon Sep 17 00:00:00 2001
From: Chengwei Yang <chengwei.yang@intel.com>
Date: Sat, 29 Jun 2013 03:56:20 +0000
Subject: Fix: a non ascii byte will trigger BadAddress error
From cef5a419f4a8f00c6cc0b57d5a01ac347fff9598 Mon Sep 17 00:00:00 2001
From: Chengwei Yang <chengwei.yang@intel.com>
Date: Sat, 29 Jun 2013 04:21:27 +0000
Subject: Test: add a test case for escaping byte > 127
From 00c1c0ac1fb9258747c56ff77a4a35beb44bd994 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 01 Jul 2013 11:14:02 +0000
Subject: Make the test for #53499 more obviously correct
--- dbus/dbus-address.c.orig Sat Jul 20 14:22:50 2013
+++ dbus/dbus-address.c Sat Jul 20 14:23:09 2013
@@ -104,15 +104,15 @@ dbus_bool_t
_dbus_address_append_escaped (DBusString *escaped,
const DBusString *unescaped)
{
- const char *p;
- const char *end;
+ const unsigned char *p;
+ const unsigned char *end;
dbus_bool_t ret;
int orig_len;
ret = FALSE;
orig_len = _dbus_string_get_length (escaped);
- p = _dbus_string_get_const_data (unescaped);
+ p = (const unsigned char *) _dbus_string_get_const_data (unescaped);
end = p + _dbus_string_get_length (unescaped);
while (p != end)
{
@@ -678,7 +678,9 @@ static const EscapeTest escape_tests[] = {
{ "Z", "Z" },
{ "a", "a" },
{ "i", "i" },
- { "z", "z" }
+ { "z", "z" },
+ /* Bug: https://bugs.freedesktop.org/show_bug.cgi?id=53499 */
+ { "%c3%b6", "\xc3\xb6" }
};
static const char* invalid_escaped_values[] = {

26
x11/dbus/patches/patch-dbus_dbus-errors_c
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-dbus_dbus-errors_c,v 1.1 2013/07/20 13:10:29 ajacoutot Exp $
From f023c0e265443e8caab45aa9aa18ce245aa22af0 Mon Sep 17 00:00:00 2001
From: Chengwei Yang <chengwei.yang@intel.com>
Date: Fri, 28 Jun 2013 06:34:22 +0000
Subject: Remove invoke of va_end before va_start
--- dbus/dbus-errors.c.orig Wed Jun 6 12:45:55 2012
+++ dbus/dbus-errors.c Sat Jul 20 14:21:46 2013
@@ -235,7 +235,7 @@ dbus_error_free (DBusError *error)
* must ensure the name and message are global data that won't be
* freed. You probably want dbus_set_error() instead, in most cases.
*
- * @param error the error.or #NULL
+ * @param error the error or #NULL
* @param name the error name (not copied!!!)
* @param message the error message (not copied!!!)
*/
@@ -379,7 +379,6 @@ dbus_set_error (DBusError *error,
message_from_error (name)))
{
_dbus_string_free (&str);
- va_end (args);
goto nomem;
}
}

22
x11/dbus/patches/patch-dbus_dbus-spawn_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-dbus_dbus-spawn_c,v 1.1 2013/01/08 09:30:27 ajacoutot Exp $
From 90f939f155bd120f44ff3906296707a6c00cd462 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Tue, 16 Oct 2012 18:38:28 +0000
Subject: dbus-spawn: set SIGPIPE to SIG_IGN before activating services
--- dbus/dbus-spawn.c.orig Fri Sep 28 21:17:25 2012
+++ dbus/dbus-spawn.c Tue Jan 8 10:00:23 2013
@@ -1256,7 +1256,11 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter
_dbus_assert_not_reached ("Got to code after write_err_and_exit()");
}
else if (grandchild_pid == 0)
- {
+ {
+ /* Go back to ignoring SIGPIPE, since it's evil
+ */
+ signal (SIGPIPE, SIG_IGN);
+
do_exec (child_err_report_pipe[WRITE_END],
argv,
env,

38
x11/dbus/patches/patch-dbus_dbus-string_c
View File

@ -1,38 +0,0 @@
$OpenBSD: patch-dbus_dbus-string_c,v 1.1 2013/07/20 13:10:29 ajacoutot Exp $
From 8eb29fda102be3bd27b04a0b2d7f53a4dfb01f62 Mon Sep 17 00:00:00 2001
From: Chengwei Yang <chengwei.yang@intel.com>
Date: Thu, 20 Jun 2013 09:24:04 +0000
Subject: DBusString: fix may crash if try to free an uninitialized str
From 32e5cab56a6707cf897f918999720ff7e455255e Mon Sep 17 00:00:00 2001
From: Chengwei Yang <chengwei.yang@intel.com>
Date: Sat, 29 Jun 2013 03:56:20 +0000
Subject: Fix: a non ascii byte will trigger BadAddress error
--- dbus/dbus-string.c.orig Sat Jul 20 14:21:21 2013
+++ dbus/dbus-string.c Sat Jul 20 14:22:16 2013
@@ -246,6 +246,14 @@ _dbus_string_free (DBusString *str)
if (real->constant)
return;
+
+ /* so it's safe if @p str returned by a failed
+ * _dbus_string_init call
+ * Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65959
+ */
+ if (real->str == NULL)
+ return;
+
dbus_free (real->str - real->align_offset);
real->invalid = TRUE;
@@ -2220,7 +2228,7 @@ _dbus_string_starts_with_c_str (const DBusString *a,
*/
dbus_bool_t
_dbus_string_append_byte_as_hex (DBusString *str,
- int byte)
+ unsigned char byte)
{
const char hexdigits[16] = {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',

18
x11/dbus/patches/patch-dbus_dbus-string_h
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-dbus_dbus-string_h,v 1.1 2013/07/20 13:10:29 ajacoutot Exp $
From 32e5cab56a6707cf897f918999720ff7e455255e Mon Sep 17 00:00:00 2001
From: Chengwei Yang <chengwei.yang@intel.com>
Date: Sat, 29 Jun 2013 03:56:20 +0000
Subject: Fix: a non ascii byte will trigger BadAddress error
--- dbus/dbus-string.h.orig Wed Jun 6 12:45:55 2012
+++ dbus/dbus-string.h Sat Jul 20 14:22:16 2013
@@ -259,7 +259,7 @@ void _dbus_string_delete_first_word (DBus
void _dbus_string_delete_leading_blanks (DBusString *str);
void _dbus_string_chop_white (DBusString *str);
dbus_bool_t _dbus_string_append_byte_as_hex (DBusString *str,
- int byte);
+ unsigned char byte);
dbus_bool_t _dbus_string_hex_encode (const DBusString *source,
int start,
DBusString *dest,

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

@ -1,43 +0,0 @@
$OpenBSD: patch-dbus_dbus-sysdeps-unix_c,v 1.14 2013/06/13 13:08:53 ajacoutot Exp $
From pkgsrc:
_dbus_poll: set the timeout value argument to poll to -1 whenever it is
less than -1 to avoid an infinite EINVAL loop.
From b8b3feb98646c8294c86f8391d243aaf3f8ac684 Mon Sep 17 00:00:00 2001
From: Michel HERMIER <hermier@frugalware.org>
Date: Fri, 09 Nov 2012 15:53:46 +0000
Subject: Remove redundant close() calls
--- dbus/dbus-sysdeps-unix.c.orig Wed Jun 12 14:55:53 2013
+++ dbus/dbus-sysdeps-unix.c Thu Jun 13 15:02:56 2013
@@ -2528,6 +2528,10 @@ _dbus_poll (DBusPollFD *fds,
_DBUS_STRUCT_OFFSET (DBusPollFD, revents) ==
_DBUS_STRUCT_OFFSET (struct pollfd, revents))
{
+ if (timeout_milliseconds < -1) {
+ _dbus_warn("_dbus_poll: timeout = %d (fixed)\n", timeout_milliseconds);
+ timeout_milliseconds = -1;
+ }
return poll ((struct pollfd*) fds,
n_fds,
timeout_milliseconds);
@@ -3312,15 +3316,12 @@ _read_subprocess_line_argv (const char *progpath,
/* set-up stdXXX */
close (result_pipe[READ_END]);
close (errors_pipe[READ_END]);
- close (0); /* close stdin */
- close (1); /* close stdout */
- close (2); /* close stderr */
- if (dup2 (fd, 0) == -1)
+ if (dup2 (fd, 0) == -1) /* setup stdin */
_exit (1);
- if (dup2 (result_pipe[WRITE_END], 1) == -1)
+ if (dup2 (result_pipe[WRITE_END], 1) == -1) /* setup stdout */
_exit (1);
- if (dup2 (errors_pipe[WRITE_END], 2) == -1)
+ if (dup2 (errors_pipe[WRITE_END], 2) == -1) /* setup stderr */
_exit (1);
_dbus_close_all ();

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

@ -1,9 +1,9 @@
$OpenBSD: patch-dbus_dbus-sysdeps-util-unix_c,v 1.8 2013/05/07 07:00:01 ajacoutot Exp $
$OpenBSD: patch-dbus_dbus-sysdeps-util-unix_c,v 1.9 2013/10/09 11:10:49 ajacoutot Exp $
XXX push upstream
--- dbus/dbus-sysdeps-util-unix.c.orig Fri Nov 9 17:01:44 2012
+++ dbus/dbus-sysdeps-util-unix.c Tue May 7 08:47:04 2013
--- dbus/dbus-sysdeps-util-unix.c.orig Fri Sep 13 13:22:11 2013
+++ dbus/dbus-sysdeps-util-unix.c Wed Oct 9 12:43:47 2013
@@ -55,6 +55,13 @@
#include <sys/syslimits.h>
#endif
@ -41,7 +41,7 @@ XXX push upstream
if (!_dbus_string_append_printf (&path, "/proc/%ld/cmdline", pid))
goto oom;
@@ -1149,6 +1164,24 @@ _dbus_command_for_pid (unsigned long pid,
@@ -1150,6 +1165,24 @@ _dbus_command_for_pid (unsigned long pid,
if (!_dbus_close (fd, error))
goto fail;
@ -66,7 +66,7 @@ XXX push upstream
string_squash_nonprintable (&cmdline);
@@ -1163,5 +1196,8 @@ oom:
@@ -1164,5 +1197,8 @@ oom:
fail:
_dbus_string_free (&cmdline);
_dbus_string_free (&path);

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

@ -1,10 +1,10 @@
$OpenBSD: patch-test_Makefile_in,v 1.9 2013/06/13 13:08:53 ajacoutot Exp $
$OpenBSD: patch-test_Makefile_in,v 1.10 2013/10/09 11:10:49 ajacoutot Exp $
XXX -lkvm push upstream (cf. patch-dbus_dbus-sysdeps-util-unix_c)
--- test/Makefile.in.orig Wed Jun 12 15:02:41 2013
+++ test/Makefile.in Thu Jun 13 15:03:02 2013
@@ -376,7 +376,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--- test/Makefile.in.orig Tue Oct 8 14:26:27 2013
+++ test/Makefile.in Wed Oct 9 12:43:49 2013
@@ -624,7 +624,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LAUNCHCTL = @LAUNCHCTL@
LAUNCHD_AGENT_DIR = @LAUNCHD_AGENT_DIR@
LD = @LD@

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

@ -1,7 +1,7 @@
$OpenBSD: patch-tools_Makefile_in,v 1.18 2013/06/13 13:08:53 ajacoutot Exp $
--- tools/Makefile.in.orig Wed Jun 12 15:02:42 2013
+++ tools/Makefile.in Thu Jun 13 15:03:02 2013
@@ -367,7 +367,7 @@ AM_CPPFLAGS = \
$OpenBSD: patch-tools_Makefile_in,v 1.19 2013/10/09 11:10:49 ajacoutot Exp $
--- tools/Makefile.in.orig Tue Oct 8 14:26:28 2013
+++ tools/Makefile.in Wed Oct 9 12:43:49 2013
@@ -412,7 +412,7 @@ AM_CPPFLAGS = \
$(DBUS_STATIC_BUILD_CPPFLAGS) \
$(DBUS_X_CFLAGS) \
-DDBUS_COMPILATION \
@ -10,8 +10,8 @@ $OpenBSD: patch-tools_Makefile_in,v 1.18 2013/06/13 13:08:53 ajacoutot Exp $
$(NULL)
@@ -779,12 +779,12 @@ uninstall-am: uninstall-binPROGRAMS
uninstall-binPROGRAMS
@@ -818,12 +818,12 @@ uninstall-am: uninstall-binPROGRAMS
uninstall-am uninstall-binPROGRAMS
-# create the /var/lib/dbus directory for dbus-uuidgen