| 1 |
commit: b32b4a57937ab2539b761226ff67dece6e7f5558 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 30 02:07:22 2023 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 30 02:12:08 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b32b4a57 |
| 7 |
|
| 8 |
sys-apps/systemd: update journald-audit patch |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
.../systemd/files/gentoo-journald-audit-r1.patch | 51 ++++++++++++++++++++++ |
| 13 |
sys-apps/systemd/systemd-9999.ebuild | 2 +- |
| 14 |
2 files changed, 52 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/systemd/files/gentoo-journald-audit-r1.patch b/sys-apps/systemd/files/gentoo-journald-audit-r1.patch |
| 17 |
new file mode 100644 |
| 18 |
index 000000000000..b5c32df788e9 |
| 19 |
--- /dev/null |
| 20 |
+++ b/sys-apps/systemd/files/gentoo-journald-audit-r1.patch |
| 21 |
@@ -0,0 +1,51 @@ |
| 22 |
+From 2de502ccff1cc780d9d29c4ff7e6c1e0f2d7a082 Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Mike Gilbert <floppym@g.o> |
| 24 |
+Date: Fri, 21 Aug 2020 13:16:17 -0400 |
| 25 |
+Subject: [PATCH] journald: do not change the kernel audit setting by default |
| 26 |
+ |
| 27 |
+Bug: https://bugs.gentoo.org/736910 |
| 28 |
+--- |
| 29 |
+ man/journald.conf.xml | 2 +- |
| 30 |
+ src/journal/journald-server.c | 2 +- |
| 31 |
+ src/journal/journald.conf | 2 +- |
| 32 |
+ 3 files changed, 3 insertions(+), 3 deletions(-) |
| 33 |
+ |
| 34 |
+diff --git a/man/journald.conf.xml b/man/journald.conf.xml |
| 35 |
+index 50c33e4792..2e14674f42 100644 |
| 36 |
+--- a/man/journald.conf.xml |
| 37 |
++++ b/man/journald.conf.xml |
| 38 |
+@@ -427,7 +427,7 @@ |
| 39 |
+ kernel auditing on start-up. If disabled it will turn it off. If unset it will neither enable nor |
| 40 |
+ disable it, leaving the previous state unchanged. This means if another tool turns on auditing even |
| 41 |
+ if <command>systemd-journald</command> left it off, it will still collect the generated |
| 42 |
+- messages. Defaults to on.</para> |
| 43 |
++ messages.</para> |
| 44 |
+ |
| 45 |
+ <para>Note that this option does not control whether <command>systemd-journald</command> collects |
| 46 |
+ generated audit records, it just controls whether it tells the kernel to generate them. If you need |
| 47 |
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c |
| 48 |
+index 022e12d83d..6b3d261af6 100644 |
| 49 |
+--- a/src/journal/journald-server.c |
| 50 |
++++ b/src/journal/journald-server.c |
| 51 |
+@@ -2367,7 +2367,7 @@ int server_init(Server *s, const char *namespace) { |
| 52 |
+ .compress.threshold_bytes = UINT64_MAX, |
| 53 |
+ .seal = true, |
| 54 |
+ |
| 55 |
+- .set_audit = true, |
| 56 |
++ .set_audit = -1, |
| 57 |
+ |
| 58 |
+ .watchdog_usec = USEC_INFINITY, |
| 59 |
+ |
| 60 |
+diff --git a/src/journal/journald.conf b/src/journal/journald.conf |
| 61 |
+index 5a60a9d39c..64156d5463 100644 |
| 62 |
+--- a/src/journal/journald.conf |
| 63 |
++++ b/src/journal/journald.conf |
| 64 |
+@@ -44,4 +44,4 @@ |
| 65 |
+ #MaxLevelWall=emerg |
| 66 |
+ #LineMax=48K |
| 67 |
+ #ReadKMsg=yes |
| 68 |
+-#Audit=yes |
| 69 |
++#Audit= |
| 70 |
+-- |
| 71 |
+2.39.1 |
| 72 |
+ |
| 73 |
|
| 74 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 75 |
index 39a2452355b2..ea3aabd5a42f 100644 |
| 76 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 77 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 78 |
@@ -237,7 +237,7 @@ src_prepare() { |
| 79 |
PATCHES+=( |
| 80 |
"${FILESDIR}/gentoo-generator-path-r2.patch" |
| 81 |
"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch" |
| 82 |
- "${FILESDIR}/gentoo-journald-audit.patch" |
| 83 |
+ "${FILESDIR}/gentoo-journald-audit-r1.patch" |
| 84 |
) |
| 85 |
fi |
Archives