Merge pull request #2369 from dm0-/glsas

Fix recent GLSAs

sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords

@@ -6,6 +6,7 @@
 =app-arch/unzip-6.0_p20 ~arm64
 =app-crypt/gnupg-2.1.15 ~arm64
 =app-crypt/pinentry-0.9.7 ~arm64
+=app-editors/vim-8.0.0106 ~arm64
 =app-eselect/eselect-python-20140125-r2 ~arm64
 =app-text/asciidoc-8.6.9-r3 ~arm64
 =dev-cpp/gflags-2.1.2 ~arm64
@@ -13,6 +14,7 @@
 =dev-lang/python-2.7.12 ~arm64
 =dev-libs/apr-1.5.2 ~arm64
 =dev-libs/apr-util-1.5.4-r1 ~arm64
+=dev-libs/expat-2.2.0-r1 ~arm64
 =dev-libs/libassuan-2.4.3 ~arm64
 =dev-libs/libgpg-error-1.24 ~arm64
 =dev-libs/libksba-1.3.5-r1 ~arm64
@@ -45,6 +47,7 @@
 =sys-apps/smartmontools-6.4 **
 =sys-block/parted-3.2-r1 ~arm64
 =sys-devel/bison-3.0.4-r1 ~arm64
+=sys-devel/flex-2.6.1 ~arm64
 =sys-fs/cryptsetup-1.7.2 **
 =sys-fs/lsscsi-0.28 **
 =sys-fs/lvm2-2.02.145-r2 ~arm64

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

@@ -1,16 +1 @@
------BEGIN PGP SIGNED MESSAGE-----
+DIST dbus-1.10.12.tar.gz 1984805 SHA256 210a79430b276eafc6406c71705e9140d25b9956d18068df98a70156dc0e475d SHA512 6616c7b2926a6fb6158d0a0a24d1b887173ca215a2f3185b95cc5f08df64fed1977e16c86c6ae530960453b6c585ae24ea4c9976e7537a45f9c6366c43baa52d WHIRLPOOL 9bd9ed70c4d9890dad09b2bcd07ee40ef472f1436cefe3bc89aaddbb183532939d6ce19da721a673a39f2e6b07e634b179190cec00e1a48fa2d9be6c830cc696
-Hash: SHA256
-
-AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89 WHIRLPOOL 74e9e79b86fc4802f34737bb47c3a71919f35fb2375119cdcd7fd6dae2de201e006fb4e6a978addd2300f7075180d4b088a69fa60d2ce4d689b6239b4a1307b1
-AUX dbus.initd 1185 SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01 SHA512 7983e77015b46c204b10948a1fcedaae53a75848919961eb1ef8878bfa11c933256642c0e3f59163e72374ce1bd33b0338c787ce067c0982fcdf8a798b922a15 WHIRLPOOL 62ef5b9191a2bd3410c53ed63015e9968789f448e5959de2ebc2404bc13ce99c333546bf1eb335f826ef7ea143f70a53c2ecffd81b4e35fa51ba2e2bdf68879f
-DIST dbus-1.8.16.tar.gz 1866436 SHA256 7f795268efd343ff0498786acb35097564390d40b1b6158daf1b4f742b522b07 SHA512 79e0fb21912fe5644e1babf96fc2a64595edef6524ef50d54f6beb8cd0f1224b8484a52a7815494b40bd00bf048176002ab35443c0bb6bd04abdc3c60599f1d5 WHIRLPOOL 5e992caf51c0fb24885099b957ce01205a249118c5db27c5161e6d45ae85a889d7f26d32dfa03a207025e87e233f74c6cffd09a5ccc44d4e598d3d535b8d4247
-EBUILD dbus-1.8.16.ebuild 6853 SHA256 834ea7c2aace81409682b21b7bf6ca1a9c956f5cb8fea38b10b47d02ef252383 SHA512 54d9035e5b59d16e66b79d6480a1065fbff7d14fbfcac34eb950d3a7e0eaea47bf9c2f536c91da2fc4da8e8637449f6d2b4ad6fe42f03e04f13062cf06b008b1 WHIRLPOOL 42e8c4bf1e630c59cbf32f45daa12656ada74f05d35515803583d26debf71defb0689077caf5c7925dc4542bec98a3caed6f0e6d197676f5dc8cee284205e641
-MISC ChangeLog 67444 SHA256 844ac34f4e4fe4c04056abeec2ee0fbeb5d6b1040c44a298d0e4998d3e6672ba SHA512 9333da0ceb6435afaf685aa68e023e5799cd5792b6cd6ac66873c3cfdf45f572fbde79f154635f60a7cb2fac521463106ea074dd11e0f54ec95dbae2d5214ea2 WHIRLPOOL 3e7c49ab32db8cd63ab27e097a4347d17f428f3754d691d44361a6374d63de01741f37c27f11c3b6bc2df9f8950f658af035079dc84c7f71e487e2f993aeb380
-MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce SHA512 2f8f64ded5050e87ce679d944dcf9c9a801ea03ee14471ab0702f10339f3f995701c313bfe10e7ab01f1bc784f04a5e6efbb29ea0b44513b9b3e384370956dc5 WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlUyDmEACgkQCaWpQKGI+9SQDgCfRBrjOgV+vUOn4gYb21lle2dv
-Ty4AnRj1h3e2w1ujTcpvqk+tlhYztY3N
-=hOke
------END PGP SIGNATURE-----

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

