Accepting request 852711 from security:apparmor

- update to AppArmor 3.0.1
  - minor additions to profiles and abstractions
  - some bugfixes in libapparmor, apparmor_parser and the aa-* utils
  - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.0.1
    for the detailed upstream changelog
- removed upstream(ed) patches:
  - changes-since-3.0.0.diff
  - extra-profiles-fix-Pux.diff
  - utils-fix-hotkey-conflict.diff

- Use apache provided variables for the module_directry:
  + Use %apache_libexecdir
  + Add apache-rpm-macros BuildRequires

libapparmor:
- update to AppArmor 3.0.1
  - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.0.1
    for the detailed upstream changelog
  - drop upstream patch changes-since-3.0.0.diff

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

apparmor-3.0.0.tar.gz

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

apparmor-3.0.0.tar.gz.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJOBAABCgA4FiEEPs3Lpfs00lSWHMU/ZonmTj02ZLsFAl92CWIaHGFwcGFybW9y
-QGxpc3RzLnVidW50dS5jb20ACgkQZonmTj02ZLta4BAAvMbcNifGq1QyWUyakBno
-ty5R8vcsrRCVzMdD4G78m+dtRlKWjSXCJyFO4LKope3p+zZKHl/q+ANJa80yK8OD
-E+eXqBRZ0NYTOgPg7Z/mNVk/qRW3EZd+ltxCjHH2uWazLxCKHH4qI9WeG1lHQTmX
-I/CsK1X1X6u2fEXdKYeBa3fjo0E4iSrR9pu5zJ+hApLcP6E4/kPzfKSaiDMa7Tnu
-IdJE4HNf62v83zxxdN72eYQjk1TD+xn1WO7zzKQwMrQDdIEXAnN0B4nomxaVlLAc
-A/54SgacgDTm79peK6eAfzx3ujRvqoZW5nV9TEgQ/M5CkLSrbMVR/hdyh+FHbqIE
-nkvrbfma2DBo7zwCe/NzctA5886jdj2bowSJ2Xo+RbYakbDzkjJjAUdI57JG2PdH
-Cbc21SPk/8qFSvPOmqHpXe5ToDoUMLOhG7WuscHSUlPsdmYFqBYGQvzWAydIRUL2
-EP+vchFv46KwM5j7KTrI5ASlnSYjP2tZNUDHpTrSPKE1UytB0qx8Jx/qU6KTZaSM
-i182UCbdBWhzluD7HRqQj21UoD+qqCq4+oOPOkaNplDvpYjDNTIuhU5WQNj8MhZg
-oW6sWlBLO/dp6Kh4rGeEGwPYtUxDDcr/Qwy66ce5RogsuShnpSEDezt3f/HUxGP1
-2JewH5WTV523nOIQuvGoAfs=
-=P633
------END PGP SIGNATURE-----

apparmor-3.0.1.tar.gz

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

apparmor-3.0.1.tar.gz.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJOBAABCgA4FiEEPs3Lpfs00lSWHMU/ZonmTj02ZLsFAl/H050aHGFwcGFybW9y
+QGxpc3RzLnVidW50dS5jb20ACgkQZonmTj02ZLs3rg//X88R7I+7HkokugnZnWPk
+3nx6M4DtvrPdz5xFsxj/Ucg+kwxNvL0CwivadPdZldW+HqUNG9GxF31S9TkNa4Q9
+480N1o7I2W+WhO2P2JPqvE97f4dfxi+c0nzbwuMJdpVQi5yOJ3eHHzg9DfiLHSSq
+u5X/YzoAf4lFIa+OWbhsWA+YB51FthGrvp8pcLdKfr4pcR3XmTdYFtRtBn+r0peG
+ryma63WE2P4rmyDx99ZU0DaHwZY4qlN56JYX3vZ8XN2tW1FYxmz1FYfp2JqG3SmD
+N0WrVPLEFSHlQEO8/x8Ua74gQS6XcntWE3MjLLOxNnbJUM4lO92UqKpkn4pffNP7
+t3IwOqS1kJkxSU7IWWUuy6eY434igsmtuJuVwOma9Svm8Mu4LpOcDyThWFc0QsTL
+E22mRdjmiVDh43CNhBXq68G2RmX0XMr1HeV3F1r4QwDmLnCHpUEeLfjOKt60rXZF
+nOCwoRuu0i9LGE0gjwNRxs9YQREg75SDTnp3jBE4YLkokihLYENNsfsLX7/PUs/E
+A0OU9jIak3yZm0zl5Zm9RdU+ISn8C54FNHUJmes3DW0Vj/aO30qZQgGIuOLBzJHw
+bVpAS6c6mZhhaBzLacxcOjvLQ1M6ufaYac2MlIqg7JM2+mPO72ebe+VVKd53pkFH
+c0QhJHU3mB4kc9uTXImKP4o=
+=kioe
+-----END PGP SIGNATURE-----

