SHA256
1
0
forked from pool/audit

Accepting request 849560 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849560
OBS-URL: https://build.opensuse.org/package/show/security/audit?expand=0&rev=112
This commit is contained in:
Enzo Matsumiya 2020-11-27 13:40:00 +00:00 committed by Git OBS Bridge
parent 005741884e
commit 07903acdf1
2 changed files with 15 additions and 6 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 16 09:40:34 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
-------------------------------------------------------------------
Mon Jan 13 17:39:03 UTC 2020 - Tony Jones <tonyj@suse.com>

View File

@ -174,10 +174,12 @@ rm -f %{buildroot}/%{_mandir}/man5/libaudit.conf.5
rm -rf %{buildroot}/%{_mandir}/man3
# Cleanup plugins
#USR-MERGE
%if !0%{?usrmerged}
mkdir %{buildroot}/sbin/
for prog in auditctl auditd ausearch autrace audispd aureport augenrules; do
ln -s %{_sbindir}/$prog %{buildroot}/sbin/$prog
done
%endif
#END-USR-MERGE
# rcauditd symlink
ln -s service %{buildroot}%{_sbindir}/rcauditd
@ -226,22 +228,24 @@ fi
%attr(644,root,root) %{_mandir}/man5/ausearch-expression.5.gz
%attr(644,root,root) %{_mandir}/man8/auvirt.8.gz
%attr(644,root,root) %{_mandir}/man8/augenrules.8.gz
%if !0%{?usrmerged}
/sbin/auditctl
%attr(750,root,root) %{_sbindir}/auditctl
/sbin/auditd
%attr(750,root,root) %{_sbindir}/auditd
/sbin/ausearch
%attr(755,root,root) %{_sbindir}/ausearch
/sbin/autrace
%attr(750,root,root) %{_sbindir}/autrace
/sbin/audispd
%attr(750,root,root) %{_sbindir}/augenrules
/sbin/augenrules
/sbin/aureport
%endif
%attr(750,root,root) %{_sbindir}/auditctl
%attr(750,root,root) %{_sbindir}/auditd
%attr(755,root,root) %{_sbindir}/ausearch
%attr(750,root,root) %{_sbindir}/autrace
%attr(750,root,root) %{_sbindir}/augenrules
%attr(750,root,root) %{_sbindir}/audispd
%attr(755,root,root) %{_bindir}/aulast
%attr(755,root,root) %{_bindir}/aulastlog
%attr(755,root,root) %{_bindir}/ausyscall
/sbin/aureport
%attr(755,root,root) %{_sbindir}/aureport
%attr(755,root,root) %{_bindir}/auvirt
%dir %attr(750,root,root) %{_sysconfdir}/audit