pool/apparmor
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1091162 from home:cboltz

Browse Source 
- fix aa-status --json output (aa-status-fix-json-mr1046.patch,
  boo#1211980#c12)

OBS-URL: https://build.opensuse.org/request/show/1091162
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=370
This commit is contained in:
Christian Boltz 2023-06-06 22:05:43 +00:00 committed by Git OBS Bridge
parent 66f8380e84
commit bc914eedfb
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
aa-status-fix-json-mr1046.patch Normal file
View File

@ -0,0 +1,27 @@
From 29b21b09d43955f20c75a5f09cc5455e2c9fafcc Mon Sep 17 00:00:00 2001
From: Christian Boltz <apparmor@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

6
apparmor.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 6 21:39:15 UTC 2023 - Christian Boltz <suse-beta@cboltz.de>
- fix aa-status --json output (aa-status-fix-json-mr1046.patch,
boo#1211980#c12)
-------------------------------------------------------------------
Mon May 29 16:55:46 UTC 2023 - Christian Boltz <suse-beta@cboltz.de>

4
apparmor.spec
View File

@ -88,6 +88,9 @@ Patch5: apparmor-lessopen-nfs-workaround.diff
# 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 @@ mv -v profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 profiles/apparmor/
%patch4
%patch5
%patch6
%patch10 -p1
%build
export SUSE_ASNEEDED=0