diff --git a/journal-don-t-enable-systemd-journald-audit.socket-b.patch b/journal-don-t-enable-systemd-journald-audit.socket-b.patch index f81ffb3ee4296a0a1d4f8e1dffd3d0befa2549b2..ca97a3ef021f120f6a4bbc920af5b75cca02137e 100644 --- a/journal-don-t-enable-systemd-journald-audit.socket-b.patch +++ b/journal-don-t-enable-systemd-journald-audit.socket-b.patch @@ -7,11 +7,26 @@ Subject: [PATCH] journal: don't enable systemd-journald-audit.socket Resolves: #1699287 --- + units/meson.build | 3 +-- units/systemd-journald.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 2 files changed, 2 insertions(+), 3 deletions(-) +diff --git a/units/meson.build b/units/meson.build +index 4eb09a3..ccea8a6 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -110,8 +110,7 @@ units = [ + 'sysinit.target.wants/'], + ['systemd-journal-gatewayd.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'], + ['systemd-journal-remote.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'], +- ['systemd-journald-audit.socket', '', +- 'sockets.target.wants/'], ++ ['systemd-journald-audit.socket', ''], + ['systemd-journald-dev-log.socket', '', + 'sockets.target.wants/'], + ['systemd-journald.socket', '', diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index 0cb1bfa3ca..fa7348aa79 100644 +index 0cb1bfa..fa7348a 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -34,7 +34,7 @@ RestrictRealtime=yes diff --git a/systemd.spec b/systemd.spec index ca233fe60f96e3a50d55421285569fdf7d5434eb..a516e3fb5745dfbdc46553ef429a02f34f0e2429 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,7 +20,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 246 -Release: 7 +Release: 8 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -1095,7 +1095,6 @@ fi %{_unitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service %{_unitdir}/systemd-hostnamed.service.d/disable-privatedevices.conf %{_unitdir}/sockets.target.wants/systemd-coredump.socket -%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket %{_unitdir}/sockets.target.wants/systemd-journald-dev-log.socket %{_unitdir}/sockets.target.wants/systemd-journald.socket %{_unitdir}/sockets.target.wants/systemd-initctl.socket @@ -1490,6 +1489,12 @@ fi %exclude /usr/share/man/man3/* %changelog +* Wed Nov 25 2020 shenyangyang - 246-8 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:don't enable systemd-journald-audit.socket by default + * Thu Sep 17 2020 openEuler Buildteam - 246-7 - Type:enhancement - ID:NA