package/apparmor: replace deprecated egrep with grep -E
authorAdam Duskett <Aduskett@gmail.com>
Fri, 8 May 2020 01:59:52 +0000 (18:59 -0700)
committerYann E. MORIN <yann.morin.1998@free.fr>
Fri, 8 May 2020 07:58:22 +0000 (09:58 +0200)
Upstream commit: 5f46dedd6e8109d845af118b36039a5d7dd05af9

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
package/apparmor/0002-replace-deprecated-egrep-with-grep-e.patch [new file with mode: 0644]

diff --git a/package/apparmor/0002-replace-deprecated-egrep-with-grep-e.patch b/package/apparmor/0002-replace-deprecated-egrep-with-grep-e.patch
new file mode 100644 (file)
index 0000000..4caefe4
--- /dev/null
@@ -0,0 +1,28 @@
+From 5f46dedd6e8109d845af118b36039a5d7dd05af9 Mon Sep 17 00:00:00 2001
+From: Christian Boltz <apparmor@cboltz.de>
+Date: Mon, 18 Mar 2019 19:17:16 +0100
+Subject: [PATCH] replace deprecated egrep with grep -e
+
+(cherry picked from commit 5f46dedd6e8109d845af118b36039a5d7dd05af9)
+Signed-off-by: Christian Boltz <apparmor@cboltz.de>
+Signed-off-by: Adam Duskett <Aduskett@gmail.com>
+---
+ parser/rc.apparmor.functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions
+index 22e8367..f3108f8 100644
+--- a/parser/rc.apparmor.functions
++++ b/parser/rc.apparmor.functions
+@@ -129,7 +129,7 @@ skip_profile() {
+            "${profile%.pacnew}" != "${profile}" ] ; then
+               return 2
+       fi
+-      if echo "${profile}" | egrep -q '^.+\.new-[0-9\.]+_[0-9]+$'; then
++      if echo "${profile}" | grep -E -q '^.+\.new-[0-9\.]+_[0-9]+$'; then
+               return 2
+       fi
+-- 
+2.26.2
+