Accepting request 1145034 from home:dmdiss:aa_multivers_openssl_prof

- Add apparmor-abstractions-openssl-allow-version-specific-en.patch to
  allow version specific engdef & engines openssl paths (boo#1219571)

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

apparmor-abstractions-openssl-allow-version-specific-en.patch

@@ -0,0 +1,43 @@
+From 00efed1f35e2bb3f01c1914a4968e48562612fd4 Mon Sep 17 00:00:00 2001
+From: Christian Boltz <apparmor@cboltz.de>
+Date: Wed, 7 Feb 2024 08:49:58 +0000
+Subject: [PATCH] Merge abstractions/openssl: allow version specific engdef &
+ engines paths
+
+Some openssl distributions use version specific engdef and engines paths
+to support multi-version installations.
+
+Fixes: https://bugzilla.opensuse.org/show_bug.cgi?id=1219571
+
+Signed-off-by: David Disseldorp <ddiss@suse.de>
+
+MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1147
+Approved-by: Christian Boltz <apparmor@cboltz.de>
+Merged-by: Christian Boltz <apparmor@cboltz.de>
+
+
+(cherry picked from commit 2577fbf0770784e531f9210856208a774ae92af0)
+
+2b8cf1be abstractions/openssl: allow version specific engdef & engines paths
+---
+ profiles/apparmor.d/abstractions/openssl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/profiles/apparmor.d/abstractions/openssl b/profiles/apparmor.d/abstractions/openssl
+index 65939ae4..e2c5955c 100644
+--- a/profiles/apparmor.d/abstractions/openssl
++++ b/profiles/apparmor.d/abstractions/openssl
+@@ -12,8 +12,8 @@
+ 
+   /etc/ssl/openssl.cnf r,
+   /etc/ssl/openssl-*.cnf r,
+-  /etc/ssl/{engdef,engines}.d/ r,
+-  /etc/ssl/{engdef,engines}.d/*.cnf r,
++  /etc/ssl/{engdef*,engines*}.d/ r,
++  /etc/ssl/{engdef*,engines*}.d/*.cnf r,
+   /usr/share/ssl/openssl.cnf r,
+ 
+   # Include additions to the abstraction
+-- 
+2.35.3
+

apparmor.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb  8 05:20:26 UTC 2024 - David Disseldorp <ddiss@suse.com>
+
+- Add apparmor-abstractions-openssl-allow-version-specific-en.patch to
+  allow version specific engdef & engines openssl paths (boo#1219571)
+
 -------------------------------------------------------------------
 Mon Feb  5 22:19:27 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
 

apparmor.spec

@@ -95,6 +95,9 @@ Patch7:         apparmor-enable-precompiled-cache.diff
 # allow dovecot-auth to execute unix_chkpwd, and add a profile for unix_chkpwd. This is needed for PAM 1.6 (boo#1219139)
 Patch9:         dovecot-unix_chkpwd.diff
 
+# abstractions/openssl: allow version specific engdef & engines paths (boo#1219571)
+Patch10:        apparmor-abstractions-openssl-allow-version-specific-en.patch
+
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
@@ -363,6 +366,7 @@ mv -v profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 profiles/apparmor/
 %patch7
 %endif
 %patch9 -p1
+%patch10 -p1
 
 %build
 export SUSE_ASNEEDED=0