From 6569d76aeaf4726359166b429bf42e54ec9ce71e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 7 May 2020 18:59:52 -0700 Subject: [PATCH] package/apparmor: replace deprecated egrep with grep -E Upstream commit: 5f46dedd6e8109d845af118b36039a5d7dd05af9 Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- ...replace-deprecated-egrep-with-grep-e.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/apparmor/0002-replace-deprecated-egrep-with-grep-e.patch 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 index 0000000000..4caefe447b --- /dev/null +++ b/package/apparmor/0002-replace-deprecated-egrep-with-grep-e.patch @@ -0,0 +1,28 @@ +From 5f46dedd6e8109d845af118b36039a5d7dd05af9 Mon Sep 17 00:00:00 2001 +From: Christian Boltz +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 +Signed-off-by: Adam Duskett +--- + 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 + -- 2.30.2