Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1555248524118850"
MIME-Version: 1.0
Date: Sun, 14 Apr 2019 13:28:44 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/mail/qmail-run
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20190414132844.BEDC4FB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1555248524118850
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Sun Apr 14 13:28:44 UTC 2019

Modified Files:
	pkgsrc/mail/qmail-run: Makefile
	pkgsrc/mail/qmail-run/files: greylisting-spp-wrapper.sh qmailqread.sh

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/mail/qmail-run/files/greylisting-spp-wrapper.sh
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/qmail-run/files/qmailqread.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1555248524118850
Content-Disposition: inline
Content-Length: 2535
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/qmail-run/Makefile
diff -u pkgsrc/mail/qmail-run/Makefile:1.71 pkgsrc/mail/qmail-run/Makefile:1.72
--- pkgsrc/mail/qmail-run/Makefile:1.71	Thu Mar 21 15:33:06 2019
+++ pkgsrc/mail/qmail-run/Makefile	Sun Apr 14 13:28:44 2019
@@ -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

Index: pkgsrc/mail/qmail-run/files/greylisting-spp-wrapper.sh
diff -u pkgsrc/mail/qmail-run/files/greylisting-spp-wrapper.sh:1.1 pkgsrc/mail/qmail-run/files/greylisting-spp-wrapper.sh:1.2
--- pkgsrc/mail/qmail-run/files/greylisting-spp-wrapper.sh:1.1	Fri Dec 14 06:49:31 2018
+++ pkgsrc/mail/qmail-run/files/greylisting-spp-wrapper.sh	Sun Apr 14 13:28:44 2019
@@ -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 @@ EXEMPTRCPTHOSTS=@PKG_SYSCONFDIR@/control
 
 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() {

Index: pkgsrc/mail/qmail-run/files/qmailqread.sh
diff -u pkgsrc/mail/qmail-run/files/qmailqread.sh:1.18 pkgsrc/mail/qmail-run/files/qmailqread.sh:1.19
--- pkgsrc/mail/qmail-run/files/qmailqread.sh:1.18	Sun Dec 16 05:32:07 2018
+++ pkgsrc/mail/qmail-run/files/qmailqread.sh	Sun Apr 14 13:28:44 2019
@@ -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 @@ name="qmailqread"
 # 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"}


--_----------=_1555248524118850--