sys-apps/dbus: Sync with Gentoo upstream

Updates to dbus-1.12.20-r1

Signed-off-by: Sayan Chowdhury <sayan@kinvolk.io>

sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest

@@ -1 +1 @@
-DIST dbus-1.10.32.tar.gz 2000784 BLAKE2B 490dfa33bf7e26d68e6dfb01c41a720623a28936fd635b8becbbb1dad6b58579fba2d7f75ed57ee0588c4a87ab9c0d07b0005f0ae7cf5b68df5e277cc6f8de07 SHA512 c0cdf99a72fe191ce45767121d67772854c6ec5df3939f2aec76b4ecc3905162d57548c2f02d8073b81c3b4d71277745b7aac8489c364064bd2cf723ce6bbbcd
+DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056

sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.12.20-r1.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
-inherit autotools ltprune linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx multilib-minimal
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
 HOMEPAGE="https://dbus.freedesktop.org/"
@@ -12,40 +12,41 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-# Flatcar: stabilize amd64 and arm64
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
-IUSE="debug doc elogind selinux static-libs systemd test user-session X"
+RESTRICT="!test? ( test )"
 
-#RESTRICT="test"
+REQUIRED_USE="?? ( elogind systemd )"
 
-REQUIRED_USE="
+BDEPEND="
-	?? ( elogind systemd )
+	acct-user/messagebus
-	test? ( debug )
+	app-text/xmlto
+	app-text/docbook-xml-dtd:4.4
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
 "
-
+COMMON_DEPEND="
-CDEPEND="
+	>=dev-libs/expat-2.1.0
-	>=dev-libs/expat-2
-	selinux? ( sys-libs/libselinux )
 	elogind? ( sys-auth/elogind )
+	selinux? ( sys-libs/libselinux )
 	systemd? ( sys-apps/systemd:0= )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXt
-		)
+	)
 "
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
-	app-text/xmlto
+	dev-libs/expat
-	app-text/docbook-xml-dtd:4.4
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
 	test? (
-		>=dev-libs/glib-2.36:2
 		${PYTHON_DEPS}
-		)
+		>=dev-libs/glib-2.40:2
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-user/messagebus
+	selinux? ( sec-policy/selinux-dbus )
 "
-# Flatcar: drop dependency on sec-policy/selinux-dbus, to avoid pulling in
-# unnecessary ebuilds into rootfs.
-RDEPEND="${CDEPEND}"
 
 DOC_CONTENTS="
 	Some applications require a session bus in addition to the system
