commit: ff18c8e63c649d4e2dd4d7b195ca4defd85aa19d Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Jul 20 15:48:36 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Jul 20 15:48:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff18c8e6
sys-apps/systemd: security bump to 248.5, 249.1 Bug: https://bugs.gentoo.org/803041 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/systemd/Manifest | 3 +- ...{systemd-249-r3.ebuild => systemd-248.5.ebuild} | 35 +++++++++++++++------- ...{systemd-249-r3.ebuild => systemd-249.1.ebuild} | 1 - 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index dc998702873..14b777cb933 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,2 +1,3 @@ -DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485 +DIST systemd-stable-248.5.tar.gz 10388105 BLAKE2B 7976c31730bce6d90e14c26ddc5d240e5e3a9e9b16dae6186f7b65a4a8708427cde0314d5820ebb817f78061cd14e3aac53d9761f6e1a34a1e16262d63454df5 SHA512 38cdb31e2e5ba1186154da06368b0b467c452368f3dd667d7ef0fb907d314545f903ea9ade3550bf057e9e487d4fdb16a0fa5bce1d0134d2e17223c0795f55cf +DIST systemd-stable-249.1.tar.gz 10590518 BLAKE2B 85eec7bc4f6af9a39fbf51e8fc65a2b02052a151ab6147e61485a307692a4984543b2506b71dae6715fc9447e85fba8052b847fbb2e5d14c23c7264b9d7fcf36 SHA512 e2c1dd39fc3b9a1a9c2aee4317dc1b2aa66cc47d0275fa4fa8214a9b43e37fd737daf1562db9aa94892128918473bad73cc16a6f0c657498389c3dadb6cf87de diff --git a/sys-apps/systemd/systemd-249-r3.ebuild b/sys-apps/systemd/systemd-248.5.ebuild similarity index 95% copy from sys-apps/systemd/systemd-249-r3.ebuild copy to sys-apps/systemd/systemd-248.5.ebuild index d11da3bdbde..b7c3f3b940d 100644 --- a/sys-apps/systemd/systemd-249-r3.ebuild +++ b/sys-apps/systemd/systemd-248.5.ebuild @@ -133,7 +133,7 @@ RDEPEND="${COMMON_DEPEND} # sys-apps/dbus: the daemon only (+ build-time lib dep for tests) PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - hwdb? ( sys-apps/hwids[systemd(+),udev] ) + hwdb? ( >=sys-apps/hwids-20150417[udev] ) >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )" @@ -144,23 +144,20 @@ BDEPEND=" >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext + sys-devel/m4 virtual/pkgconfig test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') " python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" && has_version -b "dev-python/lxml[${PYTHON_USEDEP}]" } -QA_EXECSTACK="usr/lib/systemd/boot/efi/*" - pkg_pretend() { if [[ ${MERGE_TYPE} != buildonly ]]; then if use test && has pid-sandbox ${FEATURES}; then @@ -218,8 +215,6 @@ src_prepare() { # Add local patches here PATCHES+=( - "${FILESDIR}/249-hostnamed-error-variable.patch" - "${FILESDIR}/249-libudev-static.patch" ) if ! use vanilla; then @@ -443,7 +438,19 @@ migrate_locale() { fi } +save_enabled_units() { + ENABLED_UNITS=() + type systemctl &>/dev/null || return + for x; do + if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then + ENABLED_UNITS+=( "${x}" ) + fi + done +} + pkg_preinst() { + save_enabled_units {machines,remote-{cryptsetup,fs}}.target [email protected] + if ! use split-usr; then local dir for dir in bin sbin lib; do @@ -465,17 +472,23 @@ pkg_postinst() { systemd_update_catalog # Keep this here in case the database format changes so it gets updated - # when required. - if use hwdb; then - systemd-hwdb --root="${ROOT}" update + # when required. Despite that this file is owned by sys-apps/hwids. + if has_version "sys-apps/hwids[udev]"; then + udevadm hwdb --update --root="${EROOT}" fi udev_reload || FAIL=1 - # Bug 465468, make sure locales are respected, and ensure consistency + # Bug 465468, make sure locales are respect, and ensure consistency # between OpenRC & systemd migrate_locale + systemd_reenable systemd-networkd.service systemd-resolved.service + + if [[ ${ENABLED_UNITS[@]} ]]; then + systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}" + fi + if [[ -z ${REPLACING_VERSIONS} ]]; then if type systemctl &>/dev/null; then systemctl --root="${ROOT:-/}" enable [email protected] remote-fs.target || FAIL=1 diff --git a/sys-apps/systemd/systemd-249-r3.ebuild b/sys-apps/systemd/systemd-249.1.ebuild similarity index 99% rename from sys-apps/systemd/systemd-249-r3.ebuild rename to sys-apps/systemd/systemd-249.1.ebuild index d11da3bdbde..aca935e27ce 100644 --- a/sys-apps/systemd/systemd-249-r3.ebuild +++ b/sys-apps/systemd/systemd-249.1.ebuild @@ -218,7 +218,6 @@ src_prepare() { # Add local patches here PATCHES+=( - "${FILESDIR}/249-hostnamed-error-variable.patch" "${FILESDIR}/249-libudev-static.patch" )
