Update to 20050330: default to logging with logger(1) rather than

qmail's splogger(8), as the TAI timestamps included by splogger
are mostly unnecessary with syslog's existing timestamping. If you
need TAI timestamps, or otherwise need to customize logging, you
can always change qmailfoo_logcmd in rc.conf.

This had mildly annoyed me, but I wouldn't have bothered if not
for zuntum's comment about it. Good call.

5 files changed, 10 insertions, 10 deletions

diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index a8ae208cf8e..7404957d3e0 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/12/29 16:18:41 schmonz Exp $
+# $NetBSD: Makefile,v 1.8 2005/03/30 20:06:20 schmonz Exp $
 #
 
-DISTNAME=		qmail-run-20041229
+DISTNAME=		qmail-run-20050330
 CATEGORIES=		mail
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/mail/qmail-run/files/qmailpop3d.sh b/mail/qmail-run/files/qmailpop3d.sh
index 21ac183a024..8baec47125c 100644
--- a/mail/qmail-run/files/qmailpop3d.sh
+++ b/mail/qmail-run/files/qmailpop3d.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailpop3d.sh,v 1.4 2004/12/29 16:18:41 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.5 2005/03/30 20:06:20 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
 #
@@ -19,7 +19,7 @@ name="qmailpop3d"
 : ${qmailpop3d_prepop3d:=""}
 : ${qmailpop3d_checkpassword:="@LOCALBASE@/bin/checkpassword"}
 : ${qmailpop3d_maildirname:="Maildir"}
-: ${qmailpop3d_logcmd:="@LOCALBASE@/bin/setuidgid qmaill @LOCALBASE@/bin/splogger nb${name}"}
+: ${qmailpop3d_logcmd:="@LOCALBASE@/bin/setuidgid qmaill logger -t nb${name} -p mail.info"}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
diff --git a/mail/qmail-run/files/qmailqread.sh b/mail/qmail-run/files/qmailqread.sh
index 9e3908e64f3..9e89498287a 100644
--- a/mail/qmail-run/files/qmailqread.sh
+++ b/mail/qmail-run/files/qmailqread.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailqread.sh,v 1.4 2004/12/29 16:18:41 schmonz Exp $
+# $NetBSD: qmailqread.sh,v 1.5 2005/03/30 20:06:20 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.
@@ -12,7 +12,7 @@
 name="qmailqread"
 
 # User-settable rc.conf variables and their default values:
-: ${qmailqread_logcmd:="@LOCALBASE@/bin/setuidgid qmaill @LOCALBASE@/bin/splogger nb${name}"}
+: ${qmailqread_logcmd:="@LOCALBASE@/bin/setuidgid qmaill logger -t nb${name} -p mail.info"}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
diff --git a/mail/qmail-run/files/qmailsend.sh b/mail/qmail-run/files/qmailsend.sh
index a12939bbdb3..c7ba3efb60e 100644
--- a/mail/qmail-run/files/qmailsend.sh
+++ b/mail/qmail-run/files/qmailsend.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsend.sh,v 1.4 2004/12/29 16:18:41 schmonz Exp $
+# $NetBSD: qmailsend.sh,v 1.5 2005/03/30 20:06:20 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-send (local and outgoing mail).
 #
@@ -14,7 +14,7 @@ name="qmailsend"
 # User-settable rc.conf variables and their default values:
 : ${qmailsend_postenv:="PATH=@LOCALBASE@/bin:$PATH"}
 : ${qmailsend_defaultdelivery:="`@HEAD@ -1 @PKG_SYSCONFDIR@/control/defaultdelivery`"}
-: ${qmailsend_logcmd:="@LOCALBASE@/bin/splogger nb${name}"}
+: ${qmailsend_logcmd:="logger -t nb${name} -p mail.info"}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
diff --git a/mail/qmail-run/files/qmailsmtpd.sh b/mail/qmail-run/files/qmailsmtpd.sh
index d913de3b819..3cd933f24f2 100644
--- a/mail/qmail-run/files/qmailsmtpd.sh
+++ b/mail/qmail-run/files/qmailsmtpd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsmtpd.sh,v 1.4 2004/12/29 16:18:41 schmonz Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.5 2005/03/30 20:06:20 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-smtpd (SMTP service).
 #
@@ -19,7 +19,7 @@ name="qmailsmtpd"
 : ${qmailsmtpd_pretcpserver:=""}
 : ${qmailsmtpd_presmtpd:=""}
 : ${qmailsmtpd_postsmtpd:=""}
-: ${qmailsmtpd_logcmd:="@LOCALBASE@/bin/setuidgid qmaill @LOCALBASE@/bin/splogger nb${name}"}
+: ${qmailsmtpd_logcmd:="@LOCALBASE@/bin/setuidgid qmaill logger -t nb${name} -p mail.info"}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr