~olbohlen/oi-userland.git

parent: 7c7cd7d7 | patch | commit | ignore whitespace

Michal Nowak

2018-07-05 edbff5c1dc00e215d2b7d071984233c846960423

dbus: update to 1.12.8

5 files added

8 files modified

	components/library/dbus/Makefile	21 ●●●●● patch \| view \| raw \| blame \| history
	components/library/dbus/dbus-x11.p5m	3 ●●●●● patch \| view \| raw \| blame \| history
	components/library/dbus/dbus.p5m	15 ●●●●● patch \| view \| raw \| blame \| history
	components/library/dbus/libdbus.p5m	17 ●●●●● patch \| view \| raw \| blame \| history
	components/library/dbus/manifests/sample-manifest.p5m	26 ●●●●● patch \| view \| raw \| blame \| history
	components/library/dbus/patches/05-compile.patch	19 ●●●●● patch \| view \| raw \| blame \| history
	components/library/dbus/patches/06-m4.patch	patch \| view \| raw \| blame \| history
	components/library/dbus/patches/08-disable-name-test.patch	20 ●●●●● patch \| view \| raw \| blame \| history
	components/library/dbus/patches/09-dbus-daemon-full-path.patch	11 ●●●●● patch \| view \| raw \| blame \| history
	components/library/dbus/patches/10-remove-inline-from-some-headers.patch	74 ●●●●● patch \| view \| raw \| blame \| history
	components/library/dbus/test/results-32.master	149 ●●●●● patch \| view \| raw \| blame \| history
	components/library/dbus/test/results-64.master	149 ●●●●● patch \| view \| raw \| blame \| history
	tools/.gnupg/pubring.gpg	patch \| view \| raw \| blame \| history

 components/library/dbus/Makefile

@@ -11,24 +11,26 @@

#
# Copyright 2016 Alexander Pyhalov
# Copyright 2018 Michal Nowak
#

include ../../../make-rules/shared-macros.mk

COMPONENT_NAME= dbus
COMPONENT_VERSION= 1.10.20
COMPONENT_VERSION= 1.12.8
COMPONENT_SUMMARY= Simple IPC library based on messages
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
  sha256:e574b9780b5425fde4d973bb596e7ea0f09e00fe2edd662da9016e976c460b48
  sha256:e2dc99e7338303393b6663a98320aba6a63421bcdaaf571c8022f815e5896eb3
COMPONENT_ARCHIVE_URL= \
  http://dbus.freedesktop.org/releases/dbus/$(COMPONENT_ARCHIVE)
COMPONENT_SIG_URL = $(COMPONENT_ARCHIVE_URL).asc
COMPONENT_PROJECT_URL = http://www.freedesktop.org/wiki/Software_2fdbus
COMPONENT_PROJECT_URL = https://www.freedesktop.org/wiki/Software/dbus/
COMPONENT_LICENSE_FILE = COPYING
COMPONENT_LICENSE = GPLv2,AFLv2.1
COMPONENT_CLASSIFICATION = System/Libraries
COMPONENT_FMRI = system/library/dbus

include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
@@ -47,20 +49,27 @@
CONFIGURE_OPTIONS += --with-dbus-daemondir=$(CONFIGURE_LIBDIR.$(BITS))
CONFIGURE_OPTIONS += --disable-static

CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)"
CONFIGURE_ENV    += CPPFLAGS="$(CPPFLAGS)"
CONFIGURE_ENV    += PERL=$(PERL)
CONFIGURE_ENV    += PYTHON=$(PYTHON)

COMPONENT_TEST_TRANSFORMER = $(NAWK)
COMPONENT_TEST_TRANSFORMS = "'/TOTAL|PASS|FAIL|XFAIL|SKIP|XPASS|ERROR/'"

# To prevent "libtool_install_magic: unbound variable"
unexport SHELLOPTS

build: $(BUILD_32_and_64)

install: $(INSTALL_32_and_64)

test: $(NO_TESTS)
test: $(TEST_32_and_64)

REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += developer/documentation-tool/doxygen
REQUIRED_PACKAGES += developer/build/autoconf-archive
REQUIRED_PACKAGES += library/expat
REQUIRED_PACKAGES += library/gnome/yelp-tools
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += text/xmlto
REQUIRED_PACKAGES += x11/library/libx11

 components/library/dbus/dbus-x11.p5m

@@ -11,9 +11,10 @@

#
# Copyright 2015 Alexander Pyhalov
# Copyright 2018 Michal Nowak
#

set name=pkg.fmri value=pkg:/system/library/dbus/dbus-x11@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-x11@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY) - X11"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)

 components/library/dbus/dbus.p5m

@@ -11,9 +11,10 @@

#
# Copyright 2017 Alexander Pyhalov
# Copyright 2018 Michal Nowak
#

set name=pkg.fmri value=pkg:/system/library/dbus@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -45,6 +46,8 @@
file path=usr/bin/dbus-uuidgen
file path=usr/lib/dbus-daemon mode=0555
file path=usr/lib/dbus-daemon-launch-helper mode=0555
file path=usr/lib/$(MACH64)/dbus-daemon mode=0555
file path=usr/lib/$(MACH64)/dbus-daemon-launch-helper mode=0555
file path=usr/share/dbus-1/session.conf preserve=rename-old
file path=usr/share/dbus-1/system.conf preserve=rename-old
file path=usr/share/doc/dbus/api/annotated.html
@@ -153,6 +156,7 @@
file path=usr/share/doc/dbus/api/dbus-socket-set_8c_source.html
file path=usr/share/doc/dbus/api/dbus-socket-set_8h_source.html
file path=usr/share/doc/dbus/api/dbus-sockets-win_8h_source.html
file path=usr/share/doc/dbus/api/dbus-spawn-test_8c_source.html
file path=usr/share/doc/dbus/api/dbus-spawn-win_8c_source.html
file path=usr/share/doc/dbus/api/dbus-spawn_8c_source.html
file path=usr/share/doc/dbus/api/dbus-spawn_8h_source.html
@@ -202,8 +206,8 @@
file path=usr/share/doc/dbus/api/dbus-watch_8c_source.html
file path=usr/share/doc/dbus/api/dbus-watch_8h_source.html
file path=usr/share/doc/dbus/api/dbus_8h_source.html
file path=usr/share/doc/dbus/api/dir_5b42d9f00640640b7578618a0863a45d.html
file path=usr/share/doc/dbus/api/dir_e7d8299e1873836dc4681e7d05d03e4d.html
file path=usr/share/doc/dbus/api/dir_06136cd6e1b1575498c4499b6dd7eeb4.html
file path=usr/share/doc/dbus/api/dir_8a0b5b30d8987204d61d41d40c9d1d06.html
file path=usr/share/doc/dbus/api/doc.png
file path=usr/share/doc/dbus/api/doxygen.css
file path=usr/share/doc/dbus/api/doxygen.png
@@ -404,6 +408,7 @@
file path=usr/share/doc/dbus/api/structDBusTypeReaderClass.html
file path=usr/share/doc/dbus/api/structDBusTypeWriter.html
file path=usr/share/doc/dbus/api/structDBusUserInfo.html
file path=usr/share/doc/dbus/api/structDBusVariant.html
file path=usr/share/doc/dbus/api/structDBusWatch.html
file path=usr/share/doc/dbus/api/structDBusWatchList.html
file path=usr/share/doc/dbus/api/structHeaderFieldType.html
@@ -432,7 +437,7 @@
file path=usr/share/doc/dbus/dbus-tutorial.html
file path=usr/share/doc/dbus/dbus-update-activation-environment.1.html
file path=usr/share/doc/dbus/dbus-uuidgen.1.html
file path=usr/share/doc/dbus/dbus.devhelp
file path=usr/share/doc/dbus/dbus.devhelp2
file path=usr/share/doc/dbus/diagram.png
file path=usr/share/doc/dbus/diagram.svg
file path=usr/share/doc/dbus/examples/GetAllMatchRules.py
@@ -447,3 +452,5 @@
file path=usr/share/man/man1/dbus-test-tool.1
file path=usr/share/man/man1/dbus-update-activation-environment.1
file path=usr/share/man/man1/dbus-uuidgen.1
file path=usr/share/xml/dbus-1/busconfig.dtd
file path=usr/share/xml/dbus-1/introspect.dtd

 components/library/dbus/libdbus.p5m

@@ -11,6 +11,7 @@

#
# Copyright 2017 Alexander Pyhalov
# Copyright 2018 Michal Nowak
#

set name=pkg.fmri value=pkg:/system/library/libdbus@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -39,13 +40,17 @@
file path=usr/include/dbus-1.0/dbus/dbus-threads.h
file path=usr/include/dbus-1.0/dbus/dbus-types.h
file path=usr/include/dbus-1.0/dbus/dbus.h
file path=usr/lib/$(MACH64)/cmake/DBus1/DBus1Config.cmake
file path=usr/lib/$(MACH64)/cmake/DBus1/DBus1ConfigVersion.cmake
file path=usr/lib/$(MACH64)/dbus-1.0/include/dbus/dbus-arch-deps.h
link path=usr/lib/$(MACH64)/libdbus-1.so target=libdbus-1.so.3.14.12
link path=usr/lib/$(MACH64)/libdbus-1.so.3 target=libdbus-1.so.3.14.12
file path=usr/lib/$(MACH64)/libdbus-1.so.3.14.12
link path=usr/lib/$(MACH64)/libdbus-1.so target=libdbus-1.so.3.19.7
link path=usr/lib/$(MACH64)/libdbus-1.so.3 target=libdbus-1.so.3.19.7
file path=usr/lib/$(MACH64)/libdbus-1.so.3.19.7
file path=usr/lib/$(MACH64)/pkgconfig/dbus-1.pc
file path=usr/lib/cmake/DBus1/DBus1Config.cmake
file path=usr/lib/cmake/DBus1/DBus1ConfigVersion.cmake
file path=usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h
link path=usr/lib/libdbus-1.so target=libdbus-1.so.3.14.12
link path=usr/lib/libdbus-1.so.3 target=libdbus-1.so.3.14.12
file path=usr/lib/libdbus-1.so.3.14.12
link path=usr/lib/libdbus-1.so target=libdbus-1.so.3.19.7
link path=usr/lib/libdbus-1.so.3 target=libdbus-1.so.3.19.7
file path=usr/lib/libdbus-1.so.3.19.7
file path=usr/lib/pkgconfig/dbus-1.pc

 components/library/dbus/manifests/sample-manifest.p5m

@@ -57,19 +57,23 @@
file path=usr/include/dbus-1.0/dbus/dbus-threads.h
file path=usr/include/dbus-1.0/dbus/dbus-types.h
file path=usr/include/dbus-1.0/dbus/dbus.h
file path=usr/lib/$(MACH64)/cmake/DBus1/DBus1Config.cmake
file path=usr/lib/$(MACH64)/cmake/DBus1/DBus1ConfigVersion.cmake
file path=usr/lib/$(MACH64)/dbus-1.0/include/dbus/dbus-arch-deps.h
file path=usr/lib/$(MACH64)/dbus-daemon
file path=usr/lib/$(MACH64)/dbus-daemon-launch-helper
link path=usr/lib/$(MACH64)/libdbus-1.so target=libdbus-1.so.3.14.12
link path=usr/lib/$(MACH64)/libdbus-1.so.3 target=libdbus-1.so.3.14.12
file path=usr/lib/$(MACH64)/libdbus-1.so.3.14.12
link path=usr/lib/$(MACH64)/libdbus-1.so target=libdbus-1.so.3.19.7
link path=usr/lib/$(MACH64)/libdbus-1.so.3 target=libdbus-1.so.3.19.7
file path=usr/lib/$(MACH64)/libdbus-1.so.3.19.7
file path=usr/lib/$(MACH64)/pkgconfig/dbus-1.pc
file path=usr/lib/cmake/DBus1/DBus1Config.cmake
file path=usr/lib/cmake/DBus1/DBus1ConfigVersion.cmake
file path=usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h
file path=usr/lib/dbus-daemon
file path=usr/lib/dbus-daemon-launch-helper
link path=usr/lib/libdbus-1.so target=libdbus-1.so.3.14.12
link path=usr/lib/libdbus-1.so.3 target=libdbus-1.so.3.14.12
file path=usr/lib/libdbus-1.so.3.14.12
link path=usr/lib/libdbus-1.so target=libdbus-1.so.3.19.7
link path=usr/lib/libdbus-1.so.3 target=libdbus-1.so.3.19.7
file path=usr/lib/libdbus-1.so.3.19.7
file path=usr/lib/pkgconfig/dbus-1.pc
file path=usr/share/dbus-1/session.conf
file path=usr/share/dbus-1/system.conf
@@ -179,6 +183,7 @@
file path=usr/share/doc/dbus/api/dbus-socket-set_8c_source.html
file path=usr/share/doc/dbus/api/dbus-socket-set_8h_source.html
file path=usr/share/doc/dbus/api/dbus-sockets-win_8h_source.html
file path=usr/share/doc/dbus/api/dbus-spawn-test_8c_source.html
file path=usr/share/doc/dbus/api/dbus-spawn-win_8c_source.html
file path=usr/share/doc/dbus/api/dbus-spawn_8c_source.html
file path=usr/share/doc/dbus/api/dbus-spawn_8h_source.html
@@ -228,8 +233,8 @@
file path=usr/share/doc/dbus/api/dbus-watch_8c_source.html
file path=usr/share/doc/dbus/api/dbus-watch_8h_source.html
file path=usr/share/doc/dbus/api/dbus_8h_source.html
file path=usr/share/doc/dbus/api/dir_5b42d9f00640640b7578618a0863a45d.html
file path=usr/share/doc/dbus/api/dir_e7d8299e1873836dc4681e7d05d03e4d.html
file path=usr/share/doc/dbus/api/dir_06136cd6e1b1575498c4499b6dd7eeb4.html
file path=usr/share/doc/dbus/api/dir_8a0b5b30d8987204d61d41d40c9d1d06.html
file path=usr/share/doc/dbus/api/doc.png
file path=usr/share/doc/dbus/api/doxygen.css
file path=usr/share/doc/dbus/api/doxygen.png
@@ -430,6 +435,7 @@
file path=usr/share/doc/dbus/api/structDBusTypeReaderClass.html
file path=usr/share/doc/dbus/api/structDBusTypeWriter.html
file path=usr/share/doc/dbus/api/structDBusUserInfo.html
file path=usr/share/doc/dbus/api/structDBusVariant.html
file path=usr/share/doc/dbus/api/structDBusWatch.html
file path=usr/share/doc/dbus/api/structDBusWatchList.html
file path=usr/share/doc/dbus/api/structHeaderFieldType.html
@@ -458,7 +464,7 @@
file path=usr/share/doc/dbus/dbus-tutorial.html
file path=usr/share/doc/dbus/dbus-update-activation-environment.1.html
file path=usr/share/doc/dbus/dbus-uuidgen.1.html
file path=usr/share/doc/dbus/dbus.devhelp
file path=usr/share/doc/dbus/dbus.devhelp2
file path=usr/share/doc/dbus/diagram.png
file path=usr/share/doc/dbus/diagram.svg
file path=usr/share/doc/dbus/examples/GetAllMatchRules.py
@@ -474,3 +480,5 @@
file path=usr/share/man/man1/dbus-test-tool.1
file path=usr/share/man/man1/dbus-update-activation-environment.1
file path=usr/share/man/man1/dbus-uuidgen.1
file path=usr/share/xml/dbus-1/busconfig.dtd
file path=usr/share/xml/dbus-1/introspect.dtd

 components/library/dbus/patches/05-compile.patch

old mode 100755
new mode 100644
@@ -1,11 +1,3 @@
--- dbus-1.4.14/Makefile.am-orig    2011-09-13 16:36:40.967786680 -0500
+++ dbus-1.4.14/Makefile.am    2011-09-13 16:36:45.644929457 -0500
@@ -1,4 +1,4 @@
-SUBDIRS=dbus bus tools test doc
+SUBDIRS=dbus bus tools doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dbus-1.pc
--- dbus-1.4.14/dbus/dbus-sysdeps-unix.c-orig    2011-09-13 16:41:50.420584386 -0500
+++ dbus-1.4.14/dbus/dbus-sysdeps-unix.c    2011-09-13 16:42:18.502907891 -0500
@@ -56,6 +56,7 @@
@@ -34,17 +26,6 @@
     $(NULL)
 
 AM_CPPFLAGS = \
--- dbus-1.10.0/dbus/dbus-sysdeps-util-unix.c.orig    Fri Jan 30 18:16:24 2015
+++ dbus-1.10.0/dbus/dbus-sysdeps-util-unix.c    Mon Oct 26 14:18:30 2015
@@ -522,7 +522,7 @@
 #ifdef HAVE_SYSLOG_H
   int logopts = LOG_PID;
 
-#if HAVE_DECL_LOG_PERROR
+#if LOG_PERROR
 #ifdef HAVE_SYSTEMD
   if (!is_daemon || sd_booted () <= 0)
 #endif
--- dbus-1.10.0/dbus/Makefile.am.orig    Mon Oct 26 14:29:01 2015
+++ dbus-1.10.0/dbus/Makefile.am    Mon Oct 26 14:33:56 2015
@@ -291,7 +291,7 @@

 components/library/dbus/patches/06-m4.patch

old mode 100755
new mode 100644

 components/library/dbus/patches/08-disable-name-test.patch

