[pkgsrc/pkgsrc-2017Q1]: pkgsrc/mail/qmail-run Pullup ticket #5256 - requested...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/52507759c21d
branches:  pkgsrc-2017Q1
changeset: 360273:52507759c21d
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon Apr 17 16:15:17 2017 +0000

description:
Pullup ticket #5256 - requested by schmonz
mail/qmail-run: bugfix

Revisions pulled up:
- mail/qmail-run/Makefile                                       1.33
- mail/qmail-run/files/qmailofmipd.sh                           1.3
- mail/qmail-run/files/qmailpop3d.sh                            1.12
- mail/qmail-run/files/qmailsmtpd.sh                            1.12
- mail/qmail-run/options.mk                                     1.2

---
   Module Name: pkgsrc
   Committed By:        schmonz
   Date:                Sun Apr  9 12:58:46 UTC 2017

   Modified Files:
        pkgsrc/mail/qmail-run: Makefile options.mk
        pkgsrc/mail/qmail-run/files: qmailofmipd.sh qmailpop3d.sh qmailsmtpd.sh

   Log Message:
   Add "qmail-run-ofmipd" option that controls the dependency on
   mess822. Turn it off by default. This should let us once again
   publish binary packages.

   To use another ofmipd, set qmailofmipd_ofmipdcmd in rc.conf. Likewise
   for qmail-smtpd and qmail-pop3d.

   Bump version.

diffstat:

 mail/qmail-run/Makefile             |  5 ++---
 mail/qmail-run/files/qmailofmipd.sh |  5 +++--
 mail/qmail-run/files/qmailpop3d.sh  |  5 +++--
 mail/qmail-run/files/qmailsmtpd.sh  |  5 +++--
 mail/qmail-run/options.mk           |  9 +++++++--
 5 files changed, 18 insertions(+), 11 deletions(-)

diffs (126 lines):

diff -r 28a1297ee47e -r 52507759c21d mail/qmail-run/Makefile
--- a/mail/qmail-run/Makefile   Mon Apr 17 16:12:20 2017 +0000
+++ b/mail/qmail-run/Makefile   Mon Apr 17 16:15:17 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31.2.1 2017/04/17 16:12:20 bsiegert Exp $
+# $NetBSD: Makefile,v 1.31.2.2 2017/04/17 16:15:17 bsiegert Exp $
 #
 
-DISTNAME=              qmail-run-20170404
+DISTNAME=              qmail-run-20170409
 CATEGORIES=            mail
 MASTER_SITES=          # empty
 DISTFILES=             # empty
@@ -10,7 +10,6 @@
 COMMENT=               Configures qmail to receive and deliver mail
 LICENSE=               2-clause-bsd
 
-DEPENDS+=              mess822-[0-9]*:../../mail/mess822
 DEPENDS_QMAIL=         qmail>=1.03nb8:../../mail/qmail
 DEPENDS+=              ${DEPENDS_QMAIL}
 
diff -r 28a1297ee47e -r 52507759c21d mail/qmail-run/files/qmailofmipd.sh
--- a/mail/qmail-run/files/qmailofmipd.sh       Mon Apr 17 16:12:20 2017 +0000
+++ b/mail/qmail-run/files/qmailofmipd.sh       Mon Apr 17 16:15:17 2017 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailofmipd.sh,v 1.1.2.1 2017/04/17 16:12:20 bsiegert Exp $
+# $NetBSD: qmailofmipd.sh,v 1.1.2.2 2017/04/17 16:15:17 bsiegert Exp $
 #
 # @PKGNAME@ script to control ofmipd (SMTP submission service).
 #
@@ -18,6 +18,7 @@
 : ${qmailofmipd_datalimit:="146800640"}
 : ${qmailofmipd_pretcpserver:=""}
 : ${qmailofmipd_preofmipd:=""}
+: ${qmailofmipd_ofmipdcmd:="@PREFIX@/bin/ofmipd"}
 : ${qmailofmipd_postofmipd:=""}
 : ${qmailofmipd_log:="YES"}
 : ${qmailofmipd_logcmd:="logger -t nb${name} -p mail.info"}
