From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 16 Oct 2022 20:08:46 +0000 (+0200)
Subject: 6.0-stable patches
X-Git-Tag: v5.4.219~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4e0fe352bd7deac61d854e82db6c124a4f4e512;p=thirdparty%2Fkernel%2Fstable-queue.git

6.0-stable patches

added patches:
	selinux-use-grep-e-instead-of-egrep.patch
---

diff --git a/queue-6.0/selinux-use-grep-e-instead-of-egrep.patch b/queue-6.0/selinux-use-grep-e-instead-of-egrep.patch
new file mode 100644
index 00000000000..d4dfa6d60a8
--- /dev/null
+++ b/queue-6.0/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 <gregkh@linuxfoundation.org>
+Date: Tue, 20 Sep 2022 19:12:52 +0200
+Subject: selinux: use "grep -E" instead of "egrep"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+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 <paul@paul-moore.com>
+Cc: Stephen Smalley <stephen.smalley.work@gmail.com>
+Cc: Eric Paris <eparis@parisplace.org>
+Cc: selinux@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+[PM: tweak to remove vdso reference, cleanup subj line]
+Signed-off-by: Paul Moore <paul@paul-moore.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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-6.0/series b/queue-6.0/series
index 8fd3880ac4d..48896af8394 100644
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -199,3 +199,4 @@ drm-amd-display-explicitly-disable-psr_feature_enable-appropriately.patch
 drm-amdgpu-enable-vcn-pg-on-gc11_0_1.patch
 drm-amdgpu-enable-f32_wptr_poll_enable-in-mqd.patch
 smb3-must-initialize-two-acl-struct-fields-to-zero.patch
+selinux-use-grep-e-instead-of-egrep.patch