[gentoo-commits] repo/gentoo:master commit in: eclass/

[Ulrich Müller]

commit:     47fb5c77609357b8e521491e194cea495b229b4c
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Mon May 16 14:47:32 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat May 21 17:00:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47fb5c77

qmail.eclass: remove usage of egrep

This does not use extended regular expressions in any way. While at it
change the way these matches are done: it's irrelevant if the entire
expression is in the file, if there is any rule for the given IP address
then do not add the new expression.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 eclass/qmail.eclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 9b2c5a8c7fbe..ed53bca56fae 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -409,7 +409,7 @@ qmail_config_fast() {
 }
 
 qmail_tcprules_config() {
-       local localips ip tcpstring line proto f
+       local localips ip tcpstring proto f
 
        einfo "Accepting relaying by default from all ips configured on this 
machine."
 
@@ -425,10 +425,9 @@ qmail_tcprules_config() {
        tcpstring=':allow,RELAYCLIENT="",RBLSMTPD=""'
 
        for ip in ${localips}; do
-               line="${ip}${tcpstring}"
                for proto in smtp qmtp qmqp; do
                        f="${EROOT}${TCPRULES_DIR}/tcp.qmail-${proto}"
-                       egrep -qs "${line}" "${f}" || echo "${line}" >> "${f}"
+                       grep -qs "^${ip}:" "${f}" || echo "${ip}${tcpstring}" 
>> "${f}"
                done
        done
 }