Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2015-08-02 22:44:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor" Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2015-07-24 09:57:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apparmor.new/apparmor.changes 2015-08-02 22:44:12.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 23 22:16:35 UTC 2015 - [email protected] + +- add fix-initscript-aa_log_end_msg.diff - fixes ugly initscript + output (boo#862170) + +------------------------------------------------------------------- New: ---- fix-initscript-aa_log_end_msg.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.RGjaZ1/_old 2015-08-02 22:44:13.000000000 +0200 +++ /var/tmp/diff_new_pack.RGjaZ1/_new 2015-08-02 22:44:13.000000000 +0200 @@ -92,6 +92,9 @@ # bug 906858 - confine lessopen.sh (submitted upstream 2014-12-21) Patch7: apparmor-lessopen-profile.patch +# boo#862170 - fix ugly initscript output (commited upstream trunk r3208) +Patch8: fix-initscript-aa_log_end_msg.diff + Url: https://launchpad.net/apparmor PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -436,6 +439,8 @@ %patch6 %patch7 -p1 +%patch8 + # search for left-over multiline rules test -z "$(grep -r '^\s*\(unix\|dbus\)[^,]\(([^)]*)\)*[^,]*$' profiles/apparmor.d/)" ++++++ fix-initscript-aa_log_end_msg.diff ++++++ Fix aa_log_end_msg() in rc.apparmor.suse "rcapparmor kill" results in a funny error message: /lib/apparmor/rc.apparmor.functions: line 441: return: -v: invalid option return: usage: return [n] SLE12 includes a patch that prevents this error message, but also prevents that $? is handed over correctly to rc_status. This means that "rcapparmor kill" will happily display "done" even with a compiled-in apparmor module that can't be unloaded. This patch is the improved version - it adds a small helper function to set $? (as handed over to aa_log_end_msg()) and then calls rc_status -v. This means that "rcapparmor kill" now shows "failed" because it's impossible to unload something that is compiled directly into the kernel. References: https://bugzilla.opensuse.org/show_bug.cgi?id=862170 (non-public) Acked-by: Seth Arnold <[email protected]> for 2.9 and trunk Commited to trunk revision 3208. === modified file 'parser/rc.apparmor.suse' --- parser/rc.apparmor.suse 2011-09-15 18:20:23 +0000 +++ parser/rc.apparmor.suse 2015-07-22 19:23:28 +0000 @@ -94,12 +94,13 @@ echo -e "$rc_skipped" } +_set_status() { + return $1 +} + aa_log_end_msg() { - v="-v" - if [ "$1" != '0' ]; then - rc="-v$1" - fi - rc_status $v + _set_status $1 + rc_status -v } usage() {
