mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-09 18:47:16 -08:00
sys-apps/dbus: update OpenRC service script to use supervise-daemon
Tested-on: GNOME 49, 50 Signed-off-by: zyxhere💭 <zyx@envs.net> Part-of: https://codeberg.org/gentoo/gentoo/pulls/2002 Merges: https://codeberg.org/gentoo/gentoo/pulls/2002 Signed-off-by: Pacho Ramos <pacho@gentoo.org>
This commit is contained in:
zyxhere💭
@@ -0,0 +1,220 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
# Be careful with packaging odd-version-number branches!
|
||||
# We should at the very least keep stable as an upstream stable branch,
|
||||
# possibly even ~arch too, given the note about security releases on their website.
|
||||
# See https://www.freedesktop.org/wiki/Software/dbus/#download.
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
TMPFILES_OPTIONAL=1
|
||||
|
||||
inherit linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd tmpfiles
|
||||
|
||||
DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
|
||||
HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/"
|
||||
SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
|
||||
|
||||
LICENSE="|| ( AFL-2.1 GPL-2+ ) Apache-2.0 BSD GPL-2+ LGPL-2.1+ MIT tcltk"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
|
||||
# TODO: USE=daemon
|
||||
IUSE="apparmor audit debug doc elogind selinux static-libs systemd test valgrind X"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
app-text/xmlto
|
||||
app-text/docbook-xml-dtd:4.4
|
||||
acct-user/messagebus
|
||||
dev-build/autoconf-archive
|
||||
virtual/pkgconfig
|
||||
doc? ( app-text/doxygen )
|
||||
"
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/expat-2.1.0
|
||||
apparmor? ( sys-libs/libapparmor )
|
||||
audit? ( sys-process/audit )
|
||||
elogind? ( sys-auth/elogind )
|
||||
selinux? (
|
||||
sys-libs/libselinux
|
||||
)
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXt
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
|
||||
valgrind? ( >=dev-debug/valgrind-3.6 )
|
||||
X? ( x11-base/xorg-proto )
|
||||
"
|
||||
RDEPEND="
|
||||
${COMMON_DEPEND}
|
||||
acct-user/messagebus
|
||||
selinux? ( sec-policy/selinux-dbus )
|
||||
systemd? ( virtual/tmpfiles )
|
||||
"
|
||||
|
||||
DOC_CONTENTS="
|
||||
Some applications require a session bus in addition to the system
|
||||
bus. Please see \`man dbus-launch\` for more information.
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.16.0-enable-elogind.patch # bug #599494
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
# Python interpreter required unconditionally (bug #932517)
|
||||
python-any-r1_pkg_setup
|
||||
|
||||
if use kernel_linux; then
|
||||
CONFIG_CHECK="~EPOLL"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local rundir=$(usex kernel_linux /run /var/run)
|
||||
|
||||
sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd-r1.in \
|
||||
> "${T}"/dbus.initd || die
|
||||
|
||||
meson-multilib_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local emesonargs=(
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
-Druntime_dir="${EPREFIX}${rundir}"
|
||||
|
||||
-Ddefault_library=$(multilib_native_usex static-libs both shared)
|
||||
|
||||
-Dasserts=false # TODO
|
||||
-Dchecks=false # TODO
|
||||
$(meson_use debug stats)
|
||||
$(meson_use debug verbose_mode)
|
||||
-Ddbus_user=messagebus
|
||||
-Dkqueue=disabled
|
||||
$(meson_feature kernel_linux inotify)
|
||||
$(meson_native_use_feature doc doxygen_docs)
|
||||
$(meson_native_enabled xml_docs) # Controls man pages
|
||||
|
||||
-Dinstalled_tests=false
|
||||
$(meson_native_true message_bus) # TODO: USE=daemon?
|
||||
$(meson_feature test modular_tests)
|
||||
-Dqt_help=disabled
|
||||
|
||||
$(meson_native_true tools)
|
||||
|
||||
$(meson_native_use_feature elogind)
|
||||
$(meson_native_use_feature systemd)
|
||||
$(meson_use systemd user_session)
|
||||
$(meson_native_use_feature X x11_autolaunch)
|
||||
$(meson_native_use_feature valgrind)
|
||||
|
||||
$(meson_native_use_feature apparmor)
|
||||
$(meson_native_use_feature audit libaudit)
|
||||
$(meson_native_use_feature selinux)
|
||||
|
||||
-Dsession_socket_dir="${EPREFIX}"/tmp
|
||||
-Dsystem_pid_file="${EPREFIX}${rundir}"/dbus.pid
|
||||
-Dsystem_socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
|
||||
-Dsystemd_system_unitdir="$(systemd_get_systemunitdir)"
|
||||
-Dsystemd_user_unitdir="$(systemd_get_userunitdir)"
|
||||
)
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
emesonargs+=(
|
||||
-Dlaunchd=enabled
|
||||
-Dlaunchd_agent_dir="${EPREFIX}"/Library/LaunchAgents
|
||||
)
|
||||
fi
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
# After the compile, it uses a selinuxfs interface to
|
||||
# check if the SELinux policy has the right support
|
||||
use selinux && addwrite /selinux/access
|
||||
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
# DBUS_TEST_MALLOC_FAILURES=0 to avoid huge test logs
|
||||
# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231
|
||||
DBUS_TEST_MALLOC_FAILURES=0 DBUS_VERBOSE=1 meson_src_test
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
newinitd "${T}"/dbus.initd dbus
|
||||
exeinto /etc/user/init.d
|
||||
newexe "${FILESDIR}/dbus.user.initd" dbus
|
||||
|
||||
if use X; then
|
||||
# dbus X session script (bug #77504)
|
||||
# turns out to only work for GDM (and startx). has been merged into
|
||||
# other desktop (kdm and such scripts)
|
||||
exeinto /etc/X11/xinit/xinitrc.d
|
||||
newexe "${FILESDIR}"/80-dbus-r1 80-dbus
|
||||
fi
|
||||
|
||||
# Needs to exist for dbus sessions to launch
|
||||
keepdir /usr/share/dbus-1/services
|
||||
keepdir /etc/dbus-1/{session,system}.d
|
||||
# machine-id symlink from pkg_postinst()
|
||||
keepdir /var/lib/dbus
|
||||
# Let the init script create the /var/run/dbus directory
|
||||
rm -rf "${ED}"/{,var/}run
|
||||
|
||||
# bug #761763
|
||||
rm -rf "${ED}"/usr/lib/sysusers.d
|
||||
|
||||
dodoc AUTHORS NEWS README doc/TODO
|
||||
readme.gentoo_create_doc
|
||||
|
||||
mv "${ED}"/usr/share/doc/dbus/* "${ED}"/usr/share/doc/${PF}/ || die
|
||||
rm -rf "${ED}"/usr/share/doc/dbus || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
readme.gentoo_print_elog
|
||||
|
||||
if use systemd; then
|
||||
tmpfiles_process dbus.conf
|
||||
fi
|
||||
|
||||
# Ensure unique id is generated and put it in /etc wrt bug #370451 but symlink
|
||||
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
|
||||
# dependencies with hardcoded paths (although the known ones got fixed already)
|
||||
# TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
|
||||
dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
|
||||
ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
local plist="org.freedesktop.dbus-session.plist"
|
||||
elog
|
||||
elog "For MacOS/Darwin we now ship launchd support for dbus."
|
||||
elog "This enables autolaunch of dbus at session login and makes"
|
||||
elog "dbus usable under MacOS/Darwin."
|
||||
elog
|
||||
elog "The launchd plist file ${plist} has been"
|
||||
elog "installed in ${EPREFIX}/Library/LaunchAgents."
|
||||
elog "For it to be used, you will have to do all of the following:"
|
||||
elog " + cd ~/Library/LaunchAgents"
|
||||
elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
|
||||
elog " + logout and log back in"
|
||||
elog
|
||||
elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
|
||||
elog "specified and refused to start otherwise, then export the"
|
||||
elog "the following to your environment:"
|
||||
elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
|
||||
fi
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License, v2 or later
|
||||
|
||||
supervisor=supervise-daemon
|
||||
|
||||
extra_started_commands="reload"
|
||||
|
||||
description="An IPC message bus daemon"
|
||||
command="/usr/bin/dbus-daemon"
|
||||
command_args="--system"
|
||||
command_args_foreground="--nofork"
|
||||
|
||||
dbus_socket="@rundir@/dbus/system_bus_socket"
|
||||
|
||||
depend() {
|
||||
need localmount
|
||||
after bootmisc
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
/usr/bin/dbus-uuidgen --ensure=/etc/machine-id
|
||||
|
||||
# We need to test if /var/run/dbus exists, since script will fail if it does not
|
||||
checkpath -q -d "@rundir@/dbus"
|
||||
}
|
||||
|
||||
stop_post() {
|
||||
[ ! -S "${dbus_socket}" ] || rm -f "${dbus_socket}"
|
||||
}
|
||||
|
||||
reload() {
|
||||
ebegin "Reloading D-BUS messagebus config"
|
||||
dbus-send --print-reply --system --type=method_call \
|
||||
--dest=org.freedesktop.DBus \
|
||||
/ org.freedesktop.DBus.ReloadConfig > /dev/null
|
||||
eend $?
|
||||
}
|
||||
Reference in New Issue
Block a user