From f1c2c7aee970db181cb3f5c33e0d1877bab70e047fff0409578db529b17c2022 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sat, 16 Apr 2022 20:41:16 +0000 Subject: [PATCH] Accepting request 970465 from home:cboltz - update zgrep-profile-mr870.diff to allow executing 'expr' (boo#1198531) OBS-URL: https://build.opensuse.org/request/show/970465 OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=326 --- apparmor.changes | 5 +++++ apparmor.spec | 2 +- zgrep-profile-mr870.diff | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apparmor.changes b/apparmor.changes index 29646cf..5d3e168 100644 --- a/apparmor.changes +++ b/apparmor.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Apr 16 20:33:13 UTC 2022 - Christian Boltz + +- update zgrep-profile-mr870.diff to allow executing 'expr' (boo#1198531) + ------------------------------------------------------------------- Wed Apr 13 13:38:29 UTC 2022 - Noel Power diff --git a/apparmor.spec b/apparmor.spec index 75c91de..c0a0b58 100644 --- a/apparmor.spec +++ b/apparmor.spec @@ -86,7 +86,7 @@ Patch7: update-samba-bgqd.diff # see (https://gitlab.com/apparmor/apparmor/-/merge_requests/862) Patch8: update-usr-sbin-smbd.diff -# add zgrep and xzgrep profile (submitted upstream 2022-04-10 https://gitlab.com/apparmor/apparmor/-/merge_requests/870) +# add zgrep and xzgrep profile (submitted upstream 2022-04-10 https://gitlab.com/apparmor/apparmor/-/merge_requests/870 + 2022-04-16 https://gitlab.com/apparmor/apparmor/-/merge_requests/873) Patch9: zgrep-profile-mr870.diff # squash noisy setsockopt calls https://gitlab.com/apparmor/apparmor/-/merge_requests/867 # bsc#1196850 diff --git a/zgrep-profile-mr870.diff b/zgrep-profile-mr870.diff index 7cfc07f..3dba930 100644 --- a/zgrep-profile-mr870.diff +++ b/zgrep-profile-mr870.diff @@ -1,3 +1,6 @@ +[Extended to include the fix from https://gitlab.com/apparmor/apparmor/-/merge_requests/873] + + From 3a3b49ccd93d00cbc373319b90c6acecdd6f45fa Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sun, 10 Apr 2022 15:03:08 +0200 @@ -15,7 +18,7 @@ new file mode 100644 index 000000000..0bf0765d1 --- /dev/null +++ b/profiles/apparmor.d/zgrep -@@ -0,0 +1,59 @@ +@@ -0,0 +1,60 @@ +# ------------------------------------------------------------------ +# +# Copyright (C) 2021 Christian Boltz @@ -38,6 +41,7 @@ index 000000000..0bf0765d1 + /usr/bin/bash ix, + /usr/bin/bzip2 Cx -> helper, + /usr/bin/cat ix, ++ /usr/bin/expr ix, + /usr/bin/grep Cx -> helper, + /usr/bin/gzip Cx -> helper, + /usr/bin/mktemp ix,