@@ -1,21 +1,25 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.16.ebuild,v 1.12 2015/04/18 07:57:20 pacho Exp $
+# $Id$
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils linux-info flag-o-matic python-any-r1 readme.gentoo systemd virtualx user multilib-minimal
+
+inherit autotools eutils linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="http://dbus.freedesktop.org/"
+HOMEPAGE="https://dbus.freedesktop.org/"
-SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
+SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug doc selinux static-libs systemd test X"
+IUSE="debug doc selinux static-libs systemd test user-session X"
 
-CDEPEND=">=dev-libs/expat-2
+RESTRICT="test"
+
+CDEPEND="
+	>=dev-libs/expat-2
 	selinux? (
 		sys-libs/libselinux
 		)
@@ -27,16 +31,18 @@ CDEPEND=">=dev-libs/expat-2
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	)
+"
 DEPEND="${CDEPEND}
 	app-text/xmlto
 	app-text/docbook-xml-dtd:4.4
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	test? (
-		>=dev-libs/glib-2.24
+		>=dev-libs/glib-2.36:2
 		${PYTHON_DEPS}
-		)"
+		)
+"
 RDEPEND="${CDEPEND}"
 
 DOC_CONTENTS="
@@ -60,15 +66,13 @@ 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");/' \
 		-e '/"dispatch"/d' \
 		bus/test-main.c || die
 
-	epatch_user
+	eapply_user
 
 	# required for asneeded patch but also for bug 263909, cross-compile so
 	# don't remove eautoreconf
@@ -91,7 +95,6 @@ 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"
@@ -101,18 +104,20 @@ multilib_src_configure() {
 		--disable-checks
 		$(use_enable selinux)
 		$(use_enable selinux libaudit)
+		--disable-apparmor
 		$(use_enable kernel_linux inotify)
 		$(use_enable kernel_FreeBSD kqueue)
 		$(use_enable systemd)
+		$(use_enable user-session)
 		--disable-embedded-tests
 		--disable-modular-tests
 		$(use_enable debug stats)
 		--with-session-socket-dir="${EPREFIX}"/tmp
 		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
 		--with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		--with-dbus-user=messagebus
 		$(use_with X x)
-		"$(systemd_with_unitdir)"
 		)
 
 	if [[ ${CHOST} == *-darwin* ]]; then
