Accepting request 992099 from home:cboltz

- update to AppArmor 3.0.6
  - fix LTO build in the parser
  - remove dbus deny rule in abstractions/exo-open
  - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.0.6
    for the detailed upstream changelog
- drop upstream patch dirtest-sort-mr900.diff

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

apparmor-3.0.5.tar.gz

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

apparmor-3.0.5.tar.gz.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJOBAABCgA4FiEEPs3Lpfs00lSWHMU/ZonmTj02ZLsFAmLeRbsaHGFwcGFybW9y
-QGxpc3RzLnVidW50dS5jb20ACgkQZonmTj02ZLsAKQ//b3RWTRdJM/S1b49RQd6p
-/gltAIlOD2Ne3jBUVXeKiGlsNEN8Os37D+3t9wMfXphoM+JbrUO/2gm52M/7w4Ov
-xZJOVGC1SA72R2h6CObNZ3gqsc6/HuOW+/NLahFikZWdKs4mHwKhSlKkZU8g1bVS
-KA3hrwyct4oO2XSQARc+V9n6a6y8shvBolUbB7Jm2HSomMjHkiW11wfHECroW4v+
-YZv4JwwojOvYE0J+1WEJeOhv1SfzQMnYAn2BdtoSbO3pYHTXmblVXKpiB30cHtJ7
-Rbm+a2FbRsH1giTtq48cvBl7euBEXP27uM7cQSSbqukEJtWkIJTRpnJxGV5bUS+a
-tI3J4uneuicJxc6snAmO58PXnp1O9WGeHVtPg3ERYZQQ5UoaYpxlEpMFQJV44M4U
-s7g2iTZ6+z0I4gcjnfm/uKcdLyYN2KJSQTD/bgQv6C5t94ofoZ1HCt7Ra/VHIG+Q
-0pSDN/RSu2LI3tJdDq2/KFU1e0YzElSaHNb+sUn+rQOrpMB0FJZK1KzrBn0TxjTj
-JONny5WnVaTmbBfdjIvGbpWMMbKX/3Ob5kHmgY8TYuo/Bllgr2l6rWURK1MTHO64
-narFxIqOBj0Kb+kJPhA8+55R7gA1ioW6JtQQLlbz2NgRMaOeBWiprmaxRv1xY9e3
-NYdyzQRgu/zOEM5v/J5VecQ=
-=FsDG
------END PGP SIGNATURE-----

apparmor-3.0.6.tar.gz

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

apparmor-3.0.6.tar.gz.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJOBAABCgA4FiEEPs3Lpfs00lSWHMU/ZonmTj02ZLsFAmLnjlsaHGFwcGFybW9y
+QGxpc3RzLnVidW50dS5jb20ACgkQZonmTj02ZLvA5Q//YmZXrMz4xOshEfORUeB2
+sKUG9PHgx/kYxVroIU0HSLvaVv5tl/muCVzHwnNpPjOsHWtPROZHSsXZlbqf0XN4
+9ZPyXENGFwmjWy59ORE00uPawcz7xN839aB/eZMUPvCAg1MHyLW6dJVj+WRwTdzf
+o1XrAF/1ferKcIJR4Q29YSsnsWrTGV5jSeKhiN5QfD3hUOtjCjeqz1wMpvRT1fJF
+F9+a9JY/VPYP0P9G/VjOzrl4TZZlBk4VXDqji95xx87EC+6qnfgYDVWLGIr8Wuzm
+3F23bZChZZ9qNhYSKY5Fv51MsEZT6SBnLmzBQzmAd2jJB4vJ78sgj1UdYvFDm7rN
+pBJ0QlrUZMfZHBao102jK5iUm3EeR1SgFL6S8oOV6OJ/gBstpNqcznWDSh01MoLy
+ECZg2paiwh/I+dnzZ53PU8QUg5FTXINAkGU+mJ0UOvX+RMhXBtZ1UdmdfMGF7/6l
+4Y7lwRlnpHQ0K/YcAezs9VmGxz6Toav9vXF7UwA1oLkp6tC4JiE3r7Cr3I5F+2Bg
+24kg7S40gHU9r7rSntzYHNEiWFepLyPzPhCygWLNnwlbZcDWylvdtAPCJ1ANbPh8
+FrfYHa+EiaWX6ONY0mQfRlhyN/Am//bAfbp+tXGvH9YfInODXUKfBRU5OTpSHerE
+zrp2wnY/0HULdk2En/5ttsk=
+=FqZU
+-----END PGP SIGNATURE-----

apparmor.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Aug  1 18:42:57 UTC 2022 - Christian Boltz <suse-beta@cboltz.de>
+
+- update to AppArmor 3.0.6
+  - fix LTO build in the parser
+  - remove dbus deny rule in abstractions/exo-open
+  - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.0.6
+    for the detailed upstream changelog
+- drop upstream patch dirtest-sort-mr900.diff
+
 -------------------------------------------------------------------
 Mon Jul 25 18:18:04 UTC 2022 - Christian Boltz <suse-beta@cboltz.de>
 

apparmor.spec

@@ -45,7 +45,7 @@
 %define JAR_FILE changeHatValve.jar
 
 Name:           apparmor
-Version:        3.0.5
+Version:        3.0.6
 Release:        0
 Summary:        AppArmor userlevel parser utility
 License:        GPL-2.0-or-later
@@ -83,9 +83,6 @@ Patch6:         apache-extra-profile-include-if-exists.diff
 #                               + merged upstream 2022-06-29 https://gitlab.com/apparmor/apparmor/-/merge_requests/892 - master only)
 Patch9:         zgrep-profile-mr870.diff
 
-# dirtest.sh: sort output to avoid random test failures (from upstream, merged 3.0+master 2022-07-25 https://gitlab.com/apparmor/apparmor/-/merge_requests/900)
-Patch10:        dirtest-sort-mr900.diff
-
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define apparmor_bin_prefix %{?usrmerged:/usr}/lib/apparmor
@@ -352,7 +349,6 @@ mv -v profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 profiles/apparmor/
 %patch5
 %patch6
 %patch9 -p1
-%patch10 -p1
 
 %build
 export SUSE_ASNEEDED=0

dirtest-sort-mr900.diff

@@ -1,42 +0,0 @@
-From c0815d0e0f1c68397b8ce04d81c48940e4b2c63b Mon Sep 17 00:00:00 2001
-From: intrigeri <intrigeri@boum.org>
-Date: Mon, 25 Jul 2022 10:04:13 +0000
-Subject: [PATCH] dirtest.sh: don't rely on apparmor_parser -N's output sort
- order to be deterministic
-
-I've seen this test fail because "apparmor_parser -N" returned the expected
-lines, but in a different order than what's expected (dirtest.out).
-
-To fix this, sort both the expected and actual output.
----
- parser/tst/dirtest.sh          | 3 ++-
- parser/tst/dirtest/dirtest.out | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/parser/tst/dirtest.sh b/parser/tst/dirtest.sh
-index 8c94dbd68..95c108371 100755
---- a/parser/tst/dirtest.sh
-+++ b/parser/tst/dirtest.sh
-@@ -31,8 +31,9 @@ do_tst() {
- 	shift 2
- 	#global tmpdir
- 
--	${APPARMOR_PARSER} "$@" > "$tmpdir/out" 2>/dev/null
-+	${APPARMOR_PARSER} "$@" > "$tmpdir/out.unsorted" 2>/dev/null
- 	rc=$?
-+	LC_ALL=C sort "$tmpdir/out.unsorted" > "$tmpdir/out"
- 	if [ $rc -ne 0 ] && [ "$expected" != "fail" ] ; then
- 		echo "failed: expected \"$expected\" but parser returned error"
- 		return 1
-diff --git a/parser/tst/dirtest/dirtest.out b/parser/tst/dirtest/dirtest.out
-index e82188b84..5b4cc30aa 100644
---- a/parser/tst/dirtest/dirtest.out
-+++ b/parser/tst/dirtest/dirtest.out
-@@ -1,3 +1,3 @@
--good_target
- a_profile
- b_profile
-+good_target
--- 
-GitLab
-

libapparmor.spec

@@ -18,7 +18,7 @@
 
 
 Name:           libapparmor
-Version:        3.0.5
+Version:        3.0.6
 Release:        0
 Summary:        Utility library for AppArmor
 License:        LGPL-2.1-or-later