dbus: version bump 1.8.16 -> 1.10.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 13 insertions, 222 deletions

diff --git a/projectroot/etc/dbus-1/session.conf b/projectroot/etc/dbus-1/session.conf
deleted file mode 100644
index df9d433cc..000000000
--- a/projectroot/etc/dbus-1/session.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-<!-- This configuration file controls the per-user-login-session message bus.
-     Add a session-local.conf and edit that rather than changing this
-     file directly. -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- Our well-known bus type, don't change this -->
-  <type>session</type>
-
-  <!-- If we fork, keep the user's original umask to avoid affecting
-       the behavior of child processes. -->
-  <keep_umask/>
-
-  <listen>unix:tmpdir=/tmp</listen>
-
-  <standard_session_servicedirs />
-
-  <policy context="default">
-    <!-- Allow everything to be sent -->
-    <allow send_destination="*" eavesdrop="true"/>
-    <!-- Allow everything to be received -->
-    <allow eavesdrop="true"/>
-    <!-- Allow anyone to own anything -->
-    <allow own="*"/>
-  </policy>
-
-  <!-- Config files are placed here that among other things,
-       further restrict the above policy for specific services. -->
-  <includedir>session.d</includedir>
-
-  <!-- This is included last so local configuration can override what's
-       in this standard file -->
-  <include ignore_missing="yes">session-local.conf</include>
-
-  <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
-
-  <!-- For the session bus, override the default relatively-low limits
-       with essentially infinite limits, since the bus is just running
-       as the user anyway, using up bus resources is not something we need
-       to worry about. In some cases, we do set the limits lower than
-       "all available memory" if exceeding the limit is almost certainly a bug,
-       having the bus enforce a limit is nicer than a huge memory leak. But the
-       intent is that these limits should never be hit. -->
-
-  <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max -->
-  <limit name="max_incoming_bytes">1000000000</limit>
-  <limit name="max_outgoing_bytes">1000000000</limit>
-  <limit name="max_message_size">1000000000</limit>
-  <limit name="service_start_timeout">120000</limit>
-  <limit name="auth_timeout">240000</limit>
-  <limit name="max_completed_connections">100000</limit>
-  <limit name="max_incomplete_connections">10000</limit>
-  <limit name="max_connections_per_user">100000</limit>
-  <limit name="max_pending_service_starts">10000</limit>
-  <limit name="max_names_per_connection">50000</limit>
-  <limit name="max_match_rules_per_connection">50000</limit>
-  <limit name="max_replies_per_connection">50000</limit>
-  <limit name="reply_timeout">300000</limit>
-
-</busconfig>
diff --git a/projectroot/etc/dbus-1/system.conf b/projectroot/etc/dbus-1/system.conf
deleted file mode 100644
index 553efaf60..000000000
--- a/projectroot/etc/dbus-1/system.conf
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- This configuration file controls the systemwide message bus.
-     Add a system-local.conf and edit that rather than changing this
-     file directly. -->
-
-<!-- Note that there are any number of ways you can hose yourself
-     security-wise by screwing up this file; in particular, you
-     probably don't want to listen on any more addresses, add any more
-     auth mechanisms, run as a different user, etc. -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <!-- Our well-known bus type, do not change this -->
-  <type>system</type>
-
-  <!-- Run as special user -->
-  <user>messagebus</user>
-
-  <!-- Fork into daemon mode -->
-  <fork/>
-
-  <!-- We use system service launching using a helper -->
-  <standard_system_servicedirs/>
-
-  <!-- This is a setuid helper that is used to launch system services -->
-  <servicehelper>/usr/libexec/dbus-daemon-launch-helper</servicehelper>
-
-  <!-- Write a pid file -->
-  <pidfile>/var/run/dbus/pid</pidfile>
-
-  <!-- Enable logging to syslog -->
-  <syslog/>
-
-  <!-- Only allow socket-credentials-based authentication -->
-  <auth>EXTERNAL</auth>
-
-  <!-- Only listen on a local socket. (abstract=/path/to/socket
-       means use abstract namespace, don't really create filesystem
-       file; only Linux supports this. Use path=/whatever on other
-       systems.) -->
-  <listen>unix:path=/var/run/dbus/system_bus_socket</listen>
-
-  <policy context="default">
-    <!-- All users can connect to system bus -->
-    <allow user="*"/>
-
-    <!-- Holes must be punched in service configuration files for
-         name ownership and sending method calls -->
-    <deny own="*"/>
-    <deny send_type="method_call"/>
-
-    <!-- Signals and reply messages (method returns, errors) are allowed
-         by default -->
-    <allow send_type="signal"/>
-    <allow send_requested_reply="true" send_type="method_return"/>
-    <allow send_requested_reply="true" send_type="error"/>
-
-    <!-- All messages may be received by default -->
-    <allow receive_type="method_call"/>
-    <allow receive_type="method_return"/>
-    <allow receive_type="error"/>
-    <allow receive_type="signal"/>
-
-    <!-- Allow anyone to talk to the message bus -->
-    <allow send_destination="org.freedesktop.DBus"/>
-    <!-- But disallow some specific bus services -->
-    <deny send_destination="org.freedesktop.DBus"
-          send_interface="org.freedesktop.DBus"
-          send_member="UpdateActivationEnvironment"/>
-  </policy>
-
-  <!-- Config files are placed here that among other things, punch
-       holes in the above policy for specific services. -->
-  <includedir>system.d</includedir>
-
-  <!-- This is included last so local configuration can override what's
-       in this standard file -->
-  <include ignore_missing="yes">system-local.conf</include>
-
-  <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
-
-</busconfig>
diff --git a/rules/dbus.in b/rules/dbus.in
index e637aa10d..450fb6d20 100644
--- a/rules/dbus.in
+++ b/rules/dbus.in
@@ -41,68 +41,6 @@ config DBUS_X
 	help
 	  Enable this option to build dbus with support for X.
 
-config DBUS_SYSTEM_CONF
-	bool
-	prompt "install /etc/dbus-1/system.conf"
-	default y
-	help
-	  Installs (if present) the
-	  "./projectroot/etc/dbus-1/system.conf" file from your
-	  workspace, otherwise a generic one from the ptxdist
-	  directory.
-
-config DBUS_SESSION_CONF
-	bool
-	prompt "install /etc/dbus-1/session.conf"
-	default y
-	help
-	  Installs (if present) the
-	  "./projectroot/etc/dbus-1/session.conf" file from your
-	  workspace, otherwise a generic one from the ptxdist
-	  directory.
-
-#   --enable-tests          enable unit test code
-#   --enable-ansi           enable -ansi -pedantic gcc flags
-#   --enable-verbose-mode   support verbose debug mode
-#   --enable-asserts        include assertion checks
-#   --enable-checks         include sanity checks on public API
-#   --enable-xml-docs       build XML documentation (requires xmlto)
-#   --enable-doxygen-docs   build DOXYGEN documentation (requires Doxygen)
-#   --enable-gcov           compile with coverage profiling instrumentation (gcc
-#                           only)
-#   --enable-abstract-sockets
-#                           use abstract socket namespace (linux only)
-#   --enable-selinux        build with SELinux support
-#   --enable-dnotify        build with dnotify support (linux only)
-#   --enable-kqueue         build with kqueue support
-#   --enable-console-owner-file
-#                           enable console owner file
-#   --enable-shared[=PKGS]
-#                           build shared libraries [default=yes]
-#   --enable-static[=PKGS]
-#                           build static libraries [default=yes]
-#   --enable-fast-install[=PKGS]
-#                           optimize for fast installation [default=yes]
-#   --with-xml=libxml/expat XML library to use
-#   --with-init-scripts=redhat
-#                           Style of init scripts to install
-#   --with-session-socket-dir=dirname
-#                           Where to put sockets for the per-login-session
-#                           message bus
-#   --with-test-socket-dir=dirname
-#                           Where to put sockets for make check
-#   --with-system-pid-file=pidfile
-#                           PID file for systemwide daemon
-#   --with-system-socket=filename
-#                           UNIX domain socket for systemwide daemon
-#   --with-console-auth-dir=dirname
-#                           directory to check for console ownerhip
-#   --with-console-owner-file=filename
-#                           file whose owner determines current console owner
-#   --with-dbus-daemondir=dirname
-#                           Directory for installing the DBUS daemon
-#   --with-x                use the X Window System
-
 config DBUS_STARTSCRIPT
 	bool
 	default y
