[pkgsrc/trunk]: pkgsrc/mail/qmail-run Check case-insensitively whether recipi...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/34b7f306d1ed
branches:  trunk
changeset: 332504:34b7f306d1ed
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun Apr 14 13:28:44 2019 +0000

description:
Check case-insensitively whether recipient is exempt from greylisting.
Since ucspi-tcp6's tcpserver can no longer listen to 127.0.0.1 without
specifying -4, specify it by default. Bump version.

diffstat:

 mail/qmail-run/Makefile                         |  4 ++--
 mail/qmail-run/files/greylisting-spp-wrapper.sh |  6 +++---
 mail/qmail-run/files/qmailqread.sh              |  4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (59 lines):

diff -r 783cb1f9bb9b -r 34b7f306d1ed mail/qmail-run/Makefile
--- a/mail/qmail-run/Makefile   Sun Apr 14 12:49:17 2019 +0000
+++ b/mail/qmail-run/Makefile   Sun Apr 14 13:28:44 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2019/03/21 15:33:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.72 2019/04/14 13:28:44 schmonz Exp $
 #
 
-DISTNAME=              qmail-run-20190321
+DISTNAME=              qmail-run-20190414
 CATEGORIES=            mail
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r 783cb1f9bb9b -r 34b7f306d1ed mail/qmail-run/files/greylisting-spp-wrapper.sh
--- a/mail/qmail-run/files/greylisting-spp-wrapper.sh   Sun Apr 14 12:49:17 2019 +0000
+++ b/mail/qmail-run/files/greylisting-spp-wrapper.sh   Sun Apr 14 13:28:44 2019 +0000
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: greylisting-spp-wrapper.sh,v 1.1 2018/12/14 06:49:31 schmonz Exp $
+# $NetBSD: greylisting-spp-wrapper.sh,v 1.2 2019/04/14 13:28:44 schmonz Exp $
 #
 # @PKGNAME@ wrapper for greylisting-spp.
 # Skips greylisting for configured recipient addresses and domains.
@@ -12,12 +12,12 @@
 
 is_exempt_recipient_address() {
        [ -f "$EXEMPTRCPTS" ] \
-               && @GREP@ -qFx -- "$1" "$EXEMPTRCPTS"
+               && @GREP@ -qFxi -- "$1" "$EXEMPTRCPTS"
 }
 
 is_exempt_recipient_domain() {
        [ -f "$EXEMPTRCPTHOSTS" ] \
-               && @GREP@ -qFx -- "$1" "$EXEMPTRCPTHOSTS"
+               && @GREP@ -qFxi -- "$1" "$EXEMPTRCPTHOSTS"
 }
 
 main() {
diff -r 783cb1f9bb9b -r 34b7f306d1ed mail/qmail-run/files/qmailqread.sh
--- a/mail/qmail-run/files/qmailqread.sh        Sun Apr 14 12:49:17 2019 +0000
+++ b/mail/qmail-run/files/qmailqread.sh        Sun Apr 14 13:28:44 2019 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailqread.sh,v 1.18 2018/12/16 05:32:07 schmonz Exp $
+# $NetBSD: qmailqread.sh,v 1.19 2019/04/14 13:28:44 schmonz Exp $
 #
 # @PKGNAME@ script to control a service providing local non-root
 # users access to see the queue. Adapted from a script by Steinar Haug.
@@ -14,7 +14,7 @@
 # User-settable rc.conf variables and their default values:
 : ${qmailqread_postenv:=""}
 : ${qmailqread_tcpserver:="@PREFIX@/bin/tcpserver"}
-: ${qmailqread_tcpflags:="-R1"}
+: ${qmailqread_tcpflags:="-4 -R1"}
 : ${qmailqread_tcphost:="127.0.0.1"}
 : ${qmailqread_tcpport:="20025"}
 : ${qmailqread_log:="YES"}