pool/apparmor
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 449666 from home:cboltz

Browse Source 
- delete /etc/apparmor.d/cache symlink. apparmor_parser will re-create
  it as real directory. This is needed to avoid problems on boot if
  /var/ is mounted too late (boo#1015249, boo#980081, bsc#1016259)
  (Note: I'm not packaging /etc/apparmor.d/cache/ as directory to avoid
  RPM update problems with the symlink -> directory change.)

OBS-URL: https://build.opensuse.org/request/show/449666
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=162
This commit is contained in:
Christian Boltz 2017-01-11 11:32:04 +00:00 committed by Git OBS Bridge
parent 8b7ca9d3cb
commit 1a27f96919
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apparmor.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Jan 11 10:54:10 UTC 2017 - suse-beta@cboltz.de
- delete /etc/apparmor.d/cache symlink. apparmor_parser will re-create
it as real directory. This is needed to avoid problems on boot if
/var/ is mounted too late (boo#1015249, boo#980081, bsc#1016259)
(Note: I'm not packaging /etc/apparmor.d/cache/ as directory to avoid
RPM update problems with the symlink -> directory change.)
-------------------------------------------------------------------
Tue Jan 10 22:15:56 UTC 2017 - suse-beta@cboltz.de

6
apparmor.spec
View File

@ -559,10 +559,6 @@ mkdir -p %{buildroot}%{_localstatedir}/log/apparmor
%makeinstall -C profiles
%makeinstall -C parser
# default cache dir is /etc/apparmor.d/cache - not the best location.
# Use /var/cache/apparmor and make /etc/apparmor.d/cache a symlink to it
mkdir -p %{buildroot}%{_localstatedir}/cache/apparmor
( cd %{buildroot}/%{_sysconfdir}/apparmor.d/ && ln -s ../../%{_localstatedir}/cache/apparmor cache )
%if %{with apache}
%makeinstall -C changehat/mod_apparmor
@ -632,8 +628,6 @@ echo -------------------------------------------------------------------
/sbin/apparmor_parser
%dir %attr(-, root, root) %{_sysconfdir}/apparmor
%dir %{_sysconfdir}/apparmor.d
%{_sysconfdir}/apparmor.d/cache
%dir %{_localstatedir}/cache/apparmor
%if %{distro} == "suse"
/sbin/rcsubdomain
/sbin/rcapparmor