Hi,

We are preparing spec for audit in Tizen. Please find attached a small
patch that changes a few hardcoded paths to rpm macros. I havn't changed
"/sbin" to %{_sbindir} nor "/%{_lib}", however, I'd like to ask do you
still want to keep files in "/sbin" and "/lib"?

Kind regards,
-- 
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
Index: audit.spec
===================================================================
--- audit.spec	(wersja 1128)
+++ audit.spec	(kopia robocza)
@@ -152,8 +152,8 @@
 mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir}
 
 # On platforms with 32 & 64 bit libs, we need to coordinate the timestamp
-touch -r ./audit.spec $RPM_BUILD_ROOT/etc/libaudit.conf
-touch -r ./audit.spec $RPM_BUILD_ROOT/usr/share/man/man5/libaudit.conf.5.gz
+touch -r ./audit.spec $RPM_BUILD_ROOT%{_sysconfdir}/libaudit.conf
+touch -r ./audit.spec $RPM_BUILD_ROOT%{_mandir}/man5/libaudit.conf.5.gz
 
 %check
 make check
@@ -165,8 +165,8 @@
 
 %post
 # Copy default rules into place on new installation
-if [ ! -e /etc/audit/audit.rules ] ; then
-	cp /etc/audit/rules.d/audit.rules /etc/audit/audit.rules
+if [ ! -e %{_sysconfdir}/audit/audit.rules ] ; then
+	cp %{_sysconfdir}/audit/rules.d/audit.rules %{_sysconfdir}/audit/audit.rules
 fi
 %if %{WITH_SYSTEMD}
 %systemd_post auditd.service
@@ -195,7 +195,7 @@
 %defattr(-,root,root,-)
 /%{_lib}/libaudit.so.1*
 /%{_lib}/libauparse.*
-%config(noreplace) %attr(640,root,root) /etc/libaudit.conf
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/libaudit.conf
 %{_mandir}/man5/libaudit.conf.5.gz
 
 %files libs-devel
@@ -265,30 +265,30 @@
 %attr(750,root,root) %{_libexecdir}/initscripts/legacy-actions/auditd/restart
 %attr(750,root,root) %{_libexecdir}/initscripts/legacy-actions/auditd/condrestart
 %else
-%attr(755,root,root) /etc/rc.d/init.d/auditd
-%config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
+%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/auditd
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/sysconfig/auditd
 %endif
 %attr(750,root,root) %dir %{_var}/log/audit
-%attr(750,root,root) %dir /etc/audit
-%attr(750,root,root) %dir /etc/audit/rules.d
-%attr(750,root,root) %dir /etc/audisp
-%attr(750,root,root) %dir /etc/audisp/plugins.d
-%config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
-%config(noreplace) %attr(640,root,root) /etc/audit/rules.d/audit.rules
-%ghost %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
-%config(noreplace) %attr(640,root,root) /etc/audisp/audispd.conf
-%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/af_unix.conf
-%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
+%attr(750,root,root) %dir %{_sysconfdir}/audit
+%attr(750,root,root) %dir %{_sysconfdir}/audit/rules.d
+%attr(750,root,root) %dir %{_sysconfdir}/audisp
+%attr(750,root,root) %dir %{_sysconfdir}/audisp/plugins.d
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/audit/auditd.conf
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/audit/rules.d/audit.rules
+%ghost %config(noreplace) %attr(640,root,root) %{_sysconfdir}/audit/audit.rules
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/audisp/audispd.conf
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/audisp/plugins.d/af_unix.conf
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/audisp/plugins.d/syslog.conf
 
 %files -n audispd-plugins
 %defattr(-,root,root,-)
 %attr(644,root,root) %{_mandir}/man8/audispd-zos-remote.8.gz
 %attr(644,root,root) %{_mandir}/man5/zos-remote.conf.5.gz
-%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/audispd-zos-remote.conf
-%config(noreplace) %attr(640,root,root) /etc/audisp/zos-remote.conf
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/audisp/plugins.d/audispd-zos-remote.conf
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/audisp/zos-remote.conf
 %attr(750,root,root) /sbin/audispd-zos-remote
-%config(noreplace) %attr(640,root,root) /etc/audisp/audisp-remote.conf
-%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/au-remote.conf
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/audisp/audisp-remote.conf
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/audisp/plugins.d/au-remote.conf
 %attr(750,root,root) /sbin/audisp-remote
 %attr(700,root,root) %dir %{_var}/spool/audit
 %attr(644,root,root) %{_mandir}/man5/audisp-remote.conf.5.gz

Attachment: signature.asc
Description: PGP signature

--
Linux-audit mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/linux-audit

Reply via email to