gentoo auto-resync : 02:07:2024 - 08:01:06

4 files changed, 62 insertions, 5 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 4dd354127737..5c18ca18e0f0 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -23,7 +23,7 @@ EBUILD systemd-254.8-r1.ebuild 15496 BLAKE2B 5d5c93316937fa101ff4ded77c87b8e4930
 EBUILD systemd-255.3-r1.ebuild 14938 BLAKE2B d6f0b4afb9cbea790b4df4b7365eb9b5b3ee5c5043c324fb6354786310ea4b497a2504cc9b42da90301e1382e2b3eff30acfd2d26edba5c934138dc212c00d19 SHA512 a2655313bc32b19cc5cf584b6cb2574aa54224248be6da140f1d423cbe46068a32f204c1e9e5342fd07fd096440e44f10863708d6fa3e48ee5ec2f7a833f46c3
 EBUILD systemd-255.4.ebuild 14965 BLAKE2B a33e0820412a9ccde7fec48f3924faf178add50febc66edc2156772cbc355013c3814bb90b2daa402a5fecc7dd23a6402481269aade7d15eed8dcd49f220d8db SHA512 69ec1ba7982efdb33cea7aa1b678475473994afc658d4b7eab337334161eb03c5b838d42f2b258675fd2a45372c4435ae8ed363a2dfb3419c2fe21939013fc23
 EBUILD systemd-255.6.ebuild 14923 BLAKE2B e54f5d74692108f87d090101484b24895678d4ca4fb2d1d4dff1f34ed5c6fec4813c5e6e155ee95554b2fa0ce085970eeace6709c643db8927147f55faac58e1 SHA512 b388d0155fd979e2deeae88728ac2d232320602cbbf541ab844e72ce6d70e90a98cae9eadbc1057b1ad4945cfb527cb7e12cbad1586750127cade6f0fb832e8a
-EBUILD systemd-255.7.ebuild 14910 BLAKE2B f2867db0e274b6d176f0b898f8f3297c76788c76ab2a1640403ee9c0470331b546edd53a7a4afa369494f557014a9e84cfaff104d78d1eb3c3525ad4d615eddb SHA512 fd3a0836f87a5b4b6fde043d82966f2e025b80b54c1a921685c93073b70b668f91f22945e7c1acb01b90b616f2888b56c4ce974ce0e5ba2999297779c09752f1
-EBUILD systemd-256.1-r1.ebuild 14848 BLAKE2B 3b9e7882795de0ddbaf2098900b056c85d8de4cf512a7dc903e9d1e3f85e80c104c68f096906d97485ac1ee9a92ffe10d0c0e298fb8925ea1005f04cb91864ec SHA512 394dd42804479e8dee7f2b786cf5c86d9bd89fc5726af0d716c65c209d8c3cafffa159f6dbb04ee746e32be9d47f45ab84a58013985fac0f61f46de3b141edc9
-EBUILD systemd-9999.ebuild 14848 BLAKE2B 3b9e7882795de0ddbaf2098900b056c85d8de4cf512a7dc903e9d1e3f85e80c104c68f096906d97485ac1ee9a92ffe10d0c0e298fb8925ea1005f04cb91864ec SHA512 394dd42804479e8dee7f2b786cf5c86d9bd89fc5726af0d716c65c209d8c3cafffa159f6dbb04ee746e32be9d47f45ab84a58013985fac0f61f46de3b141edc9
+EBUILD systemd-255.7-r1.ebuild 15121 BLAKE2B 117325ccbd7a80ef86c68c0d977febd14d044401716ca1d61c26fcb0b5876e19ce63d8c8cabcc2c3871d2a42122ba90183ee07120c951e797d2131bbabf9c6c0 SHA512 7a3fc657190f269de8be77e285e9fa9e578830832fa380748db5bc20e4a4d505236998adf2b97f373ab76ecc64f0b99048ff1afc4f1c7413873876cb6ad2c561
+EBUILD systemd-256.1-r3.ebuild 15673 BLAKE2B 49690e82c1b16a039f132615a92729fef4ee13d234e21d2db0f6cb4d87a736e32837bd0769bf1a349bc92b3c3763c4e9ff379e1d089667dadaafc7a9fedef4b6 SHA512 e3d10ce7520b7599c81b7bcca41752af68c93dd6d47bcbd8c16320723489c132b6e477b6a42c9e8e6fd65df42c08177b62a700a55b05ee6aed35995ed6ed5c21
+EBUILD systemd-9999.ebuild 15673 BLAKE2B 49690e82c1b16a039f132615a92729fef4ee13d234e21d2db0f6cb4d87a736e32837bd0769bf1a349bc92b3c3763c4e9ff379e1d089667dadaafc7a9fedef4b6 SHA512 e3d10ce7520b7599c81b7bcca41752af68c93dd6d47bcbd8c16320723489c132b6e477b6a42c9e8e6fd65df42c08177b62a700a55b05ee6aed35995ed6ed5c21
 MISC metadata.xml 2609 BLAKE2B 8947f3b696fbba7b90e838a54fbb4fd933c71907c8011652fc2b7d68d4ce5f78a19f350a309e4c0f66ef0159376c9064ba9c15941ecf1748c359c4ae3b072102 SHA512 dfeea24b7a93f5d4af4ac47b87ba08092d069fb1a4749c0c1f36a669be6115eaea8f67e6183b6a4f155ef90d7714f74299109420d569c2b0545d80584ed0e97e
