Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package apparmor for openSUSE:Factory 
checked in at 2023-06-12 15:24:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apparmor (Old)
 and      /work/SRC/openSUSE:Factory/.apparmor.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "apparmor"

Mon Jun 12 15:24:13 2023 rev:192 rq:1092351 version:3.1.5

Changes:
--------
--- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes        2023-06-08 
21:41:44.597701504 +0200
+++ /work/SRC/openSUSE:Factory/.apparmor.new.15902/apparmor.changes     
2023-06-12 15:24:18.430290855 +0200
@@ -1,0 +2,15 @@
+Sun Jun 11 14:13:18 UTC 2023 - Christian Boltz <suse-b...@cboltz.de>
+
+- update to AppArmor 3.1.5
+  - fix handling of mount rules in apparmor_parser
+  - minor additions to abstractions/base and snap_browsers
+  - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.5
+    for the full upstream changelog
+- remove upstreamed aa-status-fix-json-mr1046.patch
+- split off apparmor-enable-precompiled-cache.diff from
+  apparmor-enable-profile-cache.diff so that the precompiled cache
+  path doesn't get added in parser.conf for Tumbleweed builds.
+  This prevents a warning about the non-existing directory when
+  loading profiles.
+
+-------------------------------------------------------------------

Old:
----
  aa-status-fix-json-mr1046.patch
  apparmor-3.1.4.tar.gz
  apparmor-3.1.4.tar.gz.asc

New:
----
  apparmor-3.1.5.tar.gz
  apparmor-3.1.5.tar.gz.asc
  apparmor-enable-precompiled-cache.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ apparmor.spec ++++++
--- /var/tmp/diff_new_pack.hrbMze/_old  2023-06-12 15:24:20.634303894 +0200
+++ /var/tmp/diff_new_pack.hrbMze/_new  2023-06-12 15:24:20.642303941 +0200
@@ -54,7 +54,7 @@
 %define JAR_FILE changeHatValve.jar
 
 Name:           apparmor
-Version:        3.1.4
+Version:        3.1.5
 Release:        0
 Summary:        AppArmor userlevel parser utility
 License:        GPL-2.0-or-later
@@ -88,8 +88,8 @@
 # make <apache2.d> include in apache extra profile optional to make openQA 
happy (boo#1178527)
 Patch6:         apache-extra-profile-include-if-exists.diff
 
-# fix aa-status --json / --pretty-json output (merged upstream 2023-06-06 for 
3.0 and 3.1 branch [not needed/suiting for master] - 
https://gitlab.com/apparmor/apparmor/-/merge_requests/1046)
-Patch10:        aa-status-fix-json-mr1046.patch
+# add path for precompiled cache (only done/applied if precompiled_cache is 
enabled)
+Patch7:         apparmor-enable-precompiled-cache.diff
 
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -355,7 +355,9 @@
 %patch4
 %patch5
 %patch6
-%patch10 -p1
+%if %{with precompiled_cache}
+%patch7
+%endif
 
 %build
 export SUSE_ASNEEDED=0

++++++ libapparmor.spec ++++++
--- /var/tmp/diff_new_pack.hrbMze/_old  2023-06-12 15:24:20.674304130 +0200
+++ /var/tmp/diff_new_pack.hrbMze/_new  2023-06-12 15:24:20.686304201 +0200
@@ -18,7 +18,7 @@
 
 
 Name:           libapparmor
-Version:        3.1.4
+Version:        3.1.5
 Release:        0
 Summary:        Utility library for AppArmor
 License:        LGPL-2.1-or-later

++++++ apparmor-3.1.4.tar.gz -> apparmor-3.1.5.tar.gz ++++++
/work/SRC/openSUSE:Factory/apparmor/apparmor-3.1.4.tar.gz 
/work/SRC/openSUSE:Factory/.apparmor.new.15902/apparmor-3.1.5.tar.gz differ: 
char 20, line 1

++++++ apparmor-enable-precompiled-cache.diff ++++++
Set the cache location to /var/cache/apparmor/ (writeable) and
/usr/share/apparmor/cache/ (packaged precompiled cache).

See boo#1069906 and boo#1074429

Note that Tumbleweed packages don't include precompiled profile cache on
Tumbleweed as long as it's purely validated based on timestamps (boo#1205659)


Signed-off by: Christian Boltz <appar...@cboltz.de>

Index: parser/parser.conf
===================================================================
--- parser/parser.conf_ORIG     2018-04-19 22:47:18.485179998 +0200
+++ parser/parser.conf  2018-04-19 22:51:12.084588654 +0200
@@ -31,6 +31,9 @@
 
 ## Turn creating/updating of the cache on by default
 write-cache
+
+# cache location (cache writes go to the first directory in the list)
+cache-loc /var/cache/apparmor,/usr/share/apparmor/cache
 
 ## Show cache hits
 #show-cache


++++++ apparmor-enable-profile-cache.diff ++++++
--- /var/tmp/diff_new_pack.hrbMze/_old  2023-06-12 15:24:20.798304865 +0200
+++ /var/tmp/diff_new_pack.hrbMze/_new  2023-06-12 15:24:20.802304888 +0200
@@ -8,27 +8,18 @@
 See also bnc#689458
 
 
-Also set the cache location to /var/cache/apparmor/ (writeable) and
-/usr/share/apparmor/cache/ (packaged precompiled cache).
-
-See boo#1069906 and boo#1074429
-
-
 Signed-off by: Christian Boltz <appar...@cboltz.de>
 
 Index: parser/parser.conf
 ===================================================================
 --- parser/parser.conf_ORIG    2018-04-19 22:47:18.485179998 +0200
 +++ parser/parser.conf 2018-04-19 22:51:12.084588654 +0200
-@@ -31,7 +31,10 @@
+@@ -31,7 +31,7 @@
  # match-string "pattern=aadfa audit perms=crwxamlk/ user::other"
  
  ## Turn creating/updating of the cache on by default
 -#write-cache
 +write-cache
-+
-+# cache location (cache writes go to the first directory in the list)
-+cache-loc /var/cache/apparmor,/usr/share/apparmor/cache
  
  ## Show cache hits
  #show-cache

Reply via email to