Sat Nov 24 17:12:00 2018 UTC ()
Bump version and acceptutils dependency for authup regression fix.


(schmonz)
diff -r1.59 -r1.60 pkgsrc/mail/qmail-run/Makefile
diff -r1.4 -r1.5 pkgsrc/mail/qmail-run/files/fixsmtpio
cvs diff -r1.59 -r1.60 pkgsrc/mail/qmail-run/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmail-run/Makefile 2018/11/24 16:38:14 1.59
+++ pkgsrc/mail/qmail-run/Makefile 2018/11/24 17:12:00 1.60
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.59 2018/11/24 16:38:14 schmonz Exp $ 1# $NetBSD: Makefile,v 1.60 2018/11/24 17:12:00 schmonz Exp $
2# 2#
3 3
4DISTNAME= qmail-run-20181124 4DISTNAME= qmail-run-20181124.1
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10COMMENT= Configures qmail to receive and deliver mail 10COMMENT= Configures qmail to receive and deliver mail
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13DEPENDS+= greetdelay-[0-9]*:../../mail/greetdelay 13DEPENDS+= greetdelay-[0-9]*:../../mail/greetdelay
14DEPENDS+= greylisting-spp-[0-9]*:../../mail/greylisting-spp 14DEPENDS+= greylisting-spp-[0-9]*:../../mail/greylisting-spp
15DEPENDS+= pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives 15DEPENDS+= pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
16DEPENDS_QMAIL= qmail>=1.03nb41:../../mail/qmail 16DEPENDS_QMAIL= qmail>=1.03nb41:../../mail/qmail
17DEPENDS+= ${DEPENDS_QMAIL} 17DEPENDS+= ${DEPENDS_QMAIL}
18DEPENDS+= qmail-acceptutils>=20181124:../../mail/qmail-acceptutils 18DEPENDS+= qmail-acceptutils>=20181124.1:../../mail/qmail-acceptutils
19DEPENDS+= qmail-qfilter>1.5nb1:../../mail/qmail-qfilter 19DEPENDS+= qmail-qfilter>1.5nb1:../../mail/qmail-qfilter
20DEPENDS+= qmail-rejectutils>=20181110:../../mail/qmail-rejectutils 20DEPENDS+= qmail-rejectutils>=20181110:../../mail/qmail-rejectutils
21 21
22WRKSRC= ${WRKDIR} 22WRKSRC= ${WRKDIR}
23NO_BUILD= yes 23NO_BUILD= yes
24NO_CHECKSUM= yes 24NO_CHECKSUM= yes
25 25
26FILES_SUBST+= QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q} 26FILES_SUBST+= QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q}
27FILES_SUBST+= QMAIL_LOG_USER=${QMAIL_LOG_USER:Q} 27FILES_SUBST+= QMAIL_LOG_USER=${QMAIL_LOG_USER:Q}
28FILES_SUBST+= QMAIL_SEND_USER=${QMAIL_SEND_USER:Q} 28FILES_SUBST+= QMAIL_SEND_USER=${QMAIL_SEND_USER:Q}
29FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q} 29FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
30FILES_SUBST+= PKGNAME=${PKGNAME:Q} 30FILES_SUBST+= PKGNAME=${PKGNAME:Q}
31FILES_SUBST+= UCSPI_SSL_USER=${UCSPI_SSL_USER:Q} 31FILES_SUBST+= UCSPI_SSL_USER=${UCSPI_SSL_USER:Q}
cvs diff -r1.4 -r1.5 pkgsrc/mail/qmail-run/files/fixsmtpio (expand / switch to unified diff)

--- pkgsrc/mail/qmail-run/files/fixsmtpio 2018/11/24 16:38:14 1.4
+++ pkgsrc/mail/qmail-run/files/fixsmtpio 2018/11/24 17:12:00 1.5
@@ -8,27 +8,27 @@ @@ -8,27 +8,27 @@
8 8
9# Replace hostname in HELO/EHLO response 9# Replace hostname in HELO/EHLO response
10:helo::2*::&fixsmtpio_fixup 10:helo::2*::&fixsmtpio_fixup
11:ehlo::2*::&fixsmtpio_fixup 11:ehlo::2*::&fixsmtpio_fixup
12 12
13# Replace hostname in QUIT response 13# Replace hostname in QUIT response
14:quit::2*::&fixsmtpio_fixup 14:quit::2*::&fixsmtpio_fixup
15 15
16# Adjust greylisting-spp messages to look more qmail-ish 16# Adjust greylisting-spp messages to look more qmail-ish
17:rcpt::451 GL - temporary*::451 greylisted, retry later (#4.7.1) 17:rcpt::451 GL - temporary*::451 greylisted, retry later (#4.7.1)
18:data::451 GL - temporary*::451 greylisted, retry later (#4.7.1) 18:data::451 GL - temporary*::451 greylisted, retry later (#4.7.1)
19 19
20# Remove greeting for child process restarted after upgrading to STARTTLS 20# Remove greeting for child process restarted after upgrading to STARTTLS
21SSL_CIPHER:greeting::2*:: 21FIXSMTPIOTLS:greeting::2*::
22 22
23######################################################################## 23########################################################################
24 24
25### For users authenticated via authup(8): 25### For users authenticated via authup(8):
26 26
27# Replace greeting for child process started after authenticating 27# Replace greeting for child process started after authenticating
28AUTHUP_USER:greeting::2*::235 ok, go ahead (#2.0.0) 28AUTHUP_USER:greeting::2*::235 ok, go ahead (#2.0.0)
29 29
30# If client closes connection, tell authup the session succeeded 30# If client closes connection, tell authup the session succeeded
31AUTHUP_USER:clienteof::*:0: 31AUTHUP_USER:clienteof::*:0:
32 32
33# If server greets us unhappily, preserve message, and tell authup to stop trying 33# If server greets us unhappily, preserve message, and tell authup to stop trying
34AUTHUP_USER:greeting::4*:14:&fixsmtpio_noop 34AUTHUP_USER:greeting::4*:14:&fixsmtpio_noop