apparmor.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Wed Dec  2 19:29:34 UTC 2020 - Christian Boltz <suse-beta@cboltz.de>
+
+- update to AppArmor 3.0.1
+  - minor additions to profiles and abstractions
+  - some bugfixes in libapparmor, apparmor_parser and the aa-* utils
+  - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.0.1
+    for the detailed upstream changelog
+- removed upstream(ed) patches:
+  - changes-since-3.0.0.diff
+  - extra-profiles-fix-Pux.diff
+  - utils-fix-hotkey-conflict.diff
+
+-------------------------------------------------------------------
+Wed Dec  2 14:31:18 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use apache provided variables for the module_directry:
+  + Use %apache_libexecdir
+  + Add apache-rpm-macros BuildRequires
+
 -------------------------------------------------------------------
 Sat Oct 31 19:05:14 UTC 2020 - Christian Boltz <suse-beta@cboltz.de>
 

apparmor.spec

@@ -32,10 +32,9 @@
 #define APPARMOR_DOC_DIR /usr/share/doc/packages/apparmor-docs/
 #define JNI_SO libJNIChangeHat.so
 %define JAR_FILE changeHatValve.jar
-%define apache_module_path %(/usr/sbin/apxs2 -q LIBEXECDIR)
 
 Name:           apparmor
-Version:        3.0.0
+Version:        3.0.1
 Release:        0
 Summary:        AppArmor userlevel parser utility
 License:        GPL-2.0-or-later
@@ -65,15 +64,6 @@ Patch4:         apparmor-lessopen-profile.patch
 # workaround for boo#1119937 / lp#1784499 - allow network access for reading files on NFS (proper solution needs kernel fix)
 Patch5:         apparmor-lessopen-nfs-workaround.diff
 
-# changes since 3.0.0 release up to 3e18c0785abc03ee42a022a67a27a085516a7921
-Patch6:         changes-since-3.0.0.diff
-
-# fix hotkey conflict for utils (de, id and sv), and fix the test (accepted upstream 2020-11-01 https://gitlab.com/apparmor/apparmor/-/merge_requests/675)
-Patch10:        utils-fix-hotkey-conflict.diff
-
-# fix invalid Pux (should be PUx) in inactive profile - breaks creating a new profile with aa-autodep, aa-logprof and aa-genprof (accepted upstream 2020-11-01 https://gitlab.com/apparmor/apparmor/-/merge_requests/676)
-Patch11:        extra-profiles-fix-Pux.diff
-
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define apparmor_bin_prefix /lib/apparmor
@@ -100,6 +90,7 @@ BuildRequires:  ruby-devel
 %endif
 
 %if %{with apache}
+BuildRequires:  apache-rpm-macros
 BuildRequires:  apache2-devel
 %endif
 
@@ -334,9 +325,6 @@ mv -v profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 profiles/apparmor/
 %patch3 -p1
 %patch4
 %patch5
-%patch6 -p1
-%patch10 -p1
-%patch11 -p1
 
 %build
 %define _lto_cflags %{nil}
