Merge pull request 'Factory' (#1) from factory into main

audit-secondary.changes

@@ -1,14 +1,3 @@
--------------------------------------------------------------------
-Tue Feb  3 14:02:12 UTC 2026 - Thorsten Kukuk <kukuk@suse.com>
-
-- Configure runstatedir as "/run" to get rid of systemd deprecation
-  warnings.
-
--------------------------------------------------------------------
-Mon Jan 26 12:11:06 UTC 2026 - Callum Farmer <gmbr3@opensuse.org>
-
-- Move all /var/spool, /var/log directories to systemd-tmpfiles
-
 -------------------------------------------------------------------
 Tue Jun 10 14:24:47 UTC 2025 - Wolfgang Frisch <wolfgang.frisch@suse.com>
 

audit-secondary.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package audit-secondary
 #
-# Copyright (c) 2026 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,6 @@ Group:          System/Monitoring
 URL:            https://people.redhat.com/sgrubb/audit/
 Source0:        https://people.redhat.com/sgrubb/audit/%{_name}-%{version}.tar.gz
 Source1:        system-group-audit.conf
-Source2:        audit.tmpfiles
 Patch1:         audit-plugins-path.patch
 Patch2:         audit-no-gss.patch
 Patch3:         audit-ausearch-do-not-require-tclass.patch
@@ -160,7 +159,6 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
 	--with-arm \
 %endif
 	--libexecdir=%{_libexecdir}/%{_name} \
-	--runstatedir=%{_rundir} \
 	--with-apparmor \
 	--with-libwrap \
 	--with-libcap-ng=yes \
@@ -224,7 +222,6 @@ done
 ln -s service %{buildroot}%{_sbindir}/rcauditd
 %endif
 chmod 0644 %{buildroot}%{_unitdir}/auditd.service
-install -Dm0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/audit.conf
 
 %check
 %make_build check
@@ -311,11 +308,10 @@ fi
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/audit/plugins.d/syslog.conf
 %ghost %{_sysconfdir}/auditd.conf
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/audit/auditd.conf
-%ghost %dir %attr(0750,root,audit) %{_localstatedir}/log/audit
-%ghost %config(noreplace) %attr(0640,root,audit) %{_localstatedir}/log/audit/audit.log
-%ghost %dir %attr(0700,root,root) %{_localstatedir}/spool/audit
+%dir %attr(750,root,audit) %{_localstatedir}/log/audit
+%ghost %config(noreplace) %attr(640,root,audit) %{_localstatedir}/log/audit/audit.log
+%dir %attr(700,root,root) %{_localstatedir}/spool/audit
 %{_unitdir}/auditd.service
-%{_tmpfilesdir}/audit.conf
 %if 0%{?suse_version} < 1550
 %{_sbindir}/rcauditd
 %endif

audit.changes

@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Tue Feb  3 14:02:12 UTC 2026 - Thorsten Kukuk <kukuk@suse.com>
-
-- Configure runstatedir as "/run" to get rid of systemd deprecation
-  warnings.
-
 -------------------------------------------------------------------
 Tue Jun 10 14:23:54 UTC 2025 - Wolfgang Frisch <wolfgang.frisch@suse.com>
 

audit.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package audit
 #
-# Copyright (c) 2026 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -101,7 +101,6 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
 	--with-arm \
 %endif
 	--libexecdir=%{_libexecdir}/%{name} \
-	--runstatedir=%{_rundir} \
 	--with-apparmor \
 	--with-libcap-ng=no \
 	--disable-static \

audit.tmpfiles

@@ -1,3 +0,0 @@
-d /var/log/audit 0750 root audit - -
-f /var/log/audit/audit.log 0640 root audit - -
-d /var/spool/audit 0700 root root - -