8 files changed, 34 insertions, 404 deletions

diff --git a/meta/recipes-core/dbus/dbus-test_1.6.18.bb b/meta/recipes-core/dbus/dbus-test_1.8.2.bb
index 6ec9dfe78c..9c7b7492b7 100644
--- a/meta/recipes-core/dbus/dbus-test_1.6.18.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.8.2.bb
@@ -12,7 +12,6 @@ RDEPENDS_${PN}-dev = ""
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://tmpdir.patch \
-           file://ptest.patch \
            file://dbus-1.init  \
            file://run-ptest \
            file://python-config.patch \
@@ -39,7 +38,6 @@ EXTRA_OECONF = "--enable-tests \
                 --disable-xml-docs \
                 --disable-doxygen-docs \
                 --disable-libaudit \
-                --with-xml=expat \
                 --disable-systemd \
                 --without-systemdsystemunitdir \
                 --with-dbus-test-dir=${PTEST_PATH} \
@@ -49,5 +47,14 @@ do_install() {
 }
 
 do_install_ptest() {
-    find ${D}${PTEST_PATH} -name Makefile | xargs sed -i 's/^Makefile:/_Makefile:/'
+        install -d ${D}${PTEST_PATH}/test
+        case1="shell printf refs syslog"
+        for i in ${case1}; do install ${B}/test/test-$i ${D}${PTEST_PATH}/test; done
+        case2="marshal syntax corrupt dbus-daemon dbus-daemon-eavesdrop loopback relay"
+        for i in ${case2}; do install ${B}/test/.libs/test-$i ${D}${PTEST_PATH}/test; done
+        case3="bus bus-system bus-launch-helper"
+        for i in ${case3}; do install ${B}/bus/test-$i ${D}${PTEST_PATH}/test; done
+        install ${B}/dbus/test-dbus ${D}${PTEST_PATH}/test
+        cp -r ${B}/test/data ${D}${PTEST_PATH}/test
 }
+RDEPENDS_${PN}-ptest += "bash"
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 4510ae3e95..b3d3834dd0 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -17,8 +17,6 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://dbus-1.init \
            file://os-test.patch \
            file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
-           file://Set-correct-address-when-using-address-systemd.patch \
-           file://fixed-memory-freeing-if-error-during-listing-service.patch \
 "
 
 inherit useradd autotools pkgconfig gettext update-rc.d
@@ -56,6 +54,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
                ${bindir}/dbus-send \
                ${bindir}/dbus-monitor \
                ${bindir}/dbus-launch \
+               ${bindir}/dbus-run-session \
                ${libexecdir}/dbus* \
                ${sysconfdir} \
                ${localstatedir} \
@@ -84,7 +83,6 @@ EXTRA_OECONF = "--disable-tests \
                 --disable-xml-docs \
                 --disable-doxygen-docs \
                 --disable-libaudit \
-                --with-xml=expat \
                 --disable-systemd"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