@@ -193,7 +198,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	newinitd "${FILESDIR}"/dbus.initd dbus
+	newinitd "${FILESDIR}"/dbus.initd-r1 dbus
 
 	if use X; then
 		# dbus X session script (#77504)
@@ -220,12 +225,6 @@ multilib_src_install_all() {
 pkg_postinst() {
 	readme.gentoo_print_elog
 
-	# 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"
 		elog
@@ -246,4 +245,16 @@ 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-1.6.x-add-explicit-etc-path.patch

@@ -1,33 +0,0 @@
-diff --git a/bus/session.conf.in b/bus/session.conf.in
-index e121ff9..f364887 100644
---- a/bus/session.conf.in
-+++ b/bus/session.conf.in
-@@ -28,10 +28,11 @@
-   <!-- Config files are placed here that among other things, 
-        further restrict the above policy for specific services. -->
-   <includedir>session.d</includedir>
-+  <includedir>/etc/dbus-1/session.d</includedir>
-
-   <!-- This is included last so local configuration can override what's 
-        in this standard file -->
--  <include ignore_missing="yes">session-local.conf</include>
-+  <include ignore_missing="yes">/etc/dbus-1/session-local.conf</include>
-
-   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
-
-diff --git a/bus/system.conf.in b/bus/system.conf.in
-index 92f4cc4..1863a03 100644
---- a/bus/system.conf.in
-+++ b/bus/system.conf.in
-@@ -73,10 +73,11 @@
-   <!-- Config files are placed here that among other things, punch 
-        holes in the above policy for specific services. -->
-   <includedir>system.d</includedir>
-+  <includedir>/etc/dbus-1/system.d</includedir>
-
-   <!-- This is included last so local configuration can override what's 
-        in this standard file -->
--  <include ignore_missing="yes">system-local.conf</include>
-+  <include ignore_missing="yes">/etc/dbus-1/system-local.conf</include>
-
-   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>

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

@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.initd,v 1.1 2011/11/05 13:56:10 ssuominen Exp $
-
-extra_started_commands="reload"
-
-depend() {
-	need localmount
-	after bootmisc
-}
-
-start() {
-	ebegin "Starting D-BUS system messagebus"
-	/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
-	[ ! -e /var/run/dbus ] && mkdir /var/run/dbus 
-
-	start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
-	eend $?
-}
-
-stop() {
-	local retval
-
-	ebegin "Stopping D-BUS system messagebus"
-
-	start-stop-daemon --stop --pidfile /var/run/dbus.pid
-	retval=$?
-
-	eend ${retval}
-
-	[ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket
-
-	return ${retval}
-}
-
-reload() {
-	local retval
-
-	ebegin "Reloading D-BUS messagebus config"
-	
-	/usr/bin/dbus-send --print-reply --system --type=method_call \
-			--dest=org.freedesktop.DBus \
-			/ org.freedesktop.DBus.ReloadConfig > /dev/null
-	retval=$?
-	eend ${retval}
-	return ${retval}
-}

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

@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+extra_started_commands="reload"
+
+description="An IPC message bus daemon"
+pidfile="/var/run/dbus.pid"
+command="/usr/bin/dbus-daemon"
+command_args="--system"
+
+dbus_socket="/var/run/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 /var/run/dbus 
+}
+
+stop_post() {
+	[ ! -S "${dbus_socket}" ] || rm -f "${dbus_socket}"
+}
+
+reload() {
+	ebegin "Reloading D-BUS messagebus config"
+	/usr/bin/dbus-send --print-reply --system --type=method_call \
+			--dest=org.freedesktop.DBus \
+			/ org.freedesktop.DBus.ReloadConfig > /dev/null
+	eend $?
+}

sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
+	<maintainer type="project">
-	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='systemd'>Build with <pkg>sys-apps/systemd</pkg> at_console support</flag>
+		<flag name="systemd">Build with <pkg>sys-apps/systemd</pkg> at_console support</flag>
+		<flag name="user-session">Enable user-session semantics for session bus under systemd</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:freedesktop:dbus</remote-id>