Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2022-04-05 19:55:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor" Tue Apr 5 19:55:25 2022 rev:166 rq:966667 version:3.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2022-03-28 17:01:27.101041960 +0200 +++ /work/SRC/openSUSE:Factory/.apparmor.new.1900/apparmor.changes 2022-04-05 19:55:44.142044762 +0200 @@ -1,0 +2,8 @@ +Tue Mar 29 20:04:22 UTC 2022 - Christian Boltz <suse-b...@cboltz.de> + +- ensure precompiled cache files are newer than (text) profiles +- reload profiles in %posttrans instead of %post to ensure both + -profiles and -abstractons package are updated before the cache + in /var/cache/apparmor/ gets built (boo#1195463 #c20) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.ao316E/_old 2022-04-05 19:55:44.882036512 +0200 +++ /var/tmp/diff_new_pack.ao316E/_new 2022-04-05 19:55:44.886036468 +0200 @@ -63,7 +63,7 @@ # and set cache-loc in parser.conf and apparmor.service accordingly Patch1: apparmor-enable-profile-cache.diff -# include autogenerated profile sniplet for samba shares (bnc#688040) +# include autogenerated profile sniplet for samba shares (bnc#688040) - upstreamed as part of https://gitlab.com/apparmor/apparmor/-/merge_requests/838 2022-02-16 (master + 3.0 branch) Patch2: apparmor-samba-include-permissions-for-shares.diff # Ruby 2.0 mkmf prefixes everything with $(DESTDIR), bnc#822277, kkae...@suse.de @@ -442,7 +442,9 @@ %if %{with precompiled_cache} install -d -m 755 %{buildroot}/usr/share/apparmor/cache echo -e "\n\n *** WARNING: precompiling cache is known to fail under 'osc build' - use 'osc build --vm-type kvm' instead or skip building the precompiled cache with 'osc build --without precompiled_cache' ***\n\n" -cp -a profiles/cache/* %{buildroot}/usr/share/apparmor/cache +# ensure cache files are newer than (text) profiles by sleeping a few seconds, and using cp -r which updates the timestamps +sleep 2 +cp -r profiles/cache/* %{buildroot}/usr/share/apparmor/cache test -f %{buildroot}/usr/share/apparmor/cache/*/.features test -f %{buildroot}/usr/share/apparmor/cache/*/bin.ping %endif @@ -718,13 +720,13 @@ %service_del_postun_without_restart apparmor.service %endif -%post abstractions +%posttrans abstractions # workaround for bnc#904620#c8 / lp#1392042 rm -f /var/cache/apparmor/* 2>/dev/null #restart_on_update apparmor - but non-broken (bnc#853019) systemctl is-active -q apparmor && systemctl reload apparmor ||: -%post profiles +%posttrans profiles # workaround for bnc#904620#c8 / lp#1392042 # old cache location up to 2.12 rm -f /var/lib/apparmor/cache/* 2>/dev/null