@@ -685,7 +673,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmor.la
 
 %files -n apache2-mod_apparmor
 %defattr(-,root,root)
-%{apache_module_path}/mod_apparmor.so
+%{apache_libexecdir}/mod_apparmor.so
 %doc %{_mandir}/man8/mod_apparmor.8.gz
 %endif
 

extra-profiles-fix-Pux.diff

@@ -1,26 +0,0 @@
-From d08d1a00a350964abae39337402ab1f2caf271b9 Mon Sep 17 00:00:00 2001
-From: Christian Boltz <apparmor@cboltz.de>
-Date: Sat, 31 Oct 2020 20:52:30 +0100
-Subject: [PATCH] Fix invalid Pux (should be PUx) permissions in
- dhclient-script
-
----
- profiles/apparmor/profiles/extras/sbin.dhclient-script | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/profiles/apparmor/profiles/extras/sbin.dhclient-script b/profiles/apparmor/profiles/extras/sbin.dhclient-script
-index 7b3113525..d972b6093 100644
---- a/profiles/apparmor/profiles/extras/sbin.dhclient-script
-+++ b/profiles/apparmor/profiles/extras/sbin.dhclient-script
-@@ -25,7 +25,7 @@ profile dhclient-script /{usr/,}sbin/dhclient-script {
-   /etc/dhcp/{**,} r,
-   /{usr/,}sbin/dhclient-script r,
-   /{usr/,}sbin/ip rix,
--  /{usr/,}sbin/resolvconf rPux,
-+  /{usr/,}sbin/resolvconf rPUx,
- 
-   include if exists <local/sbin.dhclient-script>
- }
--- 
-GitLab
-

libapparmor.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Dec  2 19:28:22 UTC 2020 - Christian Boltz <suse-beta@cboltz.de>
+
+- update to AppArmor 3.0.1
+  - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.0.1
+    for the detailed upstream changelog
+  - drop upstream patch changes-since-3.0.0.diff
+
 -------------------------------------------------------------------
 Sun Oct 25 11:15:54 UTC 2020 - Christian Boltz <suse-beta@cboltz.de>
 

libapparmor.spec

@@ -18,7 +18,7 @@
 
 
 Name:           libapparmor
-Version:        3.0.0
+Version:        3.0.1
 Release:        0
 Summary:        Utility library for AppArmor
 License:        LGPL-2.1-or-later
@@ -31,7 +31,6 @@ BuildRequires:  dejagnu
 BuildRequires:  flex
 BuildRequires:  pkg-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Patch1:         changes-since-3.0.0.diff
 
 %description
 This package provides the libapparmor library, which contains the
@@ -68,7 +67,6 @@ AppArmor API.
 
 %prep
 %setup -q -n apparmor-%{version}
-%patch1 -p1
 
 %build
 %define _lto_cflags %{nil}

utils-fix-hotkey-conflict.diff

