diff options
| author | jlam <jlam> | 2007-09-22 04:42:03 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2007-09-22 04:42:03 +0000 |
| commit | da261392b42df949aa445c2da54b87b4bf46deaf (patch) | |
| tree | 23e675870bdcc884816d952ab98862c4099ef32e /mail/sqwebmail | |
| parent | 20654f8483d91ecaa52d28a637e5a113f4643c3d (diff) | |
| download | pkgsrc-da261392b42df949aa445c2da54b87b4bf46deaf.tar.gz | |
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
Diffstat (limited to 'mail/sqwebmail')
| -rw-r--r-- | mail/sqwebmail/Makefile | 10 | ||||
| -rw-r--r-- | mail/sqwebmail/files/sqwebmail.sh | 4 |
2 files changed, 8 insertions, 6 deletions
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" |