gentoo auto-resync : 05:05:2023 - 11:30:40

5 files changed, 19 insertions, 84 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 86ac7c9e84d2..88eeee3fb482 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,15 +1,13 @@
-AUX 252-no-stack-protector-bpf.patch 809 BLAKE2B 85a66835b0287c237f82a9e95b14fa5707f127e77af07bddcb036773d10f260372f326f10cc17602a453017da3573b966859c13cb611df4cacf3d0c00a03cdd6 SHA512 ea326d5abde0a089bbc79cb1d3aa9cb491fc18160cfdd9e6b9aebafb26ec0db26652ae1086b891f65c8938a6fa5765b03d56632e47474b7d9b58796fe27f6f7c
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit-r1.patch 1941 BLAKE2B 93f1a0ba8dd575359e5ab4bd04f99ed3172dbe1ba14d8cade6fc08b0158e66847900d8531898ee9ec3855ac3857cf07a3e10804a3cb67719f0e9378437eba836 SHA512 affbe58aa65ebca7c1c6d790f9f68ffc44bda70a08165f5298ee4a84ab1c16cf534950ac50ffdb61b647e5eb068f51c333a76e39d8336e21e5d1b0199192139c
-AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX legacy.conf 80 BLAKE2B 23eca4dd1743a5cf77767894d23d419c1663147c5aee6be971da64fdea0531eadfe97ac8bc4e63b44404dcf89940d438de6b7081158b78639945ce0fadbb103c SHA512 f74f05991102b644dee7822a80cb8e6c14cd1eb48bd9342bc662d5947b9f04d32e875d2a5e6476a67bdbface4d2b2159b99c11d72eb4658c5cb4caf595f138be
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-253-initrd-generators.patch 1486 BLAKE2B 85a7f714aa1743bd88e01b45624dc4104e4d762732745d9958019063f6ac91ffd89ae84e03f728e6040a58643f253a5ea7f77f44ef71620e686e23aed61876e4 SHA512 f8aab9f4bbf5a73c52144013fd7001dc78974211f11abb58a0f5eceff59b3ebf670409846fff854daec10219074602674176730f85583db0e81275289e89c66b
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-stable-252.7.tar.gz 11825226 BLAKE2B 81ef2f6cbe7902014a92702c0eae740d18fc24355c186f51a0467668bb225d358a422fd02eec4c38063a3f65a9f1b1ebf88036c4e5cd0bfc50857d2818a42178 SHA512 691caea30d759afd3a1ad11495f7531c04238b080281617dceb1671ea3e27c7a6a4859961a81d29ecefb94b7a764e40283f39294e34beb63e0862777f5a8d34f
 DIST systemd-stable-253.3.tar.gz 11996044 BLAKE2B fdbac11914ea4a3718dd48c19f0dc34db798e68f36e2e858536e4ef50e376380a250ad59dbbd1ccec4ed73e59efd198dcc0aa85faafa9d6f85d4b2e1de67ccfa SHA512 2c686d83b8b09efa09e09c82feb965f3cfceb6338e42b57d4133dc9ffe52592c67bce9bc9e294c69bc831294e3cbdcc391aba778f10d7b408cef90a85c0ab8aa
-EBUILD systemd-252.7.ebuild 14629 BLAKE2B e6214c37ea5b95f7df5823972c19dcc0c5d6f6eda54e9161f7c584ed3fd95f10c5a7ff122204698a5451cb4080583156c5a59c6fbac9553dae1de34f628901a3 SHA512 6f4915bd838a73eca6f675cd08584b46b6a7ba5f23ff5b758dc60535521683fd4a946c150598641afb2fab06c959416ab75ecff815ca18d9e329ba04d9232edc
+DIST systemd-stable-253.4.tar.gz 12010733 BLAKE2B 166ce3f089a9fc3d5d374566258d05ddc9ad1e6a06f5d171ee4e3462e30dd996ed45eccac9e27a8ce75ddf591d81ad2af8ce3bd214709cc0b816422f3960f52a SHA512 cbd572330871fe938307cdead57637e9a03fcdb95b62dd12506f13f48fddcacfaf1e7b179bc9e1c1889a07d3bf21f840aafc773df3a1ab05b37d28950cb94ee1
 EBUILD systemd-253.3-r1.ebuild 14579 BLAKE2B ec9e31176bad8f142e224369a868b275facb3d3f48e26a9753efd89f40af5c107e70febbbf79fffbefcfe174e258ffae6175e23dde6c3105cec40ec60e5aee7b SHA512 f25ca4b5fbeee20f1137ea9cdf7305a8eb41814ab10946bb3fbacb4bbd9aa5f03fe804119c76e5b4c05abc8b7abb2b5ed9d40dea300b009ca8dab774239b7069
-EBUILD systemd-9999.ebuild 14535 BLAKE2B dbdd2567e2ce1ccd1da92631b45a3cfed2b6832dbcb88385f86e9c91bed4dbd408262ae6b1de55a3e24816a7d3df4f978d966f8e47d847387d1906ce5ce9df50 SHA512 1c3d662a57f9451070fa1e3ded8e2e04841659e106a11f48fb71512d9d41a3079b2455521e7bf00b3d624057cdf1d868a35d6f452a42c4224850440dd8a9e558
+EBUILD systemd-253.4.ebuild 14588 BLAKE2B ac789628c1caa53681c78be188c85a660fd61a416925cb0d2e5afc9972708efece0e65a52beae8870091cfca24751b741cabac2bb0934f16f90ea48e59eb67d1 SHA512 0877b4c30e086c98fdeae3a9beb56cc97aab0b5467882dcae748af1a639e551d2fa937f9acfe2f4bc16b663e45ef8efdb7e84cc358cc944fde0fd0334c8427af
+EBUILD systemd-9999.ebuild 14536 BLAKE2B 87ff5f70255df499849825bf368f6c691ed00119a25ffe10c1e89521b9653be60f7ef66bd5b21d307c9bf5790eab7d757afcf17ef478eb69a7f4673bd69796df SHA512 5760c13575c4ef2dbbf867a20b72d640b3445c714112552725431d82162ba666f96e4ecc09d392af10c2da59ed3a701b59f847b72aa908d5149733548da51bc0
 MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565
