Accepting request 1204991 from security:apparmor

- add mesa-cachedir.diff: new cachedir in Mesa 24.2.2

- update to AppArmor 4.0.3
  - several small bugfixes
  - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_4.0.3
    for the full release notes (forwarded request 1204990 from cboltz)

OBS-URL: https://build.opensuse.org/request/show/1204991
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=216

apparmor-v4.0.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b847751b8c0e2344169ec2065cad6251063c5c5ff311953e194bbf25686d981
-size 6987316

apparmor-v4.0.2.tar.gz.asc

@@ -1,18 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJOBAABCgA4FiEEPs3Lpfs00lSWHMU/ZonmTj02ZLsFAmagRIsaHGFwcGFybW9y
-QGxpc3RzLnVidW50dS5jb20ACgkQZonmTj02ZLtWbg//brM4s3laj5L+MnsiOeHr
-x3V9lC3hM2N1IEMBLuEZLZ6pZg0WKDAyJ93DdBmVrX/xXIw6vPUvWRCW8rGv9JJr
-e5KvCI8282gRqvldowc+GX92KuXVTWBafccqlxvfnjLPIjas1/Ft4oubsv5PK97F
-ix4wlW6A+/CXNQ3vP2Dbpb/gVsCOwmSLqJUQz3g40PXUdmB6qHaw3XsIBQWUTX91
-AIPQ6WA9OEp4kupqTgw0ih/8XsLVzb8xx8v5AzQILy1jEV4E7IIN01nN5dXrj+25
-s0kZO1iEctNVgsU3Db7BJMJvAolps1R+c5I6grcS01FaOAwx1TuSacZaDkn+rqpn
-mX62UOly3OHAV7WW1X5U/Jt0rqwekH1su1TlI66bqu7OATlfdceLXe0S79U8txEd
-1T4iZZEPjflk5YjqNYN/C4nDgbNQ9wTDmnY4Q2+ExJKzv/ddD1ulEMiZAE/skNj2
-ztdwB3RZ6aeck0iWuWq/EQsg4c68rnKxwmROzmMuAPtMF3SS1B3CKQDMVib/aJn7
-DY+K4aXBMXrt0RTVa1n86/hDorWaJcB3XoVXGTaEAQhxzArVCF7/p3uVpoK0AM/D
-VYCta1j6cFupVQAHRR2m2+Y3fOFiFRWY9TPE62TTNKERjLQpA2MujevkQ7UOGnuC
-Q6BkrVpPQyVuhIXsP0GkH/c=
-=fBvk
------END PGP SIGNATURE-----
-

apparmor-v4.0.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87a77896e82047a5794725c5e0c06c6dad91a9988a163f771199719c5a95ae1c
+size 6987429

apparmor-v4.0.3.tar.gz.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJOBAABCgA4FiEEPs3Lpfs00lSWHMU/ZonmTj02ZLsFAma9YFIaHGFwcGFybW9y
+QGxpc3RzLnVidW50dS5jb20ACgkQZonmTj02ZLvxVg//byD7XUAXKMcGYVIijY4Z
+07aZU+Hn819eib2B2/mqXZL75zjdO7jjgK/YF/Oz3hBn79stlW7ERP/iMeOVfmZz
+dijw4c1fA4nPHZQzjjD8XR8OuIWWiDAacET7HKZCstZKn+tEByNxpWVxuOI4rqWs
+hNu4W3QIOFMrdkboISoXjb+38hqGX229aJlMka0J9um24yemcm5Lxx8vHiEbPOUU
+NieXwOJ1q+fHyoKML569IDAtCiPJY5vf98XVkJfak1H6sRWHtdt/5mhxy0Rdz6B8
+Dnmhdg1BFhiug7AK8LMTTVZoG0zaEEg+VgXl2QEnIdwSlZ252Pu7zNqOJo8Li0ve
+TlRdUZrREq3zxTbaR+u5u5sktazjm4/QHABSZLInv5CYavx1c3Iqjq1n3ugrhC1a
+eGIH3hww8Qlch/T/AHaKI/WOGhuccYc4mrZ5rDGdhT6ogwjHWTw+nvlerTix/maT
+AS1Gf9YwhHVsNSXIDru9N1L3aOYDe0ZLUq77P2Umsnru7ZNIiL0DfkmIKHexckW4
+h2zD2ciiHOq2T+FyxXPRjlz3hQZJDmTrXHdgL74HIeOQyciXsrUpzfUgBghTNiWu
+JyYxMSYifMD+TEDTF93Z/OKXuFN0rVTuC+SmucqLYCOr5wIv36rDJtU7zHQTJX1R
+G6WGIrjrKaEiRKn47of4DZg=
+=z3W3
+-----END PGP SIGNATURE-----

