CVS commit: pkgsrc/mail/qmail-run/files

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Nov 28 16:42:44 UTC 2018

Modified Files:
        pkgsrc/mail/qmail-run/files: qmailofmipd.sh qmailpop3d.sh qmailqread.sh
            qmailsmtpd.sh

Log Message:
Sort rc.conf defaults to match the order in which they're used.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/qmail-run/files/qmailofmipd.sh
cvs rdiff -u -r1.25 -r1.26 pkgsrc/mail/qmail-run/files/qmailpop3d.sh
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/qmail-run/files/qmailqread.sh
cvs rdiff -u -r1.22 -r1.23 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/files/qmailofmipd.sh
diff -u pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.17 pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.18
--- pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.17     Wed Nov 28 16:22:41 2018
+++ pkgsrc/mail/qmail-run/files/qmailofmipd.sh  Wed Nov 28 16:42:44 2018
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailofmipd.sh,v 1.17 2018/11/28 16:22:41 schmonz Exp $
+# $NetBSD: qmailofmipd.sh,v 1.18 2018/11/28 16:42:44 schmonz Exp $
 #
 # @PKGNAME@ script to control ofmipd (SMTP submission service).
 #
@@ -12,16 +12,16 @@ name="qmailofmipd"
 
 # User-settable rc.conf variables and their default values:
 : ${qmailofmipd_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@)"}
-: ${qmailofmipd_tcpflags:="-ne -vRl0"}
-: ${qmailofmipd_tcphost:="0.0.0.0"}
-: ${qmailofmipd_tcpport:="587"}
 : ${qmailofmipd_datalimit:="360000000"}
 : ${qmailofmipd_pretcpserver:=""}
 : ${qmailofmipd_tcpserver:="@PREFIX@/bin/sslserver"}
-: ${qmailofmipd_preofmipd:="@PREFIX@/bin/checknotroot @PREFIX@/bin/fixsmtpio"}
-: ${qmailofmipd_ofmipdcmd:="@PREFIX@/bin/ofmipd-with-user-cdb"}
+: ${qmailofmipd_tcpflags:="-ne -vRl0"}
+: ${qmailofmipd_tcphost:="0.0.0.0"}
+: ${qmailofmipd_tcpport:="587"}
 : ${qmailofmipd_precheckpassword:="@PREFIX@/bin/reup -t 5 @PREFIX@/bin/authup smtp"}
 : ${qmailofmipd_checkpassword:="@PREFIX@/bin/nbcheckpassword"}
+: ${qmailofmipd_preofmipd:="@PREFIX@/bin/checknotroot @PREFIX@/bin/fixsmtpio"}
+: ${qmailofmipd_ofmipdcmd:="@PREFIX@/bin/ofmipd-with-user-cdb"}
 : ${qmailofmipd_postofmipd:=""}
 : ${qmailofmipd_log:="YES"}
 : ${qmailofmipd_logcmd:="logger -t nbqmail/ofmipd -p mail.info"}

Index: pkgsrc/mail/qmail-run/files/qmailpop3d.sh
diff -u pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.25 pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.26
--- pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.25      Wed Nov 28 16:22:41 2018
+++ pkgsrc/mail/qmail-run/files/qmailpop3d.sh   Wed Nov 28 16:42:44 2018
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailpop3d.sh,v 1.25 2018/11/28 16:22:41 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.26 2018/11/28 16:42:44 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
 #
@@ -11,16 +11,16 @@ name="qmailpop3d"
 
 # User-settable rc.conf variables and their default values:
 : ${qmailpop3d_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@)"}
-: ${qmailpop3d_tcpflags:="-ne -vRl0"}
-: ${qmailpop3d_tcphost:="0.0.0.0"}
-: ${qmailpop3d_tcpport:="110"}
 : ${qmailpop3d_datalimit:="180000000"}
 : ${qmailpop3d_pretcpserver:=""}
 : ${qmailpop3d_tcpserver:="@PREFIX@/bin/sslserver"}
