0002-replace-deprecated-egrep-with-grep-e.patch 916 B

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