Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2018-01-19 11:46:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor" Fri Jan 19 11:46:35 2018 rev:111 rq:566495 version:2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2018-01-07 17:21:46.476146568 +0100 +++ /work/SRC/openSUSE:Factory/.apparmor.new/apparmor.changes 2018-01-19 11:46:40.494132388 +0100 @@ -1,0 +2,6 @@ +Thu Jan 11 18:14:47 CET 2018 - ku...@suse.de + +- add disable-cache-on-ro-fs.diff - disable write cache if filesystem is + read-only and don't bail out (bsc#1069906, bsc#1074429) + +------------------------------------------------------------------- New: ---- disable-cache-on-ro-fs.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.Tw6jHL/_old 2018-01-19 11:46:42.746026198 +0100 +++ /var/tmp/diff_new_pack.Tw6jHL/_new 2018-01-19 11:46:42.746026198 +0100 @@ -70,6 +70,9 @@ # make cache write failures a warning instead of an error - (patch from https://gitlab.com/apparmor/apparmor/merge_requests/49 2018-01-04) Patch9: parser-write-cache-warn-only.diff +# Disable write cache if filesystem is read-only, don't abort +Patch10: disable-cache-on-ro-fs.diff + PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apparmor_bin_prefix /lib/apparmor @@ -172,7 +175,7 @@ %package -n perl-apparmor Summary: Perl interface for libapparmor functions -License: GPL-2.0 and LGPL-2.1+ +License: GPL-2.0 AND LGPL-2.1+ Group: Development/Libraries/Perl Requires: libapparmor1 = %{version} Requires: perl = %{perl_version} @@ -189,7 +192,7 @@ %package -n python-apparmor Summary: Python 2 interface for libapparmor functions -License: GPL-2.0 and LGPL-2.1+ +License: GPL-2.0 AND LGPL-2.1+ Group: Development/Libraries/Python BuildRequires: python Requires: libapparmor1 = %{version} @@ -208,7 +211,7 @@ %package -n python3-apparmor Summary: Python 3 interface for libapparmor functions -License: GPL-2.0 and LGPL-2.1+ +License: GPL-2.0 AND LGPL-2.1+ Group: Development/Libraries/Python Requires: libapparmor1 = %{version} Requires: python = %{py3_ver} @@ -225,7 +228,7 @@ %package -n ruby-apparmor Summary: Ruby interface for libapparmor functions -License: GPL-2.0 and LGPL-2.1+ +License: GPL-2.0 AND LGPL-2.1+ Group: Development/Languages/Ruby Requires: libapparmor1 = %{version} Requires: ruby = %(rpm -q --qf '%%{version}' ruby) @@ -240,7 +243,7 @@ %package abstractions Summary: AppArmor abstractions and directory structure -License: GPL-2.0 and LGPL-2.1+ +License: GPL-2.0 AND LGPL-2.1+ Group: Productivity/Security Requires: apparmor-parser(CAP_SYSLOG) BuildArch: noarch @@ -259,7 +262,7 @@ %package profiles Summary: AppArmor profiles that are loaded into the apparmor kernel module -License: GPL-2.0 and LGPL-2.1+ +License: GPL-2.0 AND LGPL-2.1+ Group: Productivity/Security Requires: apparmor-abstractions >= %{version} Requires: apparmor-parser(CAP_SYSLOG) @@ -278,7 +281,7 @@ %package utils Summary: AppArmor User-Level Utilities Useful for Creating AppArmor Profiles -License: GPL-2.0 and LGPL-2.1+ +License: GPL-2.0 AND LGPL-2.1+ Group: Productivity/Security Requires: libapparmor1 = %{version} # some of the tools are still perl-based (aa-decode and aa-notify) @@ -307,7 +310,7 @@ %package -n tomcat_apparmor Summary: Tomcat 6 plugin for AppArmor change_hat -License: GPL-2.0 and LGPL-2.1+ +License: GPL-2.0 AND LGPL-2.1+ Group: System/Libraries Requires: libapparmor1 = %{version} Requires: tomcat6 @@ -325,7 +328,7 @@ %package -n pam_apparmor Summary: PAM module for AppArmor change_hat -License: GPL-2.0 and LGPL-2.1+ +License: GPL-2.0 AND LGPL-2.1+ Group: Productivity/Security BuildRequires: pam-devel PreReq: pam @@ -359,6 +362,7 @@ %patch7 %patch8 -p1 %patch9 -p1 +%patch10 -p0 %build export SUSE_ASNEEDED=0 ++++++ disable-cache-on-ro-fs.diff ++++++ --- parser/parser_main.c +++ parser/parser_main.c 2018/01/11 16:52:00 @@ -1124,7 +1124,7 @@ retval = aa_policy_cache_new(&policy_cache, features, AT_FDCWD, cacheloc, max_caches); if (retval) { - if (errno != ENOENT && errno != EEXIST) { + if (errno != ENOENT && errno != EEXIST && errno != EROFS) { PERROR(_("Failed setting up policy cache (%s): %s\n"), cacheloc, strerror(errno)); return 1;
