Accepting request 1113476 from home:dmdiss:aa-php-fpm-pid

- Fix pam_apparmor %post and %postun scripts to handle pam-config errors
  (bsc#1215596)

OBS-URL: https://build.opensuse.org/request/show/1113476
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=383

apparmor.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 25 14:07:39 UTC 2023 - David Disseldorp <ddiss@suse.com>
+
+- Fix pam_apparmor %post and %postun scripts to handle pam-config errors
+  (bsc#1215596)
+
 -------------------------------------------------------------------
 Tue Jul 25 09:28:33 UTC 2023 - David Disseldorp <ddiss@suse.com>
 

apparmor.spec

@@ -760,12 +760,14 @@ systemctl is-active -q apparmor && systemctl reload apparmor ||:
 %if %{with pam}
 
 %post -n pam_apparmor
-pam-config -a --apparmor
+if [ $1 -eq 1 ]; then
-pam-config --update
+        pam-config --add --apparmor || :
+fi
 
 %postun -n pam_apparmor
-pam-config -d --apparmor
+if [ $1 -eq 0 ]; then
-pam-config --update
+        pam-config --delete --apparmor || :
+fi
 %endif
 
 %changelog