From 9abb7835877d75624e4f455ff5dc0188958f9f07 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Fri, 23 Sep 2022 20:53:20 +0200
Subject: [PATCH] main/cryptsetup: replace obsolete egrep in service file for
grep -E
---
main/cryptsetup/APKBUILD | 4 ++--
main/cryptsetup/dmcrypt.initd | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 03672d7a8eb1..2df5de972865 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
pkgver=2.5.0
-pkgrel=1
+pkgrel=2
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="https://gitlab.com/cryptsetup/cryptsetup"
arch="all"
@@ -75,7 +75,7 @@ libs() {
sha512sums="
f457168292ae9fadc34d709494818aee3f18b56bdf5fcff0b2a5ae0b554031ce888d01cd126ca7aa915fcdcb00de6afed2fdb25bbbd690aa8bfcaafa516ade93 cryptsetup-2.5.0.tar.gz
-a3ca3e648749136ee724692b61488cd855f118eb93435942c2b04964a34fe49d0f0da4ef64cd2531c1c0f650e77808cf5d802789fd7664398248ead668bb35e5 dmcrypt.initd
+5315589102d6e7fac5fdee1230a4012d5548c1a7193a05a310eacdeaf709857d370359cae7ea437e3ca0591ffdb848c205c14d42017a1c5445cadaec2e8eb4a1 dmcrypt.initd
74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd
529187851def5fbc08e995eba90d3f013f1cf8469dcb9344f83d1e3c73c71467ca4ed62c8282ec27ebfa30ccc33653fdd1aea8d1d80e1ac4293d51865c9a6200 flush-stdout.patch
"
diff --git a/main/cryptsetup/dmcrypt.initd b/main/cryptsetup/dmcrypt.initd
index 85c77f7c1dff..4dbda6f892a7 100644
--- a/main/cryptsetup/dmcrypt.initd
+++ b/main/cryptsetup/dmcrypt.initd
@@ -81,7 +81,7 @@ dm_crypt_execute() {
# ${target} is active:
# Newer versions report:
# ${target} is active[ and is in use.]
- if cryptsetup status ${target} | egrep -q ' is active' ; then
+ if cryptsetup status ${target} | grep -qE ' is active' ; then
einfo "dm-crypt mapping ${target} is already configured"
return
fi
@@ -301,7 +301,7 @@ stop() {
# Break down all mappings
header=true
- egrep "^(target|swap)=" ${conf_file} | \
+ grep -E "^(target|swap)=" ${conf_file} | \
while read line ; do
${header} && einfo "Removing dm-crypt mappings"
header=false
--
GitLab