Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2023-06-08 21:41:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor" Thu Jun 8 21:41:43 2023 rev:191 rq:1091163 version:3.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2023-06-03 00:06:40.261793134 +0200 +++ /work/SRC/openSUSE:Factory/.apparmor.new.15902/apparmor.changes 2023-06-08 21:41:44.597701504 +0200 @@ -1,0 +2,6 @@ +Tue Jun 6 21:39:15 UTC 2023 - Christian Boltz <suse-b...@cboltz.de> + +- fix aa-status --json output (aa-status-fix-json-mr1046.patch, + boo#1211980#c12) + +------------------------------------------------------------------- New: ---- aa-status-fix-json-mr1046.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.Lk4QkV/_old 2023-06-08 21:41:45.473706666 +0200 +++ /var/tmp/diff_new_pack.Lk4QkV/_new 2023-06-08 21:41:45.477706690 +0200 @@ -88,6 +88,9 @@ # make <apache2.d> include in apache extra profile optional to make openQA happy (boo#1178527) Patch6: apache-extra-profile-include-if-exists.diff +# fix aa-status --json / --pretty-json output (merged upstream 2023-06-06 for 3.0 and 3.1 branch [not needed/suiting for master] - https://gitlab.com/apparmor/apparmor/-/merge_requests/1046) +Patch10: aa-status-fix-json-mr1046.patch + PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison @@ -352,6 +355,7 @@ %patch4 %patch5 %patch6 +%patch10 -p1 %build export SUSE_ASNEEDED=0 ++++++ aa-status-fix-json-mr1046.patch ++++++ >From 29b21b09d43955f20c75a5f09cc5455e2c9fafcc Mon Sep 17 00:00:00 2001 From: Christian Boltz <appar...@cboltz.de> Date: Tue, 6 Jun 2023 23:29:14 +0200 Subject: [PATCH] Fix invalid aa-status --json The previous patch changed the final }} to } - which is correct in master, but breaks the code in the 3.x branches. --- binutils/aa_status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binutils/aa_status.c b/binutils/aa_status.c index 40a854beb..092bee55b 100644 --- a/binutils/aa_status.c +++ b/binutils/aa_status.c @@ -548,7 +548,7 @@ static int detailed_output(FILE *json) { if (need_finish > 0) { fprintf(json, "]"); } - fprintf(json, "}\n"); + fprintf(json, "}}\n"); } exit: -- GitLab
