Merge pull request #22067 from robimarko/dbus

dbus: update to 1.14.10 and take ower maintainership

utils/dbus/Makefile

@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dbus
-PKG_VERSION:=1.13.18
-PKG_RELEASE:=12
+PKG_VERSION:=1.14.10
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus
-PKG_HASH:=8078f5c25e34ab907ce06905d969dc8ef0ccbec367e1e1707c7ecf8460f4254e
+PKG_HASH:=ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f
 
-PKG_MAINTAINER:=
+PKG_MAINTAINER:=Robert Marko <robimarko@gmail.com>
 PKG_LICENSE:=AFL-2.1
 PKG_CPE_ID:=cpe:/a:freedesktop:dbus
 

utils/dbus/patches/010-cmake-paths.patch

@@ -1,16 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -510,11 +510,11 @@ if(WIN32)
- else(WIN32)
-     set(DBUS_SESSION_BUS_LISTEN_ADDRESS "unix:tmpdir=${DBUS_SESSION_SOCKET_DIR}" CACHE STRING "session bus default listening address")
-     set(DBUS_SESSION_BUS_CONNECT_ADDRESS "autolaunch:" CACHE STRING "session bus fallback address for clients")
--    set(sysconfdir "")
-+    set(sysconfdir "/usr/share")
-     set(configdir ${sysconfdir}/dbus-1 )
-     set(DBUS_SYSTEM_CONFIG_FILE  ${configdir}/system.conf)
-     set(DBUS_SESSION_CONFIG_FILE ${configdir}/session.conf)
--    set(DBUS_USER "messagebus")
-+    set(DBUS_USER "root")
-     set(DBUS_TEST_USER "nobody")
-   # For best security, assume that all non-Windows platforms can do
-   # credentials-passing.

utils/dbus/patches/020-cmake-fix-tmp-session-search.patch

@@ -1,27 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -471,14 +471,16 @@ endif()
- 
- #### Find socket directories
- if(UNIX)
--    if(NOT $ENV{TMPDIR} STREQUAL "")
--        set(DBUS_SESSION_SOCKET_DIR $ENV{TMPDIR})
--    elseif(NOT $ENV{TEMP} STREQUAL "")
--        set(DBUS_SESSION_SOCKET_DIR $ENV{TEMP})
--    elseif(NOT $ENV{TMP} STREQUAL "")
--        set(DBUS_SESSION_SOCKET_DIR $ENV{TMP})
--    else()
--        set(DBUS_SESSION_SOCKET_DIR /tmp)
-+    if(NOT DEFINED DBUS_SESSION_SOCKET_DIR)
-+        if(NOT $ENV{TMPDIR} STREQUAL "")
-+            set(DBUS_SESSION_SOCKET_DIR $ENV{TMPDIR})
-+        elseif(NOT $ENV{TEMP} STREQUAL "")
-+            set(DBUS_SESSION_SOCKET_DIR $ENV{TEMP})
-+        elseif(NOT $ENV{TMP} STREQUAL "")
-+            set(DBUS_SESSION_SOCKET_DIR $ENV{TMP})
-+        else()
-+            set(DBUS_SESSION_SOCKET_DIR /tmp)
-+        endif()
-     endif()
- endif()
-