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

Update to dbus-1.10.0.

Browse Source
This commit is contained in:
ajacoutot 2015-08-27 06:46:46 +00:00
parent 1dcc435ff4
commit 20ea8b4fe9
10 changed files with 65 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
x11/dbus/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.128 2015/07/22 18:09:17 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.129 2015/08/27 06:46:46 ajacoutot Exp $
PORTROACH= limitw:1,even
DPB_PROPERTIES= parallel
@ -6,14 +6,14 @@ DPB_PROPERTIES= parallel
COMMENT-main= message bus system
COMMENT-suid= DBus setuid helper for starting system services
V= 1.8.20
V= 1.10.0
DISTNAME= dbus-${V}
EPOCH-main= 0
PKGNAME-main= ${DISTNAME}
PKGNAME-suid= dbus-daemon-launch-helper-${V}
SHARED_LIBS += dbus-1 11.0 # 11.3
SHARED_LIBS += dbus-1 11.1 # 17.3
CATEGORIES= x11
@ -28,6 +28,8 @@ WANTLIB += c expat pthread
WANTLIB-main += ${WANTLIB} ICE SM X11 xcb
WANTLIB-suid += ${WANTLIB} dbus-1
MULTI_PACKAGES= -main -suid
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
@ -36,15 +38,16 @@ USE_GMAKE= Yes
BUILD_DEPENDS= textproc/xmlto
RUN_DEPENDS-suid= ${BASE_PKGPATH},-main
LIB_DEPENDS-suid= ${BASE_PKGPATH},-main
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-dbus-user=_dbus \
--disable-doxygen-docs \
--disable-ducktype-docs \
--disable-modular-tests \
--without-dbus-glib
--disable-systemd
# gives no chance of picking up devel/libexecinfo
CONFIGURE_ENV += ac_cv_header_execinfo_h=no \
@ -55,12 +58,12 @@ CONFIGURE_ENV += ac_cv_header_execinfo_h=no \
# * requires py-gobject and dbus-python (dependency loop)
# * requires the python MODULE
#MODULES += lang/python
#TEST_DEPENDS += devel/py-gobject x11/dbus-glib
#BUILD_DEPENDS += devel/py-gobject x11/dbus-glib
#TEST_DEPENDS += devel/py-gobject3
#BUILD_DEPENDS += devel/py-gobject3
#CONFIGURE_ARGS+= --enable-developer
#CONFIGURE_ARGS+= --enable-modular-tests
#CONFIGURE_ARGS+= --enable-tests
#CONFIGURE_ARGS+= --enable-verbose-mode
#CONFIGURE_ARGS+= --enable-modular-tests
#CONFIGURE_ARGS+= --with-dbus-glib
FAKE_FLAGS= sysconfdir=${TRUEPREFIX}/share/examples/dbus

4
x11/dbus/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (dbus-1.8.20.tar.gz) = XE+/TGRiHJbocdqR0rcppbAFNuEW08RhKkadkksbcDo=
SIZE (dbus-1.8.20.tar.gz) = 1871722
SHA256 (dbus-1.10.0.tar.gz) = HfuXRfuZLxzNQ8kgSQ3oyt32cmpiIui4A75gmCk/kks=
SIZE (dbus-1.10.0.tar.gz) = 2018754

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

@ -1,8 +1,8 @@
$OpenBSD: patch-bus_Makefile_in,v 1.25 2015/07/22 18:09:17 ajacoutot Exp $
--- bus/Makefile.in.orig Tue Jul 21 18:32:30 2015
+++ bus/Makefile.in Wed Jul 22 20:05:09 2015
@@ -1538,13 +1538,6 @@ install-data-hook:
@HAVE_SYSTEMD_TRUE@ ln -fs ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service
$OpenBSD: patch-bus_Makefile_in,v 1.26 2015/08/27 06:46:46 ajacoutot Exp $
--- bus/Makefile.in.orig Tue Aug 25 17:52:09 2015
+++ bus/Makefile.in Wed Aug 26 10:50:04 2015
@@ -1686,13 +1686,6 @@ install-data-hook:
@DBUS_ENABLE_USER_SESSION_TRUE@ ln -fs ../dbus.socket $(DESTDIR)$(systemduserunitdir)/sockets.target.wants/dbus.socket
@DBUS_UNIX_TRUE@install-exec-hook:
-@DBUS_UNIX_TRUE@ if test `id -u` -eq 0; then \