-: ${qmailpop3d_prepop3d:="@PREFIX@/bin/checknotroot"}
-: ${qmailpop3d_pop3dcmd:="@PREFIX@/bin/qmail-pop3d"}
+: ${qmailpop3d_tcpflags:="-ne -vRl0"}
+: ${qmailpop3d_tcphost:="0.0.0.0"}
+: ${qmailpop3d_tcpport:="110"}
 : ${qmailpop3d_precheckpassword:="@PREFIX@/bin/authup pop3"}
 : ${qmailpop3d_checkpassword:="@PREFIX@/bin/nbcheckpassword"}
+: ${qmailpop3d_prepop3d:="@PREFIX@/bin/checknotroot"}
+: ${qmailpop3d_pop3dcmd:="@PREFIX@/bin/qmail-pop3d"}
 : ${qmailpop3d_postpop3d:="Maildir"}
 : ${qmailpop3d_log:="YES"}
 : ${qmailpop3d_logcmd:="logger -t nbqmail/pop3d -p mail.info"}

Index: pkgsrc/mail/qmail-run/files/qmailqread.sh
diff -u pkgsrc/mail/qmail-run/files/qmailqread.sh:1.15 pkgsrc/mail/qmail-run/files/qmailqread.sh:1.16
--- pkgsrc/mail/qmail-run/files/qmailqread.sh:1.15      Sat Nov  3 17:08:26 2018
+++ pkgsrc/mail/qmail-run/files/qmailqread.sh   Wed Nov 28 16:42:44 2018
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailqread.sh,v 1.15 2018/11/03 17:08:26 schmonz Exp $
+# $NetBSD: qmailqread.sh,v 1.16 2018/11/28 16:42: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.
@@ -13,10 +13,10 @@ name="qmailqread"
 
 # User-settable rc.conf variables and their default values:
 : ${qmailqread_postenv:=""}
+: ${qmailqread_tcpserver:="@PREFIX@/bin/tcpserver"}
 : ${qmailqread_tcpflags:="-R1"}
 : ${qmailqread_tcphost:="127.0.0.1"}
 : ${qmailqread_tcpport:="20025"}
-: ${qmailqread_tcpserver:="@PREFIX@/bin/tcpserver"}
 : ${qmailqread_log:="YES"}
 : ${qmailqread_logcmd:="logger -t nbqmail/qread -p mail.info"}
 : ${qmailqread_nologcmd:="@PREFIX@/bin/multilog -*"}

Index: pkgsrc/mail/qmail-run/files/qmailsmtpd.sh
diff -u pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.22 pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.23
--- pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.22      Wed Nov 28 16:22:41 2018
+++ pkgsrc/mail/qmail-run/files/qmailsmtpd.sh   Wed Nov 28 16:42:44 2018
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsmtpd.sh,v 1.22 2018/11/28 16:22:41 schmonz Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.23 2018/11/28 16:42:44 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-smtpd (SMTP service).
 #
@@ -12,12 +12,12 @@ name="qmailsmtpd"
 
 # User-settable rc.conf variables and their default values:
 : ${qmailsmtpd_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@)"}
-: ${qmailsmtpd_tcpflags:="-ne -vRl0"}
-: ${qmailsmtpd_tcphost:="0.0.0.0"}
-: ${qmailsmtpd_tcpport:="25"}
 : ${qmailsmtpd_datalimit:="540000000"}
 : ${qmailsmtpd_pretcpserver:=""}
 : ${qmailsmtpd_tcpserver:="@PREFIX@/bin/sslserver"}
+: ${qmailsmtpd_tcpflags:="-ne -vRl0"}
+: ${qmailsmtpd_tcphost:="0.0.0.0"}
+: ${qmailsmtpd_tcpport:="25"}
 : ${qmailsmtpd_presmtpd:="@PREFIX@/bin/greetdelay @PREFIX@/bin/rblsmtpd -r zen.spamhaus.org @PREFIX@/bin/fixsmtpio"}
 : ${qmailsmtpd_smtpdcmd:="@PREFIX@/bin/qmail-smtpd"}
 : ${qmailsmtpd_postsmtpd:=""}