mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-10 06:57:08 -08:00
sys-apps/dbus: drop 1.14.0-r4, 1.14.2, 1.14.4, 1.15.0-r1
Bug: https://bugs.gentoo.org/875518 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,5 +1 @@
|
||||
DIST dbus-1.14.0.tar.xz 1360228 BLAKE2B ae0ebc2779e840e2d83f633029f81fba0e35969648dddce0280640dd9bee3f9508aa7fb6aef696d1c4c56d40f91b754941f847525afaee5cc3170ad23a7eddbf SHA512 9bf17a3ebb3cf44722c6fbf24ee56e9dc14d6882fc312f26c7f07459d969424bc2fb63a229139e011804ecc479a8f0eb1a0c83286f8d5a664c5979d12634179f
|
||||
DIST dbus-1.14.2.tar.xz 1362972 BLAKE2B 81c79bbdaa19b214d2462e5ebc42933b60c72c346c71e89e2b15ed17860257ec81c1dc86cd4726f7b352933b02bf5172c1466be0bc63e67a432c76d97fbbb68b SHA512 6e503385bfc1b17d4922dc6d2fb3fa10626ed306fe2b3a6a59f6cf81667c4cd63c2fc5e4fd040f48415235e9f4a75b10948ef512f022af1edab20f426271a9b4
|
||||
DIST dbus-1.14.4.tar.xz 1368196 BLAKE2B 7da5cd8f09eaef7a64f35f8ccbeb81c5687b3fad02d6ac05dd4c232e0f731dbcf4c76c36b615e6216815c8f8631bf9cb32543665440153a1199b1b35922cdda4 SHA512 7c8ce95b8a4c63cf51cc9f10bebbc19e66d6a96c4806befad48c3fe73b4468bb2b50f9570b73fe05ff12223e5e6815032139d316995eb670c28b23c028f293d6
|
||||
DIST dbus-1.15.0.tar.xz 1391044 BLAKE2B 50cd9e5fc27f8ff53350f426d29b0ee7dd17a791e82e9d0465789c095443826d14396045c8301e73996d054e2b723b09c1c28dd392a240ed74b6c49c1369d480 SHA512 6f7e1d4ff525ce13c5f671f1b045a089c379cbfb777662ce7a55ffe4893a8ab2aaf38877a7b8f261823067a20f3b336437449eb353a97d30699496375e00bf1a
|
||||
DIST dbus-1.15.2.tar.xz 1395516 BLAKE2B fdfaf8a1a407ddcac23ce5d22497b975b4b95e62a8afaa1ed8f5f25933ad4a113aea4a39c686c1e4a046e2a05b83ab7bb9c063f77012caaa7ecbdc8ea522259c SHA512 486eab8c4f87d75e988558724bff1b0708c969341ecb62bcb9d0b0612a653ac2674aa7caa4d129dd81c00af7989b122ee7837599262c9a0c5c7f9335ed3dacaf
|
||||
|
||||
@@ -1,292 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
TMPFILES_OPTIONAL=1
|
||||
|
||||
# At least at the moment, while a CMake port exists, it's not recommended
|
||||
# for distributions.
|
||||
# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L189
|
||||
inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
|
||||
|
||||
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 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug doc elogind selinux static-libs systemd test X"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
REQUIRED_USE="?? ( elogind systemd )"
|
||||
|
||||
BDEPEND="
|
||||
acct-user/messagebus
|
||||
app-text/xmlto
|
||||
app-text/docbook-xml-dtd:4.4
|
||||
sys-devel/autoconf-archive
|
||||
virtual/pkgconfig
|
||||
doc? ( app-doc/doxygen )
|
||||
"
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/expat-2.1.0
|
||||
elogind? ( sys-auth/elogind )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
systemd? ( sys-apps/systemd:0= )
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXt
|
||||
)
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-libs/expat
|
||||
test? (
|
||||
${PYTHON_DEPS}
|
||||
>=dev-libs/glib-2.40:2
|
||||
)
|
||||
"
|
||||
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.
|
||||
"
|
||||
|
||||
# out of sources build dir for make check
|
||||
TBD="${WORKDIR}/${P}-tests-build"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/dbus-enable-elogind.patch"
|
||||
"${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
|
||||
|
||||
"${FILESDIR}/dbus-1.14.0-x-autoconf-fixes.patch"
|
||||
"${FILESDIR}/dbus-1.12.22-check-fd.patch"
|
||||
|
||||
# https://bugs.gentoo.org/836560
|
||||
"${FILESDIR}/dbus-1.14.0-oom_score_adj.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use test && python-any-r1_pkg_setup
|
||||
|
||||
if use kernel_linux; then
|
||||
CONFIG_CHECK="~EPOLL"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if [[ ${CHOST} == *-solaris* ]]; then
|
||||
# fix standards conflict, due to gcc being c99 by default nowadays
|
||||
sed -i \
|
||||
-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
|
||||
configure.ac || die
|
||||
fi
|
||||
|
||||
# required for bug #263909, cross-compile so don't remove eautoreconf
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local rundir=$(usex kernel_linux /run /var/run)
|
||||
|
||||
sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
|
||||
> "${T}"/dbus.initd || die
|
||||
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local docconf myconf testconf
|
||||
|
||||
# so we can get backtraces from apps
|
||||
case ${CHOST} in
|
||||
*-mingw*)
|
||||
# error: unrecognized command line option '-rdynamic', bug #488036
|
||||
;;
|
||||
*)
|
||||
append-flags -rdynamic
|
||||
;;
|
||||
esac
|
||||
|
||||
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
|
||||
# not on an SELinux profile.
|
||||
myconf=(
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable debug verbose-mode)
|
||||
--disable-asserts
|
||||
--disable-checks
|
||||
$(use_enable selinux)
|
||||
$(use_enable selinux libaudit)
|
||||
--disable-apparmor
|
||||
$(use_enable kernel_linux inotify)
|
||||
--disable-kqueue
|
||||
$(use_enable elogind)
|
||||
$(use_enable systemd)
|
||||
$(use_enable systemd user-session)
|
||||
--disable-embedded-tests
|
||||
--disable-modular-tests
|
||||
$(use_enable debug stats)
|
||||
--with-session-socket-dir="${EPREFIX}"/tmp
|
||||
--with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
|
||||
--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
|
||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
||||
--with-systemduserunitdir="$(systemd_get_userunitdir)"
|
||||
--with-dbus-user=messagebus
|
||||
$(use_with X x)
|
||||
)
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
myconf+=(
|
||||
--enable-launchd
|
||||
--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
|
||||
)
|
||||
fi
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
docconf=(
|
||||
--enable-xml-docs
|
||||
$(use_enable doc doxygen-docs)
|
||||
)
|
||||
else
|
||||
docconf=(
|
||||
--disable-xml-docs
|
||||
--disable-doxygen-docs
|
||||
)
|
||||
myconf+=(
|
||||
--disable-daemon
|
||||
--disable-selinux
|
||||
--disable-libaudit
|
||||
--disable-elogind
|
||||
--disable-systemd
|
||||
--without-x
|
||||
)
|
||||
fi
|
||||
|
||||
einfo "Running configure in ${BUILD_DIR}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
|
||||
|
||||
if multilib_is_native_abi && use test; then
|
||||
mkdir "${TBD}" || die
|
||||
cd "${TBD}" || die
|
||||
testconf=(
|
||||
$(use_enable test asserts)
|
||||
$(use_enable test checks)
|
||||
$(use_enable test embedded-tests)
|
||||
$(use_enable test stats)
|
||||
$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
|
||||
)
|
||||
einfo "Running configure in ${TBD}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
if multilib_is_native_abi; then
|
||||
# After the compile, it uses a selinuxfs interface to
|
||||
# check if the SELinux policy has the right support
|
||||
use selinux && addwrite /selinux/access
|
||||
|
||||
einfo "Running make in ${BUILD_DIR}"
|
||||
emake
|
||||
|
||||
if use test; then
|
||||
einfo "Running make in ${TBD}"
|
||||
emake -C "${TBD}"
|
||||
fi
|
||||
else
|
||||
emake -C dbus libdbus-1.la
|
||||
fi
|
||||
}
|
||||
|
||||
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 virtx emake -j1 -C "${TBD}" check
|
||||
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
if multilib_is_native_abi; then
|
||||
emake DESTDIR="${D}" install
|
||||
else
|
||||
emake DESTDIR="${D}" install-pkgconfigDATA
|
||||
emake DESTDIR="${D}" -C dbus \
|
||||
install-libLTLIBRARIES install-dbusincludeHEADERS \
|
||||
install-nodist_dbusarchincludeHEADERS
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
newinitd "${T}"/dbus.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
|
||||
|
||||
find "${ED}" -name '*.la' -delete || 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
|
||||
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
|
||||
}
|
||||
@@ -1,290 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
TMPFILES_OPTIONAL=1
|
||||
|
||||
# At least at the moment, while a CMake port exists, it's not recommended
|
||||
# for distributions.
|
||||
# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L189
|
||||
inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
|
||||
|
||||
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 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug doc elogind selinux static-libs systemd test X"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
REQUIRED_USE="?? ( elogind systemd )"
|
||||
|
||||
BDEPEND="
|
||||
acct-user/messagebus
|
||||
app-text/xmlto
|
||||
app-text/docbook-xml-dtd:4.4
|
||||
sys-devel/autoconf-archive
|
||||
virtual/pkgconfig
|
||||
doc? ( app-doc/doxygen )
|
||||
"
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/expat-2.1.0
|
||||
elogind? ( sys-auth/elogind )
|
||||
selinux? (
|
||||
sys-process/audit
|
||||
sys-libs/libselinux
|
||||
)
|
||||
systemd? ( sys-apps/systemd:0= )
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXt
|
||||
)
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-libs/expat
|
||||
test? (
|
||||
${PYTHON_DEPS}
|
||||
>=dev-libs/glib-2.40:2
|
||||
)
|
||||
"
|
||||
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.
|
||||
"
|
||||
|
||||
# out of sources build dir for make check
|
||||
TBD="${WORKDIR}/${P}-tests-build"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/dbus-enable-elogind.patch"
|
||||
"${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use test && python-any-r1_pkg_setup
|
||||
|
||||
if use kernel_linux; then
|
||||
CONFIG_CHECK="~EPOLL"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if [[ ${CHOST} == *-solaris* ]]; then
|
||||
# fix standards conflict, due to gcc being c99 by default nowadays
|
||||
sed -i \
|
||||
-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
|
||||
configure.ac || die
|
||||
fi
|
||||
|
||||
# required for bug #263909, cross-compile so don't remove eautoreconf
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local rundir=$(usex kernel_linux /run /var/run)
|
||||
|
||||
sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
|
||||
> "${T}"/dbus.initd || die
|
||||
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local docconf myconf testconf
|
||||
|
||||
# so we can get backtraces from apps
|
||||
case ${CHOST} in
|
||||
*-mingw*)
|
||||
# error: unrecognized command line option '-rdynamic', bug #488036
|
||||
;;
|
||||
*)
|
||||
append-flags -rdynamic
|
||||
;;
|
||||
esac
|
||||
|
||||
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
|
||||
# not on an SELinux profile.
|
||||
myconf=(
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--runstatedir="${EPREFIX}${rundir}"
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable debug verbose-mode)
|
||||
--disable-asserts
|
||||
--disable-checks
|
||||
$(use_enable selinux)
|
||||
$(use_enable selinux libaudit)
|
||||
--disable-apparmor
|
||||
$(use_enable kernel_linux inotify)
|
||||
--disable-kqueue
|
||||
$(use_enable elogind)
|
||||
$(use_enable systemd)
|
||||
$(use_enable systemd user-session)
|
||||
--disable-embedded-tests
|
||||
--disable-modular-tests
|
||||
$(use_enable debug stats)
|
||||
--with-session-socket-dir="${EPREFIX}"/tmp
|
||||
--with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
|
||||
--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
|
||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
||||
--with-systemduserunitdir="$(systemd_get_userunitdir)"
|
||||
--with-dbus-user=messagebus
|
||||
$(use_with X x)
|
||||
)
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
myconf+=(
|
||||
--enable-launchd
|
||||
--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
|
||||
)
|
||||
fi
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
docconf=(
|
||||
--enable-xml-docs
|
||||
$(use_enable doc doxygen-docs)
|
||||
)
|
||||
else
|
||||
docconf=(
|
||||
--disable-xml-docs
|
||||
--disable-doxygen-docs
|
||||
)
|
||||
myconf+=(
|
||||
--disable-daemon
|
||||
--disable-selinux
|
||||
--disable-libaudit
|
||||
--disable-elogind
|
||||
--disable-systemd
|
||||
--without-x
|
||||
)
|
||||
fi
|
||||
|
||||
einfo "Running configure in ${BUILD_DIR}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
|
||||
|
||||
if multilib_is_native_abi && use test; then
|
||||
mkdir "${TBD}" || die
|
||||
cd "${TBD}" || die
|
||||
testconf=(
|
||||
$(use_enable test asserts)
|
||||
$(use_enable test checks)
|
||||
$(use_enable test embedded-tests)
|
||||
$(use_enable test stats)
|
||||
$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
|
||||
)
|
||||
einfo "Running configure in ${TBD}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
if multilib_is_native_abi; then
|
||||
# After the compile, it uses a selinuxfs interface to
|
||||
# check if the SELinux policy has the right support
|
||||
use selinux && addwrite /selinux/access
|
||||
|
||||
einfo "Running make in ${BUILD_DIR}"
|
||||
emake
|
||||
|
||||
if use test; then
|
||||
einfo "Running make in ${TBD}"
|
||||
emake -C "${TBD}"
|
||||
fi
|
||||
else
|
||||
emake -C dbus libdbus-1.la
|
||||
fi
|
||||
}
|
||||
|
||||
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 virtx emake -j1 -C "${TBD}" check
|
||||
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
if multilib_is_native_abi; then
|
||||
emake DESTDIR="${D}" install
|
||||
else
|
||||
emake DESTDIR="${D}" install-pkgconfigDATA
|
||||
emake DESTDIR="${D}" -C dbus \
|
||||
install-libLTLIBRARIES install-dbusincludeHEADERS \
|
||||
install-nodist_dbusarchincludeHEADERS
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
newinitd "${T}"/dbus.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
|
||||
|
||||
find "${ED}" -name '*.la' -delete || 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
|
||||
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
|
||||
}
|
||||
@@ -1,290 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
TMPFILES_OPTIONAL=1
|
||||
|
||||
# At least at the moment, while a CMake port exists, it's not recommended
|
||||
# for distributions.
|
||||
# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L189
|
||||
inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
|
||||
|
||||
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 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug doc elogind selinux static-libs systemd test X"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
REQUIRED_USE="?? ( elogind systemd )"
|
||||
|
||||
BDEPEND="
|
||||
acct-user/messagebus
|
||||
app-text/xmlto
|
||||
app-text/docbook-xml-dtd:4.4
|
||||
sys-devel/autoconf-archive
|
||||
virtual/pkgconfig
|
||||
doc? ( app-doc/doxygen )
|
||||
"
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/expat-2.1.0
|
||||
elogind? ( sys-auth/elogind )
|
||||
selinux? (
|
||||
sys-process/audit
|
||||
sys-libs/libselinux
|
||||
)
|
||||
systemd? ( sys-apps/systemd:0= )
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXt
|
||||
)
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-libs/expat
|
||||
test? (
|
||||
${PYTHON_DEPS}
|
||||
>=dev-libs/glib-2.40:2
|
||||
)
|
||||
"
|
||||
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.
|
||||
"
|
||||
|
||||
# out of sources build dir for make check
|
||||
TBD="${WORKDIR}/${P}-tests-build"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/dbus-enable-elogind.patch"
|
||||
"${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use test && python-any-r1_pkg_setup
|
||||
|
||||
if use kernel_linux; then
|
||||
CONFIG_CHECK="~EPOLL"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if [[ ${CHOST} == *-solaris* ]]; then
|
||||
# fix standards conflict, due to gcc being c99 by default nowadays
|
||||
sed -i \
|
||||
-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
|
||||
configure.ac || die
|
||||
fi
|
||||
|
||||
# required for bug #263909, cross-compile so don't remove eautoreconf
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local rundir=$(usex kernel_linux /run /var/run)
|
||||
|
||||
sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
|
||||
> "${T}"/dbus.initd || die
|
||||
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local docconf myconf testconf
|
||||
|
||||
# so we can get backtraces from apps
|
||||
case ${CHOST} in
|
||||
*-mingw*)
|
||||
# error: unrecognized command line option '-rdynamic', bug #488036
|
||||
;;
|
||||
*)
|
||||
append-flags -rdynamic
|
||||
;;
|
||||
esac
|
||||
|
||||
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
|
||||
# not on an SELinux profile.
|
||||
myconf=(
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--runstatedir="${EPREFIX}${rundir}"
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable debug verbose-mode)
|
||||
--disable-asserts
|
||||
--disable-checks
|
||||
$(use_enable selinux)
|
||||
$(use_enable selinux libaudit)
|
||||
--disable-apparmor
|
||||
$(use_enable kernel_linux inotify)
|
||||
--disable-kqueue
|
||||
$(use_enable elogind)
|
||||
$(use_enable systemd)
|
||||
$(use_enable systemd user-session)
|
||||
--disable-embedded-tests
|
||||
--disable-modular-tests
|
||||
$(use_enable debug stats)
|
||||
--with-session-socket-dir="${EPREFIX}"/tmp
|
||||
--with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
|
||||
--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
|
||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
||||
--with-systemduserunitdir="$(systemd_get_userunitdir)"
|
||||
--with-dbus-user=messagebus
|
||||
$(use_with X x)
|
||||
)
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
myconf+=(
|
||||
--enable-launchd
|
||||
--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
|
||||
)
|
||||
fi
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
docconf=(
|
||||
--enable-xml-docs
|
||||
$(use_enable doc doxygen-docs)
|
||||
)
|
||||
else
|
||||
docconf=(
|
||||
--disable-xml-docs
|
||||
--disable-doxygen-docs
|
||||
)
|
||||
myconf+=(
|
||||
--disable-daemon
|
||||
--disable-selinux
|
||||
--disable-libaudit
|
||||
--disable-elogind
|
||||
--disable-systemd
|
||||
--without-x
|
||||
)
|
||||
fi
|
||||
|
||||
einfo "Running configure in ${BUILD_DIR}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
|
||||
|
||||
if multilib_is_native_abi && use test; then
|
||||
mkdir "${TBD}" || die
|
||||
cd "${TBD}" || die
|
||||
testconf=(
|
||||
$(use_enable test asserts)
|
||||
$(use_enable test checks)
|
||||
$(use_enable test embedded-tests)
|
||||
$(use_enable test stats)
|
||||
$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
|
||||
)
|
||||
einfo "Running configure in ${TBD}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
if multilib_is_native_abi; then
|
||||
# After the compile, it uses a selinuxfs interface to
|
||||
# check if the SELinux policy has the right support
|
||||
use selinux && addwrite /selinux/access
|
||||
|
||||
einfo "Running make in ${BUILD_DIR}"
|
||||
emake
|
||||
|
||||
if use test; then
|
||||
einfo "Running make in ${TBD}"
|
||||
emake -C "${TBD}"
|
||||
fi
|
||||
else
|
||||
emake -C dbus libdbus-1.la
|
||||
fi
|
||||
}
|
||||
|
||||
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 virtx emake -j1 -C "${TBD}" check
|
||||
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
if multilib_is_native_abi; then
|
||||
emake DESTDIR="${D}" install
|
||||
else
|
||||
emake DESTDIR="${D}" install-pkgconfigDATA
|
||||
emake DESTDIR="${D}" -C dbus \
|
||||
install-libLTLIBRARIES install-dbusincludeHEADERS \
|
||||
install-nodist_dbusarchincludeHEADERS
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
newinitd "${T}"/dbus.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
|
||||
|
||||
find "${ED}" -name '*.la' -delete || 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
|
||||
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
|
||||
}
|
||||
@@ -1,294 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
TMPFILES_OPTIONAL=1
|
||||
|
||||
# From 1.15.0 release notes:
|
||||
# "• Add a Meson build system. This is currently considered experimental,
|
||||
# but the intention is for it to replace Autotools and/or CMake in future
|
||||
# releases, preferably both. Please test!"
|
||||
# We haven't migrated to it yet as it's experimental but our elogind
|
||||
# patch needs adjusting too (and upstreaming, ideally!)
|
||||
# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/NEWS#L31
|
||||
inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
|
||||
|
||||
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 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug doc elogind selinux static-libs systemd test X"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
REQUIRED_USE="?? ( elogind systemd )"
|
||||
|
||||
BDEPEND="
|
||||
acct-user/messagebus
|
||||
app-text/xmlto
|
||||
app-text/docbook-xml-dtd:4.4
|
||||
sys-devel/autoconf-archive
|
||||
virtual/pkgconfig
|
||||
doc? ( app-doc/doxygen )
|
||||
"
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/expat-2.1.0
|
||||
elogind? ( sys-auth/elogind )
|
||||
selinux? (
|
||||
sys-process/audit
|
||||
sys-libs/libselinux
|
||||
)
|
||||
systemd? ( sys-apps/systemd:0= )
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXt
|
||||
)
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-libs/expat
|
||||
test? (
|
||||
${PYTHON_DEPS}
|
||||
>=dev-libs/glib-2.40:2
|
||||
)
|
||||
"
|
||||
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.
|
||||
"
|
||||
|
||||
# out of sources build dir for make check
|
||||
TBD="${WORKDIR}/${P}-tests-build"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/dbus-1.15.0-enable-elogind.patch"
|
||||
"${FILESDIR}/dbus-1.15.0-daemon-optional.patch" # bug #653136
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use test && python-any-r1_pkg_setup
|
||||
|
||||
if use kernel_linux; then
|
||||
CONFIG_CHECK="~EPOLL"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if [[ ${CHOST} == *-solaris* ]]; then
|
||||
# fix standards conflict, due to gcc being c99 by default nowadays
|
||||
sed -i \
|
||||
-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
|
||||
configure.ac || die
|
||||
fi
|
||||
|
||||
# required for bug #263909, cross-compile so don't remove eautoreconf
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local rundir=$(usex kernel_linux /run /var/run)
|
||||
|
||||
sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
|
||||
> "${T}"/dbus.initd || die
|
||||
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local docconf myconf testconf
|
||||
|
||||
# so we can get backtraces from apps
|
||||
case ${CHOST} in
|
||||
*-mingw*)
|
||||
# error: unrecognized command line option '-rdynamic', bug #488036
|
||||
;;
|
||||
*)
|
||||
append-flags -rdynamic
|
||||
;;
|
||||
esac
|
||||
|
||||
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
|
||||
# not on an SELinux profile.
|
||||
myconf=(
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--runstatedir="${EPREFIX}${rundir}"
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable debug verbose-mode)
|
||||
--disable-asserts
|
||||
--disable-checks
|
||||
$(use_enable selinux)
|
||||
$(use_enable selinux libaudit)
|
||||
--disable-apparmor
|
||||
$(use_enable kernel_linux inotify)
|
||||
--disable-kqueue
|
||||
$(use_enable elogind)
|
||||
$(use_enable systemd)
|
||||
$(use_enable systemd user-session)
|
||||
--disable-embedded-tests
|
||||
--disable-modular-tests
|
||||
$(use_enable debug stats)
|
||||
--with-session-socket-dir="${EPREFIX}"/tmp
|
||||
--with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
|
||||
--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
|
||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
||||
--with-systemduserunitdir="$(systemd_get_userunitdir)"
|
||||
--with-dbus-user=messagebus
|
||||
$(use_with X x)
|
||||
)
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
myconf+=(
|
||||
--enable-launchd
|
||||
--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
|
||||
)
|
||||
fi
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
docconf=(
|
||||
--enable-xml-docs
|
||||
$(use_enable doc doxygen-docs)
|
||||
)
|
||||
else
|
||||
docconf=(
|
||||
--disable-xml-docs
|
||||
--disable-doxygen-docs
|
||||
)
|
||||
myconf+=(
|
||||
--disable-daemon
|
||||
--disable-selinux
|
||||
--disable-libaudit
|
||||
--disable-elogind
|
||||
--disable-systemd
|
||||
--without-x
|
||||
)
|
||||
fi
|
||||
|
||||
einfo "Running configure in ${BUILD_DIR}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
|
||||
|
||||
if multilib_is_native_abi && use test; then
|
||||
mkdir "${TBD}" || die
|
||||
cd "${TBD}" || die
|
||||
testconf=(
|
||||
$(use_enable test asserts)
|
||||
$(use_enable test checks)
|
||||
$(use_enable test embedded-tests)
|
||||
$(use_enable test stats)
|
||||
$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
|
||||
)
|
||||
einfo "Running configure in ${TBD}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
if multilib_is_native_abi; then
|
||||
# After the compile, it uses a selinuxfs interface to
|
||||
# check if the SELinux policy has the right support
|
||||
use selinux && addwrite /selinux/access
|
||||
|
||||
einfo "Running make in ${BUILD_DIR}"
|
||||
emake
|
||||
|
||||
if use test; then
|
||||
einfo "Running make in ${TBD}"
|
||||
emake -C "${TBD}"
|
||||
fi
|
||||
else
|
||||
emake -C dbus libdbus-1.la
|
||||
fi
|
||||
}
|
||||
|
||||
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 virtx emake -j1 -C "${TBD}" check
|
||||
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
if multilib_is_native_abi; then
|
||||
emake DESTDIR="${D}" install
|
||||
else
|
||||
emake DESTDIR="${D}" install-pkgconfigDATA
|
||||
emake DESTDIR="${D}" -C dbus \
|
||||
install-libLTLIBRARIES install-dbusincludeHEADERS \
|
||||
install-nodist_dbusarchincludeHEADERS
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
newinitd "${T}"/dbus.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
|
||||
|
||||
find "${ED}" -name '*.la' -delete || 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
|
||||
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
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# launches a session dbus instance
|
||||
|
||||
dbuslaunch="`which dbus-launch 2>/dev/null`"
|
||||
if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
|
||||
if [ -n "$command" ]; then
|
||||
command="$dbuslaunch --exit-with-session $command"
|
||||
else
|
||||
eval `$dbuslaunch --sh-syntax --exit-with-session`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From 769a0462befb9829594a76e675526aba8579317e Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gilbert <floppym@gentoo.org>
|
||||
Date: Sun, 27 Mar 2022 15:09:48 -0400
|
||||
Subject: [PATCH] sysdeps-unix: check fd before calling
|
||||
_dbus_fd_set_close_on_exec()
|
||||
|
||||
If /proc/self/oom_score_adj does not exist, fd will invalid (-1).
|
||||
Attempting to set the CLOEXEC flag will obviously fail, and we lose the
|
||||
original errno value from open().
|
||||
|
||||
Bug: https://bugs.gentoo.org/834725
|
||||
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
|
||||
---
|
||||
dbus/dbus-sysdeps-util-unix.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
|
||||
index 314ce64b..8f079cbf 100644
|
||||
--- a/dbus/dbus-sysdeps-util-unix.c
|
||||
+++ b/dbus/dbus-sysdeps-util-unix.c
|
||||
@@ -1633,7 +1633,8 @@ _dbus_reset_oom_score_adj (const char **error_str_p)
|
||||
if (fd < 0)
|
||||
{
|
||||
fd = open ("/proc/self/oom_score_adj", O_RDWR);
|
||||
- _dbus_fd_set_close_on_exec (fd);
|
||||
+ if (fd >= 0)
|
||||
+ _dbus_fd_set_close_on_exec (fd);
|
||||
}
|
||||
|
||||
if (fd >= 0)
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,115 +0,0 @@
|
||||
From 499cdfde1b3f5d812912e89b1a1a0d7a4fb83306 Mon Sep 17 00:00:00 2001
|
||||
From: Simon McVittie <smcv@collabora.com>
|
||||
Date: Fri, 1 Apr 2022 18:58:34 +0100
|
||||
Subject: [PATCH 1/2] activation-helper: Never crash if unable to write
|
||||
oom_score_adj
|
||||
|
||||
_dbus_warn() normally only logs a warning, but can be made fatal by
|
||||
environment variables. In particular, we do that during unit testing,
|
||||
which can result in a build-time test failure if dbus is built in a
|
||||
sandbox environment that prevents write access.
|
||||
|
||||
_dbus_log() does only the logging part of _dbus_warn(), which seems
|
||||
more appropriate here.
|
||||
|
||||
Signed-off-by: Simon McVittie <smcv@collabora.com>
|
||||
---
|
||||
bus/activation-helper.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/bus/activation-helper.c b/bus/activation-helper.c
|
||||
index 8a4fd732..df0472ce 100644
|
||||
--- a/bus/activation-helper.c
|
||||
+++ b/bus/activation-helper.c
|
||||
@@ -348,7 +348,7 @@ exec_for_correct_user (char *exec, char *user, DBusError *error)
|
||||
/* Resetting the OOM score adjustment is best-effort, so we don't
|
||||
* treat a failure to do so as fatal. */
|
||||
if (!_dbus_reset_oom_score_adj (&error_str))
|
||||
- _dbus_warn ("%s: %s", error_str, strerror (errno));
|
||||
+ _dbus_log (DBUS_SYSTEM_LOG_WARNING, "%s: %s", error_str, strerror (errno));
|
||||
|
||||
if (!switch_user (user, error))
|
||||
return FALSE;
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 5c8e5b7140c4f1f88684c7a83ce9587fff2def0c Mon Sep 17 00:00:00 2001
|
||||
From: Simon McVittie <smcv@collabora.com>
|
||||
Date: Fri, 1 Apr 2022 18:56:26 +0100
|
||||
Subject: [PATCH 2/2] sysdeps: Only open oom_score_adj read/write if we need to
|
||||
write it
|
||||
|
||||
If we're running in a sandbox, we might not have write access to
|
||||
oom_score_adj. In the common case where we don't have any special
|
||||
protection from the OOM-killer, we can detect that with only read
|
||||
access, and skip the part where we open it for writing.
|
||||
|
||||
(We would also not have write access to oom_score_adj if we're running
|
||||
with elevated Linux capabilities while not root, but that should never
|
||||
actually happen for dbus-daemon-launch-helper, which is setuid root
|
||||
for production use or has no capabilities during unit-testing.)
|
||||
|
||||
Signed-off-by: Simon McVittie <smcv@collabora.com>
|
||||
---
|
||||
dbus/dbus-sysdeps-util-unix.c | 26 +++++++++++++++++++++++---
|
||||
1 file changed, 23 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
|
||||
index 8f079cbf..ca130cff 100644
|
||||
--- a/dbus/dbus-sysdeps-util-unix.c
|
||||
+++ b/dbus/dbus-sysdeps-util-unix.c
|
||||
@@ -1627,12 +1627,12 @@ _dbus_reset_oom_score_adj (const char **error_str_p)
|
||||
const char *error_str = NULL;
|
||||
|
||||
#ifdef O_CLOEXEC
|
||||
- fd = open ("/proc/self/oom_score_adj", O_RDWR | O_CLOEXEC);
|
||||
+ fd = open ("/proc/self/oom_score_adj", O_RDONLY | O_CLOEXEC);
|
||||
#endif
|
||||
|
||||
if (fd < 0)
|
||||
{
|
||||
- fd = open ("/proc/self/oom_score_adj", O_RDWR);
|
||||
+ fd = open ("/proc/self/oom_score_adj", O_RDONLY);
|
||||
if (fd >= 0)
|
||||
_dbus_fd_set_close_on_exec (fd);
|
||||
}
|
||||
@@ -1680,6 +1680,26 @@ _dbus_reset_oom_score_adj (const char **error_str_p)
|
||||
goto out;
|
||||
}
|
||||
|
||||
+ close (fd);
|
||||
+#ifdef O_CLOEXEC
|
||||
+ fd = open ("/proc/self/oom_score_adj", O_WRONLY | O_CLOEXEC);
|
||||
+
|
||||
+ if (fd < 0)
|
||||
+#endif
|
||||
+ {
|
||||
+ fd = open ("/proc/self/oom_score_adj", O_WRONLY);
|
||||
+ if (fd >= 0)
|
||||
+ _dbus_fd_set_close_on_exec (fd);
|
||||
+ }
|
||||
+
|
||||
+ if (fd < 0)
|
||||
+ {
|
||||
+ ret = FALSE;
|
||||
+ error_str = "open(/proc/self/oom_score_adj) for writing";
|
||||
+ saved_errno = errno;
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
if (pwrite (fd, "0", sizeof (char), 0) < 0)
|
||||
{
|
||||
ret = FALSE;
|
||||
@@ -1700,7 +1720,7 @@ _dbus_reset_oom_score_adj (const char **error_str_p)
|
||||
else
|
||||
{
|
||||
ret = FALSE;
|
||||
- error_str = "open(/proc/self/oom_score_adj)";
|
||||
+ error_str = "open(/proc/self/oom_score_adj) for reading";
|
||||
saved_errno = errno;
|
||||
goto out;
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,147 +0,0 @@
|
||||
https://gitlab.freedesktop.org/dbus/dbus/-/commit/7d462fe93844df711ff8433ad798b54e57f8609d.patch
|
||||
(dropped NEWS to avoid conflicts with more patches in future)
|
||||
|
||||
From fdbb32bd1f3c972d3d5fd3998930749206a1095a Mon Sep 17 00:00:00 2001
|
||||
From: Lars Wendler <polynomial-c@gentoo.org>
|
||||
Date: Tue, 1 Mar 2022 15:56:30 +0100
|
||||
Subject: [PATCH 1/6] build: Treat --with-x[=yes] the same as --with-x=auto
|
||||
|
||||
Previously, --with-x would disable the check for X11 libraries, which
|
||||
was not intended.
|
||||
|
||||
(cherry picked from commit 99cc28e0eb1a37233c0f7d3595175d1f331550e7)
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1115,7 +1115,7 @@ if test "x$dbus_win" = xyes; then
|
||||
|
||||
enable_x11_autolaunch=no
|
||||
have_x11=no
|
||||
-else if test "x$with_x" = xauto; then
|
||||
+else if test "x$with_x" != xno; then
|
||||
PKG_CHECK_MODULES([X], [x11],
|
||||
[AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])],
|
||||
[ have_x11=no ])
|
||||
GitLab
|
||||
From 5f2577aea3c5291dbb97e77c7384924851b30102 Mon Sep 17 00:00:00 2001
|
||||
From: Lars Wendler <polynomial-c@gentoo.org>
|
||||
Date: Tue, 1 Mar 2022 16:01:29 +0100
|
||||
Subject: [PATCH 2/6] Move DBUS_X_* definitions into PKG_CHECK_MODULES block
|
||||
|
||||
(cherry picked from commit 51e468d828785cbc7060678f6f257723ba11cd10)
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1117,15 +1117,15 @@ if test "x$dbus_win" = xyes; then
|
||||
have_x11=no
|
||||
else if test "x$with_x" != xno; then
|
||||
PKG_CHECK_MODULES([X], [x11],
|
||||
- [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])],
|
||||
+ [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])
|
||||
+ have_x11=yes
|
||||
+ DBUS_X_LIBS="$X_LIBS"
|
||||
+ DBUS_X_CFLAGS="$X_CFLAGS"
|
||||
+ ],
|
||||
[ have_x11=no ])
|
||||
|
||||
if test "x$have_x11" = xno; then
|
||||
AC_MSG_WARN([Couldn't found X11, tried with pkg-config.])
|
||||
- else
|
||||
- have_x11=yes
|
||||
- DBUS_X_LIBS="$X_LIBS"
|
||||
- DBUS_X_CFLAGS="$X_CFLAGS"
|
||||
fi
|
||||
else
|
||||
AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
|
||||
GitLab
|
||||
From 5dad12f34c54e2359adfe8e7f122681df1d24bcb Mon Sep 17 00:00:00 2001
|
||||
From: Lars Wendler <polynomial-c@gentoo.org>
|
||||
Date: Tue, 1 Mar 2022 16:05:52 +0100
|
||||
Subject: [PATCH 3/6] Emit an error when --with-x was given but no X11 libs
|
||||
were found
|
||||
|
||||
(cherry picked from commit 17c88a894499da64460a0ef76db1d8b88ceb9eeb)
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1121,12 +1121,13 @@ else if test "x$with_x" != xno; then
|
||||
have_x11=yes
|
||||
DBUS_X_LIBS="$X_LIBS"
|
||||
DBUS_X_CFLAGS="$X_CFLAGS"
|
||||
- ],
|
||||
- [ have_x11=no ])
|
||||
-
|
||||
- if test "x$have_x11" = xno; then
|
||||
- AC_MSG_WARN([Couldn't found X11, tried with pkg-config.])
|
||||
- fi
|
||||
+ ], [
|
||||
+ AS_IF([test "x$with_x" = xyes],
|
||||
+ [AC_MSG_ERROR([Couldn't find X11, tried with pkg-config.])],
|
||||
+ [AC_MSG_WARN([Couldn't find X11, tried with pkg-config.])]
|
||||
+ )
|
||||
+ have_x11=no
|
||||
+ ])
|
||||
else
|
||||
AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
|
||||
AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
|
||||
GitLab
|
||||
From e03554eb0bf2731e39c06191403f7544df9bb307 Mon Sep 17 00:00:00 2001
|
||||
From: Lars Wendler <polynomial-c@gentoo.org>
|
||||
Date: Tue, 1 Mar 2022 16:08:06 +0100
|
||||
Subject: [PATCH 4/6] Add have_x11=no if --without-x was given to make later
|
||||
checks happy
|
||||
|
||||
(cherry picked from commit bf3cb42c6db1f4479467d66a111b08a98afef31b)
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1129,6 +1129,7 @@ else if test "x$with_x" != xno; then
|
||||
have_x11=no
|
||||
])
|
||||
else
|
||||
+ have_x11=no
|
||||
AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
|
||||
AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
|
||||
])
|
||||
GitLab
|
||||
From 62361f47f9da2346a9ff9a8c4b4bd4a288dc44d5 Mon Sep 17 00:00:00 2001
|
||||
From: Lars Wendler <polynomial-c@gentoo.org>
|
||||
Date: Tue, 1 Mar 2022 16:11:05 +0100
|
||||
Subject: [PATCH 5/6] Convert "if" calls to AS_IF macro for the block that
|
||||
handles X11
|
||||
|
||||
(cherry picked from commit c71f013a64cd7f6de4c9cf3cf3b236239d713eb1)
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1108,14 +1108,14 @@ AC_ARG_ENABLE([x11-autolaunch],
|
||||
AS_HELP_STRING([--enable-x11-autolaunch], [build with X11 auto-launch support]),
|
||||
[], [enable_x11_autolaunch=auto])
|
||||
|
||||
-if test "x$dbus_win" = xyes; then
|
||||
- if test "x$enable_x11_autolaunch" = xyes; then
|
||||
+AS_IF([test "x$dbus_win" = xyes], [
|
||||
+ AS_IF([test "x$enable_x11_autolaunch" = xyes], [
|
||||
AC_MSG_ERROR([X11 auto-launch is not supported on Windows])
|
||||
- fi
|
||||
+ ])
|
||||
|
||||
enable_x11_autolaunch=no
|
||||
have_x11=no
|
||||
-else if test "x$with_x" != xno; then
|
||||
+], [test "x$with_x" != xno], [
|
||||
PKG_CHECK_MODULES([X], [x11],
|
||||
[AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])
|
||||
have_x11=yes
|
||||
@@ -1128,13 +1128,12 @@ else if test "x$with_x" != xno; then
|
||||
)
|
||||
have_x11=no
|
||||
])
|
||||
-else
|
||||
+], [
|
||||
have_x11=no
|
||||
AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
|
||||
AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
|
||||
])
|
||||
-fi
|
||||
-fi
|
||||
+])
|
||||
|
||||
if test "x$enable_x11_autolaunch,$have_x11" = xyes,no; then
|
||||
AC_MSG_ERROR([X11 auto-launch requires X headers/libraries])
|
||||
GitLab
|
||||
Reference in New Issue
Block a user