From b410411567c4432887b3959b65d0fed6a787b0215e4d8d7e7e242b55c599f693 Mon Sep 17 00:00:00 2001
From: Christian Boltz <suse-beta@cboltz.de>
Date: Fri, 21 May 2021 21:13:53 +0000
Subject: [PATCH] Accepting request 894864 from home:cboltz

- add abstractions-php8.diff to support PHP8 in abstractions/php (boo#1186267)

OBS-URL: https://build.opensuse.org/request/show/894864
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=298
---
 abstractions-php8.diff | 47 ++++++++++++++++++++++++++++++++++++++++++
 apparmor.changes       |  5 +++++
 apparmor.spec          |  4 ++++
 3 files changed, 56 insertions(+)
 create mode 100644 abstractions-php8.diff

diff --git a/abstractions-php8.diff b/abstractions-php8.diff
new file mode 100644
index 0000000..f9b9964
--- /dev/null
+++ b/abstractions-php8.diff
@@ -0,0 +1,47 @@
+commit 5853f52233d9d86754096e4b64415226b943b502
+Author: Christian Boltz <apparmor@cboltz.de>
+Date:   Fri May 21 22:50:54 2021 +0200
+
+    abstractions/php: support PHP 8
+    
+    References: https://bugzilla.opensuse.org/show_bug.cgi?id=1186267
+
+diff --git a/profiles/apparmor.d/abstractions/php b/profiles/apparmor.d/abstractions/php
+index cd3172d4..ddafb077 100644
+--- a/profiles/apparmor.d/abstractions/php
++++ b/profiles/apparmor.d/abstractions/php
+@@ -13,26 +13,26 @@
+   abi <abi/3.0>,
+ 
+   # shared snippets for config files
+-  /etc/php{,5,7}/**/ r,
+-  /etc/php{,5,7}/**.ini r,
++  /etc/php{,5,7,8}/**/ r,
++  /etc/php{,5,7,8}/**.ini r,
+ 
+   # Xlibs
+   /usr/X11R6/lib{,32,64}/lib*.so* mr,
+   # php extensions
+-  /usr/lib{64,}/php{,5,7}/*/*.so mr,
++  /usr/lib{64,}/php{,5,7,8}/*/*.so mr,
+ 
+   # ICU (unicode support) data tables
+   /usr/share/icu/*/*.dat r,
+ 
+   # php session mmap socket
+-  /var/lib/php{,5,7}/session_mm_* rwlk,
++  /var/lib/php{,5,7,8}/session_mm_* rwlk,
+   # file based session handler
+-  /var/lib/php{,5,7}/sess_* rwlk,
+-  /var/lib/php{,5,7}/sessions/* rwlk,
++  /var/lib/php{,5,7,8}/sess_* rwlk,
++  /var/lib/php{,5,7,8}/sessions/* rwlk,
+ 
+   # php libraries
+-  /usr/share/php{,5,7}/ r,
+-  /usr/share/php{,5,7}/** mr,
++  /usr/share/php{,5,7,8}/ r,
++  /usr/share/php{,5,7,8}/** mr,
+ 
+   # MySQL extension
+   /usr/share/mysql/** r,
diff --git a/apparmor.changes b/apparmor.changes
index c928871..33f5b67 100644
--- a/apparmor.changes
+++ b/apparmor.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 21 20:59:49 UTC 2021 - Christian Boltz <suse-beta@cboltz.de>
+
+- add abstractions-php8.diff to support PHP8 in abstractions/php (boo#1186267)
+
 -------------------------------------------------------------------
 Tue Apr 27 16:48:25 UTC 2021 - Christian Boltz <suse-beta@cboltz.de>
 
diff --git a/apparmor.spec b/apparmor.spec
index a9c184a..3a83b3e 100644
--- a/apparmor.spec
+++ b/apparmor.spec
@@ -81,6 +81,9 @@ Patch6:         apache-extra-profile-include-if-exists.diff
 # allow reading crypto policies (submitted upstream 2021-03-08 - https://gitlab.com/apparmor/apparmor/-/merge_requests/720)
 Patch7:         crypto-policies-mr720.diff
 
+# extend abstractions/php for PHP 8 (submitted upstream https://gitlab.com/apparmor/apparmor/-/merge_requests/755)
+Patch8:         abstractions-php8.diff
+
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define apparmor_bin_prefix %{?usrmerged:/usr}/lib/apparmor
@@ -345,6 +348,7 @@ mv -v profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 profiles/apparmor/
 %patch4
 %patch5
 %patch7 -p1
+%patch8 -p1
 
 %build
 %define _lto_cflags %{nil}