Change the default directory for the various pid files to be

${COURIER_STATEDIR}/tmp, which defaults to /var/courier/tmp.  This
allows some of the servers which drop root privileges too soon to still
write the pid file into a courier-owned directory instead of the
root-owned /var/run.

In mail/courier-mta, de-list ${COURIER_STATEDIR}/webmlm from the list
of owned directories.  In fact, webmlmd expects that path to be a
socket file, and breaks horribly if the "webmlm" directory is present
instead.

Bump PKGREVISIONs for the following packages:

	mail/courier-imap	--> 2
	mail/courier-mta	--> 9
	mail/sqwebmail		--> 4
	meta-pkgs/courier	--> 5

4 files changed, 8 insertions, 8 deletions

diff --git a/mail/courier-mta/files/courieresmtp.sh b/mail/courier-mta/files/courieresmtp.sh
index 17aa7810b4f..12771c1f3db 100644
--- a/mail/courier-mta/files/courieresmtp.sh
+++ b/mail/courier-mta/files/courieresmtp.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courieresmtp.sh,v 1.3 2007/08/10 17:57:04 jlam Exp $
+# $NetBSD: courieresmtp.sh,v 1.4 2007/09/22 04:42:03 jlam Exp $
 #
 # Courier ESMTP services daemon
 #
@@ -14,7 +14,7 @@ name="courieresmtp"
 rcvar=${name}
 command="@PREFIX@/sbin/couriertcpd"
 ctl_command="@PREFIX@/sbin/esmtpd"
-pidfile="@VARBASE@/run/esmtp.pid"
+pidfile="@COURIER_STATEDIR@/tmp/esmtp.pid"
 required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-ssl"
 
 start_cmd="${name}_doit start"
diff --git a/mail/courier-mta/files/courieresmtpmsa.sh b/mail/courier-mta/files/courieresmtpmsa.sh
index 87081fc3b59..98086da8954 100644
--- a/mail/courier-mta/files/courieresmtpmsa.sh
+++ b/mail/courier-mta/files/courieresmtpmsa.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courieresmtpmsa.sh,v 1.3 2007/08/10 17:57:04 jlam Exp $
+# $NetBSD: courieresmtpmsa.sh,v 1.4 2007/09/22 04:42:03 jlam Exp $
 #
 # Courier ESMTP-MSA (RFC 2476) services daemon
 #
@@ -14,7 +14,7 @@ name="courieresmtpmsa"
 rcvar=${name}
 command="@PREFIX@/sbin/couriertcpd"
 ctl_command="@PREFIX@/sbin/esmtpd-msa"
-pidfile="@VARBASE@/run/esmtpd-msa.pid"
+pidfile="@COURIER_STATEDIR@/tmp/esmtpd-msa.pid"
 required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-msa"
 
 start_cmd="${name}_doit start"
diff --git a/mail/courier-mta/files/courieresmtps.sh b/mail/courier-mta/files/courieresmtps.sh
index c4adc44a2f7..445b44cd3fc 100644
--- a/mail/courier-mta/files/courieresmtps.sh
+++ b/mail/courier-mta/files/courieresmtps.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courieresmtps.sh,v 1.4 2007/09/07 14:18:11 jlam Exp $
+# $NetBSD: courieresmtps.sh,v 1.5 2007/09/22 04:42:03 jlam Exp $
 #
 # Courier ESMTP/SSL services daemon
 #
@@ -14,7 +14,7 @@ name="courieresmtps"
 rcvar=${name}
 command="@PREFIX@/sbin/couriertcpd"
 ctl_command="@PREFIX@/sbin/esmtpd-ssl"
-pidfile="@VARBASE@/run/esmtpd-ssl.pid"
+pidfile="@COURIER_STATEDIR@/tmp/esmtpd-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-ssl"
 
 start_cmd="${name}_doit start"
diff --git a/mail/courier-mta/files/courierfilter.sh b/mail/courier-mta/files/courierfilter.sh
index 17999d549f3..dcd03907481 100644
--- a/mail/courier-mta/files/courierfilter.sh
+++ b/mail/courier-mta/files/courierfilter.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierfilter.sh,v 1.4 2007/08/10 17:57:04 jlam Exp $
+# $NetBSD: courierfilter.sh,v 1.5 2007/09/22 04:42:03 jlam Exp $
 #
 # Courier mail filter daemon
 #
@@ -13,7 +13,7 @@
 name="courierfilter"
 rcvar=${name}
 command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/${name}.pid"
+pidfile="@COURIER_STATEDIR@/tmp/${name}.pid"
 
 restart_cmd="${name}_doit restart"
 start_precmd="${name}_prestart"