diff --git a/sys-apps/systemd/files/252-no-stack-protector-bpf.patch b/sys-apps/systemd/files/252-no-stack-protector-bpf.patch
deleted file mode 100644
index 4e4d1a1bafa5..000000000000
--- a/sys-apps/systemd/files/252-no-stack-protector-bpf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/systemd/systemd/pull/26050
-
-From d6a0784a350fb27698ed04f7ada17137324b31bb Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 13 Jan 2023 05:17:56 +0000
-Subject: [PATCH] bpf: disable -fstack-protector in meson
-
-In Gentoo, we recently started making Clang behave the same way as
-our GCC, with -fstack-protector and some friends enabled by default.
-
-SSP doesn't make sense for BPF, so disable it explicitly.
-
-See also e.g. https://www.spinics.net/lists/netdev/msg556400.html.
-
-Bug: https://bugs.gentoo.org/890004
---- a/src/core/bpf/meson.build
-+++ b/src/core/bpf/meson.build
-@@ -7,6 +7,7 @@ endif
- bpf_clang_flags = [
-         '-std=gnu11',
-         '-Wno-compare-distinct-pointer-types',
-+        '-fno-stack-protector',
-         '-O2',
-         '-target',
-         'bpf',
-
diff --git a/sys-apps/systemd/files/gentoo-journald-audit.patch b/sys-apps/systemd/files/gentoo-journald-audit.patch
deleted file mode 100644
index 088bceb7696e..000000000000
--- a/sys-apps/systemd/files/gentoo-journald-audit.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 593db1c78011ddce551051ce17eda6feac079b3d Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 21 Aug 2020 13:16:17 -0400
-Subject: [PATCH] journald: do not change the kernel audit setting by default
-
-Bug: https://bugs.gentoo.org/736910
----
- man/journald.conf.xml         | 2 +-
- src/journal/journald-server.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index bfd359a903..7e93d4050e 100644
---- a/man/journald.conf.xml
-+++ b/man/journald.conf.xml
-@@ -411,7 +411,7 @@
-         <command>systemd-journald</command> collects generated audit records, it just controls whether it
-         tells the kernel to generate them. This means if another tool turns on auditing even if
-         <command>systemd-journald</command> left it off, it will still collect the generated
--        messages. Defaults to on.</para></listitem>
-+        messages.</para></listitem>
-       </varlistentry>
- 
-       <varlistentry>
-diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 5865bf9809..163be685a8 100644
---- a/src/journal/journald-server.c
-+++ b/src/journal/journald-server.c
-@@ -2208,7 +2208,7 @@ int server_init(Server *s, const char *namespace) {
-                 .compress.threshold_bytes = (uint64_t) -1,
-                 .seal = true,
- 
--                .set_audit = true,
-+                .set_audit = -1,
- 
-                 .watchdog_usec = USEC_INFINITY,
- 
--- 
-2.28.0
-
diff --git a/sys-apps/systemd/systemd-252.7.ebuild b/sys-apps/systemd/systemd-253.4.ebuild
index b35c799db45f..72824b08e850 100644
--- a/sys-apps/systemd/systemd-252.7.ebuild
+++ b/sys-apps/systemd/systemd-253.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2011-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
 
 # Avoid QA warnings
 TMPFILES_OPTIONAL=1
@@ -23,7 +23,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 inherit bash-completion-r1 linux-info meson-multilib pam
@@ -232,14 +232,13 @@ src_unpack() {
 
 src_prepare() {
 	local PATCHES=(
-		"${FILESDIR}/252-no-stack-protector-bpf.patch"
+		"${FILESDIR}/systemd-253-initrd-generators.patch"
 	)
 
 	if ! use vanilla; then
 		PATCHES+=(
 			"${FILESDIR}/gentoo-generator-path-r2.patch"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
-			"${FILESDIR}/gentoo-journald-audit.patch"
+			"${FILESDIR}/gentoo-journald-audit-r1.patch"
 		)
 	fi
 
@@ -269,6 +268,9 @@ multilib_src_configure() {
 		$(meson_use split-usr split-bin)
 		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
 		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Disable compatibility with sysvinit
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
 		# Avoid infinite exec recursion, bug 642724
 		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
 		# no deps
@@ -344,6 +346,7 @@ multilib_src_configure() {
 
 multilib_src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	local -x COLUMNS=80
 	meson_src_test
 }
 
@@ -357,17 +360,17 @@ multilib_src_install_all() {
 	einstalldocs
 	dodoc "${FILESDIR}"/nsswitch.conf
 
+	insinto /usr/lib/tmpfiles.d
+	doins "${FILESDIR}"/legacy.conf
+
 	if ! use resolvconf; then
 		rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die
 	fi
 
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
 	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,shutdown} || die
 		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 || die
 	fi
 
 	if ! use resolvconf && ! use sysv-utils && use split-usr; then
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 262f3350c7a1..8c40a935e8a7 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2011-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
 
 # Avoid QA warnings
 TMPFILES_OPTIONAL=1