@@ -106,6 +104,16 @@ do_install() {
                 install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1
         fi
 
+        if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+                for i in dbus.target.wants sockets.target.wants multi-user.target.wants; do \
+                        install -d ${D}${systemd_unitdir}/system/$i; done
+                install ${B}/bus/dbus.service ${B}/bus/dbus.socket ${D}${systemd_unitdir}/system/
+                cd ${D}${systemd_unitdir}/system/dbus.target.wants/
+                ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/dbus.target.wants/dbus.socket
+                ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/sockets.target.wants/dbus.socket
+                ln -fs ../dbus.service ${D}${systemd_unitdir}/system/multi-user.target.wants/dbus.service
+        fi
+
         install -d ${D}${sysconfdir}/default/volatiles
         echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \
              > ${D}${sysconfdir}/default/volatiles/99_dbus
diff --git a/meta/recipes-core/dbus/dbus/Set-correct-address-when-using-address-systemd.patch b/meta/recipes-core/dbus/dbus/Set-correct-address-when-using-address-systemd.patch
deleted file mode 100644
index 1fca9bb254..0000000000
--- a/meta/recipes-core/dbus/dbus/Set-correct-address-when-using-address-systemd.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From d728fdc655f17031da3bb129ab2fd17dadf0fe3a Mon Sep 17 00:00:00 2001
-From: Simon Peeters <peeters.simon@gmail.com>
-Date: Sun, 7 Oct 2012 16:59:30 +0200
-Subject: [PATCH] Set correct address when using --address=systemd:
-
-When dbus gets launched through systemd, we need to create an address
-string based on the sockets passed.
-
-The _dbus_append_addres_from_socket() function is responsible for
-extracting the address information from the file-descriptor and
-formatting it in a dbus friendly way.
-
-This fixes bus activation when running dbus under a systemd session.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=50962
-
-Upstream-Status: Backport
-
-Signed-off-by: Simon Peeters <peeters.simon@gmail.com>
-Signed-off-by: Jonathan Liu <net147@gmail.com>
----
- dbus/dbus-server-unix.c  | 38 ++++++++++++++++++---------
- dbus/dbus-sysdeps-unix.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++
- dbus/dbus-sysdeps-unix.h |  4 +++
- 3 files changed, 97 insertions(+), 13 deletions(-)
-
-diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c
-index 130f66e..d995240 100644
---- a/dbus/dbus-server-unix.c
-+++ b/dbus/dbus-server-unix.c
-@@ -149,7 +149,7 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
-     }
-   else if (strcmp (method, "systemd") == 0)
-     {
--      int n, *fds;
-+      int i, n, *fds;
-       DBusString address;
- 
-       n = _dbus_listen_systemd_sockets (&fds, error);
-@@ -159,27 +159,39 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
-           return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-         }
- 
--      _dbus_string_init_const (&address, "systemd:");
-+      if (!_dbus_string_init (&address))
-+          goto systemd_oom;
- 
--      *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL);
--      if (*server_p == NULL)
-+      for (i = 0; i < n; i++)
-         {
--          int i;
--
--          for (i = 0; i < n; i++)
-+          if (i > 0)
-             {
--              _dbus_close_socket (fds[i], NULL);
-+              if (!_dbus_string_append (&address, ";"))
-+                goto systemd_oom;
-             }
--          dbus_free (fds);
--
--          dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
--          return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-+          if (!_dbus_append_address_from_socket (fds[i], &address, error))
-+            goto systemd_err;
-         }
- 
-+      *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL);
-+      if (*server_p == NULL)
-+        goto systemd_oom;
-+
-       dbus_free (fds);
- 
-       return DBUS_SERVER_LISTEN_OK;
--       }
-+  systemd_oom:
-+      _DBUS_SET_OOM (error);
-+  systemd_err:
-+      for (i = 0; i < n; i++)
-+        {
-+          _dbus_close_socket (fds[i], NULL);
-+        }
-+      dbus_free (fds);
-+      _dbus_string_free (&address);
-+
-+      return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-+    }
- #ifdef DBUS_ENABLE_LAUNCHD
-   else if (strcmp (method, "launchd") == 0)
-     {
-diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
-index b4ecc96..55743b1 100644
---- a/dbus/dbus-sysdeps-unix.c
-+++ b/dbus/dbus-sysdeps-unix.c
-@@ -55,6 +55,7 @@
- #include <netinet/in.h>
- #include <netdb.h>
- #include <grp.h>
-+#include <arpa/inet.h>
- 
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
-@@ -4160,4 +4161,71 @@ _dbus_check_setuid (void)
- #endif
- }
- 
-+/**
-+ * Read the address from the socket and append it to the string
-+ *
-+ * @param fd the socket
-+ * @param address
-+ * @param error return location for error code
-+ */
-+dbus_bool_t
-+_dbus_append_address_from_socket (int         fd,
-+                                  DBusString *address,
-+                                  DBusError  *error)
-+{
-+  union {
-+      struct sockaddr sa;
-+      struct sockaddr_storage storage;
-+      struct sockaddr_un un;
-+      struct sockaddr_in ipv4;
-+      struct sockaddr_in6 ipv6;
-+  } socket;
-+  char hostip[INET6_ADDRSTRLEN];
-+  int size = sizeof (socket);
-+
-+  if (getsockname (fd, &socket.sa, &size))
-+    goto err;
-+
-+  switch (socket.sa.sa_family)
-+    {
-+    case AF_UNIX:
-+      if (socket.un.sun_path[0]=='\0')
-+        {
-+          if (_dbus_string_append_printf (address, "unix:abstract=%s", &(socket.un.sun_path[1])))
-+            return TRUE;
-+        }
-+      else
-+        {
-+          if (_dbus_string_append_printf (address, "unix:path=%s", socket.un.sun_path))
-+            return TRUE;
-+        }
-+      break;
-+    case AF_INET:
-+      if (inet_ntop (AF_INET, &socket.ipv4.sin_addr, hostip, sizeof (hostip)))
-+        if (_dbus_string_append_printf (address, "tcp:family=ipv4,host=%s,port=%u",
-+                   hostip, ntohs (socket.ipv4.sin_port)))
-+          return TRUE;
-+      break;
-+#ifdef AF_INET6
-+    case AF_INET6:
-+      if (inet_ntop (AF_INET6, &socket.ipv6.sin6_addr, hostip, sizeof (hostip)))
-+        if (_dbus_string_append_printf (address, "tcp:family=ipv6,host=%s,port=%u",
-+                   hostip, ntohs (socket.ipv6.sin6_port)))
-+          return TRUE;
-+      break;
-+#endif
-+    default:
-+      dbus_set_error (error,
-+                      _dbus_error_from_errno (EINVAL),
-+                      "Failed to read address from socket: Unknown socket type.");
-+      return FALSE;
-+    }
-+ err:
-+  dbus_set_error (error,
-+                  _dbus_error_from_errno (errno),
-+                  "Failed to open socket: %s",
-+                  _dbus_strerror (errno));
-+  return FALSE;
-+}
-+
- /* tests in dbus-sysdeps-util.c */
-diff --git a/dbus/dbus-sysdeps-unix.h b/dbus/dbus-sysdeps-unix.h
-index 9b70896..a265b33 100644
---- a/dbus/dbus-sysdeps-unix.h
-+++ b/dbus/dbus-sysdeps-unix.h
-@@ -138,6 +138,10 @@ dbus_bool_t _dbus_parse_uid (const DBusString  *uid_str,
- 
- void _dbus_close_all (void);
- 
-+dbus_bool_t _dbus_append_address_from_socket (int         fd,
-+                                              DBusString *address,
-+                                              DBusError  *error);
-+
- /** @} */
- 
- DBUS_END_DECLS
--- 
-1.9.0
-
diff --git a/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch b/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch
deleted file mode 100644
index 96290f41be..0000000000
--- a/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 03aeaccbffa97c9237b57ca067e3da7388862129 Mon Sep 17 00:00:00 2001
-From: Radoslaw Pajak <r.pajak@samsung.com>
-Date: Fri, 8 Nov 2013 13:51:32 +0100
-Subject: [PATCH] fixed memory freeing if error during listing services
-
-Upstream-Status: Backport
-
-Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com>
-Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71526
-Signed-off-by: Jonathan Liu <net147@gmail.com>
----
- bus/activation.c | 2 +-
- bus/services.c   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bus/activation.c b/bus/activation.c
-index fcb7133..ea48a26 100644
---- a/bus/activation.c
-+++ b/bus/activation.c
-@@ -2179,7 +2179,7 @@ bus_activation_list_services (BusActivation *activation,
- 
-  error:
-   for (j = 0; j < i; j++)
--    dbus_free (retval[i]);
-+    dbus_free (retval[j]);
-   dbus_free (retval);
- 
-   return FALSE;
-diff --git a/bus/services.c b/bus/services.c
-index 6f380fa..01a720e 100644
---- a/bus/services.c
-+++ b/bus/services.c
-@@ -368,7 +368,7 @@ bus_registry_list_services (BusRegistry *registry,
-   
-  error:
-   for (j = 0; j < i; j++)
--    dbus_free (retval[i]);
-+    dbus_free (retval[j]);
-   dbus_free (retval);
- 
-   return FALSE;
--- 
-1.9.0
-
diff --git a/meta/recipes-core/dbus/dbus/ptest.patch b/meta/recipes-core/dbus/dbus/ptest.patch
deleted file mode 100644
index 263d17eff7..0000000000
--- a/meta/recipes-core/dbus/dbus/ptest.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Add install-ptest rules.
-Change TEST_ENVIRONMENT to allow running outside build dir.
-
- Makefile.am                |    7 +++++++
- bus/Makefile.am            |    6 ++++++
- dbus/Makefile.am           |    6 ++++++
- doc/Makefile.am            |    4 ++++
- test/Makefile.am           |   25 ++++++++++++++++++++-----
- test/name-test/Makefile.am |    9 +++++++++
- tools/Makefile.am          |   12 ++++++++++++
- 7 files changed, 64 insertions(+), 5 deletions(-)
-
-Signed-off-by: Björn Stenberg <bjst@enea.com>
-Upstream-Status: Pending
-
-diff -ur a/Makefile.am b/Makefile.am
---- a/Makefile.am       2012-12-06 14:34:01.157414449 +0100
-+++ b/Makefile.am       2012-12-06 15:21:14.447113035 +0100
-@@ -30,4 +30,11 @@
- 
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- 
-+if DBUS_BUILD_TESTS
-+install-ptest:
-+       @for subdir in $(SUBDIRS); do \
-+               $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \
-+       done
-+endif
-+
- include tools/lcov.am
-diff -ur a/bus/Makefile.am b/bus/Makefile.am
---- a/bus/Makefile.am   2012-12-06 14:34:01.169413931 +0100
-+++ b/bus/Makefile.am   2012-12-06 15:21:14.463112346 +0100
-@@ -290,3 +290,9 @@
- #### Extra dist
- 
- EXTRA_DIST=$(CONFIG_IN_FILES) $(SCRIPT_IN_FILES)
-+
-+if DBUS_BUILD_TESTS
-+install-ptest:
-+       @$(MKDIR_P) $(DESTDIR)
-+       @install $(dbus_daemon_exec_PROGRAMS) $(noinst_PROGRAMS) $(DESTDIR)
-+endif
-diff -ur a/dbus/Makefile.am b/dbus/Makefile.am
---- a/dbus/Makefile.am  2012-12-06 14:34:01.161414276 +0100
-+++ b/dbus/Makefile.am  2012-12-06 15:21:14.451112862 +0100
-@@ -310,3 +310,9 @@
- update-systemd:
-        curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
-        curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > sd-daemon.h
-+
-+if DBUS_BUILD_TESTS
-+install-ptest:
-+       @$(MKDIR_P) $(DESTDIR)
-+       @install $(noinst_PROGRAMS) $(DESTDIR)
-+endif
-diff -ur a/test/Makefile.am b/test/Makefile.am
---- a/test/Makefile.am  2012-12-06 14:34:01.165414103 +0100
-+++ b/test/Makefile.am  2012-12-06 15:21:14.455112690 +0100
-@@ -119,12 +119,13 @@
-        DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \
-        DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir)
- 
-+ptest_run_dir = ..
-+
- TESTS_ENVIRONMENT = \
--       DBUS_BLOCK_ON_ABORT=1 \
--       DBUS_FATAL_WARNINGS=1 \
--       DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \
--       DBUS_TEST_DATA=@abs_top_builddir@/test/data \
--       DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \
-+       DBUS_FATAL_WARNINGS=0 \
-+       DBUS_TEST_DAEMON=$(ptest_run_dir)/bus/dbus-daemon$(EXEEXT) \
-+       DBUS_TEST_DATA=$(ptest_run_dir)/test/data \
-+       DBUS_TEST_HOMEDIR=$(ptest_run_dir)/dbus \
-        $(NULL)
- 
- test_corrupt_SOURCES = corrupt.c
-@@ -325,3 +325,25 @@
- data/valid-config-files/system.conf: $(top_builddir)/bus/system.conf
-        $(AM_V_at)$(MKDIR_P) data/valid-config-files
-        $(AM_V_GEN)cp $< $@
-+
-+if DBUS_BUILD_TESTS
-+install-ptest: install-ptest-nonrecursive
-+       @for subdir in $(SUBDIRS); do \
-+               if [ $$subdir != "." ]; then \
-+                       $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \
-+               fi; \
-+       done
-+
-+install-ptest-nonrecursive:
-+       @$(MKDIR_P) $(DESTDIR)/data/valid-config-files/session.d
-+       @for file in Makefile $(installable_tests) $(noinst_PROGRAMS) $(noinst_DATA) ; do \
-+               if [ -f .libs/$$file ]; then \
-+                       install .libs/$$file $(DESTDIR); \
-+               else \
-+                       install -D $${file%.in} $(DESTDIR)/$${file%.in}; \
-+               fi; \
-+       done;
-+       @for file in $(EXTRA_DIST); do \
-+               install -D ${srcdir}/$${file%.in} $(DESTDIR)/$${file%.in}; \
-+       done;
-+endif
-diff -ur a/test/name-test/Makefile.am b/test/name-test/Makefile.am
---- a/test/name-test/Makefile.am        2012-12-06 14:34:01.169413931 +0100
-+++ b/test/name-test/Makefile.am        2012-12-06 15:21:14.459112518 +0100
-@@ -36,4 +36,16 @@
- test_privserver_client_LDADD=../libdbus-testutils.la
- test_autolaunch_LDADD=../libdbus-testutils.la
- 
-+install-ptest:
-+       @$(MKDIR_P) $(DESTDIR)
-+       @for file in Makefile $(noinst_PROGRAMS); do \
-+               if [ -f .libs/$$file ]; then \
-+                       install .libs/$$file $(DESTDIR); \
-+               else \
-+                       install $$file $(DESTDIR); \
-+               fi \
-+       done;
-+       @for file in $(EXTRA_DIST); do \
-+               cp $(srcdir)/$$file $(DESTDIR); \
-+       done;
- endif
-diff -ur a/tools/Makefile.am b/tools/Makefile.am
---- a/tools/Makefile.am 2012-12-06 14:34:01.161414276 +0100
-+++ b/tools/Makefile.am 2012-12-06 15:21:14.455112690 +0100
-@@ -78,3 +78,15 @@
- 
- installcheck-local:
-        test -d $(DESTDIR)$(localstatedir)/lib/dbus
-+
-+if DBUS_BUILD_TESTS
-+install-ptest:
-+       @$(MKDIR_P) $(DESTDIR)
-+       @for file in $(bin_PROGRAMS); do \
-+               if [ -f .libs/$$file ]; then \
-+                       install .libs/$$file $(DESTDIR); \
-+               else \
-+                       install $$file $(DESTDIR); \
-+               fi; \
-+       done;
-+endif
-diff -ur a/doc/Makefile.am b/doc/Makefile.am
---- a/doc/Makefile.am   2012-06-06 12:45:55.000000000 +0200
-+++ b/doc/Makefile.am   2012-12-06 16:04:58.990070587 +0100
-@@ -174,3 +174,7 @@
- 
- maintainer-clean-local:
-        rm -f $(XMLTO_OUTPUT)
-+
-+if DBUS_BUILD_TESTS
-+install-ptest:
-+endif
diff --git a/meta/recipes-core/dbus/dbus/run-ptest b/meta/recipes-core/dbus/dbus/run-ptest
index e08ecb1a63..c72d083a91 100755
--- a/meta/recipes-core/dbus/dbus/run-ptest
+++ b/meta/recipes-core/dbus/dbus/run-ptest
@@ -1,3 +1,10 @@
 #!/bin/sh
-cd test
-make -k runtest-TESTS
+
+output() {
+  if [ $? -eq 0 ]
+    then echo "PASS: $i"
+    else echo "FAIL: $i"
+  fi
+}
+
+for i in `ls test/test-*`; do ./$i ./test/data DBUS_TEST_HOMEDIR=./test >/dev/null; output; done
diff --git a/meta/recipes-core/dbus/dbus_1.6.18.bb b/meta/recipes-core/dbus/dbus_1.6.18.bb
deleted file mode 100644
index 7270c36f95..0000000000
--- a/meta/recipes-core/dbus/dbus_1.6.18.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include dbus.inc
-
-SRC_URI[md5sum] = "b02e9c95027a416987b81f9893831061"
-SRC_URI[sha256sum] = "7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd"
diff --git a/meta/recipes-core/dbus/dbus_1.8.2.bb b/meta/recipes-core/dbus/dbus_1.8.2.bb
new file mode 100644
index 0000000000..37ebed2bd6
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus_1.8.2.bb
@@ -0,0 +1,4 @@
+include dbus.inc
+
+SRC_URI[md5sum] = "d6f709bbec0a022a1847c7caec9d6068"
+SRC_URI[sha256sum] = "5689f7411165adc953f37974e276a3028db94447c76e8dd92efe910c6d3bae08"