From 25e4b88083e624abf5510cc266afdb1bc3895d40 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 8 Sep 2023 23:04:33 +0200 Subject: [PATCH 1/3] dbus: drop CMake patches CMake is not being used to build dbus as it does not respect endinaness under CMake and 1.14 branch. So, lets drop the patches as they will not apply to future 1.14 update. Signed-off-by: Robert Marko --- utils/dbus/Makefile | 2 +- utils/dbus/patches/010-cmake-paths.patch | 16 ----------- .../020-cmake-fix-tmp-session-search.patch | 27 ------------------- 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 utils/dbus/patches/010-cmake-paths.patch delete mode 100644 utils/dbus/patches/020-cmake-fix-tmp-session-search.patch diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index e7db64deb..872dac582 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dbus PKG_VERSION:=1.13.18 -PKG_RELEASE:=12 +PKG_RELEASE:=13 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus diff --git a/utils/dbus/patches/010-cmake-paths.patch b/utils/dbus/patches/010-cmake-paths.patch deleted file mode 100644 index 36431eb0a..000000000 --- a/utils/dbus/patches/010-cmake-paths.patch +++ /dev/null @@ -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. diff --git a/utils/dbus/patches/020-cmake-fix-tmp-session-search.patch b/utils/dbus/patches/020-cmake-fix-tmp-session-search.patch deleted file mode 100644 index 2847b628e..000000000 --- a/utils/dbus/patches/020-cmake-fix-tmp-session-search.patch +++ /dev/null @@ -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() - From ea3482504be76392382c5371b3624e9ddd1dafac Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 8 Sep 2023 23:28:46 +0200 Subject: [PATCH 2/3] dbus: update to 1.14.10 stable Current stable branch for dbus is 1.14 and that is recommended to be used. 1.13 was a development branch and not meant for production use. 1.14.10 is the latest stable, so lets move to it. Signed-off-by: Robert Marko --- utils/dbus/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index 872dac582..464352ef9 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dbus -PKG_VERSION:=1.13.18 -PKG_RELEASE:=13 +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_LICENSE:=AFL-2.1 From 33627698a9af2fc56b1a6628248ec56d8655c4d1 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 8 Sep 2023 23:40:41 +0200 Subject: [PATCH 3/3] dbus: take maintainership of the package Since it seems that this nobody wants to be the maintainer of dbus, I can take the responsibility. I am no dbus expert, but can runtime test it and see if change seems sane. Signed-off-by: Robert Marko --- utils/dbus/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index 464352ef9..727a10a4d 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus PKG_HASH:=ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f -PKG_MAINTAINER:= +PKG_MAINTAINER:=Robert Marko PKG_LICENSE:=AFL-2.1 PKG_CPE_ID:=cpe:/a:freedesktop:dbus