diff --git a/rules/dbus.make b/rules/dbus.make
index 5ac079cd3..841c8ec56 100644
--- a/rules/dbus.make
+++ b/rules/dbus.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus
 #
 # Paths and names
 #
-DBUS_VERSION	:= 1.8.16
-DBUS_MD5	:= 020824a38850501e7d6ba8307a7c5ac3
+DBUS_VERSION	:= 1.10.0
+DBUS_MD5	:= 5af6297348107a906c8449817a728b3b
 DBUS		:= dbus-$(DBUS_VERSION)
 DBUS_SUFFIX	:= tar.gz
 DBUS_URL	:= http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
@@ -46,8 +46,10 @@ DBUS_CONF_OPT	:= \
 	--disable-checks \
 	--disable-xml-docs \
 	--disable-doxygen-docs \
+	--disable-ducktype-docs \
 	--enable-abstract-sockets=yes \
 	--$(call ptx/endis, PTXCONF_DBUS_SELINUX)-selinux \
+	--disable-apparmor \
 	--disable-libaudit \
 	--enable-inotify \
 	--disable-kqueue \
@@ -60,10 +62,11 @@ DBUS_CONF_OPT	:= \
 	--enable-epoll \
 	--$(call ptx/endis, PTXCONF_DBUS_X)-x11-autolaunch \
 	--disable-stats \
-	--without-dbus-glib \
+	--$(call ptx/endis, PTXCONF_DBUS_SYSTEMD)-user-session \
 	--$(call ptx/wwo, PTXCONF_DBUS_X)-x$(call ptx/ifdef PTXCONF_DBUS_X,=$(SYSROOT)/usr,) \
 	--without-valgrind \
-	--with-systemdsystemunitdir=/lib/systemd/system
+	--with-systemdsystemunitdir=/lib/systemd/system \
+	--with-systemduserunitdir=/usr/lib/systemd/user
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -109,18 +112,10 @@ $(STATEDIR)/dbus.targetinstall:
 	@$(call install_copy, dbus, 0, 0, 0755, /etc/dbus-1/session.d/)
 
 #	#
-#	# install /etc/dbus-1/system.conf config file
+#	# install config files
 #	#
-ifdef PTXCONF_DBUS_SYSTEM_CONF
-	@$(call install_alternative, dbus, 0, 0, 0644, /etc/dbus-1/system.conf)
-endif
-
-#	#
-#	# instal /etc/dbus-1/session.conf config file
-#	#
-ifdef PTXCONF_DBUS_SESSION_CONF
-	@$(call install_alternative, dbus, 0, 0, 0644, /etc/dbus-1/session.conf)
-endif
+	@$(call install_alternative, dbus, 0, 0, 0644, /usr/share/dbus-1/system.conf)
+	@$(call install_alternative, dbus, 0, 0, 0644, /usr/share/dbus-1/session.conf)
 
 #	#
 #	# busybox init: start script
diff --git a/rules/host-dbus.make b/rules/host-dbus.make
index 3506f5cc2..837cf77d4 100644
--- a/rules/host-dbus.make
+++ b/rules/host-dbus.make
@@ -37,8 +37,10 @@ HOST_DBUS_CONF_OPT	:= \
 	--disable-checks \
 	--disable-xml-docs \
 	--disable-doxygen-docs \
+	--disable-ducktype-docs \
 	--enable-abstract-sockets=yes \
 	--disable-selinux \
+	--disable-apparmor \
 	--disable-libaudit \
 	--disable-inotify \
 	--disable-kqueue \
@@ -50,7 +52,7 @@ HOST_DBUS_CONF_OPT	:= \
 	--disable-epoll \
 	--disable-x11-autolaunch \
 	--disable-stats \
-	--without-dbus-glib \
+	--disable-user-session \
 	--without-x \
 	--without-valgrind