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

Accepting request 511315 from home:cboltz

Browse Source 
- don't rely on implementation details for reload in %post

OBS-URL: https://build.opensuse.org/request/show/511315
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=178
This commit is contained in:
Christian Boltz 2017-07-18 19:59:57 +00:00 committed by Git OBS Bridge
parent f8148e7701
commit 5f32a36514
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apparmor.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 14 18:51:26 UTC 2017 - suse-beta@cboltz.de
- don't rely on implementation details for reload in %post
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 12 13:33:20 UTC 2017 - rgoldwyn@suse.com Wed Jul 12 13:33:20 UTC 2017 - rgoldwyn@suse.com

10
apparmor.spec
View File

@ -80,6 +80,8 @@ Patch10: upstream-changes-r3629..3648.diff
# add some exceptions to utils/test/test-parser-simple-tests.py (submitted upstream 2017-03-25) # add some exceptions to utils/test/test-parser-simple-tests.py (submitted upstream 2017-03-25)
Patch11: parser-tests-dbus-duplicated-conditionals.diff Patch11: parser-tests-dbus-duplicated-conditionals.diff
# add JSON support to aa-logprof and aa-genprof (will be in upstream 2.12)
Patch12: apparmor-yast-cleanup.patch Patch12: apparmor-yast-cleanup.patch
Patch13: apparmor-json-support.patch Patch13: apparmor-json-support.patch
@ -741,14 +743,14 @@ export DISABLE_RESTART_ON_UPDATE="yes"
%service_del_postun apparmor.service %service_del_postun apparmor.service
%post abstractions %post abstractions
#restart_on_update boot.apparmor - but non-broken (bnc#853019) #restart_on_update apparmor - but non-broken (bnc#853019)
systemctl is-active -q apparmor && /lib/apparmor/apparmor.systemd reload ||: systemctl is-active -q apparmor && systemctl reload apparmor ||:
%post profiles %post profiles
# workaround for bnc#904620#c8 / lp#1392042 # workaround for bnc#904620#c8 / lp#1392042
rm -f /var/lib/apparmor/cache/* 2>/dev/null rm -f /var/lib/apparmor/cache/* 2>/dev/null
#restart_on_update boot.apparmor - but non-broken (bnc#853019) #restart_on_update apparmor - but non-broken (bnc#853019)
systemctl is-active -q apparmor && /lib/apparmor/apparmor.systemd reload ||: systemctl is-active -q apparmor && systemctl reload apparmor ||:
%if %{with tomcat} %if %{with tomcat}