@@ -1,124 +0,0 @@
-From 07bd11390ea16df17db7f7e6bd2c9678345d3ac5 Mon Sep 17 00:00:00 2001
-From: Christian Boltz <apparmor@cboltz.de>
-Date: Sat, 31 Oct 2020 20:21:29 +0100
-Subject: [PATCH 1/2] Check hotkey conflicts case-insensitive
-
-This is needed to catch conflicts between uppercase and lowercase
-hotkeys of the same letter, as seen with `(B)enannt` and `A(b)lehnen` in
-the german utils translations.
----
- utils/test/test-translations.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utils/test/test-translations.py b/utils/test/test-translations.py
-index 4ca50c3d2..e1b91623d 100644
---- a/utils/test/test-translations.py
-+++ b/utils/test/test-translations.py
-@@ -61,7 +61,7 @@ class TestHotkeyConflicts(AATest):
-             keys = dict()
-             for key in params:
-                 text = t.gettext(CMDS[key])
--                hotkey = get_translated_hotkey(text)
-+                hotkey = get_translated_hotkey(text).lower()
- 
-                 if keys.get(hotkey):
-                     raise Exception("Hotkey conflict: '%s' and '%s' in language %s" % (keys[hotkey], text, language))
--- 
-GitLab
-
-
-From 7cf54f2cd83938cd3b51d588864eb8cc890d63f6 Mon Sep 17 00:00:00 2001
-From: Christian Boltz <apparmor@cboltz.de>
-Date: Sat, 31 Oct 2020 20:27:28 +0100
-Subject: [PATCH 2/2] Fix hotkey conflict in utils de.po, id.po and sv.po
-
----
- utils/po/de.po | 8 ++++----
- utils/po/id.po | 8 ++++----
- utils/po/sv.po | 2 +-
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/utils/po/de.po b/utils/po/de.po
-index 161b3fcd4..ecafc5dad 100644
---- a/utils/po/de.po
-+++ b/utils/po/de.po
-@@ -1079,11 +1079,11 @@ msgstr "(C)hild sauber ausführen"
- 
- #: ../apparmor/ui.py:239
- msgid "(N)amed"
--msgstr "(B)enannt"
-+msgstr "Be(n)annt"
- 
- #: ../apparmor/ui.py:240
- msgid "(N)amed Clean Exec"
--msgstr "(B)enannte sauber ausführen"
-+msgstr "Be(n)annte sauber ausführen"
- 
- #: ../apparmor/ui.py:241
- msgid "(U)nconfined"
-@@ -1111,11 +1111,11 @@ msgstr "(C)hild vererbt saubere Ausführung"
- 
- #: ../apparmor/ui.py:247
- msgid "(N)amed Inherit"
--msgstr "(B)enannte Vererbung"
-+msgstr "Be(n)annte Vererbung"
- 
- #: ../apparmor/ui.py:248
- msgid "(N)amed Inherit Clean Exec"
--msgstr "(B)enannte Vererbung sauber ausführen"
-+msgstr "Be(n)annte Vererbung sauber ausführen"
- 
- #: ../apparmor/ui.py:249
- msgid "(X) ix On"
-diff --git a/utils/po/id.po b/utils/po/id.po
-index e35a315a5..c88a1895d 100644
---- a/utils/po/id.po
-+++ b/utils/po/id.po
-@@ -1147,11 +1147,11 @@ msgstr "(B)aru"
- 
- #: ../apparmor/ui.py:254
- msgid "(G)lob"
--msgstr "(G)umpal"
-+msgstr "G(u)mpal"
- 
- #: ../apparmor/ui.py:255
- msgid "Glob with (E)xtension"
--msgstr "Gumpal dengan (E)kstensi"
-+msgstr "Gumpal dengan E(k)stensi"
- 
- #: ../apparmor/ui.py:256
- msgid "(A)dd Requested Hat"
-@@ -1159,7 +1159,7 @@ msgstr "(T)ambahkan Topi yang Diminta"
- 
- #: ../apparmor/ui.py:257
- msgid "(U)se Default Hat"
--msgstr "(G)unakan Topi Default"
-+msgstr "Gunakan Topi (D)efault"
- 
- #: ../apparmor/ui.py:258
- msgid "(S)can system log for AppArmor events"
-@@ -1175,7 +1175,7 @@ msgstr "(L)ihat Profil"
- 
- #: ../apparmor/ui.py:261
- msgid "(U)se Profile"
--msgstr "(G)unakan Profil"
-+msgstr "Gunakan (P)rofil"
- 
- #: ../apparmor/ui.py:262
- msgid "(C)reate New Profile"
-diff --git a/utils/po/sv.po b/utils/po/sv.po
-index 702c71166..e128ffda5 100644
---- a/utils/po/sv.po
-+++ b/utils/po/sv.po
-@@ -1004,7 +1004,7 @@ msgstr ""
- 
- #: ../apparmor/ui.py:223
- msgid "(A)llow"
--msgstr "(T)illåt"
-+msgstr "Ti(l)låt"
- 
- #: ../apparmor/ui.py:224
- msgid "(M)ore"
--- 
-GitLab
-