diff --git a/audit.spec b/audit.spec index 083c65e..4acc4cf 100644 --- a/audit.spec +++ b/audit.spec @@ -12,6 +12,8 @@ BuildRequires: autoconf automake libtool BuildRequires: kernel-headers >= 5.0 BuildRequires: systemd +Patch0: remote-logging-ordering-cycle.patch + Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-rules%{?_isa} = %{version}-%{release} Requires(post): systemd coreutils @@ -96,6 +98,7 @@ The audit rules package contains the rules and utilities to load audit rules. %prep %setup -q -n %{name}-userspace-%{version} +%patch -P 0 -p1 cp %{SOURCE1} . %build @@ -318,6 +321,8 @@ fi Resolves: RHEL-45311 - ausearch fix error reporting Resolves: RHEL-32808 +- Resolve ordering cycle when using remote logging + Resolves: RHEL-59561 * Tue Oct 29 2024 Troy Dawson - 4.0-10 - Bump release for October 2024 mass rebuild: diff --git a/remote-logging-ordering-cycle.patch b/remote-logging-ordering-cycle.patch new file mode 100644 index 0000000..cc30a0d --- /dev/null +++ b/remote-logging-ordering-cycle.patch @@ -0,0 +1,14 @@ +diff --git a/init.d/auditd.service.in b/init.d/auditd.service.in +index 173795164..853912f61 100644 +--- a/init.d/auditd.service.in ++++ b/init.d/auditd.service.in +@@ -16,6 +16,9 @@ Wants=audit-rules.service + ## a minimal file that overrides only the necessary lines but inherits the + ## original settings in case they get updated by a distribution. Please check + ## systemd documentation if it's unclear how to override settings. ++## If using remote logging, ensure that the systemd-update-utmp.service file ++## is updated to remove the After=auditd.service directive to prevent a ++## boot-time ordering cycle. + After=local-fs.target systemd-tmpfiles-setup.service + #After=network-online.target local-fs.target systemd-tmpfiles-setup.service + Before=sysinit.target shutdown.target audit-rules.service