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

Accepting request 1154195 from home:cboltz

Browse Source 
- Remove workaround for boo#853019 in %postun parser -
  apparmor.service contains a more safe workaround.
  This also fixes boo#1220708 (missing daemon-reload).

OBS-URL: https://build.opensuse.org/request/show/1154195
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=400
This commit is contained in:
Christian Boltz 2024-03-01 22:28:16 +00:00 committed by Git OBS Bridge
parent 4fb7056ea8
commit d108d92e93
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apparmor.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 1 20:54:12 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
- Remove workaround for boo#853019 in %postun parser -
apparmor.service contains a more safe workaround.
This also fixes boo#1220708 (missing daemon-reload).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 14:26:58 UTC 2024 - Noel Power <nopower@suse.com> Tue Feb 27 14:26:58 UTC 2024 - Noel Power <nopower@suse.com>

8
apparmor.spec
View File

@ -748,13 +748,9 @@ rm -fv %{buildroot}%{_libdir}/libapparmor.la
%service_del_preun apparmor.service %service_del_preun apparmor.service
%postun parser %postun parser
# don't call try-restart, see bnc#853019 # bnc#853019 aka boo#853019 is still a thing, but in the meantime apparmor.service has ExecStop=/bin/true (= do nothing),
%if 0%{?suse_version} <= 1500 # which means that 'systemctl restart apparmor' is safe now
export DISABLE_RESTART_ON_UPDATE="yes"
%service_del_postun apparmor.service %service_del_postun apparmor.service
%else
%service_del_postun_without_restart apparmor.service
%endif
%posttrans abstractions %posttrans abstractions
# workaround for bnc#904620#c8 / lp#1392042 # workaround for bnc#904620#c8 / lp#1392042