@@ -57,12 +58,10 @@ TBD="${WORKDIR}/${P}-tests-build"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-enable-elogind.patch"
+	"${FILESDIR}/${PN}-daemon-optional.patch" # bug #653136
 )
 
 pkg_setup() {
-	enewgroup messagebus
-	enewuser messagebus -1 -1 -1 messagebus
-
 	use test && python-any-r1_pkg_setup
 
 	if use kernel_linux; then
@@ -80,12 +79,26 @@ 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
+	local docconf myconf testconf
 
 	# so we can get backtraces from apps
 	case ${CHOST} in
@@ -101,8 +114,6 @@ multilib_src_configure() {
 	# not on an SELinux profile.
 	myconf=(
 		--localstatedir="${EPREFIX}/var"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 		$(use_enable static-libs static)
 		$(use_enable debug verbose-mode)
 		--disable-asserts
@@ -119,12 +130,12 @@ multilib_src_configure() {
 		--disable-modular-tests
 		$(use_enable debug stats)
 		--with-session-socket-dir="${EPREFIX}"/tmp
-		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
+		--with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
-		--with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
+		--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		--with-dbus-user=messagebus
 		$(use_with X x)
-		)
+	)
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		myconf+=(
@@ -144,15 +155,12 @@ multilib_src_configure() {
 			--disable-doxygen-docs
 		)
 		myconf+=(
+			--disable-daemon
 			--disable-selinux
 			--disable-libaudit
 			--disable-elogind
 			--disable-systemd
 			--without-x
-
-			# expat is used for the daemon only
-			# fake the check for multilib library build
-			ac_cv_lib_expat_XML_ParserCreate_MM=yes
 		)
 	fi
 
@@ -162,12 +170,15 @@ multilib_src_configure() {
 	if multilib_is_native_abi && use test; then
 		mkdir "${TBD}" || die
 		cd "${TBD}" || die
-		einfo "Running configure in ${TBD}"
+		testconf=(
-		ECONF_SOURCE="${S}" econf "${myconf[@]}" \
+			$(use_enable test asserts)
-			$(use_enable test asserts) \
+			$(use_enable test checks)
-			$(use_enable test checks) \
+			$(use_enable test embedded-tests)
-			$(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
 }
 
@@ -205,7 +216,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	newinitd "${FILESDIR}"/dbus.initd-r1 dbus
+	newinitd "${T}"/dbus.initd dbus
 
 	if use X; then
 		# dbus X session script (#77504)
@@ -223,16 +234,23 @@ multilib_src_install_all() {
 	# let the init script create the /var/run/dbus directory
 	rm -rf "${ED}"/var/run
 
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
+	# https://bugs.gentoo.org/761763
+	rm -rf "${ED}"/usr/lib/sysusers.d
+
+	dodoc AUTHORS ChangeLog NEWS README doc/TODO
 	readme.gentoo_create_doc
 
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
 	readme.gentoo_print_elog
 
-	# Flatcar: remove machine-id generation.
+	# Ensure unique id is generated and put it in /etc wrt #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)
+	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"
@@ -254,16 +272,4 @@ pkg_postinst() {
 		elog "the following to your environment:"
 		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
 	fi
-
-	if use user-session; then
-		ewarn "You have enabled user-session. Please note this can cause"
-		ewarn "bogus behaviors in several dbus consumers that are not prepared"
-		ewarn "for this dbus activation method yet."
-		ewarn
-		ewarn "See the following link for background on this change:"
-		ewarn "https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html"
-		ewarn
-		ewarn "Known issues are tracked here:"
-		ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028"
-	fi
 }

sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-daemon-optional.patch

@@ -0,0 +1,75 @@
+From 3c08d28fbae8b0ef3839ef26f8d2a713a9a684f9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 21 Feb 2019 23:53:19 +0100
+Subject: [PATCH] Make dbus daemon build optional
+
+---
+ bus/Makefile.am |  2 ++
+ configure.ac    | 17 ++++++++++++++++-
+ 2 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/bus/Makefile.am b/bus/Makefile.am
+index 9ae3071..26a770c 100644
+--- a/bus/Makefile.am
++++ b/bus/Makefile.am
+@@ -70,6 +70,7 @@ agentdir=$(LAUNCHD_AGENT_DIR)
+ agent_DATA=org.freedesktop.dbus-session.plist
+ endif
+ 
++if DBUS_DAEMON
+ if DBUS_BUS_ENABLE_KQUEUE
+ DIR_WATCH_SOURCE=dir-watch-kqueue.c
+ else
+@@ -241,6 +242,7 @@ test_bus_LDADD = \
+ 	$(top_builddir)/dbus/libdbus-internal.la \
+ 	$(DBUS_BUS_LIBS) \
+ 	$(NULL)
++endif DBUS_DAEMON
+ 
+ install-data-hook:
+ 	$(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/session.d
+diff --git a/configure.ac b/configure.ac
+index be6b065..854e846 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -202,6 +202,7 @@ AC_ARG_ENABLE([apparmor],
+   [enable_apparmor=$enableval],
+   [enable_apparmor=auto])
+ AC_ARG_ENABLE(libaudit,AS_HELP_STRING([--enable-libaudit],[build audit daemon support for SELinux]),enable_libaudit=$enableval,enable_libaudit=auto)
++AC_ARG_ENABLE(daemon, AS_HELP_STRING([--enable-daemon],[build with the dbus daemon]),enable_daemon=$enableval,enable_daemon=yes)
+ AC_ARG_ENABLE(inotify, AS_HELP_STRING([--enable-inotify],[build with inotify support (linux only)]),enable_inotify=$enableval,enable_inotify=auto)
+ AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)
+ AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
+@@ -830,7 +831,20 @@ AC_CHECK_FUNCS(getpeerucred getpeereid)
+ 
+ AC_CHECK_FUNCS(pipe2 accept4)
+ 
+-PKG_CHECK_MODULES([EXPAT], [expat])
++# dbusdaemon checks
++if test x$enable_daemon = xno ; then
++    have_daemon=no
++else
++    have_daemon=yes
++fi
++
++dnl check if daemon shall be built
++if test x$have_daemon = xyes; then
++   AC_DEFINE(DBUS_DAEMON,1,[Use daemon])
++   PKG_CHECK_MODULES([EXPAT], [expat])
++fi
++
++AM_CONDITIONAL(DBUS_DAEMON, test x$have_daemon = xyes)
+ 
+ save_cflags="$CFLAGS"
+ save_libs="$LIBS"
+@@ -1824,6 +1838,7 @@ echo "
+         Building bus stats API:   ${enable_stats}
+         Building SELinux support: ${have_selinux}
+         Building AppArmor support: ${have_apparmor}
++        Building daemon:          ${have_daemon}
+         Building inotify support: ${have_inotify}
+         Building kqueue support:  ${have_kqueue}
+         Building systemd support: ${have_systemd}
+-- 
+2.20.1
+

sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.initd.in

@@ -1,15 +1,15 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2 or later
 
 extra_started_commands="reload"
 
 description="An IPC message bus daemon"
-pidfile="/var/run/dbus.pid"
+pidfile="@rundir@/dbus.pid"
 command="/usr/bin/dbus-daemon"
 command_args="--system"
 
-dbus_socket="/var/run/dbus/system_bus_socket"
+dbus_socket="@rundir@/dbus/system_bus_socket"
 
 depend() {
 	need localmount
@@ -20,7 +20,7 @@ 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 /var/run/dbus 
+	checkpath -q -d "@rundir@/dbus"
 }
 
 stop_post() {
@@ -29,7 +29,7 @@ stop_post() {
 
 reload() {
 	ebegin "Reloading D-BUS messagebus config"
-	/usr/bin/dbus-send --print-reply --system --type=method_call \
+	dbus-send --print-reply --system --type=method_call \
 			--dest=org.freedesktop.DBus \
 			/ org.freedesktop.DBus.ReloadConfig > /dev/null
 	eend $?