Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2021-01-27 18:57:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor" Wed Jan 27 18:57:03 2021 rev:147 rq:865956 version:3.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2020-12-04 21:27:11.838013706 +0100 +++ /work/SRC/openSUSE:Factory/.apparmor.new.28504/apparmor.changes 2021-01-27 18:57:07.544330421 +0100 @@ -1,0 +2,7 @@ +Fri Jan 22 11:23:59 UTC 2021 - Christian Boltz <[email protected]> + +- add apache-extra-profile-include-if-exists.diff: make <apache2.d> + include in apache extra profile optional to avoid problems with empty + profile directory (boo#1178527) + +------------------------------------------------------------------- New: ---- apache-extra-profile-include-if-exists.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.g4UBZw/_old 2021-01-27 18:57:08.488331882 +0100 +++ /var/tmp/diff_new_pack.g4UBZw/_new 2021-01-27 18:57:08.492331888 +0100 @@ -1,8 +1,8 @@ # # spec file for package apparmor # -# Copyright (c) 2020 SUSE LLC -# Copyright (c) 2011-2020 Christian Boltz +# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2011-2021 Christian Boltz # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -64,6 +64,9 @@ # 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 +# make <apache2.d> include in apache extra profile optional to make openQA happy (boo#1178527) +Patch6: apache-extra-profile-include-if-exists.diff + PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apparmor_bin_prefix /lib/apparmor @@ -318,6 +321,8 @@ %setup -q # very loose profile that doesn't even match the apache2 binary path in openSUSE. Move it away instead of confusing people (boo#872984) +# (patch to change <apache.d> include to "include if exists" needs to be applied before moving the file to avoid breaking quilt) +%patch6 mv -v profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 profiles/apparmor/profiles/extras/ %patch1 ++++++ libapparmor.spec ++++++ --- /var/tmp/diff_new_pack.g4UBZw/_old 2021-01-27 18:57:08.516331925 +0100 +++ /var/tmp/diff_new_pack.g4UBZw/_new 2021-01-27 18:57:08.520331931 +0100 @@ -1,7 +1,7 @@ # # spec file for package libapparmor # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2011-2020 Christian Boltz # # All modifications and additions to the file contributed by third parties ++++++ apache-extra-profile-include-if-exists.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.d/usr.lib.apache2.mpm-prefork.apache2 =================================================================== --- profiles/apparmor.d//usr.lib.apache2.mpm-prefork.apache2.orig 2020-12-02 12:01:37.000000000 +0100 +++ profiles/apparmor.d//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>