8
x11/dbus/patches/patch-bus_config-parser_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-bus_config-parser_c,v 1.2 2014/09/17 05:49:15 ajacoutot Exp $
$OpenBSD: patch-bus_config-parser_c,v 1.3 2015/08/27 06:46:46 ajacoutot Exp $
/var/lib -> /var/db
--- bus/config-parser.c.orig Mon Sep 15 13:29:28 2014
+++ bus/config-parser.c Wed Sep 17 07:40:27 2014
@@ -3495,7 +3495,7 @@ static const char *test_system_service_dir_matches[] =
--- bus/config-parser.c.orig Thu May 14 15:48:53 2015
+++ bus/config-parser.c Wed Aug 26 10:50:04 2015
@@ -3528,7 +3528,7 @@ static const char *test_system_service_dir_matches[] =
#endif
DBUS_DATADIR"/dbus-1/system-services",
#ifdef DBUS_UNIX

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

@ -1,15 +1,15 @@
$OpenBSD: patch-dbus_Makefile_in,v 1.22 2015/07/22 18:09:17 ajacoutot Exp $
$OpenBSD: patch-dbus_Makefile_in,v 1.23 2015/08/27 06:46:46 ajacoutot Exp $
/var/lib -> /var/db
--- dbus/Makefile.in.orig Tue Jul 21 18:32:31 2015
+++ dbus/Makefile.in Wed Jul 22 20:05:09 2015
@@ -684,7 +684,7 @@ configdir = $(sysconfdir)/dbus-1
# results in an otherwise unnecessary dependency on librt. Disable it.
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(SYSTEMD_CFLAGS) \
--- dbus/Makefile.in.orig Tue Aug 25 17:52:09 2015
+++ dbus/Makefile.in Wed Aug 26 10:50:27 2015
@@ -589,7 +589,7 @@ dbusdatadir = $(datadir)/dbus-1
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
$(DBUS_STATIC_BUILD_CPPFLAGS) $(SYSTEMD_CFLAGS) \
$(VALGRIND_CFLAGS) -DDBUS_COMPILATION \
- -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
+ -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \
-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
-DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" \
$(NULL) -DSD_DAEMON_DISABLE_MQ
-DDBUS_SYSTEM_CONFIG_FILE=\""$(dbusdatadir)/system.conf"\" \
-DDBUS_SESSION_CONFIG_FILE=\""$(dbusdatadir)/session.conf"\" \
$(NULL) $(am__append_2)

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

@ -1,19 +0,0 @@
$OpenBSD: patch-dbus_dbus-sysdeps-unix_c,v 1.18 2014/09/17 05:49:15 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.
--- dbus/dbus-sysdeps-unix.c.orig Mon Sep 15 13:31:12 2014
+++ dbus/dbus-sysdeps-unix.c Wed Sep 17 07:40:27 2014
@@ -2592,6 +2592,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);