diff --git a/sys-apps/systemd/systemd-255.7.ebuild b/sys-apps/systemd/systemd-255.7-r1.ebuild
index d8e84d10f24a..910799affdb8 100644
--- a/sys-apps/systemd/systemd-255.7.ebuild
+++ b/sys-apps/systemd/systemd-255.7-r1.ebuild
@@ -504,6 +504,11 @@ pkg_postinst() {
 		ebegin "Reexecuting system manager (systemd)"
 		systemctl daemon-reexec
 		eend $? || FAIL=1
+
+		# https://lists.freedesktop.org/archives/systemd-devel/2024-June/050466.html
+		ebegin "Signaling user managers to reexec"
+		systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service'
+		eend $?
 	fi
 
 	if [[ ${FAIL} ]]; then
diff --git a/sys-apps/systemd/systemd-256.1-r1.ebuild b/sys-apps/systemd/systemd-256.1-r3.ebuild
index d2c7ad24ef7b..78f1f78f01df 100644
--- a/sys-apps/systemd/systemd-256.1-r1.ebuild
+++ b/sys-apps/systemd/systemd-256.1-r3.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="https://systemd.io/"
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 IUSE="
-	acl apparmor audit boot cryptsetup curl +dns-over-tls elfutils
+	acl apparmor audit boot cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
 	fido2 +gcrypt gnutls homed http idn importd iptables +kernel-install +kmod
 	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
 	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify vanilla xkb +zstd
@@ -180,12 +180,38 @@ BDEPEND="
 QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
 QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
 
+check_cgroup_layout() {
+	# https://bugs.gentoo.org/935261
+	[[ ${MERGE_TYPE} != buildonly ]] || return
+	[[ -z ${ROOT} ]] || return
+	[[ -e /sys/fs/cgroup/unified ]] || return
+	grep -q 'SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1' /proc/cmdline && return
+
+	eerror "This system appears to be booted with the 'hybrid' cgroup layout."
+	eerror "This layout obsolete and is disabled in systemd."
+
+	if grep -qF 'systemd.unified_cgroup_hierarchy'; then
+		eerror "Remove the systemd.unified_cgroup_hierarchy option"
+		eerror "from the kernel command line and reboot."
+		die "hybrid cgroup layout detected"
+	fi
+}
+
 pkg_pretend() {
 	if use split-usr; then
 		eerror "Please complete the migration to merged-usr."
 		eerror "https://wiki.gentoo.org/wiki/Merge-usr"
 		die "systemd no longer supports split-usr"
 	fi
+
+	check_cgroup_layout
+
+	if use cgroup-hybrid; then
+		eerror "Disable the 'cgroup-hybrid' USE flag."
+		eerror "Rebuild any initramfs images after rebuilding systemd."
+		die "cgroup-hybrid is no longer supported"
+	fi
+
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		local CONFIG_CHECK="~BLK_DEV_BSG ~CGROUPS
 			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index d2c7ad24ef7b..78f1f78f01df 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="https://systemd.io/"
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 IUSE="
-	acl apparmor audit boot cryptsetup curl +dns-over-tls elfutils
+	acl apparmor audit boot cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
 	fido2 +gcrypt gnutls homed http idn importd iptables +kernel-install +kmod
 	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
 	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify vanilla xkb +zstd
@@ -180,12 +180,38 @@ BDEPEND="
 QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
 QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
 
+check_cgroup_layout() {
+	# https://bugs.gentoo.org/935261
+	[[ ${MERGE_TYPE} != buildonly ]] || return
+	[[ -z ${ROOT} ]] || return
+	[[ -e /sys/fs/cgroup/unified ]] || return
+	grep -q 'SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1' /proc/cmdline && return
+
+	eerror "This system appears to be booted with the 'hybrid' cgroup layout."
+	eerror "This layout obsolete and is disabled in systemd."
+
+	if grep -qF 'systemd.unified_cgroup_hierarchy'; then
+		eerror "Remove the systemd.unified_cgroup_hierarchy option"
+		eerror "from the kernel command line and reboot."
+		die "hybrid cgroup layout detected"
+	fi
+}
+
 pkg_pretend() {
 	if use split-usr; then
 		eerror "Please complete the migration to merged-usr."
 		eerror "https://wiki.gentoo.org/wiki/Merge-usr"
 		die "systemd no longer supports split-usr"
 	fi
+
+	check_cgroup_layout
+
+	if use cgroup-hybrid; then
+		eerror "Disable the 'cgroup-hybrid' USE flag."
+		eerror "Rebuild any initramfs images after rebuilding systemd."
+		die "cgroup-hybrid is no longer supported"
+	fi
+
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		local CONFIG_CHECK="~BLK_DEV_BSG ~CGROUPS
 			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE