4312257819
- update to AppArmor 3.0.5 - several additions to profiles and abstractions - bugfixes in parser and utils - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.0.5 for the detailed upstream changelog - remove upstream(ed) patchs: - apparmor-setuptools61-mr897.patch - dovecot-profiles-boo1199535-mr881.diff - php8-fpm-mr876.patch - python310-help-mr848.patch - samba-new-dcerpcd.patch - samba_deny_net_admin.patch - update-samba-bgqd.diff - update-usr-sbin-smbd.diff - apparmor-samba-include-permissions-for-shares.diff: remove upstreamed part - add dirtest-sort-mr900.diff to fix random test failures - change apache-extra-profile-include-if-exists.diff to the post-mv path (new quilt executes mv) - stop disabling lto (fixed upstream) (boo#1133091) - package profile-load script in -parser OBS-URL: https://build.opensuse.org/request/show/991157 OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=342
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
Make the <apache2.d> include optional to avoid problems with empty profile dir.
|
|
Probably doesn't happen on real systems, but openQA uses an empty profile dir
|
|
for some tests.
|
|
|
|
Note: the patch gets applied before moving the profile to the extra directory
|
|
because quilt doesn't run the 'mv' command and therefore fails to patch the
|
|
profile at its new location (extra profiles directory)
|
|
|
|
Fixes https://bugzilla.opensuse.org/show_bug.cgi?id=1178527
|
|
|
|
Index: profiles/apparmor/profiles/extras/usr.lib.apache2.mpm-prefork.apache2
|
|
===================================================================
|
|
--- profiles/apparmor/profiles/extras/usr.lib.apache2.mpm-prefork.apache2.orig 2020-12-02 12:01:37.000000000 +0100
|
|
+++ profiles/apparmor/profiles/extras/usr.lib.apache2.mpm-prefork.apache2 2021-01-22 12:19:45.964708670 +0100
|
|
@@ -75,7 +75,7 @@ include <tunables/global>
|
|
# This directory contains web application
|
|
# package-specific apparmor files.
|
|
|
|
- include <apache2.d>
|
|
+ include if exists <apache2.d>
|
|
|
|
# Site-specific additions and overrides. See local/README for details.
|
|
include if exists <local/usr.lib.apache2.mpm-prefork.apache2>
|