From 552fc3ba95eab5c2c1a8b2b55ab432a1019739a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 30 Jan 2023 08:57:14 +0000 Subject: gentoo auto-resync : 30:01:2023 - 08:57:13 --- sys-apps/Manifest.gz | Bin 48614 -> 48617 bytes sys-apps/systemd/Manifest | 3 +- .../systemd/files/gentoo-journald-audit-r1.patch | 51 +++++++++++++++++++++ sys-apps/systemd/systemd-9999.ebuild | 6 ++- 4 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 sys-apps/systemd/files/gentoo-journald-audit-r1.patch (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 07fc45c210a6..85c45481f7fc 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 33d31fcaaa6e..70b71478d83d 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,6 +1,7 @@ AUX 252-no-stack-protector-bpf.patch 809 BLAKE2B 85a66835b0287c237f82a9e95b14fa5707f127e77af07bddcb036773d10f260372f326f10cc17602a453017da3573b966859c13cb611df4cacf3d0c00a03cdd6 SHA512 ea326d5abde0a089bbc79cb1d3aa9cb491fc18160cfdd9e6b9aebafb26ec0db26652ae1086b891f65c8938a6fa5765b03d56632e47474b7d9b58796fe27f6f7c AUX 252-tmpfiles-ub.patch 2892 BLAKE2B 0c65c90c0a631a48b7f3b8194350fb90e6915e0e7f32b0de87cfb83ca170f68576017efbe8a531fdeb01485ac6840a4c75628d1a384e750fc5094dff68dddcab SHA512 5c4fac1933a0b8443b80cff7069f21904773d486f30be24337f2b68234c708568ccd0f1ab216968ce71f760e4e27f85912971cdb9dd3ee724d7e6a2d8bc917d7 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 nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60 @@ -9,5 +10,5 @@ DIST systemd-stable-252.4.tar.gz 11753300 BLAKE2B 8819ca6d3a64c110e5a245ae0369dc DIST systemd-stable-252.5.tar.gz 11762414 BLAKE2B c9560ad5e49b7ff33ebcf2e553fa1824131e84bb7c40e5b04135bcdce9ad2ef32194382a501a1853a28e02b7f434bf1fb53edd6e9272d432c23fb116015d751f SHA512 f3359e0496b673033d6c8da5c117890e0dc26c9db51003b28f629ac751d9bae117be32d9f54c377eb2d5a7c2d36ac0dbdc2116498698e993550fbdd9aae535b9 EBUILD systemd-252.4-r1.ebuild 15573 BLAKE2B 92ceafc762c464491a1749f702667b898d8228d560ace390cdedd13715acf343ea4f782bf5ec0e6bb58601ac156d2a5bfe5d9d5d19bd991839c8d3c283846940 SHA512 497a035c612c242d99b347fcfdaaef4b91477071ac9c14a06139b8641318aad7966911972bbbcaba530de790f3aa62f532ac3285c9a7cc331988440900941ddc EBUILD systemd-252.5.ebuild 14594 BLAKE2B ec075f5a7be26f1abe85d62527664dd913538b43f04d1683fcf8c54b0b7286909e64a6fee78dffdbdd46a2b6c62df9eea938f47fa2485ed8bd93add14a9782ea SHA512 b398f07688e5805690db7a7fa8545190dedd2ee02bd77930849ff9342a5c4a324a81266d6e807a8819f100122c8a8264df10910bd7c22511dd9897eea98c3c20 -EBUILD systemd-9999.ebuild 14545 BLAKE2B ac0c340d7ca4a9bb205b6e2714cb8977e599e9f1fbe0192dcf38d22c4eddf65951860a0ae8ead0c5258eecafc02140884ad2a7544f9561740c2a17ecc797ffbb SHA512 add20e51c14b70ac9054863c7ea9d68c4570c7c1acbcabe954f2199ec4e1c862ccf4dcb473bd54bb4e813632e0741f076349c99f5b7f077e841760d32269b2c7 +EBUILD systemd-9999.ebuild 14565 BLAKE2B 9738197f1692283fd75ccaeb033e33b4c8502a29c94e3f27ed3f746537abb3ad94ecca65784b1a2d3be469cd0baf9358f7a805cf867ced62902322e46e848ead SHA512 2f24d97b9e6476620bd06e93bfaad4040c71a2894d0f6a42b6b67ad8a4ac5f96cc1caf17fe508f33e3603cefaa02bc1dd1bed1de44ac2acac7e231b6d87ff22e MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565 diff --git a/sys-apps/systemd/files/gentoo-journald-audit-r1.patch b/sys-apps/systemd/files/gentoo-journald-audit-r1.patch new file mode 100644 index 000000000000..b5c32df788e9 --- /dev/null +++ b/sys-apps/systemd/files/gentoo-journald-audit-r1.patch @@ -0,0 +1,51 @@ +From 2de502ccff1cc780d9d29c4ff7e6c1e0f2d7a082 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +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 +- + src/journal/journald.conf | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/man/journald.conf.xml b/man/journald.conf.xml +index 50c33e4792..2e14674f42 100644 +--- a/man/journald.conf.xml ++++ b/man/journald.conf.xml +@@ -427,7 +427,7 @@ + kernel auditing on start-up. If disabled it will turn it off. If unset it will neither enable nor + disable it, leaving the previous state unchanged. This means if another tool turns on auditing even + if systemd-journald left it off, it will still collect the generated +- messages. Defaults to on. ++ messages. + + Note that this option does not control whether systemd-journald collects + generated audit records, it just controls whether it tells the kernel to generate them. If you need +diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c +index 022e12d83d..6b3d261af6 100644 +--- a/src/journal/journald-server.c ++++ b/src/journal/journald-server.c +@@ -2367,7 +2367,7 @@ int server_init(Server *s, const char *namespace) { + .compress.threshold_bytes = UINT64_MAX, + .seal = true, + +- .set_audit = true, ++ .set_audit = -1, + + .watchdog_usec = USEC_INFINITY, + +diff --git a/src/journal/journald.conf b/src/journal/journald.conf +index 5a60a9d39c..64156d5463 100644 +--- a/src/journal/journald.conf ++++ b/src/journal/journald.conf +@@ -44,4 +44,4 @@ + #MaxLevelWall=emerg + #LineMax=48K + #ReadKMsg=yes +-#Audit=yes ++#Audit= +-- +2.39.1 + diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 39a2452355b2..77c05e37c43e 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -236,8 +236,7 @@ src_prepare() { 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 @@ -267,6 +266,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 -- cgit v1.2.3