CVS commit: pkgsrc/mail/qmail-run

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Nov  3 17:08:26 UTC 2018

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

Log Message:
When tagging log entries, insert "/" between "nbqmail" and the rest of
the tag; for instance, "nbqmailofmipd" becomes "nbqmail/ofmipd". Vaguely
redolent of Postfix, and easier to glance at logs now that just about
everything runs similarly from rc.d. Turn off sslserver verbosity by
default. Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/qmail-run/files/qmailofmipd.sh
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/qmail-run/files/qmailpop3d.sh
cvs rdiff -u -r1.14 -r1.15 pkgsrc/mail/qmail-run/files/qmailqread.sh
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/qmail-run/files/qmailsend.sh
cvs rdiff -u -r1.18 -r1.19 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.53 pkgsrc/mail/qmail-run/Makefile:1.54
--- pkgsrc/mail/qmail-run/Makefile:1.53 Sun Oct 28 16:38:36 2018
+++ pkgsrc/mail/qmail-run/Makefile      Sat Nov  3 17:08:26 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2018/10/28 16:38:36 schmonz Exp $
+# $NetBSD: Makefile,v 1.54 2018/11/03 17:08:26 schmonz Exp $
 #
 
-DISTNAME=              qmail-run-20181028
-PKGREVISION=           1
+DISTNAME=              qmail-run-20181103
 CATEGORIES=            mail
 MASTER_SITES=          # empty
 DISTFILES=             # empty

Index: pkgsrc/mail/qmail-run/files/qmailofmipd.sh
diff -u pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.13 pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.14
--- pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.13     Sun Oct 28 16:38:36 2018
+++ pkgsrc/mail/qmail-run/files/qmailofmipd.sh  Sat Nov  3 17:08:26 2018
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailofmipd.sh,v 1.13 2018/10/28 16:38:36 schmonz Exp $
+# $NetBSD: qmailofmipd.sh,v 1.14 2018/11/03 17:08:26 schmonz Exp $
 #
 # @PKGNAME@ script to control ofmipd (SMTP submission service).
 #
@@ -12,7 +12,7 @@ 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@) DHFILE=@PKG_SYSCONFDIR@/control/dh2048.pem CERTFILE=@PKG_SYSCONFDIR@/control/servercert.pem"}
-: ${qmailofmipd_tcpflags:="-neV -vRl0"}
+: ${qmailofmipd_tcpflags:="-ne -vRl0"}
 : ${qmailofmipd_tcphost:="0.0.0.0"}
 : ${qmailofmipd_tcpport:="587"}
 : ${qmailofmipd_datalimit:="360000000"}
@@ -23,7 +23,7 @@ name="qmailofmipd"
 : ${qmailofmipd_checkpassword:="@PREFIX@/bin/nbcheckpassword"}
 : ${qmailofmipd_postofmipd:=""}
 : ${qmailofmipd_log:="YES"}
-: ${qmailofmipd_logcmd:="logger -t nb${name} -p mail.info"}
+: ${qmailofmipd_logcmd:="logger -t nbqmail/ofmipd -p mail.info"}
 : ${qmailofmipd_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then

Index: pkgsrc/mail/qmail-run/files/qmailpop3d.sh
diff -u pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.22 pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.23
--- pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.22      Sun Oct 28 16:38:36 2018
+++ pkgsrc/mail/qmail-run/files/qmailpop3d.sh   Sat Nov  3 17:08:26 2018
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailpop3d.sh,v 1.22 2018/10/28 16:38:36 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.23 2018/11/03 17:08:26 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
 #
@@ -11,7 +11,7 @@ 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@) DHFILE=@PKG_SYSCONFDIR@/control/dh2048.pem CERTFILE=@PKG_SYSCONFDIR@/control/servercert.pem"}
-: ${qmailpop3d_tcpflags:="-neV -vRl0"}
+: ${qmailpop3d_tcpflags:="-ne -vRl0"}
 : ${qmailpop3d_tcphost:="0.0.0.0"}
 : ${qmailpop3d_tcpport:="110"}
 : ${qmailpop3d_datalimit:="180000000"}
@@ -22,7 +22,7 @@ name="qmailpop3d"
 : ${qmailpop3d_checkpassword:="@PREFIX@/bin/nbcheckpassword"}
 : ${qmailpop3d_maildirname:="Maildir"}
 : ${qmailpop3d_log:="YES"}
-: ${qmailpop3d_logcmd:="logger -t nb${name} -p mail.info"}
+: ${qmailpop3d_logcmd:="logger -t nbqmail/pop3d -p mail.info"}
 : ${qmailpop3d_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then

Index: pkgsrc/mail/qmail-run/files/qmailqread.sh
diff -u pkgsrc/mail/qmail-run/files/qmailqread.sh:1.14 pkgsrc/mail/qmail-run/files/qmailqread.sh:1.15
--- pkgsrc/mail/qmail-run/files/qmailqread.sh:1.14      Sat Aug  5 15:21:03 2017
+++ pkgsrc/mail/qmail-run/files/qmailqread.sh   Sat Nov  3 17:08:26 2018
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailqread.sh,v 1.14 2017/08/05 15:21:03 schmonz Exp $
+# $NetBSD: qmailqread.sh,v 1.15 2018/11/03 17:08:26 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.
@@ -18,7 +18,7 @@ name="qmailqread"
 : ${qmailqread_tcpport:="20025"}
 : ${qmailqread_tcpserver:="@PREFIX@/bin/tcpserver"}
 : ${qmailqread_log:="YES"}
-: ${qmailqread_logcmd:="logger -t nb${name} -p mail.info"}
+: ${qmailqread_logcmd:="logger -t nbqmail/qread -p mail.info"}
 : ${qmailqread_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then

Index: pkgsrc/mail/qmail-run/files/qmailsend.sh
diff -u pkgsrc/mail/qmail-run/files/qmailsend.sh:1.12 pkgsrc/mail/qmail-run/files/qmailsend.sh:1.13
--- pkgsrc/mail/qmail-run/files/qmailsend.sh:1.12       Sat Aug  5 03:03:17 2017
+++ pkgsrc/mail/qmail-run/files/qmailsend.sh    Sat Nov  3 17:08:26 2018
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsend.sh,v 1.12 2017/08/05 03:03:17 schmonz Exp $
+# $NetBSD: qmailsend.sh,v 1.13 2018/11/03 17:08:26 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-send (local and outgoing mail).
 #
@@ -15,7 +15,7 @@ name="qmailsend"
 : ${qmailsend_postenv:="PATH=@PREFIX@/bin:$PATH"}
 : ${qmailsend_defaultdelivery:="`@HEAD@ -1 @PKG_SYSCONFDIR@/control/defaultdelivery`"}
 : ${qmailsend_log:="YES"}
-: ${qmailsend_logcmd:="logger -t nb${name} -p mail.info"}
+: ${qmailsend_logcmd:="logger -t nbqmail/send -p mail.info"}
 : ${qmailsend_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then

Index: pkgsrc/mail/qmail-run/files/qmailsmtpd.sh
diff -u pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.18 pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.19
--- pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.18      Wed Oct 24 15:46:54 2018
+++ pkgsrc/mail/qmail-run/files/qmailsmtpd.sh   Sat Nov  3 17:08:26 2018
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsmtpd.sh,v 1.18 2018/10/24 15:46:54 schmonz Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.19 2018/11/03 17:08:26 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-smtpd (SMTP service).
 #
@@ -22,7 +22,7 @@ name="qmailsmtpd"
 : ${qmailsmtpd_smtpdcmd:="@PREFIX@/bin/qmail-smtpd"}
 : ${qmailsmtpd_postsmtpd:=""}
 : ${qmailsmtpd_log:="YES"}
-: ${qmailsmtpd_logcmd:="logger -t nb${name} -p mail.info"}
+: ${qmailsmtpd_logcmd:="logger -t nbqmail/smtpd -p mail.info"}
 : ${qmailsmtpd_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then