Merge pull request #781 from yeazelm/auditd

Create new sub packages for auditing functionality

Author: yeazelm

packages/libaudit/libaudit.spec

@@ -27,6 +27,13 @@ Requires: %{name}
 %description -n %{_cross_os}audit
 %{summary}.
 
+%package -n %{_cross_os}audit-rules
+Summary: Default audit rules for Bottlerocket
+Requires: %{_cross_os}audit
+
+%description -n %{_cross_os}audit-rules
+%{summary}.
+
 %prep
 %autosetup -n audit-userspace-%{version} -p1
 
@@ -83,10 +90,12 @@ install -p -m 0644 %{S:11} %{buildroot}%{_cross_datadir}/audit
 
 %files -n %{_cross_os}audit
 %{_cross_sbindir}/auditctl
-%{_cross_unitdir}/audit-rules.service
-%{_cross_datadir}/audit/audit.rules
 %exclude %{_cross_sbindir}/auditd
 %exclude %{_cross_sbindir}/aureport
 %exclude %{_cross_sbindir}/ausearch
 
+%files -n %{_cross_os}audit-rules
+%{_cross_unitdir}/audit-rules.service
+%{_cross_datadir}/audit/audit.rules
+
 %changelog

packages/release/release.spec

@@ -141,6 +141,7 @@ Source1651: local-mount-encrypted.conf
 Source1652: repart-local-encrypted.conf
 
 Requires: %{_cross_os}audit
+Requires: %{_cross_os}auditd
 Requires: %{_cross_os}chrony
 Requires: %{_cross_os}conntrack-tools
 Requires: %{_cross_os}containerd

packages/systemd-252/systemd-252.spec

@@ -180,6 +180,16 @@ Provides: %{_cross_os}systemd-resolved = %{package_priority_epoch}:
 %description resolved
 %{summary}.
 
+%package journald-audit
+Summary: Files for journald audit socket
+Requires: %{name}
+Requires: %{_cross_os}audit-rules
+Provides: %{_cross_os}auditd = %{package_priority_epoch}:
+Conflicts: %{_cross_os}auditd
+
+%description journald-audit
+%{summary}.
+
 %prep
 %autosetup -n systemd-stable-%{version} -p1
 
@@ -481,7 +491,6 @@ find %{buildroot} -type f -name README -print -delete
 %{_cross_unitdir}/slices.target
 %{_cross_unitdir}/sockets.target
 %dir %{_cross_unitdir}/sockets.target.wants
-%{_cross_unitdir}/sockets.target.wants/systemd-journald-audit.socket
 %{_cross_unitdir}/sockets.target.wants/systemd-journald-dev-log.socket
 %{_cross_unitdir}/sockets.target.wants/systemd-journald.socket
 %{_cross_unitdir}/sockets.target.wants/systemd-udevd-control.socket
@@ -524,7 +533,6 @@ find %{buildroot} -type f -name README -print -delete
 %{_cross_unitdir}/systemd-halt.service
 %{_cross_unitdir}/systemd-journal-catalog-update.service
 %{_cross_unitdir}/systemd-journal-flush.service
-%{_cross_unitdir}/systemd-journald-audit.socket
 %{_cross_unitdir}/systemd-journald-dev-log.socket
 %{_cross_unitdir}/systemd-journald-varlink@.socket
 %{_cross_unitdir}/systemd-journald.service
@@ -800,3 +808,7 @@ find %{buildroot} -type f -name README -print -delete
 %{_cross_unitdir}/sysinit.target.wants/cryptsetup.target
 %{_cross_unitdir}/sysinit.target.wants/integritysetup.target
 %{_cross_unitdir}/sysinit.target.wants/veritysetup.target
+
+%files journald-audit
+%{_cross_unitdir}/systemd-journald-audit.socket
+%{_cross_unitdir}/sockets.target.wants/systemd-journald-audit.socket

packages/systemd-257/systemd-257.spec

@@ -165,6 +165,16 @@ Provides: %{_cross_os}systemd-resolved = %{package_priority_epoch}:
 %description resolved
 %{summary}.
 
+%package journald-audit
+Summary: Files for journald audit socket
+Requires: %{name}
+Requires: %{_cross_os}audit-rules
+Provides: %{_cross_os}auditd = %{package_priority_epoch}:
+Conflicts: %{_cross_os}auditd
+
+%description journald-audit
+%{summary}.
+
 %prep
 %autosetup -n systemd-%{version} -p1
 
@@ -542,7 +552,6 @@ install -p -m 0644 %{S:2} %{buildroot}%{_cross_bootconfigdir}/21-cgroup-enable-l
 %{_cross_unitdir}/systemd-halt.service
 %{_cross_unitdir}/systemd-journal-catalog-update.service
 %{_cross_unitdir}/systemd-journal-flush.service
-%{_cross_unitdir}/systemd-journald-audit.socket
 %{_cross_unitdir}/systemd-journald-dev-log.socket
 %{_cross_unitdir}/systemd-journald-varlink@.socket
 %{_cross_unitdir}/systemd-journald.service
@@ -871,3 +880,6 @@ install -p -m 0644 %{S:2} %{buildroot}%{_cross_bootconfigdir}/21-cgroup-enable-l
 %{_cross_unitdir}/sysinit.target.wants/integritysetup.target
 %{_cross_unitdir}/sysinit.target.wants/veritysetup.target
 %{_cross_unitdir}/system-systemd\x2dveritysetup.slice
+
+%files journald-audit
+%{_cross_unitdir}/systemd-journald-audit.socket