Skip to content

Commit ab193e3

Browse files
committed
systemd-252: 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 cfa3808 commit ab193e3

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

packages/systemd-252/systemd-252.spec

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,16 @@ Provides: %{_cross_os}systemd-resolved = %{package_priority_epoch}:
180180
%description resolved
181181
%{summary}.
182182

183+
%package journald-audit
184+
Summary: Files for journald audit socket
185+
Requires: %{name}
186+
Requires: %{_cross_os}audit-rules
187+
Provides: %{_cross_os}auditd = %{package_priority_epoch}:
188+
Conflicts: %{_cross_os}auditd
189+
190+
%description journald-audit
191+
%{summary}.
192+
183193
%prep
184194
%autosetup -n systemd-stable-%{version} -p1
185195

@@ -481,7 +491,6 @@ find %{buildroot} -type f -name README -print -delete
481491
%{_cross_unitdir}/slices.target
482492
%{_cross_unitdir}/sockets.target
483493
%dir %{_cross_unitdir}/sockets.target.wants
484-
%{_cross_unitdir}/sockets.target.wants/systemd-journald-audit.socket
485494
%{_cross_unitdir}/sockets.target.wants/systemd-journald-dev-log.socket
486495
%{_cross_unitdir}/sockets.target.wants/systemd-journald.socket
487496
%{_cross_unitdir}/sockets.target.wants/systemd-udevd-control.socket
@@ -524,7 +533,6 @@ find %{buildroot} -type f -name README -print -delete
524533
%{_cross_unitdir}/systemd-halt.service
525534
%{_cross_unitdir}/systemd-journal-catalog-update.service
526535
%{_cross_unitdir}/systemd-journal-flush.service
527-
%{_cross_unitdir}/systemd-journald-audit.socket
528536
%{_cross_unitdir}/systemd-journald-dev-log.socket
529537
%{_cross_unitdir}/systemd-journald-varlink@.socket
530538
%{_cross_unitdir}/systemd-journald.service
@@ -800,3 +808,7 @@ find %{buildroot} -type f -name README -print -delete
800808
%{_cross_unitdir}/sysinit.target.wants/cryptsetup.target
801809
%{_cross_unitdir}/sysinit.target.wants/integritysetup.target
802810
%{_cross_unitdir}/sysinit.target.wants/veritysetup.target
811+
812+
%files journald-audit
813+
%{_cross_unitdir}/systemd-journald-audit.socket
814+
%{_cross_unitdir}/sockets.target.wants/systemd-journald-audit.socket

0 commit comments

Comments
 (0)