apparmor.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Oct  1 20:11:06 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
+
+- add mesa-cachedir.diff: new cachedir in Mesa 24.2.2
+
+-------------------------------------------------------------------
+Wed Aug 23 19:08:28 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
+
+- update to AppArmor 4.0.3
+  - several small bugfixes
+  - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_4.0.3
+    for the full release notes
+
 -------------------------------------------------------------------
 Thu Aug 22 11:52:52 UTC 2024 - pgajdos@suse.com
 

apparmor.spec

@@ -51,11 +51,11 @@
 %define CATALINA_HOME /usr/share/tomcat6
 %define JAR_FILE changeHatValve.jar
 
-%define tarversion v4.0.2
-%define pyeggversion 4.0.2
+%define tarversion v4.0.3
+%define pyeggversion 4.0.3
 
 Name:           apparmor
-Version:        4.0.2
+Version:        4.0.3
 Release:        0
 Summary:        AppArmor userlevel parser utility
 License:        GPL-2.0-or-later
@@ -82,6 +82,9 @@ Patch6:         apache-extra-profile-include-if-exists.diff
 # add path for precompiled cache (only done/applied if precompiled_cache is enabled)
 Patch7:         apparmor-enable-precompiled-cache.diff
 
+# Mesa: new cachedir in Mesa 24.2.2 (merged upstream 2024-09-30 https://gitlab.com/apparmor/apparmor/-/merge_requests/1333)
+Patch10:        mesa-cachedir.diff
+
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
@@ -349,6 +352,7 @@ mv -v profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 profiles/apparmor/
 %if %{with precompiled_cache}
 %patch -P 7
 %endif
+%patch -p1 -P 10
 
 %build
 export SUSE_ASNEEDED=0

libapparmor.spec

@@ -17,10 +17,10 @@
 #
 
 
-%define tarversion v4.0.2
+%define tarversion v4.0.3
 
 Name:           libapparmor
-Version:        4.0.2
+Version:        4.0.3
 Release:        0
 Summary:        Utility library for AppArmor
 License:        LGPL-2.1-or-later

mesa-cachedir.diff

@@ -0,0 +1,34 @@
+From 49b9a20997a2f636f8dc127478623aeb072fdb3c Mon Sep 17 00:00:00 2001
+From: Christian Boltz <apparmor@cboltz.de>
+Date: Fri, 20 Sep 2024 22:26:59 +0200
+Subject: [PATCH] abstractions/mesa: allow ~/.cache/mesa_shader_cache_db/
+
+... which is used by Mesa 24.2.2
+
+Reported by darix.
+
+Fixes: https://bugs.launchpad.net/bugs/2081692
+---
+ profiles/apparmor.d/abstractions/mesa | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/profiles/apparmor.d/abstractions/mesa b/profiles/apparmor.d/abstractions/mesa
+index ecabc20ec..c401a8eee 100644
+--- a/profiles/apparmor.d/abstractions/mesa
++++ b/profiles/apparmor.d/abstractions/mesa
+@@ -20,6 +20,12 @@
+   owner @{HOME}/.cache/mesa_shader_cache/[a-f0-9][a-f0-9]/[0-9a-f]* rw,
+   owner @{HOME}/.cache/mesa_shader_cache/[a-f0-9][a-f0-9]/[0-9a-f]*.tmp rwk,
+ 
++  owner @{HOME}/.cache/mesa_shader_cache_db/ rw,
++  owner @{HOME}/.cache/mesa_shader_cache_db/index rwk,
++  owner @{HOME}/.cache/mesa_shader_cache_db/part*/ rw,
++  owner @{HOME}/.cache/mesa_shader_cache_db/part*/mesa_cache.db rwk,
++  owner @{HOME}/.cache/mesa_shader_cache_db/part*/mesa_cache.idx rwk,
++
+   # Fallback location when @{HOME}/.cache is not available
+   owner /tmp/Temp-[a-f0-9]*/mesa_shader_cache/ rw,
+   owner /tmp/Temp-[a-f0-9]*/mesa_shader_cache/index rw,
+-- 
+GitLab
+