Skip to content

Commit a24b9ba

Browse files
committed
systemd-257: add journald-audit subpackage
Create a new journald-audit subpackage containing the systemd-journald-audit.socket unit file. This allows the audit socket to be excluded from builds by overriding with a higher epoch package. The subpackage provides and conflicts with auditd to ensure mutual exclusion. Signed-off-by: Matthew Yeazel <yeazelm@amazon.com>
1 parent ab193e3 commit a24b9ba

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

packages/systemd-257/systemd-257.spec

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,16 @@ Provides: %{_cross_os}systemd-resolved = %{package_priority_epoch}:
165165
%description resolved
166166
%{summary}.
167167

168+
%package journald-audit
169+
Summary: Files for journald audit socket
170+
Requires: %{name}
171+
Requires: %{_cross_os}audit-rules
172+
Provides: %{_cross_os}auditd = %{package_priority_epoch}:
173+
Conflicts: %{_cross_os}auditd
174+
175+
%description journald-audit
176+
%{summary}.
177+
168178
%prep
169179
%autosetup -n systemd-%{version} -p1
170180

@@ -542,7 +552,6 @@ install -p -m 0644 %{S:2} %{buildroot}%{_cross_bootconfigdir}/21-cgroup-enable-l
542552
%{_cross_unitdir}/systemd-halt.service
543553
%{_cross_unitdir}/systemd-journal-catalog-update.service
544554
%{_cross_unitdir}/systemd-journal-flush.service
545-
%{_cross_unitdir}/systemd-journald-audit.socket
546555
%{_cross_unitdir}/systemd-journald-dev-log.socket
547556
%{_cross_unitdir}/systemd-journald-varlink@.socket
548557
%{_cross_unitdir}/systemd-journald.service
@@ -871,3 +880,6 @@ install -p -m 0644 %{S:2} %{buildroot}%{_cross_bootconfigdir}/21-cgroup-enable-l
871880
%{_cross_unitdir}/sysinit.target.wants/integritysetup.target
872881
%{_cross_unitdir}/sysinit.target.wants/veritysetup.target
873882
%{_cross_unitdir}/system-systemd\x2dveritysetup.slice
883+
884+
%files journald-audit
885+
%{_cross_unitdir}/systemd-journald-audit.socket

0 commit comments

Comments
 (0)