CVS commit: [pkgsrc-2017Q1] pkgsrc/mail/qmail-run

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: [pkgsrc-2017Q1] pkgsrc/mail/qmail-run
From: "Benny Siegert" <bsiegert%netbsd.org@localhost>
Date: Mon, 17 Apr 2017 16:15:18 +0000

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Apr 17 16:15:17 UTC 2017

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.31.2.1 -r1.31.2.2 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 pkgsrc/mail/qmail-run/options.mk
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 pkgsrc/mail/qmail-run/files/qmailofmipd.sh
cvs rdiff -u -r1.10.12.1 -r1.10.12.2 \
    pkgsrc/mail/qmail-run/files/qmailpop3d.sh \
    pkgsrc/mail/qmail-run/files/qmailsmtpd.sh

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

Modified files:

Index: pkgsrc/mail/qmail-run/Makefile
diff -u pkgsrc/mail/qmail-run/Makefile:1.31.2.1 pkgsrc/mail/qmail-run/Makefile:1.31.2.2
--- pkgsrc/mail/qmail-run/Makefile:1.31.2.1     Mon Apr 17 16:12:20 2017
+++ pkgsrc/mail/qmail-run/Makefile      Mon Apr 17 16:15:17 2017
@@ -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 @@ MAINTAINER=           schmonz%NetBSD.org@localhost
 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}
 

Index: pkgsrc/mail/qmail-run/options.mk
diff -u pkgsrc/mail/qmail-run/options.mk:1.1 pkgsrc/mail/qmail-run/options.mk:1.1.2.1
--- pkgsrc/mail/qmail-run/options.mk:1.1        Sat Jan 14 23:00:31 2017
+++ pkgsrc/mail/qmail-run/options.mk    Mon Apr 17 16:15:17 2017
@@ -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

Index: pkgsrc/mail/qmail-run/files/qmailofmipd.sh
diff -u pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.1.2.1 pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.1.2.2
--- pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.1.2.1  Mon Apr 17 16:12:20 2017
+++ pkgsrc/mail/qmail-run/files/qmailofmipd.sh  Mon Apr 17 16:15:17 2017
@@ -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 @@ name="qmailofmipd"
 : ${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 @@ qmailofmipd_precmd()
        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=""
 }

Index: pkgsrc/mail/qmail-run/files/qmailpop3d.sh
diff -u pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.10.12.1 pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.10.12.2
--- pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.10.12.1 Mon Apr 17 16:12:20 2017
+++ pkgsrc/mail/qmail-run/files/qmailpop3d.sh   Mon Apr 17 16:15:17 2017
@@ -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 @@ name="qmailpop3d"
 : ${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 @@ qmailpop3d_precmd()
        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=""
 }
Index: pkgsrc/mail/qmail-run/files/qmailsmtpd.sh
diff -u pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.10.12.1 pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.10.12.2
--- pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.10.12.1 Mon Apr 17 16:12:20 2017
+++ pkgsrc/mail/qmail-run/files/qmailsmtpd.sh   Mon Apr 17 16:15:17 2017
@@ -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 @@ name="qmailsmtpd"
 : ${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 @@ qmailsmtpd_precmd()
        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=""
 }

Prev by Date: CVS commit: [pkgsrc-2017Q1] pkgsrc/mail/qmail-run
Next by Date: CVS commit: [pkgsrc-2017Q1] pkgsrc/mk/wrapper
Previous by Thread: CVS commit: [pkgsrc-2017Q1] pkgsrc/mail/qmail-run
Next by Thread: CVS commit: [pkgsrc-2017Q1] pkgsrc/mk/wrapper
Indexes:

Home | Main Index | Thread Index | Old Index