20
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.14 2014/11/11 14:25:56 ajacoutot Exp $
$OpenBSD: patch-dbus_dbus-sysdeps-util-unix_c,v 1.15 2015/08/27 06:46:46 ajacoutot Exp $
XXX push upstream
--- dbus/dbus-sysdeps-util-unix.c.orig Thu Nov 6 16:30:51 2014
+++ dbus/dbus-sysdeps-util-unix.c Tue Nov 11 10:07:49 2014
@@ -60,6 +60,10 @@
#include "sd-daemon.h"
--- dbus/dbus-sysdeps-util-unix.c.orig Fri Jan 30 13:46:24 2015
+++ dbus/dbus-sysdeps-util-unix.c Wed Aug 26 10:50:04 2015
@@ -62,6 +62,10 @@
#include <systemd/sd-daemon.h>
#endif
+#ifdef __OpenBSD__
+#include <sys/sysctl.h>
@ -15,7 +15,7 @@ XXX push upstream
#ifndef O_BINARY
#define O_BINARY 0
#endif
@@ -1208,7 +1212,13 @@ _dbus_command_for_pid (unsigned long pid,
@@ -1213,7 +1217,13 @@ _dbus_command_for_pid (unsigned long pid,
/* This is all Linux-specific for now */
DBusString path;
DBusString cmdline;
@ -29,7 +29,7 @@ XXX push upstream
if (!_dbus_string_init (&path))
{
@@ -1223,6 +1233,7 @@ _dbus_command_for_pid (unsigned long pid,
@@ -1228,6 +1238,7 @@ _dbus_command_for_pid (unsigned long pid,
return FALSE;
}
@ -37,7 +37,7 @@ XXX push upstream
if (!_dbus_string_append_printf (&path, "/proc/%ld/cmdline", pid))
goto oom;
@@ -1250,6 +1261,37 @@ _dbus_command_for_pid (unsigned long pid,
@@ -1255,6 +1266,37 @@ _dbus_command_for_pid (unsigned long pid,
if (!_dbus_close (fd, error))
goto fail;
@ -75,7 +75,7 @@ XXX push upstream
string_squash_nonprintable (&cmdline);
@@ -1258,12 +1300,18 @@ _dbus_command_for_pid (unsigned long pid,
@@ -1263,12 +1305,18 @@ _dbus_command_for_pid (unsigned long pid,
_dbus_string_free (&cmdline);
_dbus_string_free (&path);

8
x11/dbus/patches/patch-doc_dbus-specification_xml
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-doc_dbus-specification_xml,v 1.3 2014/05/03 11:15:19 ajacoutot Exp $
$OpenBSD: patch-doc_dbus-specification_xml,v 1.4 2015/08/27 06:46:46 ajacoutot Exp $
/var/lib -> /var/db
--- doc/dbus-specification.xml.orig Thu Mar 13 13:14:13 2014
+++ doc/dbus-specification.xml Sat May 3 13:09:31 2014
@@ -5169,7 +5169,7 @@
--- doc/dbus-specification.xml.orig Mon Mar 2 15:41:01 2015
+++ doc/dbus-specification.xml Wed Aug 26 10:50:04 2015
@@ -5357,7 +5357,7 @@
for .service files in
<literal>/usr/local/share/dbus-1/system-services</literal>,
<literal>/usr/share/dbus-1/system-services</literal> and

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

@ -1,10 +1,10 @@
$OpenBSD: patch-tools_Makefile_in,v 1.23 2015/07/22 18:09:17 ajacoutot Exp $
$OpenBSD: patch-tools_Makefile_in,v 1.24 2015/08/27 06:46:46 ajacoutot Exp $
/var/lib -> /var/db
--- tools/Makefile.in.orig Tue Jul 21 18:32:32 2015
+++ tools/Makefile.in Wed Jul 22 20:05:10 2015
@@ -428,7 +428,7 @@ AM_CPPFLAGS = \
--- tools/Makefile.in.orig Tue Aug 25 17:52:09 2015
+++ tools/Makefile.in Wed Aug 26 10:50:04 2015
@@ -491,7 +491,7 @@ AM_CPPFLAGS = \
$(DBUS_STATIC_BUILD_CPPFLAGS) \
$(DBUS_X_CFLAGS) \
-DDBUS_COMPILATION \

20
x11/dbus/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.3 2015/07/22 18:09:17 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2015/08/27 06:46:46 ajacoutot Exp $
@pkgpath x11/dbus
@newgroup _dbus:572
@newuser _dbus:572:_dbus:daemon:dbus user:/nonexistent:/sbin/nologin
@ -10,6 +10,8 @@
@bin bin/dbus-monitor
@bin bin/dbus-run-session
@bin bin/dbus-send
@bin bin/dbus-test-tool
@bin bin/dbus-update-activation-environment
@bin bin/dbus-uuidgen
include/dbus-1.0/
include/dbus-1.0/dbus/
@ -45,9 +47,15 @@ lib/pkgconfig/dbus-1.pc
@man man/man1/dbus-monitor.1
@man man/man1/dbus-run-session.1
@man man/man1/dbus-send.1
@man man/man1/dbus-test-tool.1
@man man/man1/dbus-update-activation-environment.1
@man man/man1/dbus-uuidgen.1
share/dbus-1/
share/dbus-1/services/
share/dbus-1/session.conf
share/dbus-1/session.d/
share/dbus-1/system.conf
share/dbus-1/system.d/
share/doc/dbus/
share/doc/dbus/dbus-cleanup-sockets.1.html
share/doc/dbus/dbus-daemon.1.html
@ -58,10 +66,16 @@ share/doc/dbus/dbus-run-session.1.html
share/doc/dbus/dbus-send.1.html
share/doc/dbus/dbus-specification.html
share/doc/dbus/dbus-test-plan.html
share/doc/dbus/dbus-test-tool.1.html
share/doc/dbus/dbus-tutorial.html
share/doc/dbus/dbus-update-activation-environment.1.html
share/doc/dbus/dbus-uuidgen.1.html
share/doc/dbus/diagram.png
share/doc/dbus/diagram.svg
share/doc/dbus/examples/
share/doc/dbus/examples/GetAllMatchRules.py
share/doc/dbus/examples/example-session-disable-stats.conf
share/doc/dbus/examples/example-system-enable-stats.conf
share/doc/dbus/system-activation.txt
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/dbus/
@ -69,12 +83,8 @@ share/examples/dbus/dbus-1/
@sample ${SYSCONFDIR}/dbus-1/
share/examples/dbus/dbus-1/session.conf
@sample ${SYSCONFDIR}/dbus-1/session.conf
share/examples/dbus/dbus-1/session.d/
@sample ${SYSCONFDIR}/dbus-1/session.d/
share/examples/dbus/dbus-1/system.conf
@sample ${SYSCONFDIR}/dbus-1/system.conf
share/examples/dbus/dbus-1/system.d/
@sample ${SYSCONFDIR}/dbus-1/system.d/
@sample /var/db/dbus/
@exec ${PREFIX}/bin/dbus-uuidgen --ensure=${SYSCONFDIR}/machine-id
@rcscript ${RCDIR}/messagebus