mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-03 19:42:15 +02:00
sys-apps/dbus: apply Flatcar patches
* Drop the dependency on `sec-policy/selinux-dbus` * Drop machine-id generation * Stabilize both keywords `amd64` and `arm64` to build it. * Do not add a third-party patch for CVE-2019-12749 again, as the fix is already included in dbus >= 1.10.29. Loosely based on a409238795c44dabfd16e466c8433a89f5f0844f and e458211c8418462f4bd4d4536dc96f62380a22cf .
This commit is contained in:
parent
5eb623c758
commit
feec17561b
@ -12,7 +12,8 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
|
|||||||
|
|
||||||
LICENSE="|| ( AFL-2.1 GPL-2 )"
|
LICENSE="|| ( AFL-2.1 GPL-2 )"
|
||||||
SLOT="0"
|
SLOT="0"
|
||||||
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"
|
# Flatcar: stabilize amd64 and arm64
|
||||||
|
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 selinux static-libs systemd test user-session X"
|
IUSE="debug doc elogind selinux static-libs systemd test user-session X"
|
||||||
|
|
||||||
#RESTRICT="test"
|
#RESTRICT="test"
|
||||||
@ -42,9 +43,9 @@ DEPEND="${CDEPEND}
|
|||||||
${PYTHON_DEPS}
|
${PYTHON_DEPS}
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
RDEPEND="${CDEPEND}
|
# Flatcar: drop dependency on sec-policy/selinux-dbus, to avoid pulling in
|
||||||
selinux? ( sec-policy/selinux-dbus )
|
# unnecessary ebuilds into rootfs.
|
||||||
"
|
RDEPEND="${CDEPEND}"
|
||||||
|
|
||||||
DOC_CONTENTS="
|
DOC_CONTENTS="
|
||||||
Some applications require a session bus in addition to the system
|
Some applications require a session bus in addition to the system
|
||||||
@ -231,11 +232,7 @@ multilib_src_install_all() {
|
|||||||
pkg_postinst() {
|
pkg_postinst() {
|
||||||
readme.gentoo_print_elog
|
readme.gentoo_print_elog
|
||||||
|
|
||||||
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
|
# Flatcar: remove machine-id generation.
|
||||||
# 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
|
if [[ ${CHOST} == *-darwin* ]]; then
|
||||||
local plist="org.freedesktop.dbus-session.plist"
|
local plist="org.freedesktop.dbus-session.plist"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user