diff --git a/apparmor.changes b/apparmor.changes index 34957fe..c928871 100644 --- a/apparmor.changes +++ b/apparmor.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Apr 27 16:48:25 UTC 2021 - Christian Boltz + +- add crypto-policies-mr720.diff to allow reading crypto policies + in abstractions/ssl_certs (boo#1183597) + +------------------------------------------------------------------- +Sat Mar 27 22:56:06 UTC 2021 - Christian Boltz + +- replace %{?systemd_requires} with %{?systemd_ordering} to avoid dragging in + systemd into containers just because apparmor-parser ships a *.service file + ------------------------------------------------------------------- Thu Feb 11 18:18:46 UTC 2021 - Christian Boltz diff --git a/apparmor.spec b/apparmor.spec index 90140c5..a9c184a 100644 --- a/apparmor.spec +++ b/apparmor.spec @@ -78,6 +78,9 @@ Patch5: apparmor-lessopen-nfs-workaround.diff # make include in apache extra profile optional to make openQA happy (boo#1178527) 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 + PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apparmor_bin_prefix %{?usrmerged:/usr}/lib/apparmor @@ -132,7 +135,7 @@ Provides: subdomain-parser-demo = %{version} Provides: subdomain_parser = %{version} Provides: apparmor-parser(CAP_SYSLOG) BuildRequires: systemd-rpm-macros -%{?systemd_requires} +%{?systemd_ordering} %description parser The AppArmor Parser is a userlevel program that is used to load in @@ -341,6 +344,7 @@ mv -v profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 profiles/apparmor/ %patch3 -p1 %patch4 %patch5 +%patch7 -p1 %build %define _lto_cflags %{nil} diff --git a/crypto-policies-mr720.diff b/crypto-policies-mr720.diff new file mode 100644 index 0000000..b8238d1 --- /dev/null +++ b/crypto-policies-mr720.diff @@ -0,0 +1,36 @@ +[current version of https://gitlab.com/apparmor/apparmor/-/merge_requests/720 - might still be changed or extended, but this patch solves the most urgent denials] + + +From 0aea44f43a1d6cd6b7ebd32bbff803455b3aad44 Mon Sep 17 00:00:00 2001 +From: Christian Boltz +Date: Mon, 8 Mar 2021 01:20:24 +0100 +Subject: [PATCH] abstractions/ssl_certs: allow reading crypto policies + +See https://gitlab.com/redhat-crypto/fedora-crypto-policies for details. + +Reported by darix and also my own audit.log - the actual denial was for +/usr/share/crypto-policies/DEFAULT/openssl.txt. + +(I'm aware that the crypto policies are not really certificates, but +since they are used by several crypto libraries, ssl_certs is probably +the best place for them even if the filename doesn't match.) +--- + profiles/apparmor.d/abstractions/ssl_certs | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/profiles/apparmor.d/abstractions/ssl_certs b/profiles/apparmor.d/abstractions/ssl_certs +index 57d0f41a2..0392c0ccc 100644 +--- a/profiles/apparmor.d/abstractions/ssl_certs ++++ b/profiles/apparmor.d/abstractions/ssl_certs +@@ -41,5 +41,8 @@ + /etc/certbot/archive/*/chain*.pem r, + /etc/certbot/archive/*/fullchain*.pem r, + ++ # crypto policies used by various libraries ++ /usr/share/crypto-policies/*/*.txt r, ++ + # Include additions to the abstraction + include if exists +-- +GitLab + diff --git a/libapparmor.spec b/libapparmor.spec index 010b9eb..ecbbc5f 100644 --- a/libapparmor.spec +++ b/libapparmor.spec @@ -37,7 +37,6 @@ This package provides the libapparmor library, which contains the change_hat(2) symbol, used for sub-process confinement by AppArmor, as well as functions to parse AppArmor log messages. - %package -n libapparmor1 Summary: Utility library for AppArmor Group: System/Libraries @@ -63,8 +62,6 @@ Provides: libapparmor:/usr/include/sys/apparmor.h These libraries are needed for developing software that makes use of the AppArmor API. - - %prep %setup -q -n apparmor-%{version}