Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2018-04-30 08:50:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor" Mon Apr 30 08:50:00 2018 rev:116 rq:602408 version:2.13 Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2018-04-23 19:51:15.123600464 +0200 +++ /work/SRC/openSUSE:Factory/.apparmor.new/apparmor.changes 2018-04-30 08:50:02.698785013 +0200 @@ -1,0 +2,6 @@ +Sun Apr 29 22:24:33 UTC 2018 - [email protected] + +- exclude the /etc/apparmor.d/cache.d/ directory from aa-logprof parsing + (logprof-skip-cache-d.diff) + +------------------------------------------------------------------- New: ---- logprof-skip-cache-d.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.GMnsUh/_old 2018-04-30 08:50:03.718747627 +0200 +++ /var/tmp/diff_new_pack.GMnsUh/_new 2018-04-30 08:50:03.718747627 +0200 @@ -65,9 +65,12 @@ # install aa-teardown to /usr/sbin, not /sbin (merged upstream 2018-04-15 https://gitlab.com/apparmor/apparmor/merge_requests/97) Patch8: aa-teardown-path.diff -# fix permissions of apparmor.systemd (boo#1090545) +# fix permissions of apparmor.systemd (boo#1090545, merged upstream 2018-04-27 https://gitlab.com/apparmor/apparmor/merge_requests/106) Patch9: fix-apparmor-systemd-perms.diff +# exclude the /etc/apparmor.d/cache.d directory from aa-logprof parsing +Patch10: logprof-skip-cache-d.diff + PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apparmor_bin_prefix /lib/apparmor @@ -357,6 +360,7 @@ %patch7 %patch8 %patch9 -p1 +%patch10 %build export SUSE_ASNEEDED=0 @@ -456,6 +460,7 @@ %makeinstall -C profiles install -d -m 755 %{buildroot}/usr/share/apparmor/cache +echo "*** WARNING: precompiling cache is known to fail under 'osc build' - use 'osc build --vm-type kvm' instead ***" cp -a profiles/cache/* %{buildroot}/usr/share/apparmor/cache test -f %{buildroot}/usr/share/apparmor/cache/*/.features test -f %{buildroot}/usr/share/apparmor/cache/*/bin.ping ++++++ logprof-skip-cache-d.diff ++++++ diff --git a/utils/apparmor/aa.py b/utils/apparmor/aa.py index e28b8495..88bf2172 100644 --- utils/apparmor/aa.py +++ utils/apparmor/aa.py @@ -2048,7 +2048,7 @@ def is_skippable_file(path): return False def is_skippable_dir(path): - if re.search('^(.*/)?(disable|cache|force-complain|lxc|\.git)/?$', path): + if re.search('^(.*/)?(disable|cache|cache\.d|force-complain|lxc|\.git)/?$', path): return True return False diff --git a/utils/test/test-aa.py b/utils/test/test-aa.py index 243283a9..b5f8e94f 100644 --- utils/test/test-aa.py +++ utils/test/test-aa.py @@ -484,6 +484,8 @@ class AaTest_is_skippable_dir(AATest): ('lxc', True), ('force-complain', True), ('/etc/apparmor.d/cache', True), + ('/etc/apparmor.d/cache.d', True), + ('/etc/apparmor.d/cache.d/', True), ('/etc/apparmor.d/lxc/', True), ('/etc/apparmor.d/.git/', True),