@@ -48,7 +49,7 @@
        if [ -f /etc/rc.subr ]; then
                checkyesno qmailofmipd_log || qmailofmipd_logcmd=${qmailofmipd_nologcmd}
        fi
-       command="@SETENV@ - ${qmailofmipd_postenv} @PREFIX@/bin/softlimit -m ${qmailofmipd_datalimit} ${qmailofmipd_pretcpserver} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} 
${qmailofmipd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.ofmip.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyofmip` -u `@ID@ -u @QMAIL_DAEMON_USER@` -g `@ID@ -g @QMAIL_DAEMON_USER@` 
${qmailofmipd_tcphost} ${qmailofmipd_tcpport} ${qmailofmipd_preofmipd} @PREFIX@/bin/ofmipd ${qmailofmipd_postofmipd} 2>&1 | @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailofmipd_logcmd}"
+       command="@SETENV@ - ${qmailofmipd_postenv} @PREFIX@/bin/softlimit -m ${qmailofmipd_datalimit} ${qmailofmipd_pretcpserver} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} 
${qmailofmipd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.ofmip.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyofmip` -u `@ID@ -u @QMAIL_DAEMON_USER@` -g `@ID@ -g @QMAIL_DAEMON_USER@` 
${qmailofmipd_tcphost} ${qmailofmipd_tcpport} ${qmailofmipd_preofmipd} ${qmailofmipd_ofmipdcmd} ${qmailofmipd_postofmipd} 2>&1 | @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailofmipd_logcmd}"
        command_args="&"
        rc_flags=""
 }
diff -r 28a1297ee47e -r 52507759c21d mail/qmail-run/files/qmailpop3d.sh
--- a/mail/qmail-run/files/qmailpop3d.sh        Mon Apr 17 16:12:20 2017 +0000
+++ b/mail/qmail-run/files/qmailpop3d.sh        Mon Apr 17 16:15:17 2017 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailpop3d.sh,v 1.10.12.1 2017/04/17 16:12:20 bsiegert Exp $
+# $NetBSD: qmailpop3d.sh,v 1.10.12.2 2017/04/17 16:15:17 bsiegert Exp $
 #
 # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
 #
@@ -17,6 +17,7 @@
 : ${qmailpop3d_datalimit:="146800640"}
 : ${qmailpop3d_pretcpserver:=""}
 : ${qmailpop3d_prepop3d:=""}
+: ${qmailpop3d_pop3dcmd:="@PREFIX@/bin/qmail-pop3d"}
 : ${qmailpop3d_checkpassword:="@PREFIX@/bin/checkpassword"}
 : ${qmailpop3d_maildirname:="Maildir"}
 : ${qmailpop3d_log:="YES"}
@@ -48,7 +49,7 @@
        if [ -f /etc/rc.subr ]; then
                checkyesno qmailpop3d_log || qmailpop3d_logcmd=${qmailpop3d_nologcmd}
        fi
-       command="@SETENV@ - ${qmailpop3d_postenv} @PREFIX@/bin/softlimit -m ${qmailpop3d_datalimit} ${qmailpop3d_pretcpserver} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} ${qmailpop3d_tcpflags} 
-x @PKG_SYSCONFDIR@/tcp.pop3.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3` ${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @PREFIX@/bin/qmail-popup `@HEAD@ -1 @PKG_SYSCONFDIR@/control/me` 
${qmailpop3d_checkpassword} ${qmailpop3d_prepop3d} @PREFIX@/bin/qmail-pop3d ${qmailpop3d_maildirname} 2>&1 | @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailpop3d_logcmd}"
+       command="@SETENV@ - ${qmailpop3d_postenv} @PREFIX@/bin/softlimit -m ${qmailpop3d_datalimit} ${qmailpop3d_pretcpserver} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} ${qmailpop3d_tcpflags} 
-x @PKG_SYSCONFDIR@/tcp.pop3.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3` ${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @PREFIX@/bin/qmail-popup `@HEAD@ -1 @PKG_SYSCONFDIR@/control/me` 
${qmailpop3d_checkpassword} ${qmailpop3d_prepop3d} ${qmailpop3d_pop3dcmd} ${qmailpop3d_maildirname} 2>&1 | @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailpop3d_logcmd}"
        command_args="&"
        rc_flags=""
 }
