Attachment #19351 for bug #34398

View | Details | Raw Unified | Return to bug 34398
Collapse All | Expand All




#

PORTNAME=	courier
PORTVERSION=	0.37.2.20020125
PORTREVISION=	0
CATEGORIES=	mail ipv6
MASTER_SITES=	http://www.courier-mta.org/beta/%SUBDIR%/ \
		${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	courier

MAINTAINER=	yds@CoolRat.org

RUN_DEPENDS=	${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR

#
# User-serviceable variables

# [ There's no need to add trailing ``/''s ]
#
# set IMAGEURL to where on the web server URL the images are found
# set CACHEOWN to who you'd like to own the cache files
# set MAILDROPDEFAULT to what you'd like the $DEFAULT in maildrop to be
#     recomended values are: /var/mail, ./Mailbox or ./Maildir
#
IMAGEURL?=	/webmail
CACHEOWN?=	pop
MAILDROPDEFAULT?=./Maildir
# End of user-serviceable variables
MAILOWN=	courier
MAILGRP=	courier
MAILUID=	62
MAILGID=	62
ETCDIR=		${PREFIX}/etc

IS_INTERACTIVE=	yes
.endif

USE_PERL5=	yes
USE_GMAKE=	yes
USE_AUTOMAKE=	yes
USE_LIBTOOL=	yes

USE_AUTOCONF_VER=213
CONFIGURE_ARGS=	--disable-root-check --with-db=db \
		--enable-syslog=1 --enable-use-flock \
		--with-mailuser=${MAILOWN} \
		--with-mailgroup=${MAILGRP} \
		--with-mailuid=${MAILUID} \
		--with-mailgid=${MAILGID} \
 		--with-etcdir=${ETCDIR} \

		--enable-mimetypes=${MIMETYPES} \
		--enable-imageurl=${IMAGEURL} \
		--with-cachedir=${CACHEDIR} \
		--with-cacheowner=${CACHEOWN} \
		--with-calendardir=${CALENDIR} \
		--with-default-maildrop=${MAILDROPDEFAULT} \
		--enable-workarounds-for-imap-client-bugs


INSTALL_TARGET=	install-strip install-perms

PLIST_SUB+=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" \
		MAILOWN="${MAILOWN}" MAILGRP="${MAILGRP}" \
		MAILUID="${MAILUID}" MAILGID="${MAILGID}" \
		CACHEOWN="${CACHEOWN}"

SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
		TOUCH="${TOUCH}" \


.include "${.CURDIR}/Makefile.man"
.include "${.CURDIR}/Makefile.doc"
.include "${.CURDIR}/Makefile.own"

pre-everything::
	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.${PORTNAME}

.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"

	@${PERL} -pi -e 's:^(TLS_CERTFILE=)\@datadir\@:$$1\@sysconfdir\@:g;' \
		${WRKSRC}/*/*.dist.in \
		${WRKSRC}/*/*/*.dist.in
	@${PERL} -pi -e 's:^(RANDFILE = )\@datadir\@\S+:$$1\@sysconfdir\@/random.tmp:g;' \
		${WRKSRC}/*/*.cnf.in \
		${WRKSRC}/*/*/*.cnf.in


	@${INSTALL_DATA} /dev/null ${SYSCONFDIR}/locallowercase
	@${INSTALL_SCRIPT} ${FILESDIR}/courier.sh ${PREFIX}/etc/rc.d
	@${INSTALL_DATA} ${WRKDIR}/crontab ${PREFIX}/etc/courier/
.for file in ${OWNER0}
	@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/${file}
.endfor
	@${GREP} '^@exec ' ${TMPPLIST} \
		| ${SED} -e 's:^@exec ::' -e 's:%D:${PREFIX}:g' \
		> ${WRKDIR}/.PLIST.exec \
		&& ${SH} ${WRKDIR}/.PLIST.exec
.if !defined(NOPORTDOCS)
	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} ${DOCSDIR}/html
	@${INSTALL_DATA} ${DATADIR}/htmldoc/* ${DOCSDIR}/html
.for file in ${DOCS}
	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}

	@for F in ${MANPREFIX}/man/man[1-9ln]/*; \
		do ${CHMOD} ${MANMODE} $$F; \
	done
	@${CHOWN} -Rh ${MANOWN}:${MANGRP} ${MANPREFIX}/man/man[1-9ln]
	@${CHOWN} -Rh ${SHAREOWN}:${SHAREGRP} ${DATADIR}
	@${CHMOD} -R a-w ${DATADIR}
	@${CAT} ${PKGMESSAGE}





OWNER0=	bin/courier-config \
	bin/couriermlm \
	bin/couriertls \
	bin/deliverquota \
	bin/dotforward \
	bin/dotlock \
	bin/imapd \
	bin/mailbot \
	bin/maildirmake \
	bin/makemime \
	bin/mimegpg \
	bin/preline \
	bin/reformail \
	bin/reformime \
	bin/sendmail \
	bin/testmxlookup \
	etc/courier/courierd.dist \
	etc/courier/enablefiltering \
	etc/courier/esmtp.authpam \
	etc/courier/esmtpd-msa.dist \
	etc/courier/esmtpd-ssl.dist \
	etc/courier/esmtpd.cnf \
	etc/courier/esmtpd.dist \
	etc/courier/imapd-ssl.dist \
	etc/courier/imapd.authpam \
	etc/courier/imapd.cnf \
	etc/courier/imapd.dist \
	etc/courier/ldapaddressbook.dist \
	etc/courier/locallowercase \
	etc/courier/maildrop \
	etc/courier/maildropfilter \
	etc/courier/pop3d-ssl.dist \
	etc/courier/pop3d.authpam \
	etc/courier/pop3d.cnf \
	etc/courier/pop3d.dist \
	etc/courier/quotawarnmsg.example \
	etc/courier/rfcerr2045.txt \
	etc/courier/rfcerr2046.txt \
	etc/courier/rfcerr2047.txt \
	etc/courier/rfcerrheader.txt \
	etc/courier/smtpaccess/default \
	etc/courier/webmail.authpam \
	libexec/authlib/authdaemon \
	libexec/authlib/authdaemond \
	libexec/authlib/authdaemond.plain \
	libexec/authlib/changepwd/authdaemon.passwd \
	libexec/courier/courierpop3d \
	libexec/courier/courierpop3login \
	libexec/courier/imaplogin \
	libexec/courier/makedatprog \
	libexec/courier/modules/esmtp/authend \
	libexec/courier/modules/local/courierdeliver \
	libexec/courier/modules/local/courierlocal \
	libexec/courier/modules/modules.ctl \
	libexec/courier/pcpd \
	libexec/courier/webmail/webadmin \
	libexec/courier/webmail/webmail \
	libexec/filters/dupfilter \
	libexec/filters/perlfilter \
	sbin/courier \
	sbin/couriertcpd \
	sbin/logger \
	sbin/showconfig \
	sbin/userdbpw

Line 1 Link Here

(-)courier/distinfo (-1 / +1 lines)
1	MD5 (courier-0.37.2.tar.gz) = f7935e8152477a9f4625f982533e15ec	1	MD5 (courier-0.37.2.20020125.tar.gz) = 5b53d96297648570883137ddff31da7c

Lines 124-129 Link Here

(-)courier/files/courier.sh (-1 / +18 lines)
124	esac	124	esac
125	fi	125	fi
126		126
		127	ESMTPDSSLSTART=""
		128	if [ -f ${sysconfdir}/esmtpd-ssl ]; then
		129	. ${sysconfdir}/esmtpd-ssl
		130	case $ESMTPDSSLSTART in
		131	[Yy]*)
		132	if [ -x $COURIERTLS \
		133	-a -x ${sbindir}/esmtpd-ssl ]; then
		134	${sbindir}/esmtpd-ssl start && echo -n " esmtpd-ssl"
		135	fi
		136	;;
		137	esac
		138	fi
		139
127	IMAPDSTART=""	140	IMAPDSTART=""
128	if [ -f ${sysconfdir}/imapd ]; then	141	if [ -f ${sysconfdir}/imapd ]; then
129	. ${sysconfdir}/imapd	142	. ${sysconfdir}/imapd
Lines 203-212 Link Here
203	${sbindir}/imapd stop && echo -n " imapd"	216	${sbindir}/imapd stop && echo -n " imapd"
204	fi	217	fi
205		218
		219	if [ -x ${sbindir}/esmtpd-ssl ]; then
		220	${sbindir}/esmtpd-ssl stop && echo -n " esmtpd-ssl"
		221	fi
		222
206	if [ -x ${sbindir}/esmtpd-msa ]; then	223	if [ -x ${sbindir}/esmtpd-msa ]; then
207	${sbindir}/esmtpd-msa stop && echo -n " esmtpd-msa"	224	${sbindir}/esmtpd-msa stop && echo -n " esmtpd-msa"
208	fi	225	fi
209		226
210	if [ -x ${sbindir}/esmtpd ]; then	227	if [ -x ${sbindir}/esmtpd ]; then
211	${sbindir}/esmtpd stop && echo -n " esmtpd"	228	${sbindir}/esmtpd stop && echo -n " esmtpd"
212	fi	229	fi




--- courier/perms.sh.in.orig	Fri Dec  7 08:37:35 2001
+++ courier/perms.sh.in	Sun Jan 27 23:12:48 2002
@@ -10,9 +10,6 @@
 exec_prefix="@exec_prefix@"
 
 PERMS="
-.			755
-
-@localstatedir@		755	x	bin	bin
+@localstatedir@		755	x	root	wheel
 @localstatedir@/tmp	770
 @localstatedir@/msgs	750
 @localstatedir@/msgq	750
@@ -41,7 +38,6 @@
 @sysconfdir@/rfcerr2046.txt	444	config
 @sysconfdir@/rfcerr2047.txt	444	config
 
-@libexecdir@		755	x	bin	bin
 @libexecdir@/authlib	755	x	bin	bin
 @libexecdir@/courier	755	x	bin	bin
 @libexecdir@/courier/modules	755	x	bin	bin
@@ -61,7 +57,6 @@
 @libexecdir@/courier/webmail/webmail	4555	x	root	bin
 @libexecdir@/courier/webmail/webadmin	4555	x	root	bin
 
+@libexecdir@/courier/modules/dsn	755	x	root	wheel
+@libexecdir@/courier/modules/esmtp	755	x	root	wheel
+@libexecdir@/courier/modules/esmtp/authend 555	x	root	wheel
+@libexecdir@/courier/modules/local	755	x	root	wheel
+@libexecdir@/courier/modules/local/courierdeliver 555 x	root	wheel
+@libexecdir@/courier/modules/local/courierlocal 555 x	root	wheel
+@libexecdir@/courier/modules/modules.ctl 444	x	root	wheel
 @libexecdir@/courier/submitmkdir	4550
-@libexecdir@/courier/courierd	550
-@libexecdir@/courier/courierpop3d	555
-@libexecdir@/courier/courierpop3login	555
+@libexecdir@/courier/courierd		550
+@libexecdir@/courier/courierpop3d	555	x	root	wheel
+@libexecdir@/courier/courierpop3login	555	x	root	wheel
 @libexecdir@/courier/aliasexp		550
 @libexecdir@/courier/aliascombine	550
 @libexecdir@/courier/aliascreate	550
 @libexecdir@/courier/submit		550
-@libexecdir@/courier/makedatprog	555
-@libexecdir@/courier/imaplogin		555	x	bin	bin
-@libexecdir@/courier/pcpd		555	x	bin	bin
-@libexecdir@/courier/webmail		700	x	root	bin
-@libexecdir@/courier/webmail/webmail	4555	x	root	bin
-@libexecdir@/courier/webmail/webadmin	4555	x	root	bin
-
-@sbindir@			755	x	bin	bin
 @sbindir@/courier		555
 @sbindir@/showconfig		555
+@libexecdir@/courier/makedatprog	555	x	root	wheel
+@libexecdir@/courier/imaplogin		555	x	root	wheel
+@libexecdir@/courier/pcpd		555	x	root	wheel
+@libexecdir@/courier/webmail		700	x	root	wheel
+@libexecdir@/courier/webmail/webmail	4555	x	root	wheel
+@libexecdir@/courier/webmail/webadmin	4555	x	root	wheel
+@libexecdir@/filters			755	x	root	wheel
+@libexecdir@/filters/dupfilter		555	x	root	wheel
+@libexecdir@/filters/perlfilter		555	x	root	wheel
+
+@sbindir@/courier		555	x	root	wheel
+@sbindir@/showconfig		555	x	root	wheel
 @sbindir@/showmodules		550
@@ -73,7 +68,6 @@
 @datadir@/imapd			555	x	bin	bin
 @datadir@/imapd-ssl		555	x	bin	bin
-@sbindir@/imapd			555
-@sbindir@/imapd-ssl		555
-@datadir@/imapd			555	x	bin	bin
-@datadir@/imapd-ssl		555	x	bin	bin
+@sbindir@/userdbpw		555	x	root	wheel
+@sbindir@/couriertcpd		555	x	root	wheel
+@sbindir@/logger		555	x	root	wheel
+@sbindir@/imapd			555	x	root	wheel
+@sbindir@/imapd-ssl		555	x	root	wheel
+@datadir@/imapd			555	x	root	wheel
+@datadir@/imapd-ssl		555	x	root	wheel
 
-@bindir@			755	x	bin	bin
 @bindir@/cancelmsg		6555
 @bindir@/courier-config		555
 @bindir@/mailq			2555
-@bindir@/maildirmake		555
-@bindir@/sendmail		4511	x	root
-@bindir@/rmail			4511	x	root
-@bindir@/dotlock		555
-@bindir@/deliverquota		555
-@bindir@/mailbot		555
-@bindir@/makemime		555
-@bindir@/reformail		555
-@bindir@/reformime		555
-@bindir@/mimegpg		555
-@bindir@/couriermlm		555
-@bindir@/dotforward		555
-
-@datadir@/makedat		555	x	bin	bin
-@bindir@/makedat		555
-@bindir@/testmxlookup		555
-@bindir@/imapd			555
-@datadir@/makealiases		550
-@sbindir@/makealiases		550
-@datadir@/makehosteddomains	555
-@sbindir@/makehosteddomains	555
-@datadir@/pop3d			755
-@sbindir@/pop3d			755
-@datadir@/pop3d-ssl		755
-@sbindir@/pop3d-ssl		755
-@datadir@/makeuserdb		555
-@sbindir@/makeuserdb		555
-@datadir@/webgpg		555
-@sbindir@/webgpg		555
-@datadir@/userdb		555
-@sbindir@/userdb		555
-@datadir@/pw2userdb		555
-@sbindir@/pw2userdb		555
-@datadir@/vchkpw2userdb		555
-@sbindir@/vchkpw2userdb		555
-
-@datadir@			755	x	bin	bin
-@datadir@/courierctl.start	555
-
-@datadir@/mkimapdcert		755
-@sbindir@/mkimapdcert		755
-@datadir@/mkpop3dcert		755
-@sbindir@/mkpop3dcert		755
-@datadir@/couriermlm		755
-
-@datadir@/couriermlm/adminrequest.tmpl	644
-@datadir@/couriermlm/confsubj.tmpl	644
-@datadir@/couriermlm/digestsubj.tmpl	644
-@datadir@/couriermlm/fetch.tmpl	644
-@datadir@/couriermlm/fetchsubj.tmpl	644
-@datadir@/couriermlm/help.tmpl	644
-@datadir@/couriermlm/idxsubject.tmpl	644
-@datadir@/couriermlm/idxheaderhtml.tmpl	644
-@datadir@/couriermlm/idxheader2html.tmpl 644
-@datadir@/couriermlm/idxheadertxt.tmpl	644
-@datadir@/couriermlm/modrejbody.tmpl	644
-@datadir@/couriermlm/modreject.tmpl	644
-@datadir@/couriermlm/modrejheader.tmpl	644
-@datadir@/couriermlm/modsubject.tmpl	644
-@datadir@/couriermlm/modtext.tmpl	644
-@datadir@/couriermlm/modtext2.tmpl	644
-@datadir@/couriermlm/sub.tmpl	644
-@datadir@/couriermlm/sub2.tmpl	644
-@datadir@/couriermlm/sub3.tmpl	644
-@datadir@/couriermlm/sub4.tmpl	644
-@datadir@/couriermlm/sub5.tmpl	644
-@datadir@/couriermlm/subreportfooter.tmpl	644
-@datadir@/couriermlm/subreporthdr.tmpl 644
-@datadir@/couriermlm/subreporthdr1.tmpl 644
-@datadir@/couriermlm/subreporthdr2.tmpl 644
-@datadir@/couriermlm/subreporthdr3.tmpl 644
-@datadir@/couriermlm/unsub.tmpl	644
-@datadir@/couriermlm/unsub2.tmpl	644
-@datadir@/couriermlm/unsub3.tmpl	644
-@datadir@/couriermlm/warn1headers.tmpl	644
-@datadir@/couriermlm/warn1text.tmpl	644
-@datadir@/couriermlm/warn1text2.tmpl	644
-@datadir@/couriermlm/warn2msg.tmpl	644
+@bindir@/courier-config		555	x	root	wheel
+@bindir@/mailq			2555	x	root
+@bindir@/maildirmake		555	x	root	wheel
+@bindir@/sendmail		4511	x	root	wheel
+@bindir@/rmail			4511	x	root	wheel
+@bindir@/dotlock		555	x	root	wheel
+@bindir@/deliverquota		555	x	root	wheel
+@bindir@/mailbot		555	x	root	wheel
+@bindir@/makemime		555	x	root	wheel
+@bindir@/reformail		555	x	root	wheel
+@bindir@/reformime		555	x	root	wheel
+@bindir@/mimegpg		555	x	root	wheel
+@bindir@/couriermlm		555	x	root	wheel
+@bindir@/dotforward		555	x	root	wheel
+
+@datadir@/makedat		555	x	root	wheel
+@bindir@/makedat		555	x	root	wheel
+@bindir@/testmxlookup		555	x	root	wheel
+@bindir@/imapd			555	x	root	wheel
+@datadir@/makealiases		555	x	root	wheel
+@sbindir@/makealiases		555	x	root	wheel
+@datadir@/makehosteddomains	555	x	root	wheel
+@sbindir@/makehosteddomains	555	x	root	wheel
+@datadir@/pop3d			555	x	root	wheel
+@sbindir@/pop3d			555	x	root	wheel
+@datadir@/pop3d-ssl		555	x	root	wheel
+@sbindir@/pop3d-ssl		555	x	root	wheel
+@datadir@/makeuserdb		555	x	root	wheel
+@sbindir@/makeuserdb		555	x	root	wheel
+@datadir@/webgpg		555	x	root	wheel
+@sbindir@/webgpg		555	x	root	wheel
+@datadir@/userdb		555	x	root	wheel
+@sbindir@/userdb		555	x	root	wheel
+@datadir@/pw2userdb		555	x	root	wheel
+@sbindir@/pw2userdb		555	x	root	wheel
+@datadir@/vchkpw2userdb		555	x	root	wheel
+@sbindir@/vchkpw2userdb		555	x	root	wheel
+
+@datadir@/courierctl.start	555	x	root	wheel
+
+@datadir@/mkimapdcert		555	x	root	wheel
+@sbindir@/mkimapdcert		555	x	root	wheel
+@datadir@/mkpop3dcert		555	x	root	wheel
+@sbindir@/mkpop3dcert		555	x	root	wheel
+@datadir@/couriermlm		555	x	root	wheel
+
+@datadir@/couriermlm/adminrequest.tmpl	444	x	root	wheel
+@datadir@/couriermlm/confsubj.tmpl	444	x	root	wheel
+@datadir@/couriermlm/digestsubj.tmpl	444	x	root	wheel
+@datadir@/couriermlm/fetch.tmpl		444	x	root	wheel
+@datadir@/couriermlm/fetchsubj.tmpl	444	x	root	wheel
+@datadir@/couriermlm/help.tmpl		444	x	root	wheel
+@datadir@/couriermlm/idxsubject.tmpl	444	x	root	wheel
+@datadir@/couriermlm/idxheaderhtml.tmpl	444	x	root	wheel
+@datadir@/couriermlm/idxheader2html.tmpl 444	x	root	wheel
+@datadir@/couriermlm/idxheadertxt.tmpl	444	x	root	wheel
+@datadir@/couriermlm/modrejbody.tmpl	444	x	root	wheel
+@datadir@/couriermlm/modreject.tmpl	444	x	root	wheel
+@datadir@/couriermlm/modrejheader.tmpl	444	x	root	wheel
+@datadir@/couriermlm/modsubject.tmpl	444	x	root	wheel
+@datadir@/couriermlm/modtext.tmpl	444	x	root	wheel
+@datadir@/couriermlm/modtext2.tmpl	444	x	root	wheel
+@datadir@/couriermlm/sub.tmpl		444	x	root	wheel
+@datadir@/couriermlm/sub2.tmpl		444	x	root	wheel
+@datadir@/couriermlm/sub3.tmpl		444	x	root	wheel
+@datadir@/couriermlm/sub4.tmpl		444	x	root	wheel
+@datadir@/couriermlm/sub5.tmpl		444	x	root	wheel
+@datadir@/couriermlm/subreportfooter.tmpl 444	x	root	wheel
+@datadir@/couriermlm/subreporthdr.tmpl	444	x	root	wheel
+@datadir@/couriermlm/subreporthdr1.tmpl	444	x	root	wheel
+@datadir@/couriermlm/subreporthdr2.tmpl	444	x	root	wheel
+@datadir@/couriermlm/subreporthdr3.tmpl	444	x	root	wheel
+@datadir@/couriermlm/unsub.tmpl		444	x	root	wheel
+@datadir@/couriermlm/unsub2.tmpl	444	x	root	wheel
+@datadir@/couriermlm/unsub3.tmpl	444	x	root	wheel
+@datadir@/couriermlm/warn1headers.tmpl	444	x	root	wheel
+@datadir@/couriermlm/warn1text.tmpl	444	x	root	wheel
+@datadir@/couriermlm/warn1text2.tmpl	444	x	root	wheel
+@datadir@/couriermlm/warn2msg.tmpl	444	x	root	wheel
 "
 
 echo "$PERMS" | while read FILE MODE SPECIAL USER GROUP
@@ -198,7 +201,7 @@
 
 if test "$couriertls" != ""
 then
-   echo @bindir@/couriertls 555 bin bin
+   echo @bindir@/couriertls 555 root wheel
 fi
 
 if test "@HAVE_LDAP@" != 0
@@ -207,23 +210,23 @@
 	echo @sbindir@/courierldapaliasd 700 @mailuser@ @mailgroup@
 fi
 
-echo @datadir@/sqwebmail/images 755 @mailuser@ @mailgroup@
+echo @datadir@/sqwebmail/images 755 root wheel
 
 for f in `cat ../webmail/images/filelist 2>/dev/null`
 do
-	echo @datadir@/sqwebmail/images/$f 444 @mailuser@ @mailgroup@
+	echo @datadir@/sqwebmail/images/$f 444 root wheel
 done
 
 . ../maildrop/uidgid
 
-echo @bindir@/maildrop 4511 $uid @mailgroup@
+echo @bindir@/maildrop 4511 $uid mail
 
 sed 's:^:'@sysconfdir@/':;s/$/ 660 @mailuser@ @mailgroup@ config/' <../authlib/authconfiglist
 
 for f in `cat ../authlib/installlist ../authlib/installlist.sh`
 do
 	test -z "$f" && continue
-	echo @libexecdir@/authlib/$f 755 bin bin
+	echo @libexecdir@/authlib/$f 555 root wheel
 done
 
 . ../authlib/authdaemonrc
@@ -240,16 +243,16 @@
 
 . ../authlib/authpwdprogs
 
-echo "@authchangepwdir@ 755 @mailuser@ @mailgroup@"
+echo "@authchangepwdir@ 755 root wheel"
 for f in `echo $PWPROGS dummy`
 do
 	test "$f" = "dummy" && continue
-	echo "@authchangepwdir@/$f 4555 root bin"
+	echo "@authchangepwdir@/$f 4555 root wheel"
 done
 
 for f in `echo $PWSCRIPTS dummy`
 do
 	test "$f" = "dummy" && continue
 	echo "@authchangepwdir@/$f 555 @mailuser@ @mailgroup@"
-	echo "@datadir@/$f 555 @mailuser@ @mailgroup@"
+	echo "@datadir@/$f 555 root wheel"
 done




--- courier/submit2.C.orig	Tue Jan 15 17:44:37 2002
+++ courier/submit2.C	Mon Jan 21 15:38:40 2002
@@ -777,6 +777,8 @@
 {
 int	is8bit=0, dorewrite=0, rwmode=0;
 const	char *mime=getenv("MIME");
+const	char *q=getenv("BOFHACCEPT8BIT");
+const	int accept8bit=(q && *q == '1' ? 1 : 0);
 unsigned	n;
 struct	stat	stat_buf;
 const char *rfcerr=NULL;
@@ -800,12 +802,12 @@
 		return (1);
 	}
 
-	if (rwrfcptr->rfcviolation & RFC2045_ERR8BITHEADER)
+	if (!accept8bit && (rwrfcptr->rfcviolation & RFC2045_ERR8BITHEADER))
 	{
 		rfcerr= SYSCONFDIR "/rfcerr2047.txt";
 		dorewrite=1;
         }
-	else if (rwrfcptr->rfcviolation & RFC2045_ERR8BITCONTENT)
+	else if (!accept8bit && (rwrfcptr->rfcviolation & RFC2045_ERR8BITCONTENT))
 	{
 		rfcerr= SYSCONFDIR "/rfcerr2045.txt";
 		dorewrite=1;




    done
}

replace() {
    local orig repl
    
    orig=$1
    repl=$2
    if [ -e ${orig} ]; then
        mv -f ${orig} ${orig}.OFF
        chmod 0 ${orig}.OFF
    fi
    if [ -e ${repl} ]; then
        ln -s ${repl} ${orig}
    fi
}

if [ x"$2" = xPRE-INSTALL ]; then
    USER=courier;	UID=62
    GROUP=courier;	GID=62

        fi
    fi
fi

replace() {
    local orig repl
    
    orig=$1
    repl=$2
    if [ -e ${orig} ]; then
        mv -f ${orig} ${orig}.OFF
        chmod 0 ${orig}.OFF
    fi
    if [ -e ${repl} ]; then
        ln -s ${repl} ${orig}
    fi
}

if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
    if [ -x /sbin/sysctl ]; then

Lines 1-4 Link Here

(-)courier/pkg-message (-1 / +1 lines)
1	ATTENTION.........ATTENTION
2		1
3	RTFM before configuring and runnig Courier!!!	2	RTFM before configuring and runnig Courier!!!
4		3
Lines 12-17 Link Here
12	%%PREFIX%%/etc/courier/courierd	11	%%PREFIX%%/etc/courier/courierd
13	%%PREFIX%%/etc/courier/esmtpd	12	%%PREFIX%%/etc/courier/esmtpd
14	%%PREFIX%%/etc/courier/esmtpd-msa	13	%%PREFIX%%/etc/courier/esmtpd-msa
		14	%%PREFIX%%/etc/courier/esmtpd-ssl
15	%%PREFIX%%/etc/courier/imapd	15	%%PREFIX%%/etc/courier/imapd
16	%%PREFIX%%/etc/courier/imapd-ssl	16	%%PREFIX%%/etc/courier/imapd-ssl
17	%%PREFIX%%/etc/courier/ldapaddressbook	17	%%PREFIX%%/etc/courier/ldapaddressbook




@exec pw groupshow %%MAILGRP%% || pw groupadd %%MAILGRP%% -g %%MAILUID%% -h -
@exec pw user show %%MAILOWN%% || pw useradd %%MAILOWN%% -u %%MAILUID%% -g %%MAILGID%% -h - -d /var/spool/courier -s /sbin/nologin -c "Courier Mail System"
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 %D/etc/courier/aliasdir
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 %D/etc/courier/aliases
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 %D/etc/courier/esmtpacceptmailfor.dir
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 %D/etc/courier/esmtppercentrelay.dir
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 %D/etc/courier/filters/active
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 %D/etc/courier/smtpaccess
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0700 %D/etc/courier/webadmin/added
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0700 %D/etc/courier/webadmin/removed
@exec install -d -o courier -g courier -m 0755 %D/etc/courier/webadmin/removed
@unexec %D/etc/rc.d/courier.sh stop 2>/dev/null || true
@unexec rm -f %D/etc/courier/*.dat 2>/dev/null || true
@unexec cmp -s %D/etc/courier/authdaemonrc %D/etc/courier/authdaemonrc.dist && rm -f %D/etc/courier/authdaemonrc 2>/dev/null || true

%%SUB_PGSQL%%@unexec cmp -s %D/etc/courier/authpgsqlrc %D/etc/courier/authpgsqlrc.dist && rm -f %D/etc/courier/authpgsqlrc 2>/dev/null || true
@unexec cmp -s %D/etc/courier/courierd %D/etc/courier/courierd.dist && rm -f %D/etc/courier/courierd 2>/dev/null || true
@unexec cmp -s %D/etc/courier/esmtpd-msa %D/etc/courier/esmtpd-msa.dist && rm -f %D/etc/courier/esmtpd-msa 2>/dev/null || true
@unexec cmp -s %D/etc/courier/esmtpd-ssl %D/etc/courier/esmtpd-ssl.dist && rm -f %D/etc/courier/esmtpd-ssl 2>/dev/null || true
@unexec cmp -s %D/etc/courier/esmtpd %D/etc/courier/esmtpd.dist && rm -f %D/etc/courier/esmtpd 2>/dev/null || true
@unexec cmp -s %D/etc/courier/imapd-ssl %D/etc/courier/imapd-ssl.dist && rm -f %D/etc/courier/imapd-ssl 2>/dev/null || true
@unexec cmp -s %D/etc/courier/imapd %D/etc/courier/imapd.dist && rm -f %D/etc/courier/imapd 2>/dev/null || true

etc/courier/esmtp.authpam
etc/courier/esmtpauthclient
etc/courier/esmtpd-msa.dist
etc/courier/esmtpd-ssl.dist
etc/courier/esmtpd.cnf
etc/courier/esmtpd.dist
etc/courier/imapd-ssl.dist

etc/courier/smtpaccess/default
etc/courier/webmail.authpam
@exec [ -e /etc/aliases ] && ln -sf /etc/aliases %D/etc/courier/aliases/system
@exec [ -f %D/etc/courier/authdaemonrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/authdaemonrc.dist
%%SUB_LDAP%%@exec [ -f %D/etc/courier/authldaprc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/authldaprc.dist
%%SUB_MYSQL%%@exec [ -f %D/etc/courier/authmysqlrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/authmysqlrc.dist
%%SUB_PGSQL%%@exec [ -f %D/etc/courier/authpgsqlrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/authpgsqlrc.dist
@exec [ -f %D/etc/courier/courierd.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/courierd.dist
@exec [ -f %D/etc/courier/esmtpd-msa.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/esmtpd-msa.dist
@exec [ -f %D/etc/courier/esmtpd-ssl.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/esmtpd-ssl.dist
@exec [ -f %D/etc/courier/esmtpd.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/esmtpd.dist
@exec [ -f %D/etc/courier/imapd-ssl.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/imapd-ssl.dist
@exec [ -f %D/etc/courier/imapd.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/imapd.dist
@exec [ -f %D/etc/courier/ldapaddressbook.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/ldapaddressbook.dist
%%SUB_LDAP%%@exec [ -f %D/etc/courier/ldapaliasrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/ldapaliasrc.dist
@exec [ -f %D/etc/courier/pop3d-ssl.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/pop3d-ssl.dist
@exec [ -f %D/etc/courier/pop3d.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/pop3d.dist
@unexec rmdir %D/etc/courier/aliasdir 2>/dev/null || true
@unexec rmdir %D/etc/courier/aliases 2>/dev/null || true
@unexec rmdir %D/etc/courier/esmtpacceptmailfor.dir 2>/dev/null || true

sbin/couriertcpd
sbin/esmtpd
sbin/esmtpd-msa
sbin/esmtpd-ssl
sbin/filterctl
sbin/imapd
sbin/imapd-ssl

share/courier/courierwebadmin/webadmin.pm
@dirrm share/courier/courierwebadmin
share/courier/esmtpd
share/courier/esmtpd-ssl
share/courier/filterctl
share/courier/imapd
share/courier/imapd-ssl

%%PORTDOCS%%share/doc/courier/html/courierpop3d.html
%%PORTDOCS%%share/doc/courier/html/couriertcpd.html
%%PORTDOCS%%share/doc/courier/html/couriertls.html
%%PORTDOCS%%%%SUB_UUCP%%share/doc/courier/html/courieruucp.html
%%PORTDOCS%%share/doc/courier/html/deliverquota.html
%%PORTDOCS%%share/doc/courier/html/dot-courier.html
%%PORTDOCS%%share/doc/courier/html/dot-forward.html

%%PORTDOCS%%share/doc/courier/html/userdbpw.html
%%PORTDOCS%%@dirrm share/doc/courier/html
%%PORTDOCS%%@dirrm share/doc/courier
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/bin/cancelmsg
@exec chown %%BINOWN%%:mail %D/bin/maildrop
@exec chown %%BINOWN%%:%%MAILGRP%% %D/bin/mailq
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier
@exec chown -Rh %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/aliases
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/authdaemonrc.dist
%%SUB_LDAP%%@exec chown %%BINOWN%%:%%BINGRP%% %D/etc/courier/authldaprc.dist
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/authmodulelist
%%SUB_MYSQL%%@exec chown %%BINOWN%%:%%BINGRP%% %D/etc/courier/authmysqlrc.dist
%%SUB_PGSQL%%@exec chown %%BINOWN%%:%%BINGRP%% %D/etc/courier/authpgsqlrc.dist
@exec chown %%BINOWN%%:%%BINGRP%% %D/etc/courier/courierd.dist
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsndelayed.txt
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsndelivered.txt
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnfailed.txt
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnfooter.txt
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnheader.txt
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnrelayed.txt
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnsubjectnotice.txt
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnsubjectwarn.txt
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/esmtpauthclient
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.dsn
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.esmtp
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.local
%%SUB_UUCP%%@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.uucp
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliascombine
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliascreate
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliasexp
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/courierd
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/dsn/courierdsn
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/addcr
@exec chown %%BINOWN%%:%%BINGRP%% %D/libexec/courier/modules/esmtp/authend
@exec chown %%BINOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/authstart
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/courieresmtp
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/courieresmtpd
%%SUB_UUCP%%@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/uucp/courieruucp
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/submit
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/submitmkdir
@exec chown %%MAILOWN%%:%%MAILGRP%% %D/sbin/showmodules
@exec install -d -o %%BINOWN%% -g %%BINGRP%% -m 0755 /var/spool/calendar
@exec install -d -o %%CACHEOWN%% -g %%MAILGRP%% -m 0700 /var/spool/calendar/localcache
@exec install -d -o %%CACHEOWN%% -g %%MAILGRP%% -m 0750 /var/spool/calendar/private
@exec install -d -o %%CACHEOWN%% -g %%MAILGRP%% -m 0755 /var/spool/calendar/public
@exec install -d -o %%BINOWN%% -g %%BINGRP%% -m 0755 /var/spool/courier
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/allfilters
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0770 /var/spool/courier/authdaemon
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/filters
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/msgq
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/msgs
@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0770 /var/spool/courier/tmp
@exec install -c -o %%MAILOWN%% -g %%MAILGRP%% -m 0400 /dev/null /var/spool/courier/.noident
@exec install -d -o %%CACHEOWN%% -g mail -m 0700 /var/spool/webmail
@exec crontab -u %%CACHEOWN%% %D/etc/courier/crontab 2>/dev/null || true
@unexec crontab -u %%CACHEOWN%% -l 2>/dev/null || true
@unexec crontab -u %%CACHEOWN%% -r || true
@unexec [ -d /var/spool/courier ] && chown -Rh %%MAILOWN%%:%%MAILGRP%% /var/spool/courier
@exec chown root:courier %D/libexec/courier/modules/esmtp/authstart
@exec chown courier:courier %D/libexec/courier/modules/esmtp/courieresmtp
@exec chown courier:courier %D/libexec/courier/modules/esmtp/courieresmtpd
%%SUB_UUCP%%@exec chown courier:courier %D/libexec/courier/modules/uucp/courieruucp
@exec chown courier:courier %D/libexec/courier/submit
@exec chown courier:courier %D/libexec/courier/submitmkdir
@exec chown courier:courier %D/sbin/showmodules
@exec install -d -o root -g wheel -m 0755 /var/spool/calendar
@exec install -d -o %%CACHEOWNER%% -g courier -m 0700 /var/spool/calendar/localcache
@exec install -d -o root -g courier -m 0750 /var/spool/calendar/private
@exec install -d -o root -g courier -m 0755 /var/spool/calendar/public
@exec install -d -o root -g wheel -m 0755 /var/spool/courier
@exec install -d -o courier -g courier -m 0750 /var/spool/courier/allfilters
@exec install -d -o courier -g courier -m 0770 /var/spool/courier/authdaemon
@exec install -d -o courier -g courier -m 0750 /var/spool/courier/filters
@exec install -d -o courier -g courier -m 0750 /var/spool/courier/msgq
@exec install -d -o courier -g courier -m 0750 /var/spool/courier/msgs
@exec install -d -o courier -g courier -m 0770 /var/spool/courier/tmp
@exec install -d -o root -g wheel -m 0755 /var/spool/courier/tmp/broken
@exec install -d -o %%CACHEOWNER%% -g mail -m 0700 /var/spool/webmail
@exec crontab -u %%CACHEOWNER%% %D/etc/courier/crontab 2>/dev/null || true
@unexec crontab -u %%CACHEOWNER%% -l 2>/dev/null || true
@unexec crontab -u %%CACHEOWNER%% -r || true
@unexec [ -d /var/spool/courier ] && chown -R courier:courier /var/spool/courier
@unexec echo ""
@unexec echo "Warning: Removing user courier will also delete any"
@unexec echo "	 undelivered mail in the mail queue directories!!!"
@unexec echo "	 Do not do it if you're upgrading and would like"
@unexec echo "	 courier to continue trying to deliver this mail."
@unexec echo ""
@unexec rmuser %%MAILOWN%% 2>/dev/null || true
@unexec [ -d /var/spool/courier ] && chown 0:0 /var/spool/courier 2>/dev/null || true
@unexec [ -d /var/spool/courier/tmp/broken ] && chown 0:0 /var/spool/courier/tmp/broken 2>/dev/null || true
@unexec rm -rf /var/spool/calendar 2>/dev/null || true
@unexec rm -rf /var/spool/webmail 2>/dev/null || true

Return to bug 34398

Lines 1-14 Link Here

(-)courier/pkg-plist (-106 / +85 lines)
1	@exec pw groupshow courier \|\| pw groupadd courier -g 62 -h -	1	@exec pw groupshow %%MAILGRP%% \|\| pw groupadd %%MAILGRP%% -g %%MAILUID%% -h -
2	@exec pw user show courier \|\| pw useradd courier -u 62 -g 62 -h - -d /var/spool/courier -s /sbin/nologin -c "Courier Mail System"	2	@exec pw user show %%MAILOWN%% \|\| pw useradd %%MAILOWN%% -u %%MAILUID%% -g %%MAILGID%% -h - -d /var/spool/courier -s /sbin/nologin -c "Courier Mail System"
3	@exec install -d -o courier -g courier -m 0755 %D/etc/courier/aliasdir	3	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 %D/etc/courier/aliasdir
4	@exec install -d -o courier -g courier -m 0750 %D/etc/courier/aliases	4	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 %D/etc/courier/aliases
5	@exec install -d -o root -g wheel -m 0755 %D/etc/courier/esmtpacceptmailfor.dir	5	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 %D/etc/courier/esmtpacceptmailfor.dir
6	@exec install -d -o root -g wheel -m 0755 %D/etc/courier/esmtppercentrelay.dir	6	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 %D/etc/courier/esmtppercentrelay.dir
7	@exec install -d -o courier -g courier -m 0750 %D/etc/courier/filters/active	7	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 %D/etc/courier/filters/active
8	@exec install -d -o courier -g courier -m 0755 %D/etc/courier/smtpaccess	8	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 %D/etc/courier/smtpaccess
9	@exec install -d -o courier -g courier -m 0700 %D/etc/courier/webadmin	9	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0700 %D/etc/courier/webadmin/added
10	@exec install -d -o courier -g courier -m 0755 %D/etc/courier/webadmin/added	10	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0700 %D/etc/courier/webadmin/removed
11	@exec install -d -o courier -g courier -m 0755 %D/etc/courier/webadmin/removed
12	@unexec %D/etc/rc.d/courier.sh stop 2>/dev/null \|\| true	11	@unexec %D/etc/rc.d/courier.sh stop 2>/dev/null \|\| true
13	@unexec rm -f %D/etc/courier/*.dat 2>/dev/null \|\| true	12	@unexec rm -f %D/etc/courier/*.dat 2>/dev/null \|\| true
14	@unexec cmp -s %D/etc/courier/authdaemonrc %D/etc/courier/authdaemonrc.dist && rm -f %D/etc/courier/authdaemonrc 2>/dev/null \|\| true	13	@unexec cmp -s %D/etc/courier/authdaemonrc %D/etc/courier/authdaemonrc.dist && rm -f %D/etc/courier/authdaemonrc 2>/dev/null \|\| true
Lines 17-22 Link Here
17	%%SUB_PGSQL%%@unexec cmp -s %D/etc/courier/authpgsqlrc %D/etc/courier/authpgsqlrc.dist && rm -f %D/etc/courier/authpgsqlrc 2>/dev/null \|\| true	16	%%SUB_PGSQL%%@unexec cmp -s %D/etc/courier/authpgsqlrc %D/etc/courier/authpgsqlrc.dist && rm -f %D/etc/courier/authpgsqlrc 2>/dev/null \|\| true
18	@unexec cmp -s %D/etc/courier/courierd %D/etc/courier/courierd.dist && rm -f %D/etc/courier/courierd 2>/dev/null \|\| true	17	@unexec cmp -s %D/etc/courier/courierd %D/etc/courier/courierd.dist && rm -f %D/etc/courier/courierd 2>/dev/null \|\| true
19	@unexec cmp -s %D/etc/courier/esmtpd-msa %D/etc/courier/esmtpd-msa.dist && rm -f %D/etc/courier/esmtpd-msa 2>/dev/null \|\| true	18	@unexec cmp -s %D/etc/courier/esmtpd-msa %D/etc/courier/esmtpd-msa.dist && rm -f %D/etc/courier/esmtpd-msa 2>/dev/null \|\| true
		19	@unexec cmp -s %D/etc/courier/esmtpd-ssl %D/etc/courier/esmtpd-ssl.dist && rm -f %D/etc/courier/esmtpd-ssl 2>/dev/null \|\| true
20	@unexec cmp -s %D/etc/courier/esmtpd %D/etc/courier/esmtpd.dist && rm -f %D/etc/courier/esmtpd 2>/dev/null \|\| true	20	@unexec cmp -s %D/etc/courier/esmtpd %D/etc/courier/esmtpd.dist && rm -f %D/etc/courier/esmtpd 2>/dev/null \|\| true
21	@unexec cmp -s %D/etc/courier/imapd-ssl %D/etc/courier/imapd-ssl.dist && rm -f %D/etc/courier/imapd-ssl 2>/dev/null \|\| true	21	@unexec cmp -s %D/etc/courier/imapd-ssl %D/etc/courier/imapd-ssl.dist && rm -f %D/etc/courier/imapd-ssl 2>/dev/null \|\| true
22	@unexec cmp -s %D/etc/courier/imapd %D/etc/courier/imapd.dist && rm -f %D/etc/courier/imapd 2>/dev/null \|\| true	22	@unexec cmp -s %D/etc/courier/imapd %D/etc/courier/imapd.dist && rm -f %D/etc/courier/imapd 2>/dev/null \|\| true
Lines 65-70 Link Here
65	etc/courier/esmtp.authpam	65	etc/courier/esmtp.authpam
66	etc/courier/esmtpauthclient	66	etc/courier/esmtpauthclient
67	etc/courier/esmtpd-msa.dist	67	etc/courier/esmtpd-msa.dist
		68	etc/courier/esmtpd-ssl.dist
68	etc/courier/esmtpd.cnf	69	etc/courier/esmtpd.cnf
69	etc/courier/esmtpd.dist	70	etc/courier/esmtpd.dist
70	etc/courier/imapd-ssl.dist	71	etc/courier/imapd-ssl.dist
Lines 92-110 Link Here
92	etc/courier/smtpaccess/default	93	etc/courier/smtpaccess/default
93	etc/courier/webmail.authpam	94	etc/courier/webmail.authpam
94	@exec [ -e /etc/aliases ] && ln -sf /etc/aliases %D/etc/courier/aliases/system	95	@exec [ -e /etc/aliases ] && ln -sf /etc/aliases %D/etc/courier/aliases/system
95	@exec [ -f %D/etc/courier/authdaemonrc ] \|\| cp -p %D/etc/courier/authdaemonrc.dist %D/etc/courier/authdaemonrc	96	@exec [ -f %D/etc/courier/authdaemonrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/authdaemonrc.dist
96	%%SUB_LDAP%%@exec [ -f %D/etc/courier/authldaprc ] \|\| cp -p %D/etc/courier/authldaprc.dist %D/etc/courier/authldaprc	97	%%SUB_LDAP%%@exec [ -f %D/etc/courier/authldaprc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/authldaprc.dist
97	%%SUB_MYSQL%%@exec [ -f %D/etc/courier/authmysqlrc ] \|\| cp -p %D/etc/courier/authmysqlrc.dist %D/etc/courier/authmysqlrc	98	%%SUB_MYSQL%%@exec [ -f %D/etc/courier/authmysqlrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/authmysqlrc.dist
98	%%SUB_PGSQL%%@exec [ -f %D/etc/courier/authpgsqlrc ] \|\| cp -p %D/etc/courier/authpgsqlrc.dist %D/etc/courier/authpgsqlrc	99	%%SUB_PGSQL%%@exec [ -f %D/etc/courier/authpgsqlrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/authpgsqlrc.dist
99	@exec [ -f %D/etc/courier/courierd ] \|\| cp -p %D/etc/courier/courierd.dist %D/etc/courier/courierd	100	@exec [ -f %D/etc/courier/courierd.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/courierd.dist
100	@exec [ -f %D/etc/courier/esmtpd-msa ] \|\| cp -p %D/etc/courier/esmtpd-msa.dist %D/etc/courier/esmtpd-msa	101	@exec [ -f %D/etc/courier/esmtpd-msa.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/esmtpd-msa.dist
101	@exec [ -f %D/etc/courier/esmtpd ] \|\| cp -p %D/etc/courier/esmtpd.dist %D/etc/courier/esmtpd	102	@exec [ -f %D/etc/courier/esmtpd-ssl.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/esmtpd-ssl.dist
102	@exec [ -f %D/etc/courier/imapd-ssl ] \|\| cp -p %D/etc/courier/imapd-ssl.dist %D/etc/courier/imapd-ssl	103	@exec [ -f %D/etc/courier/esmtpd.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/esmtpd.dist
103	@exec [ -f %D/etc/courier/imapd ] \|\| cp -p %D/etc/courier/imapd.dist %D/etc/courier/imapd	104	@exec [ -f %D/etc/courier/imapd-ssl.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/imapd-ssl.dist
104	@exec [ -f %D/etc/courier/ldapaddressbook ] \|\| cp -p %D/etc/courier/ldapaddressbook.dist %D/etc/courier/ldapaddressbook	105	@exec [ -f %D/etc/courier/imapd.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/imapd.dist
105	%%SUB_LDAP%%@exec [ -f %D/etc/courier/ldapaliasrc ] \|\| cp -p %D/etc/courier/ldapaliasrc.dist %D/etc/courier/ldapaliasrc	106	@exec [ -f %D/etc/courier/ldapaddressbook.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/ldapaddressbook.dist
106	@exec [ -f %D/etc/courier/pop3d-ssl ] \|\| cp -p %D/etc/courier/pop3d-ssl.dist %D/etc/courier/pop3d-ssl	107	%%SUB_LDAP%%@exec [ -f %D/etc/courier/ldapaliasrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/ldapaliasrc.dist
107	@exec [ -f %D/etc/courier/pop3d ] \|\| cp -p %D/etc/courier/pop3d.dist %D/etc/courier/pop3d	108	@exec [ -f %D/etc/courier/pop3d-ssl.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/pop3d-ssl.dist
		109	@exec [ -f %D/etc/courier/pop3d.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/pop3d.dist
108	@unexec rmdir %D/etc/courier/aliasdir 2>/dev/null \|\| true	110	@unexec rmdir %D/etc/courier/aliasdir 2>/dev/null \|\| true
109	@unexec rmdir %D/etc/courier/aliases 2>/dev/null \|\| true	111	@unexec rmdir %D/etc/courier/aliases 2>/dev/null \|\| true
110	@unexec rmdir %D/etc/courier/esmtpacceptmailfor.dir 2>/dev/null \|\| true	112	@unexec rmdir %D/etc/courier/esmtpacceptmailfor.dir 2>/dev/null \|\| true
Lines 167-172 Link Here
167	sbin/couriertcpd	169	sbin/couriertcpd
168	sbin/esmtpd	170	sbin/esmtpd
169	sbin/esmtpd-msa	171	sbin/esmtpd-msa
		172	sbin/esmtpd-ssl
170	sbin/filterctl	173	sbin/filterctl
171	sbin/imapd	174	sbin/imapd
172	sbin/imapd-ssl	175	sbin/imapd-ssl
Lines 268-273 Link Here
268	share/courier/courierwebadmin/webadmin.pm	271	share/courier/courierwebadmin/webadmin.pm
269	@dirrm share/courier/courierwebadmin	272	@dirrm share/courier/courierwebadmin
270	share/courier/esmtpd	273	share/courier/esmtpd
		274	share/courier/esmtpd-ssl
271	share/courier/filterctl	275	share/courier/filterctl
272	share/courier/imapd	276	share/courier/imapd
273	share/courier/imapd-ssl	277	share/courier/imapd-ssl
Lines 498-504 Link Here
498	%%PORTDOCS%%share/doc/courier/html/courierpop3d.html	502	%%PORTDOCS%%share/doc/courier/html/courierpop3d.html
499	%%PORTDOCS%%share/doc/courier/html/couriertcpd.html	503	%%PORTDOCS%%share/doc/courier/html/couriertcpd.html
500	%%PORTDOCS%%share/doc/courier/html/couriertls.html	504	%%PORTDOCS%%share/doc/courier/html/couriertls.html
501	%%SUB_UUCP%%%%PORTDOCS%%share/doc/courier/html/courieruucp.html	505	%%PORTDOCS%%%%SUB_UUCP%%share/doc/courier/html/courieruucp.html
502	%%PORTDOCS%%share/doc/courier/html/deliverquota.html	506	%%PORTDOCS%%share/doc/courier/html/deliverquota.html
503	%%PORTDOCS%%share/doc/courier/html/dot-courier.html	507	%%PORTDOCS%%share/doc/courier/html/dot-courier.html
504	%%PORTDOCS%%share/doc/courier/html/dot-forward.html	508	%%PORTDOCS%%share/doc/courier/html/dot-forward.html
Lines 557-649 Link Here
557	%%PORTDOCS%%share/doc/courier/html/userdbpw.html	561	%%PORTDOCS%%share/doc/courier/html/userdbpw.html
558	%%PORTDOCS%%@dirrm share/doc/courier/html	562	%%PORTDOCS%%@dirrm share/doc/courier/html
559	%%PORTDOCS%%@dirrm share/doc/courier	563	%%PORTDOCS%%@dirrm share/doc/courier
560	@exec chown courier:courier %D/bin/cancelmsg	564	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/bin/cancelmsg
561	@exec chown root:mail %D/bin/maildrop	565	@exec chown %%BINOWN%%:mail %D/bin/maildrop
562	@exec chown root:courier %D/bin/mailq	566	@exec chown %%BINOWN%%:%%MAILGRP%% %D/bin/mailq
563	@exec chown courier:courier %D/etc/courier	567	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier
564	@exec chown -Rh courier:courier %D/etc/courier/aliases	568	@exec chown -Rh %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/aliases
565	@exec chown courier:courier %D/etc/courier/authdaemonrc.dist	569	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/authdaemonrc.dist
566	%%SUB_LDAP%%@exec chown root:wheel %D/etc/courier/authldaprc.dist	570	%%SUB_LDAP%%@exec chown %%BINOWN%%:%%BINGRP%% %D/etc/courier/authldaprc.dist
567	@exec chown courier:courier %D/etc/courier/authmodulelist	571	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/authmodulelist
568	%%SUB_MYSQL%%@exec chown root:wheel %D/etc/courier/authmysqlrc.dist	572	%%SUB_MYSQL%%@exec chown %%BINOWN%%:%%BINGRP%% %D/etc/courier/authmysqlrc.dist
569	%%SUB_PGSQL%%@exec chown root:wheel %D/etc/courier/authpgsqlrc.dist	573	%%SUB_PGSQL%%@exec chown %%BINOWN%%:%%BINGRP%% %D/etc/courier/authpgsqlrc.dist
570	@exec chown root:wheel %D/etc/courier/courierd.dist	574	@exec chown %%BINOWN%%:%%BINGRP%% %D/etc/courier/courierd.dist
571	@exec chown courier:courier %D/etc/courier/dsndelayed.txt	575	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsndelayed.txt
572	@exec chown courier:courier %D/etc/courier/dsndelivered.txt	576	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsndelivered.txt
573	@exec chown courier:courier %D/etc/courier/dsnfailed.txt	577	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnfailed.txt
574	@exec chown courier:courier %D/etc/courier/dsnfooter.txt	578	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnfooter.txt
575	@exec chown courier:courier %D/etc/courier/dsnheader.txt	579	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnheader.txt
576	@exec chown courier:courier %D/etc/courier/dsnrelayed.txt	580	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnrelayed.txt
577	@exec chown courier:courier %D/etc/courier/dsnsubjectnotice.txt	581	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnsubjectnotice.txt
578	@exec chown courier:courier %D/etc/courier/dsnsubjectwarn.txt	582	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnsubjectwarn.txt
579	@exec chown root:wheel %D/etc/courier/enablefiltering	583	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/esmtpauthclient
580	@exec chown root:wheel %D/etc/courier/esmtp.authpam	584	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.dsn
581	@exec chown courier:courier %D/etc/courier/esmtpauthclient	585	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.esmtp
582	@exec chown root:wheel %D/etc/courier/esmtpd-msa.dist	586	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.local
583	@exec chown root:wheel %D/etc/courier/esmtpd.cnf	587	%%SUB_UUCP%%@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.uucp
584	@exec chown root:wheel %D/etc/courier/esmtpd.dist	588	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliascombine
585	@exec chown root:wheel %D/etc/courier/imapd-ssl.dist	589	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliascreate
586	@exec chown root:wheel %D/etc/courier/imapd.authpam	590	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliasexp
587	@exec chown root:wheel %D/etc/courier/imapd.cnf	591	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/courierd
588	@exec chown root:wheel %D/etc/courier/imapd.dist	592	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/dsn/courierdsn
589	@exec chown root:wheel %D/etc/courier/ldapaddressbook.dist	593	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/addcr
590	@exec chown root:wheel %D/etc/courier/locallowercase	594	@exec chown %%BINOWN%%:%%BINGRP%% %D/libexec/courier/modules/esmtp/authend
591	@exec chown root:wheel %D/etc/courier/maildrop	595	@exec chown %%BINOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/authstart
592	@exec chown root:wheel %D/etc/courier/maildropfilter	596	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/courieresmtp
593	@exec chown courier:courier %D/etc/courier/module.dsn	597	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/courieresmtpd
594	@exec chown courier:courier %D/etc/courier/module.esmtp	598	%%SUB_UUCP%%@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/uucp/courieruucp
595	@exec chown courier:courier %D/etc/courier/module.local	599	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/submit
596	%%SUB_UUCP%%@exec chown courier:courier %D/etc/courier/module.uucp	600	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/submitmkdir
597	@exec chown root:wheel %D/etc/courier/pop3d-ssl.dist	601	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/sbin/showmodules
598	@exec chown root:wheel %D/etc/courier/pop3d.authpam	602	@exec install -d -o %%BINOWN%% -g %%BINGRP%% -m 0755 /var/spool/calendar
599	@exec chown root:wheel %D/etc/courier/pop3d.cnf	603	@exec install -d -o %%CACHEOWN%% -g %%MAILGRP%% -m 0700 /var/spool/calendar/localcache
600	@exec chown root:wheel %D/etc/courier/pop3d.dist	604	@exec install -d -o %%CACHEOWN%% -g %%MAILGRP%% -m 0750 /var/spool/calendar/private
601	@exec chown root:wheel %D/etc/courier/quotawarnmsg.example	605	@exec install -d -o %%CACHEOWN%% -g %%MAILGRP%% -m 0755 /var/spool/calendar/public
602	@exec chown root:wheel %D/etc/courier/rfcerr2045.txt	606	@exec install -d -o %%BINOWN%% -g %%BINGRP%% -m 0755 /var/spool/courier
603	@exec chown root:wheel %D/etc/courier/rfcerr2046.txt	607	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/allfilters
604	@exec chown root:wheel %D/etc/courier/rfcerr2047.txt	608	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0770 /var/spool/courier/authdaemon
605	@exec chown root:wheel %D/etc/courier/rfcerrheader.txt	609	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/filters
606	@exec chown root:wheel %D/etc/courier/smtpaccess/default	610	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/msgq
607	@exec chown root:wheel %D/etc/courier/webmail.authpam	611	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/msgs
608	@exec chown courier:courier %D/libexec/courier/aliascombine	612	@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0770 /var/spool/courier/tmp
609	@exec chown courier:courier %D/libexec/courier/aliascreate	613	@exec install -c -o %%MAILOWN%% -g %%MAILGRP%% -m 0400 /dev/null /var/spool/courier/.noident
610	@exec chown courier:courier %D/libexec/courier/aliasexp	614	@exec install -d -o %%CACHEOWN%% -g mail -m 0700 /var/spool/webmail
611	@exec chown courier:courier %D/libexec/courier/courierd	615	@exec crontab -u %%CACHEOWN%% %D/etc/courier/crontab 2>/dev/null \|\| true
612	@exec chown courier:courier %D/libexec/courier/modules/dsn/courierdsn	616	@unexec crontab -u %%CACHEOWN%% -l 2>/dev/null \|\| true
613	@exec chown courier:courier %D/libexec/courier/modules/esmtp/addcr	617	@unexec crontab -u %%CACHEOWN%% -r \|\| true
614	@exec chown root:wheel %D/libexec/courier/modules/esmtp/authend	618	@unexec [ -d /var/spool/courier ] && chown -Rh %%MAILOWN%%:%%MAILGRP%% /var/spool/courier
615	@exec chown root:courier %D/libexec/courier/modules/esmtp/authstart
616	@exec chown courier:courier %D/libexec/courier/modules/esmtp/courieresmtp
617	@exec chown courier:courier %D/libexec/courier/modules/esmtp/courieresmtpd
618	%%SUB_UUCP%%@exec chown courier:courier %D/libexec/courier/modules/uucp/courieruucp
619	@exec chown courier:courier %D/libexec/courier/submit
620	@exec chown courier:courier %D/libexec/courier/submitmkdir
621	@exec chown courier:courier %D/sbin/showmodules
622	@exec install -d -o root -g wheel -m 0755 /var/spool/calendar
623	@exec install -d -o %%CACHEOWNER%% -g courier -m 0700 /var/spool/calendar/localcache
624	@exec install -d -o root -g courier -m 0750 /var/spool/calendar/private
625	@exec install -d -o root -g courier -m 0755 /var/spool/calendar/public
626	@exec install -d -o root -g wheel -m 0755 /var/spool/courier
627	@exec install -d -o courier -g courier -m 0750 /var/spool/courier/allfilters
628	@exec install -d -o courier -g courier -m 0770 /var/spool/courier/authdaemon
629	@exec install -d -o courier -g courier -m 0750 /var/spool/courier/filters
630	@exec install -d -o courier -g courier -m 0750 /var/spool/courier/msgq
631	@exec install -d -o courier -g courier -m 0750 /var/spool/courier/msgs
632	@exec install -d -o courier -g courier -m 0770 /var/spool/courier/tmp
633	@exec install -d -o root -g wheel -m 0755 /var/spool/courier/tmp/broken
634	@exec install -d -o %%CACHEOWNER%% -g mail -m 0700 /var/spool/webmail
635	@exec crontab -u %%CACHEOWNER%% %D/etc/courier/crontab 2>/dev/null \|\| true
636	@unexec crontab -u %%CACHEOWNER%% -l 2>/dev/null \|\| true
637	@unexec crontab -u %%CACHEOWNER%% -r \|\| true
638	@unexec [ -d /var/spool/courier ] && chown -R courier:courier /var/spool/courier
639	@unexec echo ""	619	@unexec echo ""
640	@unexec echo "Warning: Removing user courier will also delete any"	620	@unexec echo "Warning: Removing user courier will also delete any"
641	@unexec echo " undelivered mail in the mail queue directories!!!"	621	@unexec echo " undelivered mail in the mail queue directories!!!"
642	@unexec echo " Do not do it if you're upgrading and would like"	622	@unexec echo " Do not do it if you're upgrading and would like"
643	@unexec echo " courier to continue trying to deliver this mail."	623	@unexec echo " courier to continue trying to deliver this mail."
644	@unexec echo ""	624	@unexec echo ""
645	@unexec rmuser courier 2>/dev/null \|\| true	625	@unexec rmuser %%MAILOWN%% 2>/dev/null \|\| true
646	@unexec [ -d /var/spool/courier ] && chown 0:0 /var/spool/courier 2>/dev/null \|\| true	626	@unexec [ -d /var/spool/courier ] && chown 0:0 /var/spool/courier 2>/dev/null \|\| true
647	@unexec [ -d /var/spool/courier/tmp/broken ] && chown 0:0 /var/spool/courier/tmp/broken 2>/dev/null \|\| true
648	@unexec rm -rf /var/spool/calendar 2>/dev/null \|\| true	627	@unexec rm -rf /var/spool/calendar 2>/dev/null \|\| true
649	@unexec rm -rf /var/spool/webmail 2>/dev/null \|\| true	628	@unexec rm -rf /var/spool/webmail 2>/dev/null \|\| true

Lines 6-20 Link Here

(-)courier/Makefile (-16 / +26 lines)
6	#	6	#
7		7
8	PORTNAME= courier	8	PORTNAME= courier
9	PORTVERSION= 0.37.2	9	PORTVERSION= 0.37.2.20020125
10	PORTREVISION= 0	10	PORTREVISION= 0
11	CATEGORIES= mail ipv6	11	CATEGORIES= mail ipv6
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= http://www.courier-mta.org/beta/%SUBDIR%/ \
		13	${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= courier	14	MASTER_SITE_SUBDIR= courier
14		15
15	MAINTAINER= yds@CoolRat.org	16	MAINTAINER= yds@CoolRat.org
16		17
17	RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR	18	RUN_DEPENDS= ${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
		19	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
18		20
19	#	21	#
20	# User-serviceable variables	22	# User-serviceable variables
Lines 22-37 Link Here
22	# [ There's no need to add trailing ``/''s ]	24	# [ There's no need to add trailing ``/''s ]
23	#	25	#
24	# set IMAGEURL to where on the web server URL the images are found	26	# set IMAGEURL to where on the web server URL the images are found
25	# set CACHEOWNER to who you'd like to own the cache files	27	# set CACHEOWN to who you'd like to own the cache files
26	# set MAILDROPDEFAULT to what you'd like the $DEFAULT in maildrop to be	28	# set MAILDROPDEFAULT to what you'd like the $DEFAULT in maildrop to be
27	# recomended values are: /var/mail, ./Mailbox or ./Maildir	29	# recomended values are: /var/mail, ./Mailbox or ./Maildir
28	#	30	#
29	IMAGEURL?= /webmail	31	IMAGEURL?= /webmail
30	CACHEOWNER?= pop	32	CACHEOWN?= pop
31	MAILDROPDEFAULT?=./Maildir	33	MAILDROPDEFAULT?=./Maildir
32	# End of user-serviceable variables	34	# End of user-serviceable variables
33	MAILUSER= courier	35	MAILOWN= courier
34	MAILGROUP= courier	36	MAILGRP= courier
35	MAILUID= 62	37	MAILUID= 62
36	MAILGID= 62	38	MAILGID= 62
37	ETCDIR= ${PREFIX}/etc	39	ETCDIR= ${PREFIX}/etc
Lines 47-52 Link Here
47	IS_INTERACTIVE= yes	49	IS_INTERACTIVE= yes
48	.endif	50	.endif
49		51
		52	USE_PERL5= yes
50	USE_GMAKE= yes	53	USE_GMAKE= yes
51	USE_AUTOMAKE= yes	54	USE_AUTOMAKE= yes
52	USE_LIBTOOL= yes	55	USE_LIBTOOL= yes
Lines 55-62 Link Here
55	USE_AUTOCONF_VER=213	58	USE_AUTOCONF_VER=213
56	CONFIGURE_ARGS= --disable-root-check --with-db=db \	59	CONFIGURE_ARGS= --disable-root-check --with-db=db \
57	--enable-syslog=1 --enable-use-flock \	60	--enable-syslog=1 --enable-use-flock \
58	--with-mailuser=${MAILUSER} \	61	--with-mailuser=${MAILOWN} \
59	--with-mailgroup=${MAILGROUP} \	62	--with-mailgroup=${MAILGRP} \
60	--with-mailuid=${MAILUID} \	63	--with-mailuid=${MAILUID} \
61	--with-mailgid=${MAILGID} \	64	--with-mailgid=${MAILGID} \
62	--with-etcdir=${ETCDIR} \	65	--with-etcdir=${ETCDIR} \
Lines 68-74 Link Here
68	--enable-mimetypes=${MIMETYPES} \	71	--enable-mimetypes=${MIMETYPES} \
69	--enable-imageurl=${IMAGEURL} \	72	--enable-imageurl=${IMAGEURL} \
70	--with-cachedir=${CACHEDIR} \	73	--with-cachedir=${CACHEDIR} \
71	--with-cacheowner=${CACHEOWNER} \	74	--with-cacheowner=${CACHEOWN} \
72	--with-calendardir=${CALENDIR} \	75	--with-calendardir=${CALENDIR} \
73	--with-default-maildrop=${MAILDROPDEFAULT} \	76	--with-default-maildrop=${MAILDROPDEFAULT} \
74	--enable-workarounds-for-imap-client-bugs	77	--enable-workarounds-for-imap-client-bugs
Lines 86-92 Link Here
86		89
87	INSTALL_TARGET= install-strip install-perms	90	INSTALL_TARGET= install-strip install-perms
88		91
89	PLIST_SUB+= CACHEOWNER="${CACHEOWNER}"	92	PLIST_SUB+= BINOWN="${BINOWN}" BINGRP="${BINGRP}" \
		93	MAILOWN="${MAILOWN}" MAILGRP="${MAILGRP}" \
		94	MAILUID="${MAILUID}" MAILGID="${MAILGID}" \
		95	CACHEOWN="${CACHEOWN}"
90		96
91	SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \	97	SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
92	TOUCH="${TOUCH}" \	98	TOUCH="${TOUCH}" \
Lines 94-102 Link Here
94		100
95	.include "${.CURDIR}/Makefile.man"	101	.include "${.CURDIR}/Makefile.man"
96	.include "${.CURDIR}/Makefile.doc"	102	.include "${.CURDIR}/Makefile.doc"
		103	.include "${.CURDIR}/Makefile.own"
97		104
98	pre-everything::	105	pre-everything::
99	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.courier	106	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.${PORTNAME}
100		107
101	.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)	108	.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
102	.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"	109	.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
Lines 109-115 Link Here
109	@${PERL} -pi -e 's:^(TLS_CERTFILE=)\@datadir\@:$$1\@sysconfdir\@:g;' \	116	@${PERL} -pi -e 's:^(TLS_CERTFILE=)\@datadir\@:$$1\@sysconfdir\@:g;' \
110	${WRKSRC}//.dist.in \	117	${WRKSRC}//.dist.in \
111	${WRKSRC}///*.dist.in	118	${WRKSRC}///*.dist.in
112	@${PERL} -pi -e 's:^(RANDFILE = )\@datadir\@:$$1\@sysconfdir\@:g;' \	119	@${PERL} -pi -e 's:^(RANDFILE = )\@datadir\@\S+:$$1\@sysconfdir\@/random.tmp:g;' \
113	${WRKSRC}//.cnf.in \	120	${WRKSRC}//.cnf.in \
114	${WRKSRC}///*.cnf.in	121	${WRKSRC}///*.cnf.in
115		122
Lines 155-166 Link Here
155	@${INSTALL_DATA} /dev/null ${SYSCONFDIR}/locallowercase	162	@${INSTALL_DATA} /dev/null ${SYSCONFDIR}/locallowercase
156	@${INSTALL_SCRIPT} ${FILESDIR}/courier.sh ${PREFIX}/etc/rc.d	163	@${INSTALL_SCRIPT} ${FILESDIR}/courier.sh ${PREFIX}/etc/rc.d
157	@${INSTALL_DATA} ${WRKDIR}/crontab ${PREFIX}/etc/courier/	164	@${INSTALL_DATA} ${WRKDIR}/crontab ${PREFIX}/etc/courier/
		165	.for file in ${OWNER0}
		166	@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/${file}
		167	.endfor
158	@${GREP} '^@exec ' ${TMPPLIST} \	168	@${GREP} '^@exec ' ${TMPPLIST} \
159	\| ${SED} -e 's:^@exec ::' -e 's:%D:${PREFIX}:g' \	169	\| ${SED} -e 's:^@exec ::' -e 's:%D:${PREFIX}:g' \
160	> ${WRKDIR}/.PLIST.exec \	170	> ${WRKDIR}/.PLIST.exec \
161	&& ${SH} ${WRKDIR}/.PLIST.exec	171	&& ${SH} ${WRKDIR}/.PLIST.exec
162	.if !defined(NOPORTDOCS)	172	.if !defined(NOPORTDOCS)
163	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${DOCSDIR}/html	173	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} ${DOCSDIR}/html
164	@${INSTALL_DATA} ${DATADIR}/htmldoc/* ${DOCSDIR}/html	174	@${INSTALL_DATA} ${DATADIR}/htmldoc/* ${DOCSDIR}/html
165	.for file in ${DOCS}	175	.for file in ${DOCS}
166	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}	176	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
Lines 170-177 Link Here
170	@for F in ${MANPREFIX}/man/man[1-9ln]/*; \	180	@for F in ${MANPREFIX}/man/man[1-9ln]/*; \
171	do ${CHMOD} ${MANMODE} $$F; \	181	do ${CHMOD} ${MANMODE} $$F; \
172	done	182	done
173	@${CHOWN} -R ${MANOWN}:${MANGRP} ${MANPREFIX}/man/man[1-9ln]	183	@${CHOWN} -Rh ${MANOWN}:${MANGRP} ${MANPREFIX}/man/man[1-9ln]
174	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}	184	@${CHOWN} -Rh ${SHAREOWN}:${SHAREGRP} ${DATADIR}
175	@${CHMOD} -R a-w ${DATADIR}	185	@${CHMOD} -R a-w ${DATADIR}
176	@${CAT} ${PKGMESSAGE}	186	@${CAT} ${PKGMESSAGE}
177		187

Line 0 Link Here

(-)courier/Makefile.own (+64 lines)
	1	OWNER0= bin/courier-config \
	2	bin/couriermlm \
	3	bin/couriertls \
	4	bin/deliverquota \
	5	bin/dotforward \
	6	bin/dotlock \
	7	bin/imapd \
	8	bin/mailbot \
	9	bin/maildirmake \
	10	bin/makemime \
	11	bin/mimegpg \
	12	bin/preline \
	13	bin/reformail \
	14	bin/reformime \
	15	bin/sendmail \
	16	bin/testmxlookup \
	17	etc/courier/courierd.dist \
	18	etc/courier/enablefiltering \
	19	etc/courier/esmtp.authpam \
	20	etc/courier/esmtpd-msa.dist \
	21	etc/courier/esmtpd-ssl.dist \
	22	etc/courier/esmtpd.cnf \
	23	etc/courier/esmtpd.dist \
	24	etc/courier/imapd-ssl.dist \
	25	etc/courier/imapd.authpam \
	26	etc/courier/imapd.cnf \
	27	etc/courier/imapd.dist \
	28	etc/courier/ldapaddressbook.dist \
	29	etc/courier/locallowercase \
	30	etc/courier/maildrop \
	31	etc/courier/maildropfilter \
	32	etc/courier/pop3d-ssl.dist \
	33	etc/courier/pop3d.authpam \
	34	etc/courier/pop3d.cnf \
	35	etc/courier/pop3d.dist \
	36	etc/courier/quotawarnmsg.example \
	37	etc/courier/rfcerr2045.txt \
	38	etc/courier/rfcerr2046.txt \
	39	etc/courier/rfcerr2047.txt \
	40	etc/courier/rfcerrheader.txt \
	41	etc/courier/smtpaccess/default \
	42	etc/courier/webmail.authpam \
	43	libexec/authlib/authdaemon \
	44	libexec/authlib/authdaemond \
	45	libexec/authlib/authdaemond.plain \
	46	libexec/authlib/changepwd/authdaemon.passwd \
	47	libexec/courier/courierpop3d \
	48	libexec/courier/courierpop3login \
	49	libexec/courier/imaplogin \
	50	libexec/courier/makedatprog \
	51	libexec/courier/modules/esmtp/authend \
	52	libexec/courier/modules/local/courierdeliver \
	53	libexec/courier/modules/local/courierlocal \
	54	libexec/courier/modules/modules.ctl \
	55	libexec/courier/pcpd \
	56	libexec/courier/webmail/webadmin \
	57	libexec/courier/webmail/webmail \
	58	libexec/filters/dupfilter \
	59	libexec/filters/perlfilter \
	60	sbin/courier \
	61	sbin/couriertcpd \
	62	sbin/logger \
	63	sbin/showconfig \
	64	sbin/userdbpw

Lines 1-302 Link Here

(-)courier/files/patch-courier_perms.sh.in (-283 / +17 lines)
1	--- courier/perms.sh.in.orig Fri Dec 7 08:37:35 2001	1	--- courier/perms.sh.in.orig Fri Dec 7 08:37:35 2001
2	+++ courier/perms.sh.in Mon Jan 21 18:46:38 2002	2	+++ courier/perms.sh.in Sun Jan 27 23:12:48 2002
3	@@ -10,9 +10,7 @@	3	@@ -10,9 +10,6 @@
4	exec_prefix="@exec_prefix@"	4	exec_prefix="@exec_prefix@"
5		5
6	PERMS="	6	PERMS="
7	-. 755	7	-. 755
8	-	8	-
9	-@localstatedir@ 755 x bin bin	9	-@localstatedir@ 755 x bin bin
10	+@localstatedir@ 755 x root wheel
11	@localstatedir@/tmp 770	10	@localstatedir@/tmp 770
12	@localstatedir@/msgs 750	11	@localstatedir@/msgs 750
13	@localstatedir@/msgq 750	12	@localstatedir@/msgq 750
14	@@ -41,120 +39,125 @@	13	@@ -41,7 +38,6 @@
15	@sysconfdir@/rfcerr2046.txt 444 config	14	@sysconfdir@/rfcerr2046.txt 444 config
16	@sysconfdir@/rfcerr2047.txt 444 config	15	@sysconfdir@/rfcerr2047.txt 444 config
17		16
18	-@libexecdir@ 755 x bin bin	17	-@libexecdir@ 755 x bin bin
19	-@libexecdir@/authlib 755 x bin bin	18	@libexecdir@/authlib 755 x bin bin
20	-@libexecdir@/courier 755 x bin bin	19	@libexecdir@/courier 755 x bin bin
21	-@libexecdir@/courier/modules 755 x bin bin	20	@libexecdir@/courier/modules 755 x bin bin
22	-@libexecdir@/courier/modules/modules.ctl 444 x bin bin	21	@@ -61,7 +57,6 @@
23	+@libexecdir@/authlib 755 x root wheel	22	@libexecdir@/courier/webmail/webmail 4555 x root bin
24	+@libexecdir@/courier 755 x root wheel	23	@libexecdir@/courier/webmail/webadmin 4555 x root bin
25	+@libexecdir@/courier/modules 755 x root wheel	24
26	+@libexecdir@/courier/modules/dsn 755 x root wheel
27	+@libexecdir@/courier/modules/esmtp 755 x root wheel
28	+@libexecdir@/courier/modules/esmtp/authend 555 x root wheel
29	+@libexecdir@/courier/modules/local 755 x root wheel
30	+@libexecdir@/courier/modules/local/courierdeliver 555 x root wheel
31	+@libexecdir@/courier/modules/local/courierlocal 555 x root wheel
32	+@libexecdir@/courier/modules/modules.ctl 444 x root wheel
33	@libexecdir@/courier/submitmkdir 4550
34	-@libexecdir@/courier/courierd 550
35	-@libexecdir@/courier/courierpop3d 555
36	-@libexecdir@/courier/courierpop3login 555
37	+@libexecdir@/courier/courierd 550
38	+@libexecdir@/courier/courierpop3d 555 x root wheel
39	+@libexecdir@/courier/courierpop3login 555 x root wheel
40	@libexecdir@/courier/aliasexp 550
41	@libexecdir@/courier/aliascombine 550
42	@libexecdir@/courier/aliascreate 550
43	@libexecdir@/courier/submit 550
44	-@libexecdir@/courier/makedatprog 555
45	-@libexecdir@/courier/imaplogin 555 x bin bin
46	-@libexecdir@/courier/pcpd 555 x bin bin
47	-@libexecdir@/courier/webmail 700 x root bin
48	-@libexecdir@/courier/webmail/webmail 4555 x root bin
49	-@libexecdir@/courier/webmail/webadmin 4555 x root bin
50	-
51	-@sbindir@ 755 x bin bin	25	-@sbindir@ 755 x bin bin
52	-@sbindir@/courier 555	26	@sbindir@/courier 555
53	-@sbindir@/showconfig 555	27	@sbindir@/showconfig 555
54	+@libexecdir@/courier/makedatprog 555 x root wheel
55	+@libexecdir@/courier/imaplogin 555 x root wheel
56	+@libexecdir@/courier/pcpd 555 x root wheel
57	+@libexecdir@/courier/webmail 700 x root wheel
58	+@libexecdir@/courier/webmail/webmail 4555 x root wheel
59	+@libexecdir@/courier/webmail/webadmin 4555 x root wheel
60	+@libexecdir@/filters 755 x root wheel
61	+@libexecdir@/filters/dupfilter 555 x root wheel
62	+@libexecdir@/filters/perlfilter 555 x root wheel
63	+
64	+@sbindir@/courier 555 x root wheel
65	+@sbindir@/showconfig 555 x root wheel
66	@sbindir@/showmodules 550	28	@sbindir@/showmodules 550
67	-@sbindir@/userdbpw 555	29	@@ -73,7 +68,6 @@
68	-@sbindir@/couriertcpd 555	30	@datadir@/imapd 555 x bin bin
69	-@sbindir@/logger 555	31	@datadir@/imapd-ssl 555 x bin bin
70	-@sbindir@/imapd 555
71	-@sbindir@/imapd-ssl 555
72	-@datadir@/imapd 555 x bin bin
73	-@datadir@/imapd-ssl 555 x bin bin
74	+@sbindir@/userdbpw 555 x root wheel
75	+@sbindir@/couriertcpd 555 x root wheel
76	+@sbindir@/logger 555 x root wheel
77	+@sbindir@/imapd 555 x root wheel
78	+@sbindir@/imapd-ssl 555 x root wheel
79	+@datadir@/imapd 555 x root wheel
80	+@datadir@/imapd-ssl 555 x root wheel
81		32
82	-@bindir@ 755 x bin bin	33	-@bindir@ 755 x bin bin
83	@bindir@/cancelmsg 6555	34	@bindir@/cancelmsg 6555
84	-@bindir@/courier-config 555	35	@bindir@/courier-config 555
85	-@bindir@/mailq 2555	36	@bindir@/mailq 2555
86	-@bindir@/maildirmake 555
87	-@bindir@/sendmail 4511 x root
88	-@bindir@/rmail 4511 x root
89	-@bindir@/dotlock 555
90	-@bindir@/deliverquota 555
91	-@bindir@/mailbot 555
92	-@bindir@/makemime 555
93	-@bindir@/reformail 555
94	-@bindir@/reformime 555
95	-@bindir@/mimegpg 555
96	-@bindir@/couriermlm 555
97	-@bindir@/dotforward 555
98	-
99	-@datadir@/makedat 555 x bin bin
100	-@bindir@/makedat 555
101	-@bindir@/testmxlookup 555
102	-@bindir@/imapd 555
103	-@datadir@/makealiases 550
104	-@sbindir@/makealiases 550
105	-@datadir@/makehosteddomains 555
106	-@sbindir@/makehosteddomains 555
107	-@datadir@/pop3d 755
108	-@sbindir@/pop3d 755
109	-@datadir@/pop3d-ssl 755
110	-@sbindir@/pop3d-ssl 755
111	-@datadir@/makeuserdb 555
112	-@sbindir@/makeuserdb 555
113	-@datadir@/webgpg 555
114	-@sbindir@/webgpg 555
115	-@datadir@/userdb 555
116	-@sbindir@/userdb 555
117	-@datadir@/pw2userdb 555
118	-@sbindir@/pw2userdb 555
119	-@datadir@/vchkpw2userdb 555
120	-@sbindir@/vchkpw2userdb 555
121	-
122	-@datadir@ 755 x bin bin
123	-@datadir@/courierctl.start 555
124	-
125	-@datadir@/mkimapdcert 755
126	-@sbindir@/mkimapdcert 755
127	-@datadir@/mkpop3dcert 755
128	-@sbindir@/mkpop3dcert 755
129	-@datadir@/couriermlm 755
130	-
131	-@datadir@/couriermlm/adminrequest.tmpl 644
132	-@datadir@/couriermlm/confsubj.tmpl 644
133	-@datadir@/couriermlm/digestsubj.tmpl 644
134	-@datadir@/couriermlm/fetch.tmpl 644
135	-@datadir@/couriermlm/fetchsubj.tmpl 644
136	-@datadir@/couriermlm/help.tmpl 644
137	-@datadir@/couriermlm/idxsubject.tmpl 644
138	-@datadir@/couriermlm/idxheaderhtml.tmpl 644
139	-@datadir@/couriermlm/idxheader2html.tmpl 644
140	-@datadir@/couriermlm/idxheadertxt.tmpl 644
141	-@datadir@/couriermlm/modrejbody.tmpl 644
142	-@datadir@/couriermlm/modreject.tmpl 644
143	-@datadir@/couriermlm/modrejheader.tmpl 644
144	-@datadir@/couriermlm/modsubject.tmpl 644
145	-@datadir@/couriermlm/modtext.tmpl 644
146	-@datadir@/couriermlm/modtext2.tmpl 644
147	-@datadir@/couriermlm/sub.tmpl 644
148	-@datadir@/couriermlm/sub2.tmpl 644
149	-@datadir@/couriermlm/sub3.tmpl 644
150	-@datadir@/couriermlm/sub4.tmpl 644
151	-@datadir@/couriermlm/sub5.tmpl 644
152	-@datadir@/couriermlm/subreportfooter.tmpl 644
153	-@datadir@/couriermlm/subreporthdr.tmpl 644
154	-@datadir@/couriermlm/subreporthdr1.tmpl 644
155	-@datadir@/couriermlm/subreporthdr2.tmpl 644
156	-@datadir@/couriermlm/subreporthdr3.tmpl 644
157	-@datadir@/couriermlm/unsub.tmpl 644
158	-@datadir@/couriermlm/unsub2.tmpl 644
159	-@datadir@/couriermlm/unsub3.tmpl 644
160	-@datadir@/couriermlm/warn1headers.tmpl 644
161	-@datadir@/couriermlm/warn1text.tmpl 644
162	-@datadir@/couriermlm/warn1text2.tmpl 644
163	-@datadir@/couriermlm/warn2msg.tmpl 644
164	+@bindir@/courier-config 555 x root wheel
165	+@bindir@/mailq 2555 x root
166	+@bindir@/maildirmake 555 x root wheel
167	+@bindir@/sendmail 4511 x root wheel
168	+@bindir@/rmail 4511 x root wheel
169	+@bindir@/dotlock 555 x root wheel
170	+@bindir@/deliverquota 555 x root wheel
171	+@bindir@/mailbot 555 x root wheel
172	+@bindir@/makemime 555 x root wheel
173	+@bindir@/reformail 555 x root wheel
174	+@bindir@/reformime 555 x root wheel
175	+@bindir@/mimegpg 555 x root wheel
176	+@bindir@/couriermlm 555 x root wheel
177	+@bindir@/dotforward 555 x root wheel
178	+
179	+@datadir@/makedat 555 x root wheel
180	+@bindir@/makedat 555 x root wheel
181	+@bindir@/testmxlookup 555 x root wheel
182	+@bindir@/imapd 555 x root wheel
183	+@datadir@/makealiases 555 x root wheel
184	+@sbindir@/makealiases 555 x root wheel
185	+@datadir@/makehosteddomains 555 x root wheel
186	+@sbindir@/makehosteddomains 555 x root wheel
187	+@datadir@/pop3d 555 x root wheel
188	+@sbindir@/pop3d 555 x root wheel
189	+@datadir@/pop3d-ssl 555 x root wheel
190	+@sbindir@/pop3d-ssl 555 x root wheel
191	+@datadir@/makeuserdb 555 x root wheel
192	+@sbindir@/makeuserdb 555 x root wheel
193	+@datadir@/webgpg 555 x root wheel
194	+@sbindir@/webgpg 555 x root wheel
195	+@datadir@/userdb 555 x root wheel
196	+@sbindir@/userdb 555 x root wheel
197	+@datadir@/pw2userdb 555 x root wheel
198	+@sbindir@/pw2userdb 555 x root wheel
199	+@datadir@/vchkpw2userdb 555 x root wheel
200	+@sbindir@/vchkpw2userdb 555 x root wheel
201	+
202	+@datadir@/courierctl.start 555 x root wheel
203	+
204	+@datadir@/mkimapdcert 555 x root wheel
205	+@sbindir@/mkimapdcert 555 x root wheel
206	+@datadir@/mkpop3dcert 555 x root wheel
207	+@sbindir@/mkpop3dcert 555 x root wheel
208	+@datadir@/couriermlm 555 x root wheel
209	+
210	+@datadir@/couriermlm/adminrequest.tmpl 444 x root wheel
211	+@datadir@/couriermlm/confsubj.tmpl 444 x root wheel
212	+@datadir@/couriermlm/digestsubj.tmpl 444 x root wheel
213	+@datadir@/couriermlm/fetch.tmpl 444 x root wheel
214	+@datadir@/couriermlm/fetchsubj.tmpl 444 x root wheel
215	+@datadir@/couriermlm/help.tmpl 444 x root wheel
216	+@datadir@/couriermlm/idxsubject.tmpl 444 x root wheel
217	+@datadir@/couriermlm/idxheaderhtml.tmpl 444 x root wheel
218	+@datadir@/couriermlm/idxheader2html.tmpl 444 x root wheel
219	+@datadir@/couriermlm/idxheadertxt.tmpl 444 x root wheel
220	+@datadir@/couriermlm/modrejbody.tmpl 444 x root wheel
221	+@datadir@/couriermlm/modreject.tmpl 444 x root wheel
222	+@datadir@/couriermlm/modrejheader.tmpl 444 x root wheel
223	+@datadir@/couriermlm/modsubject.tmpl 444 x root wheel
224	+@datadir@/couriermlm/modtext.tmpl 444 x root wheel
225	+@datadir@/couriermlm/modtext2.tmpl 444 x root wheel
226	+@datadir@/couriermlm/sub.tmpl 444 x root wheel
227	+@datadir@/couriermlm/sub2.tmpl 444 x root wheel
228	+@datadir@/couriermlm/sub3.tmpl 444 x root wheel
229	+@datadir@/couriermlm/sub4.tmpl 444 x root wheel
230	+@datadir@/couriermlm/sub5.tmpl 444 x root wheel
231	+@datadir@/couriermlm/subreportfooter.tmpl 444 x root wheel
232	+@datadir@/couriermlm/subreporthdr.tmpl 444 x root wheel
233	+@datadir@/couriermlm/subreporthdr1.tmpl 444 x root wheel
234	+@datadir@/couriermlm/subreporthdr2.tmpl 444 x root wheel
235	+@datadir@/couriermlm/subreporthdr3.tmpl 444 x root wheel
236	+@datadir@/couriermlm/unsub.tmpl 444 x root wheel
237	+@datadir@/couriermlm/unsub2.tmpl 444 x root wheel
238	+@datadir@/couriermlm/unsub3.tmpl 444 x root wheel
239	+@datadir@/couriermlm/warn1headers.tmpl 444 x root wheel
240	+@datadir@/couriermlm/warn1text.tmpl 444 x root wheel
241	+@datadir@/couriermlm/warn1text2.tmpl 444 x root wheel
242	+@datadir@/couriermlm/warn2msg.tmpl 444 x root wheel
243	"
244
245	echo "$PERMS" \| while read FILE MODE SPECIAL USER GROUP
246	@@ -198,7 +201,7 @@
247
248	if test "$couriertls" != ""
249	then
250	- echo @bindir@/couriertls 555 bin bin
251	+ echo @bindir@/couriertls 555 root wheel
252	fi
253
254	if test "@HAVE_LDAP@" != 0
255	@@ -207,23 +210,23 @@
256	echo @sbindir@/courierldapaliasd 700 @mailuser@ @mailgroup@
257	fi
258
259	-echo @datadir@/sqwebmail/images 755 @mailuser@ @mailgroup@
260	+echo @datadir@/sqwebmail/images 755 root wheel
261
262	for f in `cat ../webmail/images/filelist 2>/dev/null`
263	do
264	- echo @datadir@/sqwebmail/images/$f 444 @mailuser@ @mailgroup@
265	+ echo @datadir@/sqwebmail/images/$f 444 root wheel
266	done
267
268	. ../maildrop/uidgid
269
270	-echo @bindir@/maildrop 4511 $uid @mailgroup@
271	+echo @bindir@/maildrop 4511 $uid mail
272
273	sed 's:^:'@sysconfdir@/':;s/$/ 660 @mailuser@ @mailgroup@ config/' <../authlib/authconfiglist
274
275	for f in `cat ../authlib/installlist ../authlib/installlist.sh`
276	do
277	test -z "$f" && continue
278	- echo @libexecdir@/authlib/$f 755 bin bin
279	+ echo @libexecdir@/authlib/$f 555 root wheel
280	done
281
282	. ../authlib/authdaemonrc
283	@@ -240,16 +243,16 @@
284
285	. ../authlib/authpwdprogs
286
287	-echo "@authchangepwdir@ 755 @mailuser@ @mailgroup@"
288	+echo "@authchangepwdir@ 755 root wheel"
289	for f in `echo $PWPROGS dummy`
290	do
291	test "$f" = "dummy" && continue
292	- echo "@authchangepwdir@/$f 4555 root bin"
293	+ echo "@authchangepwdir@/$f 4555 root wheel"
294	done
295
296	for f in `echo $PWSCRIPTS dummy`
297	do
298	test "$f" = "dummy" && continue
299	echo "@authchangepwdir@/$f 555 @mailuser@ @mailgroup@"
300	- echo "@datadir@/$f 555 @mailuser@ @mailgroup@"
301	+ echo "@datadir@/$f 555 root wheel"
302	done

Lines 1-26 Link Here

(-)courier/files/patch-courier_submit2.C (-26 lines)
1	--- courier/submit2.C.orig Tue Jan 15 17:44:37 2002
2	+++ courier/submit2.C Mon Jan 21 15:38:40 2002
3	@@ -777,6 +777,8 @@
4	{
5	int is8bit=0, dorewrite=0, rwmode=0;
6	const char *mime=getenv("MIME");
7	+const char *q=getenv("BOFHACCEPT8BIT");
8	+const int accept8bit=(q && *q == '1' ? 1 : 0);
9	unsigned n;
10	struct stat stat_buf;
11	const char *rfcerr=NULL;
12	@@ -800,12 +802,12 @@
13	return (1);
14	}
15
16	- if (rwrfcptr->rfcviolation & RFC2045_ERR8BITHEADER)
17	+ if (!accept8bit && (rwrfcptr->rfcviolation & RFC2045_ERR8BITHEADER))
18	{
19	rfcerr= SYSCONFDIR "/rfcerr2047.txt";
20	dorewrite=1;
21	}
22	- else if (rwrfcptr->rfcviolation & RFC2045_ERR8BITCONTENT)
23	+ else if (!accept8bit && (rwrfcptr->rfcviolation & RFC2045_ERR8BITCONTENT))
24	{
25	rfcerr= SYSCONFDIR "/rfcerr2045.txt";
26	dorewrite=1;

Lines 34-39 Link Here

(-)courier/pkg-install (-14 / +14 lines)
34	done	34	done
35	}	35	}
36		36
		37	replace() {
		38	local orig repl
		39
		40	orig=$1
		41	repl=$2
		42	if [ -e ${orig} ]; then
		43	mv -f ${orig} ${orig}.OFF
		44	chmod 0 ${orig}.OFF
		45	fi
		46	if [ -e ${repl} ]; then
		47	ln -s ${repl} ${orig}
		48	fi
		49	}
		50
37	if [ x"$2" = xPRE-INSTALL ]; then	51	if [ x"$2" = xPRE-INSTALL ]; then
38	USER=courier; UID=62	52	USER=courier; UID=62
39	GROUP=courier; GID=62	53	GROUP=courier; GID=62
Lines 67-86 Link Here
67	fi	81	fi
68	fi	82	fi
69	fi	83	fi
70
71	replace() {
72	local orig repl
73
74	orig=$1
75	repl=$2
76	if [ -e ${orig} ]; then
77	mv -f ${orig} ${orig}.OFF
78	chmod 0 ${orig}.OFF
79	fi
80	if [ -e ${repl} ]; then
81	ln -s ${repl} ${orig}
82	fi
83	}
84		84
85	if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then	85	if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
86	if [ -x /sbin/sysctl ]; then	86	if [ -x /sbin/sysctl ]; then