From 6aa75ab3773d8a7a9eb0aa3c115b4ffa2400b4c0 Mon Sep 17 00:00:00 2001
From: Yangyang Shen <shenyangyang4@huawei.com>
Date: Wed, 25 Nov 2020 10:59:27 +0800
Subject: [PATCH] don't enable systemd-journald-audit.socket by default

---
 ...able-systemd-journald-audit.socket-b.patch | 19 +++++++++++++++++--
 systemd.spec                                  |  9 +++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

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 bdb9129..1c4f54a 100644
--- a/journal-don-t-enable-systemd-journald-audit.socket-b.patch
+++ b/journal-don-t-enable-systemd-journald-audit.socket-b.patch
@@ -7,9 +7,24 @@ 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 e105ade..48c621d 100644
+--- a/units/meson.build
++++ b/units/meson.build
+@@ -88,8 +88,7 @@ units = [
+          'sockets.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 089bc38..7436619 100644
 --- a/units/systemd-journald.service.in
@@ -24,5 +39,5 @@ index 089bc38..7436619 100644
  SystemCallArchitectures=native
  SystemCallErrorNumber=EPERM
 -- 
-2.19.1
+2.23.0
 
diff --git a/systemd.spec b/systemd.spec
index 28e6d50..e4bbaba 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 Version:        243
-Release:        27
+Release:        28
 License:        MIT and LGPLv2+ and GPLv2+
 Summary:        System and Service Manager
 
@@ -1139,7 +1139,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
@@ -1504,6 +1503,12 @@ fi
 %exclude /usr/share/man/man3/*
 
 %changelog
+* Wed Nov 25 2020 shenyangyang <shenyangyang4@huawei.com> - 243-28
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:don't enable systemd-journald-audit.socket by default
+
 * Mon Nov 23 2020 openEuler Buildteam <buildteam@openeuler.org> - 243-27
 - Type:enhancement
 - ID:NA
-- 
Gitee