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

13 files changed, 36 insertions, 36 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"
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
index 3c064821186..e0529bd18e0 100644
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2007/09/21 22:42:00 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/22 04:42:03 jlam Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-mta-/}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--datadir=${DATADIR:Q}
 CONFIGURE_ARGS+=	--with-mailuid=${PKG_UID.${COURIER_USER}}
 CONFIGURE_ARGS+=	--with-mailgid=${PKG_GID.${COURIER_GROUP}}
 CONFIGURE_ARGS+=	--with-paranoid-smtpext
-CONFIGURE_ARGS+=	--with-piddir=${VARBASE:Q}/run
+CONFIGURE_ARGS+=	--with-piddir=${COURIER_STATEDIR:Q}/tmp
 CONFIGURE_ARGS+=	--with-transport=${COURIER_TRANSPORTS:M*:Q}
 CONFIGURE_ARGS+=	--without-certdb
 
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"
diff --git a/mail/courier-mta/pkginstall.mk b/mail/courier-mta/pkginstall.mk
index 3a7625e488f..6e9c7c870b9 100644
--- a/mail/courier-mta/pkginstall.mk
+++ b/mail/courier-mta/pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pkginstall.mk,v 1.6 2007/09/11 02:35:04 jlam Exp $
+# $NetBSD: pkginstall.mk,v 1.7 2007/09/22 04:42:03 jlam Exp $
 
 # Convenience definition used below for a file or directory owned by the
 # courier user and group.
@@ -9,7 +9,8 @@ REQD_DIRS+=		${DATADIR} ${DOCDIR} ${EGDIR}			\
 			${LIBEXECDIR} ${LIBEXECDIR}/modules
 REQD_DIRS_PERMS+=	${LIBEXECDIR}/webmail				\
 				${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
-MAKE_DIRS+=		${VARBASE}/run ${COURIER_STATEDIR}
+MAKE_DIRS+=		${COURIER_STATEDIR}
+MAKE_DIRS_PERMS+=	${COURIER_STATEDIR}/tmp		${COURIER_OWNED} 0770
 
 ###
 ### Courier filter directories
@@ -25,7 +26,6 @@ OWN_DIRS_PERMS+=	${COURIER_STATEDIR}/filters	${COURIER_OWNED} 0750
 ###
 OWN_DIRS_PERMS+=	${COURIER_STATEDIR}/msgq	${COURIER_OWNED} 0750
 OWN_DIRS_PERMS+=	${COURIER_STATEDIR}/msgs	${COURIER_OWNED} 0750
-OWN_DIRS_PERMS+=	${COURIER_STATEDIR}/tmp		${COURIER_OWNED} 0770
 OWN_DIRS_PERMS+=	${COURIER_STATEDIR}/track	${COURIER_OWNED} 0755
 
 ###
@@ -38,11 +38,6 @@ OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/webadmin/removed		\
 							${COURIER_OWNED} 0700
 
 ###
-### Courier webmlmd directories
-###
-OWN_DIRS_PERMS+=	${COURIER_STATEDIR}/webmlm	${COURIER_OWNED} 0755
-
-###
 ### Courier setuid and setgid binaries
 ###
 SPECIAL_PERMS+=		bin/cancelmsg			${COURIER_OWNED} 6555
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index af9d01515b4..6c73ad57d0c 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2007/09/21 22:42:00 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2007/09/22 04:42:04 jlam Exp $
 
 DISTNAME=	sqwebmail-5.1.6
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -66,7 +66,7 @@ CONFIGURE_ARGS+=	--with-calendardir=${SQWEBMAIL_CALENDARDIR:Q}
 CONFIGURE_ARGS+=	--with-ispell="${PREFIX}/bin/ispell"
 CONFIGURE_ARGS+=	--with-mailer="${SENDMAIL} -oi -t"
 CONFIGURE_ARGS+=	--with-mailgroup=${COURIER_GROUP:Q}
-CONFIGURE_ARGS+=	--with-piddir=${VARBASE:Q}/run
+CONFIGURE_ARGS+=	--with-piddir=${COURIER_STATEDIR:Q}/tmp
 
 CONFIGURE_ENV+=		GZIP=${TOOLS_PATH.gzip:Q}
 CONFIGURE_ENV+=		GPG=${PREFIX:Q}/bin/gpg
@@ -74,7 +74,9 @@ CONFIGURE_ENV+=		GPG=${PREFIX:Q}/bin/gpg
 REQD_DIRS+=		${DATADIR} ${DOCDIR} ${EGDIR} ${LIBEXECDIR}
 REQD_DIRS_PERMS+=	${LIBEXECDIR}/webmail				\
 			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
-MAKE_DIRS+=		${VARBASE}/run ${LOCALSTATEDIR}
+MAKE_DIRS+=		${COURIER_STATEDIR}
+MAKE_DIRS_PERMS+=	${COURIER_STATEDIR}/tmp				\
+			${COURIER_USER} ${COURIER_GROUP} 0770
 OWN_DIRS+=		${SQWEBMAIL_STATEDIR}
 OWN_DIRS_PERMS=		${SQWEBMAIL_CACHEDIR}				\
 			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
diff --git a/mail/sqwebmail/files/sqwebmail.sh b/mail/sqwebmail/files/sqwebmail.sh
index 1ab4a5726fe..da98ac5fb49 100644
--- a/mail/sqwebmail/files/sqwebmail.sh
+++ b/mail/sqwebmail/files/sqwebmail.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: sqwebmail.sh,v 1.9 2007/09/11 04:44:18 jlam Exp $
+# $NetBSD: sqwebmail.sh,v 1.10 2007/09/22 04:42:04 jlam Exp $
 #
 # Courier SqWebMail services daemon
 #
@@ -14,7 +14,7 @@ name="sqwebmail"
 rcvar=${name}
 command="@PREFIX@/sbin/courierlogger"
 ctl_command="@PREFIX@/sbin/webmaild"
-pidfile="@VARBASE@/run/sqwebmaild.pid"
+pidfile="@COURIER_STATEDIR@/tmp/sqwebmaild.pid"
 required_files="@PKG_SYSCONFDIR@/calendarmode @PKG_SYSCONFDIR@/sqwebmaild"
 
 start_precmd="${name}_prestart"