4.9-stable patches

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

diff --git a/queue-4.9/selinux-use-grep-e-instead-of-egrep.patch b/queue-4.9/selinux-use-grep-e-instead-of-egrep.patch
new file mode 100644 (file)
index 0000000..6da72b6
--- /dev/null
+++ b/queue-4.9/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
+@@ -56,7 +56,7 @@ fi
+ cd /etc/selinux/dummy/contexts/files
+ $SF file_contexts /
+ 
+-mounts=`cat /proc/$$/mounts | egrep "ext2|ext3|xfs|jfs|ext4|ext4dev|gfs2" | awk '{ print $2 '}`
++mounts=`cat /proc/$$/mounts | grep -E "ext2|ext3|xfs|jfs|ext4|ext4dev|gfs2" | awk '{ print $2 '}`
+ $SF file_contexts $mounts
+ 
+ 

diff --git a/queue-4.9/series b/queue-4.9/series
index 81ad27043db93419bb87f02350ad013ca0652570..8db33da0384d352cbd4a3b1e63a7bbe4a66e69aa 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -60,3 +60,4 @@ ring-buffer-allow-splice-to-read-previous-partially-read-pages.patch
 ring-buffer-check-pending-waiters-when-doing-wake-ups-as-well.patch
 ring-buffer-fix-race-between-reset-page-and-reading-page.patch
 kvm-x86-emulator-fix-handing-of-pop-ss-to-correctly-set-interruptibility.patch
+selinux-use-grep-e-instead-of-egrep.patch