diff -r 28a1297ee47e -r 52507759c21d mail/qmail-run/files/qmailsmtpd.sh
--- a/mail/qmail-run/files/qmailsmtpd.sh        Mon Apr 17 16:12:20 2017 +0000
+++ b/mail/qmail-run/files/qmailsmtpd.sh        Mon Apr 17 16:15:17 2017 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsmtpd.sh,v 1.10.12.1 2017/04/17 16:12:20 bsiegert Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.10.12.2 2017/04/17 16:15:17 bsiegert Exp $
 #
 # @PKGNAME@ script to control qmail-smtpd (SMTP service).
 #
@@ -18,6 +18,7 @@
 : ${qmailsmtpd_datalimit:="146800640"}
 : ${qmailsmtpd_pretcpserver:=""}
 : ${qmailsmtpd_presmtpd:=""}
+: ${qmailsmtpd_smtpdcmd:="@PREFIX@/bin/qmail-smtpd"}
 : ${qmailsmtpd_postsmtpd:=""}
 : ${qmailsmtpd_log:="YES"}
 : ${qmailsmtpd_logcmd:="logger -t nb${name} -p mail.info"}
@@ -48,7 +49,7 @@
        if [ -f /etc/rc.subr ]; then
                checkyesno qmailsmtpd_log || qmailsmtpd_logcmd=${qmailsmtpd_nologcmd}
        fi
-       command="@SETENV@ - ${qmailsmtpd_postenv} @PREFIX@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} ${qmailsmtpd_tcpflags} 
-x @PKG_SYSCONFDIR@/tcp.smtp.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyincoming` -u `@ID@ -u @QMAIL_DAEMON_USER@` -g `@ID@ -g @QMAIL_DAEMON_USER@` ${qmailsmtpd_tcphost} 
${qmailsmtpd_tcpport} ${qmailsmtpd_presmtpd} @PREFIX@/bin/qmail-smtpd ${qmailsmtpd_postsmtpd} 2>&1 | @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailsmtpd_logcmd}"
+       command="@SETENV@ - ${qmailsmtpd_postenv} @PREFIX@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} ${qmailsmtpd_tcpflags} 
-x @PKG_SYSCONFDIR@/tcp.smtp.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyincoming` -u `@ID@ -u @QMAIL_DAEMON_USER@` -g `@ID@ -g @QMAIL_DAEMON_USER@` ${qmailsmtpd_tcphost} 
${qmailsmtpd_tcpport} ${qmailsmtpd_presmtpd} ${qmailsmtpd_smtpdcmd} ${qmailsmtpd_postsmtpd} 2>&1 | @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailsmtpd_logcmd}"
        command_args="&"
        rc_flags=""
 }
diff -r 28a1297ee47e -r 52507759c21d mail/qmail-run/options.mk
--- a/mail/qmail-run/options.mk Mon Apr 17 16:12:20 2017 +0000
+++ b/mail/qmail-run/options.mk Mon Apr 17 16:15:17 2017 +0000
@@ -1,10 +1,15 @@
-# $NetBSD: options.mk,v 1.1 2017/01/14 23:00:31 schmonz Exp $
+# $NetBSD: options.mk,v 1.1.2.1 2017/04/17 16:15:17 bsiegert Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qmail-run
-PKG_SUPPORTED_OPTIONS+=        sasl tls
+PKG_SUPPORTED_OPTIONS+=        qmail-run-ofmipd sasl tls
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mqmail-run-ofmipd)
+DEPENDS+=              mess822-[0-9]*:../../mail/mess822
+.endif
+
+
 .if !empty(PKG_OPTIONS:Msasl)
 DEPENDS+=              spamdyke-[0-9]*:../../mail/spamdyke
 .endif