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

5 files changed, 14 insertions, 11 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 54547ed8958..f8e4c93d1e3 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2007/09/21 14:12:19 jlam Exp $
+# $NetBSD: Makefile,v 1.65 2007/09/22 04:42:03 jlam Exp $
 
 DISTNAME=	courier-imap-4.1.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--datadir=${DATADIR:Q}
 CONFIGURE_ARGS+=	--libexecdir=${LIBEXECDIR:Q}
 
 CONFIGURE_ARGS+=	--with-mailuser=${ROOT_USER:Q}
-CONFIGURE_ARGS+=	--with-piddir=${VARBASE:Q}/run
+CONFIGURE_ARGS+=	--with-piddir=${COURIER_STATEDIR:Q}/tmp
 CONFIGURE_ARGS+=	--program-transform-name='s/\.rc$$//'
 CONFIGURE_ENV+=		OPENSSL=${TOOLS_OPENSSL:Q}
 
@@ -52,6 +52,9 @@ INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
 FILES_SUBST+=		SSLCERTS=${SSLCERTS:Q}
 
 REQD_DIRS+=		${DATADIR} ${DOCDIR} ${EGDIR} ${LIBEXECDIR}
+MAKE_DIRS+=		${COURIER_STATEDIR}
+MAKE_DIRS_PERMS+=	${COURIER_STATEDIR}/tmp				\
+			${COURIER_USER} ${COURIER_GROUP} 0770
 
 .for _file_ in		imapd.cnf imapd.dist imapd-ssl.dist		\
 			pop3d.cnf pop3d.dist pop3d-ssl.dist
diff --git a/mail/courier-imap/files/courierimap.sh b/mail/courier-imap/files/courierimap.sh
index f0004430cd8..a456a4c5b3c 100755
--- a/mail/courier-imap/files/courierimap.sh
+++ b/mail/courier-imap/files/courierimap.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimap.sh,v 1.14 2007/08/10 17:56:57 jlam Exp $
+# $NetBSD: courierimap.sh,v 1.15 2007/09/22 04:42:03 jlam Exp $
 #
 # Courier IMAP services daemon
 #
@@ -14,7 +14,7 @@ name="courierimap"
 rcvar=${name}
 command="@PREFIX@/sbin/couriertcpd"
 ctl_command="@PREFIX@/sbin/imapd"
-pidfile="@VARBASE@/run/imapd.pid"
+pidfile="@COURIER_STATEDIR@/tmp/imapd.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 
 start_cmd="${name}_doit start"
diff --git a/mail/courier-imap/files/courierimaps.sh b/mail/courier-imap/files/courierimaps.sh
index ea3dab13382..3608a2570f2 100755
--- a/mail/courier-imap/files/courierimaps.sh
+++ b/mail/courier-imap/files/courierimaps.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimaps.sh,v 1.16 2007/08/10 17:56:57 jlam Exp $
+# $NetBSD: courierimaps.sh,v 1.17 2007/09/22 04:42:03 jlam Exp $
 #
 # Courier IMAP/SSL services daemon
 #
@@ -14,7 +14,7 @@ name="courierimaps"
 rcvar=${name}
 command="@PREFIX@/sbin/couriertcpd"
 ctl_command="@PREFIX@/sbin/imapd-ssl"
-pidfile="@VARBASE@/run/imapd-ssl.pid"
+pidfile="@COURIER_STATEDIR@/tmp/imapd-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 
 start_cmd="${name}_doit start"
diff --git a/mail/courier-imap/files/courierpop.sh b/mail/courier-imap/files/courierpop.sh
index 1f5df7abcd0..4dbf9533fd1 100755
--- a/mail/courier-imap/files/courierpop.sh
+++ b/mail/courier-imap/files/courierpop.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpop.sh,v 1.14 2007/08/10 17:56:57 jlam Exp $
+# $NetBSD: courierpop.sh,v 1.15 2007/09/22 04:42:03 jlam Exp $
 #
 # Courier POP3 services daemon
 #
@@ -14,7 +14,7 @@ name="courierpop"
 rcvar=${name}
 command="@PREFIX@/sbin/couriertcpd"
 ctl_command="@PREFIX@/sbin/pop3d"
-pidfile="@VARBASE@/run/pop3d.pid"
+pidfile="@COURIER_STATEDIR@/tmp/pop3d.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 
 start_cmd="${name}_doit start"
diff --git a/mail/courier-imap/files/courierpops.sh b/mail/courier-imap/files/courierpops.sh
index a9db789dc3d..68e672914f4 100755
--- a/mail/courier-imap/files/courierpops.sh
+++ b/mail/courier-imap/files/courierpops.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpops.sh,v 1.16 2007/08/10 17:56:57 jlam Exp $
+# $NetBSD: courierpops.sh,v 1.17 2007/09/22 04:42:03 jlam Exp $
 #
 # Courier POP3/SSL services daemon
 #
@@ -14,7 +14,7 @@ name="courierpops"
 rcvar=${name}
 command="@PREFIX@/sbin/couriertcpd"
 ctl_command="@PREFIX@/sbin/pop3d-ssl"
-pidfile="@VARBASE@/run/pop3d-ssl.pid"
+pidfile="@COURIER_STATEDIR@/tmp/pop3d-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 
 start_cmd="${name}_doit start"