New file
@@ -0,0 +1,20 @@
--- dbus-1.12.8/test/Makefile.am    2018-02-23 11:25:17.000000000 +0000
+++ dbus-1.12.8/test/Makefile.am    2018-07-01 21:32:06.070657489 +0000
@@ -1,9 +1,3 @@
-## the "name-test" subdir in fact contains a bunch of tests now that need a temporary bus
-## to be running to do stuff with. The directory should be renamed.
-## We want to build the current directory first to pick up the testutils lib
-SUBDIRS= . name-test
-DIST_SUBDIRS=name-test
-
 CLEANFILES =
 EXTRA_DIST =
 
@@ -466,7 +460,6 @@ in_data = \
 EXTRA_DIST += $(in_data)
 
 static_data = \
-    name-test/tmp-session-like-system.conf \
     data/auth/anonymous-client-successful.auth-script \
     data/auth/anonymous-server-successful.auth-script \
     data/auth/cancel.auth-script \

 components/library/dbus/patches/09-dbus-daemon-full-path.patch

New file
@@ -0,0 +1,11 @@
--- dbus-1.12.8/tools/dbus-run-session.c    2017-10-30 13:26:18.000000000 +0000
+++ dbus-1.12.8/tools/dbus-run-session.c    2018-07-02 09:28:50.358551987 +0000
@@ -346,7 +346,7 @@ main (int argc, char **argv)
     }
 
   if (dbus_daemon == NULL)
-    dbus_daemon = "dbus-daemon";
+    dbus_daemon = "/usr/lib/dbus-daemon";
 
   if (pipe (bus_address_pipe) < 0)
     {

 components/library/dbus/patches/10-remove-inline-from-some-headers.patch

New file
@@ -0,0 +1,74 @@
This patch makes illumos-gate build: https://github.com/OpenIndiana/oi-userland/pull/4297#issuecomment-402036563

```
/usr/include/dbus-1.0/dbus/dbus-address.h:74: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
/usr/include/dbus-1.0/dbus/dbus-message.h:366: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
/usr/include/dbus-1.0/dbus/dbus-connection.h:464: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
/usr/include/dbus-1.0/dbus/dbus-pending-call.h:87: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
/usr/include/dbus-1.0/dbus/dbus-server.h:115: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
dmake: Warning: Command failed for target `pics/libhal.o'
```

```
 74 static inline void
 75 dbus_clear_address_entries (DBusAddressEntry ***pointer_to_entries)
 76 {
 77   _dbus_clear_pointer_impl (DBusAddressEntry *, pointer_to_entries,
 78                             dbus_address_entries_free);
 79 }
```
--- dbus-1.12.8/dbus/dbus-address.h    2017-10-30 13:26:18.000000000 +0000
+++ dbus-1.12.8/dbus/dbus-address.h    2018-07-04 21:04:36.033281868 +0000
@@ -71,7 +71,7 @@ char* dbus_address_unescape_value (const
  * pointer_to_entries must not be #NULL, but *pointer_to_entries
  * may be #NULL.
  */
-static inline void
+static void
 dbus_clear_address_entries (DBusAddressEntry ***pointer_to_entries)
 {
   _dbus_clear_pointer_impl (DBusAddressEntry *, pointer_to_entries,
--- dbus-1.12.8/dbus/dbus-connection.h    2017-10-30 13:26:18.000000000 +0000
+++ dbus-1.12.8/dbus/dbus-connection.h    2018-07-04 21:04:42.641032977 +0000
@@ -461,7 +461,7 @@ dbus_bool_t dbus_connection_get_socket
  * pointer_to_connection must not be #NULL, but *pointer_to_connection
  * may be #NULL.
  */
-static inline void
+static void
 dbus_clear_connection (DBusConnection **pointer_to_connection)
 {
   _dbus_clear_pointer_impl (DBusConnection, pointer_to_connection,
--- dbus-1.12.8/dbus/dbus-message.h    2017-10-30 13:26:18.000000000 +0000
+++ dbus-1.12.8/dbus/dbus-message.h    2018-07-04 21:05:04.576402315 +0000
@@ -363,7 +363,7 @@ dbus_bool_t dbus_message_get_allow_inter
  * pointer_to_message must not be #NULL, but *pointer_to_message
  * may be #NULL.
  */
-static inline void
+static void
 dbus_clear_message (DBusMessage **pointer_to_message)
 {
   _dbus_clear_pointer_impl (DBusMessage, pointer_to_message,
--- dbus-1.12.8/dbus/dbus-pending-call.h    2017-10-30 13:26:18.000000000 +0000
+++ dbus-1.12.8/dbus/dbus-pending-call.h    2018-07-04 21:05:12.336140616 +0000
@@ -84,7 +84,7 @@ void*       dbus_pending_call_get_data
  * pointer_to_pending_call must not be #NULL, but *pointer_to_pending_call
  * may be #NULL.
  */
-static inline void
+static void
 dbus_clear_pending_call (DBusPendingCall **pointer_to_pending_call)
 {
   _dbus_clear_pointer_impl (DBusPendingCall, pointer_to_pending_call,
--- dbus-1.12.8/dbus/dbus-server.h    2017-10-30 13:26:18.000000000 +0000
+++ dbus-1.12.8/dbus/dbus-server.h    2018-07-04 21:05:16.288682825 +0000
@@ -112,7 +112,7 @@ void*       dbus_server_get_data
  * pointer_to_server must not be #NULL, but *pointer_to_server
  * may be #NULL.
  */
-static inline void
+static void
 dbus_clear_server (DBusServer **pointer_to_server)
 {
   _dbus_clear_pointer_impl (DBusServer, pointer_to_server, dbus_server_unref);

 components/library/dbus/test/results-32.master

New file
@@ -0,0 +1,149 @@
PASS: test-dbus-daemon-fork.sh 1 - normal dbus-daemon
PASS: test-dbus-daemon-fork.sh 2 - dbus-daemon with stdin closed
PASS: test-dbus-daemon-fork.sh 3 - dbus-daemon with stdin, stdout, stderr closed
PASS: test-shell 1
PASS: test-shell 2
PASS: test-shell 3
PASS: test-shell 4
PASS: test-shell 5
PASS: test-shell 6
PASS: test-shell 7
PASS: test-shell 8
PASS: test-shell 9
PASS: test-shell 10
PASS: test-shell 11
PASS: test-printf 1
PASS: test-printf 2
PASS: test-printf 3
PASS: test-printf 4
PASS: test-printf 5
PASS: test-printf 6
PASS: test-printf 7
PASS: test-corrupt 1 /corrupt/tcp
PASS: test-corrupt 2 /corrupt/unix
PASS: test-corrupt 3 /corrupt/byte-order/tcp
PASS: test-dbus-daemon 1 /creds
PASS: test-dbus-daemon 2 /processid
PASS: test-dbus-daemon 3 /unix-runtime-is-default
PASS: test-dbus-daemon 4 /echo/session
PASS: test-dbus-daemon 5 /echo/limited
PASS: test-dbus-daemon 6 /no-reply/disconnect
PASS: test-dbus-daemon 7 /no-reply/timeout
PASS: test-dbus-daemon 8 /canonical-path/uae
PASS: test-dbus-daemon 9 /limits/max-completed-connections
PASS: test-dbus-daemon 10 /limits/max-connections-per-user
PASS: test-dbus-daemon 11 /limits/max-replies-per-connection
PASS: test-dbus-daemon 12 /limits/max-match-rules-per-connection
PASS: test-dbus-daemon 13 /limits/max-names-per-connection
PASS: test-dbus-daemon 14 /limits/pending-fd-timeout
PASS: test-dbus-daemon 15 /peer/ping
PASS: test-dbus-daemon 16 /peer/get-machine-id
PASS: test-dbus-daemon 17 /properties/get-invalid-iface
PASS: test-dbus-daemon 18 /properties/get-invalid-path
PASS: test-dbus-daemon 19 /properties/get-invalid
PASS: test-dbus-daemon 20 /properties/get-all-invalid-iface
PASS: test-dbus-daemon 21 /properties/get-all-invalid-path
PASS: test-dbus-daemon 22 /properties/set-invalid-iface
PASS: test-dbus-daemon 23 /properties/set-invalid-path
PASS: test-dbus-daemon 24 /properties/set-invalid
PASS: test-dbus-daemon 25 /properties/set
PASS: test-dbus-daemon 26 /properties/features
PASS: test-dbus-daemon 27 /properties/interfaces
PASS: test-dbus-daemon 28 /properties/get-all
PASS: test-dbus-daemon 29 /policy/count-fds
SKIP: test-dbus-daemon 30 /fd-limit/session # SKIP prlimit() not supported on this platform
SKIP: test-dbus-daemon 31 /fd-limit/system # SKIP cannot use alternative uid when not uid 0
PASS: test-dbus-daemon-eavesdrop 1 /eavedrop/match_keyword/broadcast
PASS: test-dbus-daemon-eavesdrop 2 /eavedrop/match_keyword/unicast_to_receiver
PASS: test-dbus-daemon-eavesdrop 3 /eavedrop/match_keyword/unicast_to_sender
PASS: test-fdpass 1 /unsupported
PASS: test-fdpass 2 /relay
PASS: test-fdpass 3 /limit
PASS: test-fdpass 4 /too-many/plus1
PASS: test-fdpass 5 /too-many/plus2
PASS: test-fdpass 6 /too-many/plus17
PASS: test-fdpass 7 /too-many/split
PASS: test-fdpass 8 /flood/1
PASS: test-fdpass 9 /flood/half-limit
PASS: test-fdpass 10 /flood/over-half-limit
PASS: test-fdpass 11 /flood/limit
PASS: test-fdpass 12 /odd-limit/minus1
PASS: test-fdpass 13 /odd-limit/at
PASS: test-fdpass 14 /odd-limit/plus1
PASS: test-fdpass 15 /odd-limit/plus2
PASS: test-message 1 /message/fd
PASS: test-message 2 /message/zero-iter
PASS: test-message 3 /message/array/array
PASS: test-message 4 /message/array/dict
PASS: test-message 5 /message/array/variant
PASS: test-monitor 1 /monitor/invalid
PASS: test-monitor 2 /monitor/become
PASS: test-monitor 3 /monitor/broadcast
PASS: test-monitor 4 /monitor/forbidden-broadcast
PASS: test-monitor 5 /monitor/unicast-signal
PASS: test-monitor 6 /monitor/forbidden
PASS: test-monitor 7 /monitor/method-call
PASS: test-monitor 8 /monitor/forbidden-method
PASS: test-monitor 9 /monitor/dbus-daemon
PASS: test-monitor 10 /monitor/selective
PASS: test-monitor 11 /monitor/well-known-destination
PASS: test-monitor 12 /monitor/unique-destination
PASS: test-monitor 13 /monitor/wildcard
PASS: test-monitor 14 /monitor/no-rule
PASS: test-monitor 15 /monitor/eavesdrop
PASS: test-monitor 16 /monitor/no-eavesdrop
PASS: test-monitor 17 /monitor/activation
PASS: test-loopback 1 /connect/tcp
PASS: test-loopback 2 /connect/nonce-tcp
PASS: test-loopback 3 /connect/unix/tmpdir
PASS: test-loopback 4 /connect/unix/dir
PASS: test-loopback 5 /connect/unix/runtime
PASS: test-loopback 6 /connect/unix/no-runtime
PASS: test-loopback 7 /message/tcp
PASS: test-loopback 8 /message/nonce-tcp
PASS: test-loopback 9 /message/bad-guid
PASS: test-loopback 10 /message/unix/tmpdir
PASS: test-loopback 11 /message/unix/dir
PASS: test-marshal 1 /demarshal/le
PASS: test-marshal 2 /demarshal/be
PASS: test-marshal 3 /demarshal/needed/le
PASS: test-marshal 4 /demarshal/needed/be
PASS: test-refs 1 /refs/connection
PASS: test-refs 2 /refs/message
PASS: test-refs 3 /refs/pending-call
PASS: test-refs 4 /refs/server
PASS: test-relay 1 /connect
PASS: test-relay 2 /relay
PASS: test-relay 3 /limit
PASS: test-server-oom 1 /server/new-tcp
PASS: test-server-oom 2 /server/new-nonce-tcp
PASS: test-server-oom 3 /server/new-tcp-star
PASS: test-server-oom 4 /server/new-tcp-v4
PASS: test-syntax 1 /syntax/path
PASS: test-syntax 2 /syntax/interface
PASS: test-syntax 3 /syntax/error
PASS: test-syntax 4 /syntax/member
PASS: test-syntax 5 /syntax/bus-name
PASS: test-syntax 6 /syntax/signature
PASS: test-syntax 7 /syntax/single-signature
PASS: test-syntax 8 /syntax/utf8
PASS: test-syslog 1 /syslog/normal
SKIP: test-uid-permissions 1 /uid-permissions/uae/other # SKIP cannot use alternative uid when not uid 0
SKIP: test-uid-permissions 2 /uid-permissions/monitor/root # SKIP cannot use alternative uid when not uid 0
SKIP: test-uid-permissions 3 /uid-permissions/monitor/messagebus # SKIP cannot use alternative uid when not uid 0
SKIP: test-uid-permissions 4 /uid-permissions/monitor/other # SKIP cannot use alternative uid when not uid 0
PASS: test-variant 1 /variant/simple
PASS: test-variant 2 /variant/oom
PASS: test-sd-activation 1 /sd-activation/activation
PASS: test-sd-activation 2 /sd-activation/uae
PASS: test-sd-activation 3 /sd-activation/deny-send/com.example.SendDenied
PASS: test-sd-activation 4 /sd-activation/deny-receive/com.example.ReceiveDenied
PASS: test-sd-activation 5 /sd-activation/transient-services/later
PASS: test-sd-activation 6 /sd-activation/transient-services/in-advance
# TOTAL: 142
# PASS:  136
# SKIP:  6
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0

 components/library/dbus/test/results-64.master

New file
@@ -0,0 +1,149 @@
PASS: test-dbus-daemon-fork.sh 1 - normal dbus-daemon
PASS: test-dbus-daemon-fork.sh 2 - dbus-daemon with stdin closed
PASS: test-dbus-daemon-fork.sh 3 - dbus-daemon with stdin, stdout, stderr closed
PASS: test-shell 1
PASS: test-shell 2
PASS: test-shell 3
PASS: test-shell 4
PASS: test-shell 5
PASS: test-shell 6
PASS: test-shell 7
PASS: test-shell 8
PASS: test-shell 9
PASS: test-shell 10
PASS: test-shell 11
PASS: test-printf 1
PASS: test-printf 2
PASS: test-printf 3
PASS: test-printf 4
PASS: test-printf 5
PASS: test-printf 6
PASS: test-printf 7
PASS: test-corrupt 1 /corrupt/tcp
PASS: test-corrupt 2 /corrupt/unix
PASS: test-corrupt 3 /corrupt/byte-order/tcp
PASS: test-dbus-daemon 1 /creds
PASS: test-dbus-daemon 2 /processid
PASS: test-dbus-daemon 3 /unix-runtime-is-default
PASS: test-dbus-daemon 4 /echo/session
PASS: test-dbus-daemon 5 /echo/limited
PASS: test-dbus-daemon 6 /no-reply/disconnect
PASS: test-dbus-daemon 7 /no-reply/timeout
PASS: test-dbus-daemon 8 /canonical-path/uae
PASS: test-dbus-daemon 9 /limits/max-completed-connections
PASS: test-dbus-daemon 10 /limits/max-connections-per-user
PASS: test-dbus-daemon 11 /limits/max-replies-per-connection
PASS: test-dbus-daemon 12 /limits/max-match-rules-per-connection
PASS: test-dbus-daemon 13 /limits/max-names-per-connection
PASS: test-dbus-daemon 14 /limits/pending-fd-timeout
PASS: test-dbus-daemon 15 /peer/ping
PASS: test-dbus-daemon 16 /peer/get-machine-id
PASS: test-dbus-daemon 17 /properties/get-invalid-iface
PASS: test-dbus-daemon 18 /properties/get-invalid-path
PASS: test-dbus-daemon 19 /properties/get-invalid
PASS: test-dbus-daemon 20 /properties/get-all-invalid-iface
PASS: test-dbus-daemon 21 /properties/get-all-invalid-path
PASS: test-dbus-daemon 22 /properties/set-invalid-iface
PASS: test-dbus-daemon 23 /properties/set-invalid-path
PASS: test-dbus-daemon 24 /properties/set-invalid
PASS: test-dbus-daemon 25 /properties/set
PASS: test-dbus-daemon 26 /properties/features
PASS: test-dbus-daemon 27 /properties/interfaces
PASS: test-dbus-daemon 28 /properties/get-all
PASS: test-dbus-daemon 29 /policy/count-fds
SKIP: test-dbus-daemon 30 /fd-limit/session # SKIP prlimit() not supported on this platform
SKIP: test-dbus-daemon 31 /fd-limit/system # SKIP cannot use alternative uid when not uid 0
PASS: test-dbus-daemon-eavesdrop 1 /eavedrop/match_keyword/broadcast
PASS: test-dbus-daemon-eavesdrop 2 /eavedrop/match_keyword/unicast_to_receiver
PASS: test-dbus-daemon-eavesdrop 3 /eavedrop/match_keyword/unicast_to_sender
PASS: test-fdpass 1 /unsupported
PASS: test-fdpass 2 /relay
PASS: test-fdpass 3 /limit
PASS: test-fdpass 4 /too-many/plus1
PASS: test-fdpass 5 /too-many/plus2
PASS: test-fdpass 6 /too-many/plus17
PASS: test-fdpass 7 /too-many/split
PASS: test-fdpass 8 /flood/1
PASS: test-fdpass 9 /flood/half-limit
PASS: test-fdpass 10 /flood/over-half-limit
PASS: test-fdpass 11 /flood/limit
PASS: test-fdpass 12 /odd-limit/minus1
PASS: test-fdpass 13 /odd-limit/at
PASS: test-fdpass 14 /odd-limit/plus1
PASS: test-fdpass 15 /odd-limit/plus2
PASS: test-message 1 /message/fd
PASS: test-message 2 /message/zero-iter
PASS: test-message 3 /message/array/array
PASS: test-message 4 /message/array/dict
PASS: test-message 5 /message/array/variant
PASS: test-monitor 1 /monitor/invalid
PASS: test-monitor 2 /monitor/become
PASS: test-monitor 3 /monitor/broadcast
PASS: test-monitor 4 /monitor/forbidden-broadcast
PASS: test-monitor 5 /monitor/unicast-signal
PASS: test-monitor 6 /monitor/forbidden
PASS: test-monitor 7 /monitor/method-call
PASS: test-monitor 8 /monitor/forbidden-method
PASS: test-monitor 9 /monitor/dbus-daemon
PASS: test-monitor 10 /monitor/selective
PASS: test-monitor 11 /monitor/well-known-destination
PASS: test-monitor 12 /monitor/unique-destination
PASS: test-monitor 13 /monitor/wildcard
PASS: test-monitor 14 /monitor/no-rule
PASS: test-monitor 15 /monitor/eavesdrop
PASS: test-monitor 16 /monitor/no-eavesdrop
PASS: test-monitor 17 /monitor/activation
PASS: test-loopback 1 /connect/tcp
PASS: test-loopback 2 /connect/nonce-tcp
PASS: test-loopback 3 /connect/unix/tmpdir
PASS: test-loopback 4 /connect/unix/dir
PASS: test-loopback 5 /connect/unix/runtime
PASS: test-loopback 6 /connect/unix/no-runtime
PASS: test-loopback 7 /message/tcp
PASS: test-loopback 8 /message/nonce-tcp
PASS: test-loopback 9 /message/bad-guid
PASS: test-loopback 10 /message/unix/tmpdir
PASS: test-loopback 11 /message/unix/dir
PASS: test-marshal 1 /demarshal/le
PASS: test-marshal 2 /demarshal/be
PASS: test-marshal 3 /demarshal/needed/le
PASS: test-marshal 4 /demarshal/needed/be
PASS: test-refs 1 /refs/connection
PASS: test-refs 2 /refs/message
PASS: test-refs 3 /refs/pending-call
PASS: test-refs 4 /refs/server
PASS: test-relay 1 /connect
PASS: test-relay 2 /relay
PASS: test-relay 3 /limit
PASS: test-server-oom 1 /server/new-tcp
PASS: test-server-oom 2 /server/new-nonce-tcp
PASS: test-server-oom 3 /server/new-tcp-star
PASS: test-server-oom 4 /server/new-tcp-v4
PASS: test-syntax 1 /syntax/path
PASS: test-syntax 2 /syntax/interface
PASS: test-syntax 3 /syntax/error
PASS: test-syntax 4 /syntax/member
PASS: test-syntax 5 /syntax/bus-name
PASS: test-syntax 6 /syntax/signature
PASS: test-syntax 7 /syntax/single-signature
PASS: test-syntax 8 /syntax/utf8
PASS: test-syslog 1 /syslog/normal
SKIP: test-uid-permissions 1 /uid-permissions/uae/other # SKIP cannot use alternative uid when not uid 0
SKIP: test-uid-permissions 2 /uid-permissions/monitor/root # SKIP cannot use alternative uid when not uid 0
SKIP: test-uid-permissions 3 /uid-permissions/monitor/messagebus # SKIP cannot use alternative uid when not uid 0
SKIP: test-uid-permissions 4 /uid-permissions/monitor/other # SKIP cannot use alternative uid when not uid 0
PASS: test-variant 1 /variant/simple
PASS: test-variant 2 /variant/oom
PASS: test-sd-activation 1 /sd-activation/activation
PASS: test-sd-activation 2 /sd-activation/uae
PASS: test-sd-activation 3 /sd-activation/deny-send/com.example.SendDenied
PASS: test-sd-activation 4 /sd-activation/deny-receive/com.example.ReceiveDenied
PASS: test-sd-activation 5 /sd-activation/transient-services/later
PASS: test-sd-activation 6 /sd-activation/transient-services/in-advance
# TOTAL: 142
# PASS:  136
# SKIP:  6
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0

 tools/.gnupg/pubring.gpg

Binary files differ

			@@ -11,24 +11,26 @@

			#
			# Copyright 2016 Alexander Pyhalov
			# Copyright 2018 Michal Nowak
			#

			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME= dbus
			COMPONENT_VERSION= 1.10.20
			COMPONENT_VERSION= 1.12.8
			COMPONENT_SUMMARY= Simple IPC library based on messages
			COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
			COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
			COMPONENT_ARCHIVE_HASH= \
			sha256:e574b9780b5425fde4d973bb596e7ea0f09e00fe2edd662da9016e976c460b48
			sha256:e2dc99e7338303393b6663a98320aba6a63421bcdaaf571c8022f815e5896eb3
			COMPONENT_ARCHIVE_URL= \
			http://dbus.freedesktop.org/releases/dbus/$(COMPONENT_ARCHIVE)
			COMPONENT_SIG_URL = $(COMPONENT_ARCHIVE_URL).asc
			COMPONENT_PROJECT_URL = http://www.freedesktop.org/wiki/Software_2fdbus
			COMPONENT_PROJECT_URL = https://www.freedesktop.org/wiki/Software/dbus/
			COMPONENT_LICENSE_FILE = COPYING
			COMPONENT_LICENSE = GPLv2,AFLv2.1
			COMPONENT_CLASSIFICATION = System/Libraries
			COMPONENT_FMRI = system/library/dbus

			include $(WS_MAKE_RULES)/prep.mk
			include $(WS_MAKE_RULES)/configure.mk
			@@ -47,20 +49,27 @@
			CONFIGURE_OPTIONS += --with-dbus-daemondir=$(CONFIGURE_LIBDIR.$(BITS))
			CONFIGURE_OPTIONS += --disable-static

			CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)"
			CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)"
			CONFIGURE_ENV += PERL=$(PERL)
			CONFIGURE_ENV += PYTHON=$(PYTHON)

			COMPONENT_TEST_TRANSFORMER = $(NAWK)
			COMPONENT_TEST_TRANSFORMS = "'/TOTAL\|PASS\|FAIL\|XFAIL\|SKIP\|XPASS\|ERROR/'"

			# To prevent "libtool_install_magic: unbound variable"
			unexport SHELLOPTS

			build: $(BUILD_32_and_64)

			install: $(INSTALL_32_and_64)

			test: $(NO_TESTS)
			test: $(TEST_32_and_64)

			REQUIRED_PACKAGES += SUNWcs
			REQUIRED_PACKAGES += developer/documentation-tool/doxygen
			REQUIRED_PACKAGES += developer/build/autoconf-archive
			REQUIRED_PACKAGES += library/expat
			REQUIRED_PACKAGES += library/gnome/yelp-tools
			REQUIRED_PACKAGES += SUNWcs
			REQUIRED_PACKAGES += system/library
			REQUIRED_PACKAGES += text/xmlto
			REQUIRED_PACKAGES += x11/library/libx11

			@@ -11,9 +11,10 @@

			#
			# Copyright 2015 Alexander Pyhalov
			# Copyright 2018 Michal Nowak
			#

			set name=pkg.fmri value=pkg:/system/library/dbus/dbus-x11@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-x11@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			set name=pkg.summary value="$(COMPONENT_SUMMARY) - X11"
			set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
			set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)

			@@ -11,9 +11,10 @@

			#
			# Copyright 2017 Alexander Pyhalov
			# Copyright 2018 Michal Nowak
			#

			set name=pkg.fmri value=pkg:/system/library/dbus@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			set name=pkg.summary value="$(COMPONENT_SUMMARY)"
			set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
			set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
			@@ -45,6 +46,8 @@
			file path=usr/bin/dbus-uuidgen
			file path=usr/lib/dbus-daemon mode=0555
			file path=usr/lib/dbus-daemon-launch-helper mode=0555
			file path=usr/lib/$(MACH64)/dbus-daemon mode=0555
			file path=usr/lib/$(MACH64)/dbus-daemon-launch-helper mode=0555
			file path=usr/share/dbus-1/session.conf preserve=rename-old
			file path=usr/share/dbus-1/system.conf preserve=rename-old
			file path=usr/share/doc/dbus/api/annotated.html
			@@ -153,6 +156,7 @@
			file path=usr/share/doc/dbus/api/dbus-socket-set_8c_source.html
			file path=usr/share/doc/dbus/api/dbus-socket-set_8h_source.html
			file path=usr/share/doc/dbus/api/dbus-sockets-win_8h_source.html
			file path=usr/share/doc/dbus/api/dbus-spawn-test_8c_source.html
			file path=usr/share/doc/dbus/api/dbus-spawn-win_8c_source.html
			file path=usr/share/doc/dbus/api/dbus-spawn_8c_source.html
			file path=usr/share/doc/dbus/api/dbus-spawn_8h_source.html
			@@ -202,8 +206,8 @@
			file path=usr/share/doc/dbus/api/dbus-watch_8c_source.html
			file path=usr/share/doc/dbus/api/dbus-watch_8h_source.html
			file path=usr/share/doc/dbus/api/dbus_8h_source.html
			file path=usr/share/doc/dbus/api/dir_5b42d9f00640640b7578618a0863a45d.html
			file path=usr/share/doc/dbus/api/dir_e7d8299e1873836dc4681e7d05d03e4d.html
			file path=usr/share/doc/dbus/api/dir_06136cd6e1b1575498c4499b6dd7eeb4.html
			file path=usr/share/doc/dbus/api/dir_8a0b5b30d8987204d61d41d40c9d1d06.html
			file path=usr/share/doc/dbus/api/doc.png
			file path=usr/share/doc/dbus/api/doxygen.css
			file path=usr/share/doc/dbus/api/doxygen.png
			@@ -404,6 +408,7 @@
			file path=usr/share/doc/dbus/api/structDBusTypeReaderClass.html
			file path=usr/share/doc/dbus/api/structDBusTypeWriter.html
			file path=usr/share/doc/dbus/api/structDBusUserInfo.html
			file path=usr/share/doc/dbus/api/structDBusVariant.html
			file path=usr/share/doc/dbus/api/structDBusWatch.html
			file path=usr/share/doc/dbus/api/structDBusWatchList.html
			file path=usr/share/doc/dbus/api/structHeaderFieldType.html
			@@ -432,7 +437,7 @@
			file path=usr/share/doc/dbus/dbus-tutorial.html
			file path=usr/share/doc/dbus/dbus-update-activation-environment.1.html
			file path=usr/share/doc/dbus/dbus-uuidgen.1.html
			file path=usr/share/doc/dbus/dbus.devhelp
			file path=usr/share/doc/dbus/dbus.devhelp2
			file path=usr/share/doc/dbus/diagram.png
			file path=usr/share/doc/dbus/diagram.svg
			file path=usr/share/doc/dbus/examples/GetAllMatchRules.py
			@@ -447,3 +452,5 @@
			file path=usr/share/man/man1/dbus-test-tool.1
			file path=usr/share/man/man1/dbus-update-activation-environment.1
			file path=usr/share/man/man1/dbus-uuidgen.1
			file path=usr/share/xml/dbus-1/busconfig.dtd
			file path=usr/share/xml/dbus-1/introspect.dtd

			@@ -11,6 +11,7 @@

			#
			# Copyright 2017 Alexander Pyhalov
			# Copyright 2018 Michal Nowak
			#

			set name=pkg.fmri value=pkg:/system/library/libdbus@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			@@ -39,13 +40,17 @@
			file path=usr/include/dbus-1.0/dbus/dbus-threads.h
			file path=usr/include/dbus-1.0/dbus/dbus-types.h
			file path=usr/include/dbus-1.0/dbus/dbus.h
			file path=usr/lib/$(MACH64)/cmake/DBus1/DBus1Config.cmake
			file path=usr/lib/$(MACH64)/cmake/DBus1/DBus1ConfigVersion.cmake
			file path=usr/lib/$(MACH64)/dbus-1.0/include/dbus/dbus-arch-deps.h
			link path=usr/lib/$(MACH64)/libdbus-1.so target=libdbus-1.so.3.14.12
			link path=usr/lib/$(MACH64)/libdbus-1.so.3 target=libdbus-1.so.3.14.12
			file path=usr/lib/$(MACH64)/libdbus-1.so.3.14.12
			link path=usr/lib/$(MACH64)/libdbus-1.so target=libdbus-1.so.3.19.7
			link path=usr/lib/$(MACH64)/libdbus-1.so.3 target=libdbus-1.so.3.19.7
			file path=usr/lib/$(MACH64)/libdbus-1.so.3.19.7
			file path=usr/lib/$(MACH64)/pkgconfig/dbus-1.pc
			file path=usr/lib/cmake/DBus1/DBus1Config.cmake
			file path=usr/lib/cmake/DBus1/DBus1ConfigVersion.cmake
			file path=usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h
			link path=usr/lib/libdbus-1.so target=libdbus-1.so.3.14.12
			link path=usr/lib/libdbus-1.so.3 target=libdbus-1.so.3.14.12
			file path=usr/lib/libdbus-1.so.3.14.12
			link path=usr/lib/libdbus-1.so target=libdbus-1.so.3.19.7
			link path=usr/lib/libdbus-1.so.3 target=libdbus-1.so.3.19.7
			file path=usr/lib/libdbus-1.so.3.19.7
			file path=usr/lib/pkgconfig/dbus-1.pc

			@@ -57,19 +57,23 @@
			file path=usr/include/dbus-1.0/dbus/dbus-threads.h
			file path=usr/include/dbus-1.0/dbus/dbus-types.h
			file path=usr/include/dbus-1.0/dbus/dbus.h
			file path=usr/lib/$(MACH64)/cmake/DBus1/DBus1Config.cmake
			file path=usr/lib/$(MACH64)/cmake/DBus1/DBus1ConfigVersion.cmake
			file path=usr/lib/$(MACH64)/dbus-1.0/include/dbus/dbus-arch-deps.h
			file path=usr/lib/$(MACH64)/dbus-daemon
			file path=usr/lib/$(MACH64)/dbus-daemon-launch-helper
			link path=usr/lib/$(MACH64)/libdbus-1.so target=libdbus-1.so.3.14.12
			link path=usr/lib/$(MACH64)/libdbus-1.so.3 target=libdbus-1.so.3.14.12
			file path=usr/lib/$(MACH64)/libdbus-1.so.3.14.12
			link path=usr/lib/$(MACH64)/libdbus-1.so target=libdbus-1.so.3.19.7
			link path=usr/lib/$(MACH64)/libdbus-1.so.3 target=libdbus-1.so.3.19.7
			file path=usr/lib/$(MACH64)/libdbus-1.so.3.19.7
			file path=usr/lib/$(MACH64)/pkgconfig/dbus-1.pc
			file path=usr/lib/cmake/DBus1/DBus1Config.cmake
			file path=usr/lib/cmake/DBus1/DBus1ConfigVersion.cmake
			file path=usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h
			file path=usr/lib/dbus-daemon
			file path=usr/lib/dbus-daemon-launch-helper
			link path=usr/lib/libdbus-1.so target=libdbus-1.so.3.14.12
			link path=usr/lib/libdbus-1.so.3 target=libdbus-1.so.3.14.12
			file path=usr/lib/libdbus-1.so.3.14.12
			link path=usr/lib/libdbus-1.so target=libdbus-1.so.3.19.7
			link path=usr/lib/libdbus-1.so.3 target=libdbus-1.so.3.19.7
			file path=usr/lib/libdbus-1.so.3.19.7
			file path=usr/lib/pkgconfig/dbus-1.pc
			file path=usr/share/dbus-1/session.conf
			file path=usr/share/dbus-1/system.conf
			@@ -179,6 +183,7 @@
			file path=usr/share/doc/dbus/api/dbus-socket-set_8c_source.html
			file path=usr/share/doc/dbus/api/dbus-socket-set_8h_source.html
			file path=usr/share/doc/dbus/api/dbus-sockets-win_8h_source.html
			file path=usr/share/doc/dbus/api/dbus-spawn-test_8c_source.html
			file path=usr/share/doc/dbus/api/dbus-spawn-win_8c_source.html
			file path=usr/share/doc/dbus/api/dbus-spawn_8c_source.html
			file path=usr/share/doc/dbus/api/dbus-spawn_8h_source.html
			@@ -228,8 +233,8 @@
			file path=usr/share/doc/dbus/api/dbus-watch_8c_source.html
			file path=usr/share/doc/dbus/api/dbus-watch_8h_source.html
			file path=usr/share/doc/dbus/api/dbus_8h_source.html
			file path=usr/share/doc/dbus/api/dir_5b42d9f00640640b7578618a0863a45d.html
			file path=usr/share/doc/dbus/api/dir_e7d8299e1873836dc4681e7d05d03e4d.html
			file path=usr/share/doc/dbus/api/dir_06136cd6e1b1575498c4499b6dd7eeb4.html
			file path=usr/share/doc/dbus/api/dir_8a0b5b30d8987204d61d41d40c9d1d06.html
			file path=usr/share/doc/dbus/api/doc.png
			file path=usr/share/doc/dbus/api/doxygen.css
			file path=usr/share/doc/dbus/api/doxygen.png
			@@ -430,6 +435,7 @@
			file path=usr/share/doc/dbus/api/structDBusTypeReaderClass.html
			file path=usr/share/doc/dbus/api/structDBusTypeWriter.html
			file path=usr/share/doc/dbus/api/structDBusUserInfo.html
			file path=usr/share/doc/dbus/api/structDBusVariant.html
			file path=usr/share/doc/dbus/api/structDBusWatch.html
			file path=usr/share/doc/dbus/api/structDBusWatchList.html
			file path=usr/share/doc/dbus/api/structHeaderFieldType.html
			@@ -458,7 +464,7 @@
			file path=usr/share/doc/dbus/dbus-tutorial.html
			file path=usr/share/doc/dbus/dbus-update-activation-environment.1.html
			file path=usr/share/doc/dbus/dbus-uuidgen.1.html
			file path=usr/share/doc/dbus/dbus.devhelp
			file path=usr/share/doc/dbus/dbus.devhelp2
			file path=usr/share/doc/dbus/diagram.png
			file path=usr/share/doc/dbus/diagram.svg
			file path=usr/share/doc/dbus/examples/GetAllMatchRules.py
			@@ -474,3 +480,5 @@
			file path=usr/share/man/man1/dbus-test-tool.1
			file path=usr/share/man/man1/dbus-update-activation-environment.1
			file path=usr/share/man/man1/dbus-uuidgen.1
			file path=usr/share/xml/dbus-1/busconfig.dtd
			file path=usr/share/xml/dbus-1/introspect.dtd

			@@ -1,11 +1,3 @@
			--- dbus-1.4.14/Makefile.am-orig 2011-09-13 16:36:40.967786680 -0500
			+++ dbus-1.4.14/Makefile.am 2011-09-13 16:36:45.644929457 -0500
			@@ -1,4 +1,4 @@
			-SUBDIRS=dbus bus tools test doc
			+SUBDIRS=dbus bus tools doc

			pkgconfigdir = $(libdir)/pkgconfig
			pkgconfig_DATA = dbus-1.pc
			--- dbus-1.4.14/dbus/dbus-sysdeps-unix.c-orig 2011-09-13 16:41:50.420584386 -0500
			+++ dbus-1.4.14/dbus/dbus-sysdeps-unix.c 2011-09-13 16:42:18.502907891 -0500
			@@ -56,6 +56,7 @@
			@@ -34,17 +26,6 @@
			$(NULL)

			AM_CPPFLAGS = \
			--- dbus-1.10.0/dbus/dbus-sysdeps-util-unix.c.orig Fri Jan 30 18:16:24 2015
			+++ dbus-1.10.0/dbus/dbus-sysdeps-util-unix.c Mon Oct 26 14:18:30 2015
			@@ -522,7 +522,7 @@
			#ifdef HAVE_SYSLOG_H
			int logopts = LOG_PID;

			-#if HAVE_DECL_LOG_PERROR
			+#if LOG_PERROR
			#ifdef HAVE_SYSTEMD
			if (!is_daemon \|\| sd_booted () <= 0)
			#endif
			--- dbus-1.10.0/dbus/Makefile.am.orig Mon Oct 26 14:29:01 2015
			+++ dbus-1.10.0/dbus/Makefile.am Mon Oct 26 14:33:56 2015
			@@ -291,7 +291,7 @@

New file
			@@ -0,0 +1,20 @@
			--- dbus-1.12.8/test/Makefile.am 2018-02-23 11:25:17.000000000 +0000
			+++ dbus-1.12.8/test/Makefile.am 2018-07-01 21:32:06.070657489 +0000
			@@ -1,9 +1,3 @@
			-## the "name-test" subdir in fact contains a bunch of tests now that need a temporary bus
			-## to be running to do stuff with. The directory should be renamed.
			-## We want to build the current directory first to pick up the testutils lib
			-SUBDIRS= . name-test
			-DIST_SUBDIRS=name-test
			-
			CLEANFILES =
			EXTRA_DIST =

			@@ -466,7 +460,6 @@ in_data = \
			EXTRA_DIST += $(in_data)

			static_data = \
			- name-test/tmp-session-like-system.conf \
			data/auth/anonymous-client-successful.auth-script \
			data/auth/anonymous-server-successful.auth-script \
			data/auth/cancel.auth-script \

New file
			@@ -0,0 +1,11 @@
			--- dbus-1.12.8/tools/dbus-run-session.c 2017-10-30 13:26:18.000000000 +0000
			+++ dbus-1.12.8/tools/dbus-run-session.c 2018-07-02 09:28:50.358551987 +0000
			@@ -346,7 +346,7 @@ main (int argc, char **argv)
			}

			if (dbus_daemon == NULL)
			- dbus_daemon = "dbus-daemon";
			+ dbus_daemon = "/usr/lib/dbus-daemon";

			if (pipe (bus_address_pipe) < 0)
			{

New file
			@@ -0,0 +1,74 @@
			This patch makes illumos-gate build: https://github.com/OpenIndiana/oi-userland/pull/4297#issuecomment-402036563

			```
			/usr/include/dbus-1.0/dbus/dbus-address.h:74: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
			/usr/include/dbus-1.0/dbus/dbus-message.h:366: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
			/usr/include/dbus-1.0/dbus/dbus-connection.h:464: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
			/usr/include/dbus-1.0/dbus/dbus-pending-call.h:87: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
			/usr/include/dbus-1.0/dbus/dbus-server.h:115: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
			dmake: Warning: Command failed for target `pics/libhal.o'
			```

			```
			74 static inline void
			75 dbus_clear_address_entries (DBusAddressEntry ***pointer_to_entries)
			76 {
			77 _dbus_clear_pointer_impl (DBusAddressEntry *, pointer_to_entries,
			78 dbus_address_entries_free);
			79 }
			```
			--- dbus-1.12.8/dbus/dbus-address.h 2017-10-30 13:26:18.000000000 +0000
			+++ dbus-1.12.8/dbus/dbus-address.h 2018-07-04 21:04:36.033281868 +0000
			@@ -71,7 +71,7 @@ char* dbus_address_unescape_value (const
			* pointer_to_entries must not be #NULL, but *pointer_to_entries
			* may be #NULL.
			*/
			-static inline void
			+static void
			dbus_clear_address_entries (DBusAddressEntry ***pointer_to_entries)
			{
			_dbus_clear_pointer_impl (DBusAddressEntry *, pointer_to_entries,
			--- dbus-1.12.8/dbus/dbus-connection.h 2017-10-30 13:26:18.000000000 +0000
			+++ dbus-1.12.8/dbus/dbus-connection.h 2018-07-04 21:04:42.641032977 +0000
			@@ -461,7 +461,7 @@ dbus_bool_t dbus_connection_get_socket
			* pointer_to_connection must not be #NULL, but *pointer_to_connection
			* may be #NULL.
			*/
			-static inline void
			+static void
			dbus_clear_connection (DBusConnection **pointer_to_connection)
			{
			_dbus_clear_pointer_impl (DBusConnection, pointer_to_connection,
			--- dbus-1.12.8/dbus/dbus-message.h 2017-10-30 13:26:18.000000000 +0000
			+++ dbus-1.12.8/dbus/dbus-message.h 2018-07-04 21:05:04.576402315 +0000
			@@ -363,7 +363,7 @@ dbus_bool_t dbus_message_get_allow_inter
			* pointer_to_message must not be #NULL, but *pointer_to_message
			* may be #NULL.
			*/
			-static inline void
			+static void
			dbus_clear_message (DBusMessage **pointer_to_message)
			{
			_dbus_clear_pointer_impl (DBusMessage, pointer_to_message,
			--- dbus-1.12.8/dbus/dbus-pending-call.h 2017-10-30 13:26:18.000000000 +0000
			+++ dbus-1.12.8/dbus/dbus-pending-call.h 2018-07-04 21:05:12.336140616 +0000
			@@ -84,7 +84,7 @@ void* dbus_pending_call_get_data
			* pointer_to_pending_call must not be #NULL, but *pointer_to_pending_call
			* may be #NULL.
			*/
			-static inline void
			+static void
			dbus_clear_pending_call (DBusPendingCall **pointer_to_pending_call)
			{
			_dbus_clear_pointer_impl (DBusPendingCall, pointer_to_pending_call,
			--- dbus-1.12.8/dbus/dbus-server.h 2017-10-30 13:26:18.000000000 +0000
			+++ dbus-1.12.8/dbus/dbus-server.h 2018-07-04 21:05:16.288682825 +0000
			@@ -112,7 +112,7 @@ void* dbus_server_get_data
			* pointer_to_server must not be #NULL, but *pointer_to_server
			* may be #NULL.
			*/
			-static inline void
			+static void
			dbus_clear_server (DBusServer **pointer_to_server)
			{
			_dbus_clear_pointer_impl (DBusServer, pointer_to_server, dbus_server_unref);

New file
			@@ -0,0 +1,149 @@
			PASS: test-dbus-daemon-fork.sh 1 - normal dbus-daemon
			PASS: test-dbus-daemon-fork.sh 2 - dbus-daemon with stdin closed
			PASS: test-dbus-daemon-fork.sh 3 - dbus-daemon with stdin, stdout, stderr closed
			PASS: test-shell 1
			PASS: test-shell 2
			PASS: test-shell 3
			PASS: test-shell 4
			PASS: test-shell 5
			PASS: test-shell 6
			PASS: test-shell 7
			PASS: test-shell 8
			PASS: test-shell 9
			PASS: test-shell 10
			PASS: test-shell 11
			PASS: test-printf 1
			PASS: test-printf 2
			PASS: test-printf 3
			PASS: test-printf 4
			PASS: test-printf 5
			PASS: test-printf 6
			PASS: test-printf 7
			PASS: test-corrupt 1 /corrupt/tcp
			PASS: test-corrupt 2 /corrupt/unix
			PASS: test-corrupt 3 /corrupt/byte-order/tcp
			PASS: test-dbus-daemon 1 /creds
			PASS: test-dbus-daemon 2 /processid
			PASS: test-dbus-daemon 3 /unix-runtime-is-default
			PASS: test-dbus-daemon 4 /echo/session
			PASS: test-dbus-daemon 5 /echo/limited
			PASS: test-dbus-daemon 6 /no-reply/disconnect
			PASS: test-dbus-daemon 7 /no-reply/timeout
			PASS: test-dbus-daemon 8 /canonical-path/uae
			PASS: test-dbus-daemon 9 /limits/max-completed-connections
			PASS: test-dbus-daemon 10 /limits/max-connections-per-user
			PASS: test-dbus-daemon 11 /limits/max-replies-per-connection
			PASS: test-dbus-daemon 12 /limits/max-match-rules-per-connection
			PASS: test-dbus-daemon 13 /limits/max-names-per-connection
			PASS: test-dbus-daemon 14 /limits/pending-fd-timeout
			PASS: test-dbus-daemon 15 /peer/ping
			PASS: test-dbus-daemon 16 /peer/get-machine-id
			PASS: test-dbus-daemon 17 /properties/get-invalid-iface
			PASS: test-dbus-daemon 18 /properties/get-invalid-path
			PASS: test-dbus-daemon 19 /properties/get-invalid
			PASS: test-dbus-daemon 20 /properties/get-all-invalid-iface
			PASS: test-dbus-daemon 21 /properties/get-all-invalid-path
			PASS: test-dbus-daemon 22 /properties/set-invalid-iface
			PASS: test-dbus-daemon 23 /properties/set-invalid-path
			PASS: test-dbus-daemon 24 /properties/set-invalid
			PASS: test-dbus-daemon 25 /properties/set
			PASS: test-dbus-daemon 26 /properties/features
			PASS: test-dbus-daemon 27 /properties/interfaces
			PASS: test-dbus-daemon 28 /properties/get-all
			PASS: test-dbus-daemon 29 /policy/count-fds
			SKIP: test-dbus-daemon 30 /fd-limit/session # SKIP prlimit() not supported on this platform
			SKIP: test-dbus-daemon 31 /fd-limit/system # SKIP cannot use alternative uid when not uid 0
			PASS: test-dbus-daemon-eavesdrop 1 /eavedrop/match_keyword/broadcast
			PASS: test-dbus-daemon-eavesdrop 2 /eavedrop/match_keyword/unicast_to_receiver
			PASS: test-dbus-daemon-eavesdrop 3 /eavedrop/match_keyword/unicast_to_sender
			PASS: test-fdpass 1 /unsupported
			PASS: test-fdpass 2 /relay
			PASS: test-fdpass 3 /limit
			PASS: test-fdpass 4 /too-many/plus1
			PASS: test-fdpass 5 /too-many/plus2
			PASS: test-fdpass 6 /too-many/plus17
			PASS: test-fdpass 7 /too-many/split
			PASS: test-fdpass 8 /flood/1
			PASS: test-fdpass 9 /flood/half-limit
			PASS: test-fdpass 10 /flood/over-half-limit
			PASS: test-fdpass 11 /flood/limit
			PASS: test-fdpass 12 /odd-limit/minus1
			PASS: test-fdpass 13 /odd-limit/at
			PASS: test-fdpass 14 /odd-limit/plus1
			PASS: test-fdpass 15 /odd-limit/plus2
			PASS: test-message 1 /message/fd
			PASS: test-message 2 /message/zero-iter
			PASS: test-message 3 /message/array/array
			PASS: test-message 4 /message/array/dict
			PASS: test-message 5 /message/array/variant
			PASS: test-monitor 1 /monitor/invalid
			PASS: test-monitor 2 /monitor/become
			PASS: test-monitor 3 /monitor/broadcast
			PASS: test-monitor 4 /monitor/forbidden-broadcast
			PASS: test-monitor 5 /monitor/unicast-signal
			PASS: test-monitor 6 /monitor/forbidden
			PASS: test-monitor 7 /monitor/method-call
			PASS: test-monitor 8 /monitor/forbidden-method
			PASS: test-monitor 9 /monitor/dbus-daemon
			PASS: test-monitor 10 /monitor/selective
			PASS: test-monitor 11 /monitor/well-known-destination
			PASS: test-monitor 12 /monitor/unique-destination
			PASS: test-monitor 13 /monitor/wildcard
			PASS: test-monitor 14 /monitor/no-rule
			PASS: test-monitor 15 /monitor/eavesdrop
			PASS: test-monitor 16 /monitor/no-eavesdrop
			PASS: test-monitor 17 /monitor/activation
			PASS: test-loopback 1 /connect/tcp
			PASS: test-loopback 2 /connect/nonce-tcp
			PASS: test-loopback 3 /connect/unix/tmpdir
			PASS: test-loopback 4 /connect/unix/dir
			PASS: test-loopback 5 /connect/unix/runtime
			PASS: test-loopback 6 /connect/unix/no-runtime
			PASS: test-loopback 7 /message/tcp
			PASS: test-loopback 8 /message/nonce-tcp
			PASS: test-loopback 9 /message/bad-guid
			PASS: test-loopback 10 /message/unix/tmpdir
			PASS: test-loopback 11 /message/unix/dir
			PASS: test-marshal 1 /demarshal/le
			PASS: test-marshal 2 /demarshal/be
			PASS: test-marshal 3 /demarshal/needed/le
			PASS: test-marshal 4 /demarshal/needed/be
			PASS: test-refs 1 /refs/connection
			PASS: test-refs 2 /refs/message
			PASS: test-refs 3 /refs/pending-call
			PASS: test-refs 4 /refs/server
			PASS: test-relay 1 /connect
			PASS: test-relay 2 /relay
			PASS: test-relay 3 /limit
			PASS: test-server-oom 1 /server/new-tcp
			PASS: test-server-oom 2 /server/new-nonce-tcp
			PASS: test-server-oom 3 /server/new-tcp-star
			PASS: test-server-oom 4 /server/new-tcp-v4
			PASS: test-syntax 1 /syntax/path
			PASS: test-syntax 2 /syntax/interface
			PASS: test-syntax 3 /syntax/error
			PASS: test-syntax 4 /syntax/member
			PASS: test-syntax 5 /syntax/bus-name
			PASS: test-syntax 6 /syntax/signature
			PASS: test-syntax 7 /syntax/single-signature
			PASS: test-syntax 8 /syntax/utf8
			PASS: test-syslog 1 /syslog/normal
			SKIP: test-uid-permissions 1 /uid-permissions/uae/other # SKIP cannot use alternative uid when not uid 0
			SKIP: test-uid-permissions 2 /uid-permissions/monitor/root # SKIP cannot use alternative uid when not uid 0
			SKIP: test-uid-permissions 3 /uid-permissions/monitor/messagebus # SKIP cannot use alternative uid when not uid 0
			SKIP: test-uid-permissions 4 /uid-permissions/monitor/other # SKIP cannot use alternative uid when not uid 0
			PASS: test-variant 1 /variant/simple
			PASS: test-variant 2 /variant/oom
			PASS: test-sd-activation 1 /sd-activation/activation
			PASS: test-sd-activation 2 /sd-activation/uae
			PASS: test-sd-activation 3 /sd-activation/deny-send/com.example.SendDenied
			PASS: test-sd-activation 4 /sd-activation/deny-receive/com.example.ReceiveDenied
			PASS: test-sd-activation 5 /sd-activation/transient-services/later
			PASS: test-sd-activation 6 /sd-activation/transient-services/in-advance
			# TOTAL: 142
			# PASS: 136
			# SKIP: 6
			# XFAIL: 0
			# FAIL: 0
			# XPASS: 0
			# ERROR: 0