From: Greg Kroah-Hartman Date: Sun, 16 Oct 2022 20:08:40 +0000 (+0200) Subject: 5.19-stable patches X-Git-Tag: v5.4.219~57 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09ff334223d4d96345a2e2be84ebb9e71a41532b;p=thirdparty%2Fkernel%2Fstable-queue.git 5.19-stable patches added patches: selinux-use-grep-e-instead-of-egrep.patch --- diff --git a/queue-5.19/selinux-use-grep-e-instead-of-egrep.patch b/queue-5.19/selinux-use-grep-e-instead-of-egrep.patch new file mode 100644 index 00000000000..d4dfa6d60a8 --- /dev/null +++ b/queue-5.19/selinux-use-grep-e-instead-of-egrep.patch @@ -0,0 +1,37 @@ +From c969bb8dbaf2f3628927eae73e7c579a74cf1b6e Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Tue, 20 Sep 2022 19:12:52 +0200 +Subject: selinux: use "grep -E" instead of "egrep" + +From: Greg Kroah-Hartman + +commit c969bb8dbaf2f3628927eae73e7c579a74cf1b6e upstream. + +The latest version of grep claims that egrep is now obsolete so the build +now contains warnings that look like: + egrep: warning: egrep is obsolescent; using grep -E +fix this by using "grep -E" instead. + +Cc: Paul Moore +Cc: Stephen Smalley +Cc: Eric Paris +Cc: selinux@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +[PM: tweak to remove vdso reference, cleanup subj line] +Signed-off-by: Paul Moore +Signed-off-by: Greg Kroah-Hartman +--- + scripts/selinux/install_policy.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scripts/selinux/install_policy.sh ++++ b/scripts/selinux/install_policy.sh +@@ -78,7 +78,7 @@ cd /etc/selinux/dummy/contexts/files + $SF -F file_contexts / + + mounts=`cat /proc/$$/mounts | \ +- egrep "ext[234]|jfs|xfs|reiserfs|jffs2|gfs2|btrfs|f2fs|ocfs2" | \ ++ grep -E "ext[234]|jfs|xfs|reiserfs|jffs2|gfs2|btrfs|f2fs|ocfs2" | \ + awk '{ print $2 '}` + $SF -F file_contexts $mounts + diff --git a/queue-5.19/series b/queue-5.19/series index 4496cb72fa7..678b0fe7092 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -173,3 +173,4 @@ drm-i915-fix-watermark-calculations-for-dg2-ccs-cc-modifier.patch drm-amd-display-fix-vblank-refcount-in-vrr-transition.patch drm-amd-display-explicitly-disable-psr_feature_enable-appropriately.patch smb3-must-initialize-two-acl-struct-fields-to-zero.patch +selinux-use-grep-e-instead-of-egrep.patch