From f233bc994c2e791d91ab531e60b5a6d6a25fc4fd Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 13 May 2015 14:54:44 -0700
Subject: [PATCH] sys-apps/dbus: Apply local changes from old versions

---
 .../{dbus-1.8.16.ebuild => dbus-1.8.16-r1.ebuild}   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/{dbus-1.8.16.ebuild => dbus-1.8.16-r1.ebuild} (93%)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.16.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.16-r1.ebuild
similarity index 93%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.16.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.16-r1.ebuild
index a7fcf5479b..874a08c322 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.16.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.16-r1.ebuild
@@ -62,6 +62,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.6.x-add-explicit-etc-path.patch
+
 	# Tests were restricted because of this
 	sed -i \
 		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
@@ -91,6 +93,7 @@ multilib_src_configure() {
 	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
 	# not on an SELinux profile.
 	myconf=(
+		--sysconfdir=/usr/share
 		--localstatedir="${EPREFIX}/var"
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
@@ -219,11 +222,11 @@ multilib_src_install_all() {
 pkg_postinst() {
 	readme.gentoo_print_elog
 
-	# 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 "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+	# Put a "known" machine id into /etc/machine-id so that when we boot,
+	# if it matches, then we can override it with a unique one.
+	# TODO(marineam): Remove this once we double check it is safe to do so.
+	echo "42000000000000000000000000000042" > "${EROOT}"/etc/machine-id
+	ln -sf ../../../etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		local plist="org.freedesktop.dbus-session.plist"