diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 273585a902b0..85742588b14b 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -1,357 +1,391 @@
 PORTNAME=	courier
-PORTVERSION=	0.65.3
-PORTREVISION=	6
+PORTVERSION=	1.1.11
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
 MAINTAINER=	bsd@dino.sk
 COMMENT=	Courier SMTP IMAP POP3 HTTP mail server suite
 WWW=		https://www.Courier-MTA.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.GPL
 
-BROKEN=	ld: error: duplicate symbol: sqwebmail_content_charset
-DEPRECATED=	Broken for more than a year and fails to build on supported RELEASE
-EXPIRATION_DATE=	2023-06-01
-
-BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base
+BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base \
+		wget:ftp/wget
 LIB_DEPENDS=	libidn.so:dns/libidn \
-		libpcre.so:devel/pcre
+		libpcre.so:devel/pcre \
+		libgdbm.so:databases/gdbm \
+		libcourier-unicode.so:devel/courier-unicode \
+		libpcre2-8.so:devel/pcre2
 RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base \
 		${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool \
 		${LOCALBASE}/etc/mime.types:misc/mime-support \
 		p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
-		ca_root_nss>=3.*:security/ca_root_nss
-
+		ca_root_nss>=3.*:security/ca_root_nss \
+		${LOCALBASE}/bin/wget:ftp/wget
 CONFLICTS=	courier-imap-2.* couriermlm-0.* \
 		exim-4.* maildrop-1.* \
 		panda-imap-201* postfix-1.* postfix-2.* \
 		qmail-*-1.* qmail-1.* \
 		sendmail-*-8.* sendmail-8.* \
 		smail-3.* sqwebmail-3.* \
 		zmailer-2.*
 
 #
 # 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=	465
-MAILGID=	465
+MAILOWN?=	courier
+MAILGRP?=	courier
+MAILUID?=	465
+MAILGID?=	465
 ETCDIR=		${PREFIX}/etc
 SYSCONFDIR=	${ETCDIR}/courier
 LIBEXECDIR=	${PREFIX}/libexec
 LOCALSTATEDIR=	/var/spool/courier
 CACHEDIR=	/var/spool/webmail
 CALENDIR=	/var/spool/calendar
 MIMETYPES=	${LOCALBASE}/etc/mime.types
 WITH_TRANSPORT=	local esmtp dsn
 
-USES=		fam gettext gmake libtool perl5 pkgconfig tar:bzip2 ssl
+USES=		fam gettext gmake libtool perl5 pkgconfig tar:bzip2 ssl shebangfix
 USE_SUBMAKE=	yes
 USE_RC_SUBR=	courier
+SHEBANG_FILES=	courier/filters/perlfilter/perlfilter-ratelimit.pl \
+		courier/filters/perlfilter/perlfilter-wrapper.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-root-check \
-		--with-db=db \
+		--with-db=gdbm \
 		--enable-syslog=1 --enable-use-flock \
 		--program-transform-name=s,^,, \
 		--enable-utf7-folder-encoding \
 		--enable-unicode \
 		--with-mailuser=${MAILOWN} \
 		--with-mailgroup=${MAILGRP} \
 		--with-mailuid=${MAILUID} \
 		--with-mailgid=${MAILGID} \
 		--with-etcdir=${ETCDIR} \
 		--sysconfdir=${SYSCONFDIR} \
 		--datadir=${DATADIR} \
 		--libexecdir=${LIBEXECDIR} \
 		--localstatedir=${LOCALSTATEDIR} \
 		--enable-mimetypes=${MIMETYPES} \
 		--enable-imageurl=${IMAGEURL} \
 		--with-cachedir=${CACHEDIR} \
 		--with-cacheowner=${CACHEOWN} \
 		--with-calendardir=${CALENDIR} \
-		--with-certsdir=${SYSCONFDIR} \
+		--with-mydatadir=${SYSCONFDIR} \
 		--with-transport='${WITH_TRANSPORT}' \
 		--with-default-maildrop=${MAILDROPDEFAULT} \
 		--with-paranoid-smtpext \
-		--enable-workarounds-for-imap-client-bugs
+		--enable-workarounds-for-imap-client-bugs \
+		--with-notice=unicode
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 INSTALL_TARGET=	install-strip install-perms
 
 PLIST_SUB+=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" \
+		CACHEOWN="${CACHEOWN}" CACHEDIR="${CACHEDIR}" \
+		CALENDIR="${CALENDIR}" LOCALSTATEDIR="${LOCALSTATEDIR}" \
 		MAILOWN="${MAILOWN}" MAILGRP="${MAILGRP}" \
 		MAILUID="${MAILUID}" MAILGID="${MAILGID}" \
-		CACHEOWN="${CACHEOWN}" CACHEDIR="${CACHEDIR}" \
-		CALENDIR="${CALENDIR}" LOCALSTATEDIR="${LOCALSTATEDIR}"
+		SHAREOWN="${SHAREOWN}" SHAREGRP="${SHAREGRP}"
+
 SUB_LIST:=	${PLIST_SUB}
 SUB_FILES+=	pkg-message crontab sharedindexupdate
-#SUB_FILES+=	pkg-install pkg-message crontab sharedindexupdate
 
-OPTIONS_DEFINE=	LDAP PROCMAIL SENDFAX UUCP IPV6 MAILDROPFLAGS DOCS
+OPTIONS_DEFINE=	LDAP PROCMAIL SENDFAX UUCP IPV6 DOCS CERTSDIR
 OPTIONS_GROUP=	WEBMAIL
-#OPTIONS_GROUP=	SYSTEM WEBMAIL
-#OPTIONS_GROUP_SYSTEM=	RCCONF MAILCONF PERIODIC
 OPTIONS_GROUP_WEBMAIL=	GNUPG WEBMAILRSENT WEBMAILFLAGS WEBMAILXFACE
 OPTIONS_RADIO=	ALIASES SPELL
 OPTIONS_RADIO_ALIASES=	SYSTEMALIASES EMPTYALIASES
 OPTIONS_RADIO_SPELL=	ASPELL ISPELL
 OPTIONS_DEFAULT=WEBMAILRSENT SYSTEMALIASES
 
 LDAP_DESC=	LDAP-based mail aliasing support
 GNUPG_DESC=	GNU Privacy Guard support for WebMail
 ASPELL_DESC=	ASpell support for WebMail
 ISPELL_DESC=	ISpell support for WebMail
 PROCMAIL_DESC=	Procmail local delivery support
 SENDFAX_DESC=	mgetty+sendfax support
 UUCP_DESC=	UUCP support
-MAILDROPFLAGS_DESC=	maildrop set flags patch
+CERTSDIR_DESC=	separate .pem directory for certificates
 WEBMAILRSENT_DESC=	enable Autorename Sent folder
 WEBMAILFLAGS_DESC=	webmail show flags patch
 WEBMAILXFACE_DESC=	experimental webmail X-Face patch
 SYSTEMALIASES_DESC=	symlink system /etc/aliases
 EMPTYALIASES_DESC=	create empty aliases file
 RCCONF_DESC=	modify rc.conf to enable courier/disable sendmail
 MAILCONF_DESC=	modify mailer.conf to use courier instead of sendmail
 PERIODIC_DESC=	modify/create periodic.conf
 
 .include <bsd.port.options.mk>
 
 .include "${.CURDIR}/Makefile.doc"
-.include "${.CURDIR}/Makefile.own"
 
 .if ${PORT_OPTIONS:MLDAP}
 USES+=	ldap
 WITH_AUTH_LDAP=	yes
 RUN_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthldap.so:net/courier-authlib-ldap
 CONFIGURE_ARGS+=--with-ldapaliasd
 PLIST_SUB+=	WITHLDAP=""
 SUB_LIST+=	WITHLDAP=""
 .else
 CONFIGURE_ARGS+=--without-ldapaliasd
 PLIST_SUB+=	WITHLDAP="@comment "
 SUB_LIST+=	WITHLDAP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSYSTEMALIASES}
 PLIST_SUB+=	WITHSYSTEMALIASES=""
 SUB_LIST+=	WITHSYSTEMALIASES=""
 .else
 PLIST_SUB+=	WITHSYSTEMALIASES="@comment "
 SUB_LIST+=	WITHSYSTEMALIASES="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MEMPTYALIASES}
 PLIST_SUB+=	WITHEMPTYALIASES=""
 SUB_LIST+=	WITHEMPTYALIASES=""
 .else
 PLIST_SUB+=	WITHEMPTYALIASES="@comment "
 SUB_LIST+=	WITHEMPTYALIASES="@comment "
 .endif
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
 
 .if ${PORT_OPTIONS:MGNUPG}
 BUILD_DEPENDS+=	gpg:security/gnupg
 RUN_DEPENDS+=	gpg:security/gnupg
+.else
+# This is a hack! But works well (at least partially) for me...
+CONFIGURE_ENV+=	GPG="${WRKSRC}/fakegpg"
 .endif
 
 .if ${PORT_OPTIONS:MASPELL}
 BUILD_DEPENDS+=	aspell:textproc/aspell
 RUN_DEPENDS+=	aspell:textproc/aspell
 CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/aspell
 .elif ${PORT_OPTIONS:MISPELL}
 BUILD_DEPENDS+=	ispell:textproc/aspell-ispell
 RUN_DEPENDS+=	ispell:textproc/aspell-ispell
 CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/ispell
 .else
 CONFIGURE_ARGS+=--without-ispell
 .endif
 
 .if ${PORT_OPTIONS:MPROCMAIL}
 BUILD_DEPENDS+=	procmail:mail/procmail
 RUN_DEPENDS+=	procmail:mail/procmail
 .endif
 
 .if ${PORT_OPTIONS:MSENDFAX}
 USES+=		ghostscript
 SENDFAX_DEPENDS=sendfax:comms/mgetty+sendfax \
 		pnmscale:graphics/netpbm
 BUILD_DEPENDS+=	${SENDFAX_DEPENDS}
 RUN_DEPENDS+=	${SENDFAX_DEPENDS}
 WITH_TRANSPORT+=fax
 PLIST_SUB+=	WITHFAX=""
 SUB_LIST+=	WITHFAX=""
 .else
 PLIST_SUB+=	WITHFAX="@comment "
 SUB_LIST+=	WITHFAX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MUUCP}
 .if !exists(/usr/bin/uux)
 BUILD_DEPENDS+=	uux:net/freebsd-uucp
 RUN_DEPENDS+=	uux:net/freebsd-uucp
 .endif
 WITH_TRANSPORT+=uucp
 PLIST_SUB+=	WITHUUCP=""
 .else
 PLIST_SUB+=	WITHUUCP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=--with-ipv6
 .else
 CONFIGURE_ARGS+=--without-ipv6
 .endif
 
-.if ${PORT_OPTIONS:MMAILDROPFLAGS}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-maildrop__maildir.C
-.endif
-
 .if ${PORT_OPTIONS:MWEBMAILXFACE}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-webmail__msg2html.c
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libs__sqwebmail__msg2html.c
 .endif
 
 .if ${PORT_OPTIONS:MWEBMAILFLAGS}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-webmail__folder.c ${FILESDIR}/extra-patch-webmail__maildir.c
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-webmail__maildir.h ${FILESDIR}/extra-patch-webmail__images__sqwebmail.css
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libs__sqwebmail__folder.c ${FILESDIR}/extra-patch-libs__sqwebmail__maildir.c
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libs__sqwebmail__maildir.h ${FILESDIR}/extra-patch-libs__sqwebmail__images__sqwebmail.css
 .endif
 
 .if ${PORT_OPTIONS:MWEBMAILRSENT}
 CONFIGURE_ARGS+=--enable-autorenamesent
 .else
 CONFIGURE_ARGS+=--disable-autorenamesent
 .endif
 
 .if ${PORT_OPTIONS:MMAILCONF}
 SUB_LIST+=	MAILCONF="y"
 .else
 SUB_LIST+=	MAILCONF="n"
 .endif
 
 .if ${PORT_OPTIONS:MRCCONF}
 SUB_LIST+=	RCCONF="y"
 .else
 SUB_LIST+=	RCCONF="n"
 .endif
 
 .if ${PORT_OPTIONS:MPERIODIC}
 SUB_LIST+=	PERIODIC="y"
 .else
 SUB_LIST+=	PERIODIC="n"
 .endif
 
-.if ${SSL_DEFAULT} == base
-BROKEN_FreeBSD_12=	pkg-static: Unable to access file /wrkdirs/usr/ports/mail/courier/work/stage/usr/local/bin/couriertls
-BROKEN_FreeBSD_13=	pkg-static: Unable to access file /wrkdirs/usr/ports/mail/courier/work/stage/usr/local/bin/couriertls
+.if ${PORT_OPTIONS:MCERTSDIR}
+CONFIGURE_ARGS+=--with-certsdir=${SYSCONFDIR}/.pem
+PLIST_SUB+=	WITHCERTSDIR=""
+SUB_LIST+=	CERTSDIR="${SYSCONFDIR}/.pem"
+.else
+CONFIGURE_ARGS+=--with-certsdir=${SYSCONFDIR}
+PLIST_SUB+=	WITHCERTSDIR="@comment "
+SUB_LIST+=	CERTSDIR="${SYSCONFDIR}"
 .endif
 
+_CNFFILES=	esmtpd.cnf \
+		imapd.cnf \
+		pop3d.cnf
+
+_DISTEXFILES=	courierd.dist \
+		esmtpd-msa.dist \
+		esmtpd-ssl.dist \
+		esmtpd.dist \
+		faxcoverpage.tr.dist \
+		faxnotifyrc.dist \
+		faxrc.dist \
+		imapd-ssl.dist \
+		imapd.dist \
+		ldapaddressbook.dist \
+		ldapaliasrc.dist \
+		pop3d-ssl.dist \
+		pop3d.dist \
+		sqwebmaild.dist \
+		webmlmrc.dist
+
 pre-everything::
 	@${ECHO_MSG} "===> --------------------------------------------------------"
 	@${ECHO_MSG} "===>	Run 'make config' to (re)configure ${PKGNAME}"
 	@${ECHO_MSG} "===> --------------------------------------------------------"
 
 pre-patch:
-	@${CP} ${TEMPLATES}/config.guess ${TEMPLATES}/config.sub ${WRKSRC}
+	${CP} ${TEMPLATES}/config.guess ${TEMPLATES}/config.sub ${WRKSRC}
 
 post-patch:
-	@${REINPLACE_CMD} -i '' -e 's|#! perl|#!${PERL}|g' \
+	${REINPLACE_CMD} -i '' -e 's|#! perl|#!${PERL}|g' \
 		${WRKSRC}/webadmin/*.pl \
 		${WRKSRC}/webadmin/*.pl.in \
 		${WRKSRC}/courier/webadmin/*.pl \
 		${WRKSRC}/courier/webadmin/*.pl.in
-	@${REINPLACE_CMD} -e 's|^PROG=\./|PROG=exec ./|g' \
+	${REINPLACE_CMD} -e 's|^PROG=\./|PROG=exec ./|g' \
 		${WRKSRC}/courier/module.*/courier.config
-	@${REINPLACE_CMD} -e 's|@mydatadir@|@sysconfdir@|g' \
-		${WRKSRC}/*/mk*cert.* \
+	${REINPLACE_CMD} -e 's|@mydatadir@|@sysconfdir@|g' \
 		${WRKSRC}/*/*/mk*cert.*
-	@${REINPLACE_CMD} -e 's|^\(TLS_CERTFILE=\)@mydatadir@|\1@sysconfdir@|g' \
+	${REINPLACE_CMD} -e 's|^\(TLS_CERTFILE=\)@mydatadir@|\1@sysconfdir@|g' \
+		${WRKSRC}/*/*.dist.in \
+		${WRKSRC}/*/*/*.dist.in
+	${REINPLACE_CMD} -e 's|^\(TLS_DHPARAMS=\)@mydatadir@|\1@sysconfdir@|g' \
 		${WRKSRC}/*/*.dist.in \
 		${WRKSRC}/*/*/*.dist.in
-	@${REINPLACE_CMD} -e 's|^\(RANDFILE[[:space:]]*=[[:space:]]*\)@mydatadir@|\1@sysconfdir@|g' \
-		${WRKSRC}/*/*.cnf.openssl.in \
+	${REINPLACE_CMD} -e 's|^\(RANDFILE[[:space:]]*=[[:space:]]*\)@mydatadir@|\1@sysconfdir@|g' \
 		${WRKSRC}/*/*/*.cnf.openssl.in
-	@${REINPLACE_CMD} -e 's|$$(INSTALL_DATA) \(.$$$$file.\)|${INSTALL_MAN} \1|' \
+	${REINPLACE_CMD} -e 's|$$(INSTALL_DATA) \(.$$$$file.\)|${INSTALL_MAN} \1|' \
 		${WRKSRC}/Makefile.in \
 		${WRKSRC}/*/Makefile.in \
 		${WRKSRC}/*/*/Makefile.in \
 		${WRKSRC}/*/*/*/Makefile.in
-	@${REINPLACE_CMD} -e 's|^\(INSTALL_STRIP_PROGRAM=\).*$$|\1"${INSTALL_PROGRAM} -s"|' \
+	${REINPLACE_CMD} -e 's|^\(INSTALL_STRIP_PROGRAM=\).*$$|\1"${INSTALL_PROGRAM} -s"|' \
 			-e 's|; ldapaliasd="yes"||' \
 		${WRKSRC}/configure \
 		${WRKSRC}/*/configure \
 		${WRKSRC}/*/*/configure \
 		${WRKSRC}/*/*/*/configure
-	@${REINPLACE_CMD} -E -e 's/(root|bin)[[:space:]]*bin/root	wheel/g' \
+	${REINPLACE_CMD} -E -e 's/(root|bin)[[:space:]]*bin/root	wheel/g' \
 		${WRKSRC}/courier/perms.sh.in
-	@${REINPLACE_CMD} '/^courieresmtp_LDADD =/s/$$/ -lcourierauth/' \
+	${REINPLACE_CMD} '/^courieresmtp_LDADD =/s/$$/ -lcourierauth/' \
 		${WRKSRC}/courier/module.esmtp/Makefile.in
 # Avoid conflict with C++20 <version> by adding .txt suffix
-	@${REINPLACE_CMD} -i .c++20 's/>version$$/&.txt/' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name configure -exec ${REINPLACE_CMD} \
+	${REINPLACE_CMD} -i .c++20 's/>version$$/&.txt/' ${WRKSRC}/configure
+	${FIND} ${WRKSRC} -name configure -exec ${REINPLACE_CMD} \
 		-i .c++20 '/^version.*cat/s,/version,&.txt,' {} +
 
+pre-configure:
+# This is a hack! But works well (at least partially) for me...
+	touch ${WRKSRC}/fakegpg
+	chmod +x ${WRKSRC}/fakegpg
+
 post-build:
-	@${PERL} -pi -e 's|^(auth)\s+(required).*|$$1\t\t$$2\tpam_unix.so\ttry_first_pass|g;' \
-		     -e 's|^(account)\s+(required).*|$$1 \t$$2\tpam_unix.so|g;' \
-		     -e 's|^(session)\s+(required).*|$$1 \t$$2\tpam_permit.so|g;' \
+	${PERL} -pi -e 's|^(auth)\s+(required).*|$$1\t\t$$2\tpam_unix.so\ttry_first_pass|g;' \
+		    -e 's|^(account)\s+(required).*|$$1 \t$$2\tpam_unix.so|g;' \
+		    -e 's|^(session)\s+(required).*|$$1 \t$$2\tpam_permit.so|g;' \
 		${WRKSRC}/*/*.authpam* \
 		${WRKSRC}/*/*/*.authpam*
-	@${LN} -f ${WRKSRC}/gpglib/README.html		${WRKSRC}/gpglib/README.gpglib.html
-	@${LN} -f ${WRKSRC}/imap/BUGS			${WRKSRC}/imap/BUGS.imap
-	@${LN} -f ${WRKSRC}/imap/BUGS.html		${WRKSRC}/imap/BUGS.imap.html
-	@${LN} -f ${WRKSRC}/imap/README			${WRKSRC}/imap/README.imap
-	@${LN} -f ${WRKSRC}/imap/README.html		${WRKSRC}/imap/README.imap.html
-	@${LN} -f ${WRKSRC}/maildrop/README.html	${WRKSRC}/maildrop/README.maildrop.html
-	@${LN} -f ${WRKSRC}/pcp/README.html		${WRKSRC}/pcp/README.pcp.html
-	@${LN} -f ${WRKSRC}/webmail/BUGS		${WRKSRC}/webmail/BUGS.webmail
-	@${LN} -f ${WRKSRC}/webmail/BUGS.html		${WRKSRC}/webmail/BUGS.webmail.html
-	@${LN} -f ${WRKSRC}/webmail/SECURITY		${WRKSRC}/webmail/SECURITY.webmail
-	@${LN} -f ${WRKSRC}/webmail/SECURITY.html	${WRKSRC}/webmail/SECURITY.webmail.html
+	${INSTALL} -lrs ${WRKSRC}/libs/gpglib/README.html	${WRKSRC}/libs/gpglib/README.gpglib.html
+	${INSTALL} -lrs ${WRKSRC}/libs/imap/BUGS		${WRKSRC}/libs/imap/BUGS.imap
+	${INSTALL} -lrs ${WRKSRC}/libs/imap/BUGS.html		${WRKSRC}/libs/imap/BUGS.imap.html
+	${INSTALL} -lrs ${WRKSRC}/libs/maildrop/README.html	${WRKSRC}/libs/maildrop/README.maildrop.html
+	${INSTALL} -lrs ${WRKSRC}/libs/pcp/README.html		${WRKSRC}/libs/pcp/README.pcp.html
+	${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/BUGS		${WRKSRC}/libs/sqwebmail/BUGS.sqwebmail
+	${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/BUGS.html	${WRKSRC}/libs/sqwebmail/BUGS.sqwebmail.html
+	${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/SECURITY	${WRKSRC}/libs/sqwebmail/SECURITY.sqwebmail
+	${INSTALL} -lrs ${WRKSRC}/libs/sqwebmail/SECURITY.html	${WRKSRC}/libs/sqwebmail/SECURITY.sqwebmail.html
 
 post-install:
-	@${LN} -f ${STAGEDIR}${SYSCONFDIR}/maildrop ${STAGEDIR}${SYSCONFDIR}/maildropfilter
-	@${INSTALL_DATA} /dev/null ${STAGEDIR}${SYSCONFDIR}/locallowercase
-	@${INSTALL_DATA} ${WRKDIR}/crontab ${STAGEDIR}${SYSCONFDIR}/
-	@${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate ${STAGEDIR}${DATADIR}/
-.for file in ${OWNER0}
-	@-${CHOWN} -Rh ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX}/${file}
+.for _cfgfile in ${_CNFFILES}
+	-${MV} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile:S/.cnf/.cnf.sample/g}
 .endfor
+.for _cfgfile in ${_DISTEXFILES}
+	-${MV} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile} ${STAGEDIR}${SYSCONFDIR}/${_cfgfile:S/.dist/.sample/g}
+.endfor
+	${INSTALL} -lrs ${STAGEDIR}${SYSCONFDIR}/maildrop ${STAGEDIR}${SYSCONFDIR}/maildropfilter
+	${INSTALL_DATA} /dev/null ${STAGEDIR}${SYSCONFDIR}/locallowercase
+	${INSTALL_DATA} ${WRKDIR}/crontab ${STAGEDIR}${SYSCONFDIR}/
+	${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate ${STAGEDIR}${DATADIR}/
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 .for f in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for f in ${HTMLDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/html
 .endfor
-	@${INSTALL_DATA} ${STAGEDIR}${DATADIR}/htmldoc/* ${STAGEDIR}${DOCSDIR}/html
+	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/htmldoc/* ${STAGEDIR}${DOCSDIR}/html
+.endif
+.if ${PORT_OPTIONS:MCERTSDIR}
+	${MKDIR} ${STAGEDIR}${SYSCONFDIR}/.pem
 .endif
-	@${RM} -r ${STAGEDIR}${DATADIR}/htmldoc
-	@-${CHOWN} -Rh ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}
-	@${CHMOD} -R a+r ${STAGEDIR}${DATADIR}/courierwebadmin
-	@${CHMOD} -R a-w ${STAGEDIR}${DATADIR} ${STAGEDIR}${LIBEXECDIR}/courier
-	@${CHMOD} 550 ${STAGEDIR}${LIBEXECDIR}/courier/modules/esmtp/courieresmtp*
+	${RM} -r ${STAGEDIR}${DATADIR}/htmldoc
+	${CHMOD} -R a+r ${STAGEDIR}${DATADIR}/courierwebadmin
+	${CHMOD} -R a-w ${STAGEDIR}${DATADIR} ${STAGEDIR}${LIBEXECDIR}/courier
+	${CHMOD} 550 ${STAGEDIR}${LIBEXECDIR}/courier/modules/esmtp/courieresmtp*
 
 .include <bsd.port.mk>
diff --git a/mail/courier/Makefile.doc b/mail/courier/Makefile.doc
index a0e0cfcc166e..d93cdb4798c9 100644
--- a/mail/courier/Makefile.doc
+++ b/mail/courier/Makefile.doc
@@ -1,31 +1,29 @@
 DOCS=	AUTHORS \
 	BENCHMARKS \
 	COPYING \
 	COPYING.GPL \
 	ChangeLog \
 	ChangeLog.2001 \
 	INSTALL \
 	NEWS \
 	README \
 	TODO \
-	imap/BUGS.imap \
-	imap/README.imap \
-	imap/README.proxy \
-	maildir/README.maildirquota.txt \
-	maildir/README.sharedfolders.txt \
-	tcpd/README.couriertls \
-	webmail/BUGS.webmail \
-	webmail/SECURITY.webmail
+	libs/imap/BUGS.imap \
+	libs/imap/README.imap.proxy \
+	libs/maildir/README.maildirquota.txt \
+	libs/maildir/README.sharedfolders.txt \
+	libs/tcpd/README.couriertls \
+	libs/sqwebmail/BUGS.webmail \
+	libs/sqwebmail/SECURITY.webmail
 
 HTMLDOCS=NEWS.html \
-	gpglib/README.gpglib.html \
-	imap/BUGS.imap.html \
-	imap/README.imap.html \
-	imap/README.proxy.html \
-	maildir/README.maildirfilter.html \
-	maildir/README.maildirquota.html \
-	maildir/README.sharedfolders.html \
-	maildrop/README.maildrop.html \
-	pcp/README.pcp.html \
-	webmail/BUGS.webmail.html \
-	webmail/SECURITY.webmail.html
+	libs/gpglib/README.gpglib.html \
+	libs/imap/BUGS.imap.html \
+	libs/imap/README.imap.proxy.html \
+	libs/maildir/README.maildirfilter.html \
+	libs/maildir/README.maildirquota.html \
+	libs/maildir/README.sharedfolders.html \
+	libs/maildrop/README.maildrop.html \
+	libs/pcp/README.pcp.html \
+	libs/sqwebmail/BUGS.webmail.html \
+	libs/sqwebmail/SECURITY.webmail.html
diff --git a/mail/courier/Makefile.own b/mail/courier/Makefile.own
deleted file mode 100644
index 3d1b346df0ba..000000000000
--- a/mail/courier/Makefile.own
+++ /dev/null
@@ -1,67 +0,0 @@
-OWNER0=	bin/courier-config \
-	bin/couriermlm \
-	bin/couriertls \
-	bin/deliverquota \
-	bin/dotforward \
-	bin/imapd \
-	bin/lockmail \
-	bin/mailbot \
-	bin/maildirmake \
-	bin/maildiracl \
-	bin/maildirkw \
-	bin/makemime \
-	bin/mimegpg \
-	bin/preline \
-	bin/reformail \
-	bin/reformime \
-	bin/sendmail \
-	bin/testmxlookup \
-	bin/webmlmd \
-	bin/webmlmd.rc \
-	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 \
-	etc/courier/webmlmrc.dist \
-	libexec/courier/courierpop3d \
-	libexec/courier/courierpop3login \
-	libexec/courier/imaplogin \
-	libexec/courier/makedatprog \
-	libexec/courier/modules \
-	libexec/courier/pcpd \
-	libexec/courier/sqwebmaild \
-	libexec/courier/webmail/webadmin \
-	libexec/courier/webmail/webmail \
-	libexec/courier/webmail/webmlm \
-	libexec/filters/dupfilter \
-	libexec/filters/perlfilter \
-	sbin/courier \
-	sbin/couriertcpd \
-	sbin/showconfig \
-	sbin/webmaild
-
-.if defined(WITH_LDAP) && !defined(WITHOUT_LDAP)
-OWNER0+=sbin/courierldapaliasd
-.endif
diff --git a/mail/courier/distinfo b/mail/courier/distinfo
index 0d76693c1c49..af6d59963b10 100644
--- a/mail/courier/distinfo
+++ b/mail/courier/distinfo
@@ -1,2 +1,3 @@
-SHA256 (courier-0.65.3.tar.bz2) = a743ba01137230165b00d726cf0faef3998d43edc0bfb00d8358eeefd96c7d60
-SIZE (courier-0.65.3.tar.bz2) = 7152828
+TIMESTAMP = 1686226592
+SHA256 (courier-1.1.11.tar.bz2) = 4fe3b73e7da159351ab973b52044996aa0006076f2effdcc4c004be087c5f777
+SIZE (courier-1.1.11.tar.bz2) = 7895772
diff --git a/mail/courier/files/courier.in b/mail/courier/files/courier.in
index 2dcecaa786e6..45a3e5a54bf5 100644
--- a/mail/courier/files/courier.in
+++ b/mail/courier/files/courier.in
@@ -1,327 +1,341 @@
 #!/bin/sh
 #
 # Adapted for FreeBSD from courier.sysvinit
 #
 # NOTE: The 'restart' here does a "hard" stop, and a start.  Be gentle, use
 # "courierd restart" for a kindler, gentler, restart.
 #
 # PROVIDE: mail
 # REQUIRE: LOGIN courier_authdaemond
 # BEFORE:  securelevel
 # KEYWORD: shutdown
 
 prefix="%%PREFIX%%"
 exec_prefix="${prefix}"
 sysconfdir="${prefix}/etc/courier"
+certsdir="%%CERTSDIR%%"
 sbindir="${exec_prefix}/sbin"
 bindir="${exec_prefix}/bin"
 libexecdir="${prefix}/libexec"
 datadir="${prefix}/share/courier"
 
 # Define these courier_* variables in one of these files:
 #	/etc/rc.conf
 #	/etc/rc.conf.local
 #	/etc/rc.conf.d/courier
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
 courier_enable=${courier_enable:-"NO"}	# Run Courier-MTA (YES/NO).
 
 . /etc/rc.subr
 
 name="courier"
 rcvar=courier_enable
 
 start_precmd="${name}_prestart"
 start_cmd="${name}_start"
 stop_cmd="${name}_stop"
 extra_commands="restart"
 
 courier_prestart()
 {	# Ensure runtime directories exist with correct permissions
 	/usr/bin/install -o %%BINOWN%% -g %%BINGRP%% -m 0755 -d %%LOCALSTATEDIR%%
 	/usr/bin/install -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 -d %%LOCALSTATEDIR%%/allfilters
 	/usr/bin/install -o %%MAILOWN%% -g %%MAILGRP%% -m 0700 -d %%LOCALSTATEDIR%%/faxtmp
 	/usr/bin/install -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 -d %%LOCALSTATEDIR%%/filters
 	/usr/bin/install -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 -d %%LOCALSTATEDIR%%/msgq
 	/usr/bin/install -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 -d %%LOCALSTATEDIR%%/msgs
 	/usr/bin/install -o %%MAILOWN%% -g %%MAILGRP%% -m 0770 -d %%LOCALSTATEDIR%%/tmp
 	/usr/bin/install -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 -d %%LOCALSTATEDIR%%/track
 	/usr/bin/install -o %%MAILOWN%% -g %%MAILGRP%% -m 0400 -c /dev/null %%LOCALSTATEDIR%%/.noident
 
 	/usr/bin/install -o %%BINOWN%% -g %%BINGRP%% -m 0755 -d %%CALENDIR%%
 	/usr/bin/install -o %%CACHEOWN%% -g %%MAILGRP%% -m 0700 -d %%CALENDIR%%/localcache
 	/usr/bin/install -o %%CACHEOWN%% -g %%MAILGRP%% -m 0750 -d %%CALENDIR%%/private
 	/usr/bin/install -o %%CACHEOWN%% -g %%MAILGRP%% -m 0755 -d %%CALENDIR%%/public
 
 	/usr/bin/install -o %%CACHEOWN%% -g mail -m 0700 -d %%CACHEDIR%%
 }
 
 courier_start()
 {	# First time after install create aliases.dat and makesmtpaccess.dat
 	echo -n "Starting"
 
 	if [ -f ${sysconfdir}/crontab ]; then
 		/usr/bin/crontab -u %%CACHEOWN%% ${sysconfdir}/crontab
 	fi
 
 	if [ ! -f ${sysconfdir}/aliases.dat \
 	  -a -x ${sbindir}/makealiases ]; then
 		${sbindir}/makealiases
 	fi
 
 	esmtpdcert=0
 
 	ESMTPDSTART=""
 	if [ -f ${sysconfdir}/esmtpd ]; then
 		. ${sysconfdir}/esmtpd
 		case "$ESMTPDSTART" in
 		[Yy]*)
 			esmtpdcert=1
 			;;
 		esac
 		if [ ! -f ${sysconfdir}/esmtpacceptmailfor.dat \
 		  -a -x ${sbindir}/makeacceptmailfor ]; then
 			${sbindir}/makeacceptmailfor
 		fi
 		if [ ! -f ${sysconfdir}/${ACCESSFILE}.dat \
 		  -a -x ${sbindir}/makesmtpaccess ]; then
 			${sbindir}/makesmtpaccess
 		fi
 	fi
 
 	ESMTPDSTART=""
 	if [ -f ${sysconfdir}/esmtpd-msa ]; then
 		. ${sysconfdir}/esmtpd-msa
 		case "$ESMTPDSTART" in
 		[Yy]*)
 			esmtpdcert=1
 			;;
 		esac
 		if [ ! -f ${sysconfdir}/${ACCESSFILE}.dat \
 		  -a -x ${sbindir}/makesmtpaccess-msa ]; then
 			${sbindir}/makesmtpaccess-msa
 		fi
 	fi
 
 	if [ -x ${sbindir}/courierfilter ]; then
 		echo -n " courierfilter"
 		${sbindir}/courierfilter start
 	fi
 
 	if [ -x ${sbindir}/courierldapaliasd ]; then
 		echo -n " courierldapaliasd"
 		${sbindir}/courierldapaliasd start
 	fi
 
 	if [ -x ${libexecdir}/courier/sqwebmaild \
 	  -a -x ${sbindir}/webmaild ]; then
 		echo -n " webmail"
 		${sbindir}/webmaild start
 	fi
 
 	if [ -x ${sbindir}/courier ]; then
 		echo -n " courierd"
 		${sbindir}/courier start
 	fi
 
 	if [ "$esmtpdcert" = 1 ]; then
 		# If we do not have a certificate, make one up.
-		if [ ! -f ${sysconfdir}/esmtpd.pem \
+		if [ ! -f ${certsdir}/esmtpd.pem \
 		  -a -x "$COURIERTLS" \
 		  -a -x ${sbindir}/mkesmtpdcert ]; then
 			echo -n " generating-ESMTP-SSL-certificate..."
 			${sbindir}/mkesmtpdcert >/dev/null 2>&1
 		fi
 	fi
 
 	ESMTPDSTART=""
 	if [ -f ${sysconfdir}/esmtpd ]; then
 		. ${sysconfdir}/esmtpd
 		case "$ESMTPDSTART" in
 		[Yy]*)
 			if [ -x ${sbindir}/esmtpd ]; then
 				echo -n " esmtpd"
 				${sbindir}/esmtpd start
 			fi
 			;;
 		esac
 	fi
 
 	ESMTPDSTART=""
 	if [ -f ${sysconfdir}/esmtpd-msa ]; then
 		. ${sysconfdir}/esmtpd-msa
 		case "$ESMTPDSTART" in
 		[Yy]*)
 			if [ -x ${sbindir}/esmtpd-msa ]; then
 				echo -n " esmtpd-msa"
 				${sbindir}/esmtpd-msa start
 			fi
 			;;
 		esac
 	fi
 
 	ESMTPDSSLSTART=""
 	if [ -f ${sysconfdir}/esmtpd-ssl ]; then
 		. ${sysconfdir}/esmtpd-ssl
 		case "$ESMTPDSSLSTART" in
 		[Yy]*)
 			if [ -x "$COURIERTLS" \
 			  -a -x ${sbindir}/esmtpd-ssl ]; then
 				echo -n " esmtpd-ssl"
 				${sbindir}/esmtpd-ssl start
 			fi
 			;;
 		esac
 	fi
 
 	IMAPDSTART=""
 	if [ -f ${sysconfdir}/imapd ]; then
 		. ${sysconfdir}/imapd
 		case "$IMAPDSTART" in
 		[Yy]*)
 			if [ -x ${sbindir}/imapd ]; then
 				echo -n " imapd"
 				${sbindir}/imapd start
 			fi
 			;;
 		esac
 	fi
 
 	IMAPDSSLSTART=""
 	if [ -f ${sysconfdir}/imapd-ssl ]; then
 		. ${sysconfdir}/imapd-ssl
 		case "$IMAPDSSLSTART" in
 		[Yy]*)	# If we do not have a certificate, make one up.
 			if [ -x "$COURIERTLS" ]; then
-				if [ ! -f ${sysconfdir}/imapd.pem \
+				if [ ! -f ${certsdir}/imapd.pem \
 				  -a -x ${sbindir}/mkimapdcert ]; then
 					echo -n " generating-IMAP-SSL-certificate..."
 					${sbindir}/mkimapdcert >/dev/null 2>&1
+					# double usage - DH params need to exist
+					esmtpdcert=1
 				fi
 				if [ -x ${sbindir}/imapd-ssl ]; then
 					echo -n " imapd-ssl"
 					${sbindir}/imapd-ssl start
 				fi
 			fi
 			;;
 		esac
 	fi
 
 	POP3DSTART=""
 	if [ -f ${sysconfdir}/pop3d ]; then 
 		. ${sysconfdir}/pop3d
 		case "$POP3DSTART" in
 		[Yy]*)
 			if [ -x ${sbindir}/pop3d ]; then
 				echo -n " pop3d"
 				${sbindir}/pop3d start
 			fi
 			;;
 		esac
 	fi
 
 	POP3DSSLSTART=""
 	if [ -f ${sysconfdir}/pop3d-ssl ]; then
 		. ${sysconfdir}/pop3d-ssl
 		case "$POP3DSSLSTART" in
 		[Yy]*)	# If we do not have a certificate, make one up.
 			if [ -x "$COURIERTLS" ]; then
-				if [ ! -f ${sysconfdir}/pop3d.pem \
+				if [ ! -f ${certsdir}/pop3d.pem \
 				  -a -x ${sbindir}/mkpop3dcert ]; then 
 					echo -n " generating-POP3-SSL-certificate..."
 					${sbindir}/mkpop3dcert >/dev/null 2>&1
+					# double usage - DH params need to exist
+					esmtpdcert=1
 				fi
 				if [ -x ${sbindir}/pop3d-ssl ]; then
 					echo -n " pop3d-ssl"
 					${sbindir}/pop3d-ssl start
 				fi
 			fi
 			;;
 		esac
 	fi
 
+	if [ "$esmtpdcert" = 1 ]; then
+		# If we do not have DH params, make them up.
+		if [ ! -f ${certsdir}/dhparams.pem \
+		  -a -x ${sbindir}/mkdhparams ]; then
+			echo -n " generating-DH-params..."
+			${sbindir}/mkdhparams >/dev/null 2>&1
+		fi
+	fi
+
 	LISTS=""
 	if [ -f ${sysconfdir}/webmlmrc ]; then 
 		. ${sysconfdir}/webmlmrc
 		if [ -n "$LISTS" \
 		  -a -x ${bindir}/webmlmd \
 		  -a -x ${bindir}/webmlmd.rc ]; then
 			echo -n " webmlmd"
 			${bindir}/webmlmd.rc start ${sysconfdir}/webmlmrc
 		fi
 	fi
 	echo "."
 }
 
 courier_stop()
 {	# kill courier services in the reverse order of starting them
 	echo -n "Stopping"
 
 	if [ -x ${bindir}/webmlmd \
 	  -a -x ${bindir}/webmlmd.rc ]; then
 		echo -n " webmlmd"
 		${bindir}/webmlmd.rc stop ${sysconfdir}/webmlmrc
 	fi
 
 	if [ -x ${sbindir}/pop3d-ssl ]; then
 		echo -n " pop3d-ssl"
 		${sbindir}/pop3d-ssl stop
 	fi
 
 	if [ -x ${sbindir}/pop3d ]; then
 		echo -n " pop3d"
 		${sbindir}/pop3d stop
 	fi
 
 	if [ -x ${sbindir}/imapd-ssl ]; then
 		echo -n " imapd-ssl"
 		${sbindir}/imapd-ssl stop
 	fi
 
 	if [ -x ${sbindir}/imapd ]; then
 		echo -n " imapd"
 		${sbindir}/imapd stop
 	fi
 
 	if [ -x ${sbindir}/esmtpd-ssl ]; then
 		echo -n " esmtpd-ssl"
 		${sbindir}/esmtpd-ssl stop
 	fi
 
 	if [ -x ${sbindir}/esmtpd-msa ]; then
 		echo -n " esmtpd-msa"
 		${sbindir}/esmtpd-msa stop
 	fi
 
 	if [ -x ${sbindir}/esmtpd ]; then
 		echo -n " esmtpd"
 		${sbindir}/esmtpd stop
 	fi
 
 	if [ -x ${sbindir}/courier ]; then
 		echo -n " courierd"
 		${sbindir}/courier stop
 	fi
 
 	if [ -x ${sbindir}/webmaild ]; then
 		echo -n " webmail"
 		${sbindir}/webmaild stop
 	fi
 
 	if [ -x ${sbindir}/courierldapaliasd ]; then
 		echo -n " courierldapaliasd"
 		${sbindir}/courierldapaliasd stop
 	fi
 
 	if [ -x ${sbindir}/courierfilter ]; then
 		echo -n " courierfilter"
 		${sbindir}/courierfilter stop
 	fi
 
 	echo y | /usr/bin/crontab -u %%CACHEOWN%% -r || true
 	echo "."
 }
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/mail/courier/files/extra-patch-maildrop__maildir.C b/mail/courier/files/extra-patch-maildrop__maildir.C
deleted file mode 100644
index ba1d64c18051..000000000000
--- a/mail/courier/files/extra-patch-maildrop__maildir.C
+++ /dev/null
@@ -1,33 +0,0 @@
---- maildrop/maildir.C.orig	Thu Jan 15 04:12:13 2004
-+++ maildrop/maildir.C	Thu Jul  5 00:09:38 2007
-@@ -137,7 +137,6 @@
- 			tmpname=createInfo.tmpname;
- 			newname=createInfo.newname;
- 			tmpname += '\0';
--			newname += '\0';
- 			maildir_tmpcreate_free(&createInfo);
- 
- 			file.fd(f);
-@@ -181,6 +180,22 @@
- {
- 	if (is_open)
- 	{
-+		Buffer b;
-+
-+		b="MFLAGS";
-+
-+		const char *f=GetVarStr(b);
-+
-+		if (f && strlen(f) > 0)
-+		{
-+			newname += ':';
-+			newname += '2';
-+			newname += ',';
-+			newname += f;
-+		}
-+
-+		newname += '\0';
-+
- 		Buffer keywords;
- 
- 		keywords="KEYWORDS";
diff --git a/mail/courier/files/extra-patch-webmail__folder.c b/mail/courier/files/extra-patch-webmail__folder.c
index d1a6139cbcd3..d62fbc5703e3 100644
--- a/mail/courier/files/extra-patch-webmail__folder.c
+++ b/mail/courier/files/extra-patch-webmail__folder.c
@@ -1,102 +1,102 @@
---- webmail/folder.c.orig	2008-07-20 19:00:33.000000000 +0200
-+++ webmail/folder.c	2009-06-04 08:32:54.000000000 +0200
-@@ -247,6 +247,18 @@
- 	return (maildir_msgmovefile(folder, file, cgi("moveto"), pos));
+--- libs/sqwebmail/folder.c.orig	2008-07-20 19:00:33.000000000 +0200
++++ libs/sqwebmail/folder.c	2009-06-04 08:32:54.000000000 +0200
+@@ -331,6 +331,18 @@
+ 	return rc ? "quota":"";
  }
  
 +static int groupmark(const char *folder, const char *file, size_t pos)
 +{
 +	maildir_msgmarkfile(folder, file, pos);
 +	return (0);
 +}
 +
 +static int groupunmark(const char *folder, const char *file, size_t pos)
 +{
 +	maildir_msgunmarkfile(folder, file, pos);
 +	return (0);
 +}
 +
  void folder_delmsgs(const char *dir, size_t pos)
  {
- 	int	rc=0;
-@@ -317,6 +329,16 @@
- 		rc=group_movedel( dir, &groupmove );
- 		maildir_savefoldermsgs(dir);
+ 	const char *status=do_folder_delmsgs(dir, pos);
+@@ -392,6 +404,16 @@
+ 		}
+ 		fclose(fp);
  	}
 +	else if (*cgi("cmdmark"))
 +	{
 +		rc=group_movedel( dir, &groupmark );
 +		maildir_savefoldermsgs(dir);
 +	} 
 +	else if (*cgi("cmdunmark"))
 +	{
 +		rc=group_movedel( dir, &groupunmark );
 +		maildir_savefoldermsgs(dir);
 +	} 
  
- 	maildir_cleanup();
- 
-@@ -441,7 +463,7 @@
- 
- 	folder_navigate(dir, pos, highend, morebefore, moreafter);
+ 	fprintf(ofp, "%s\n%s\n", maildir, path);
+ 	fclose(ofp);
+@@ -510,7 +532,7 @@
+ 	folder_navigate(dir, pos, highend, morebefore, moreafter,
+ 			last_message_searched_ptr);
  
 -	printf("<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\"><tr class=\"folder-index-header\"><th align=\"center\">%s</th><th>&nbsp;</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n",
 +	printf("<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\"><tr class=\"folder-index-header\"><th align=\"center\">%s</th><th>&nbsp;</th><th>&nbsp;</th><th>&nbsp;</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n",
  		getarg("NUM"),
  		getarg("DATE"),
  		(strncmp(dir, INBOX "." SENT, sizeof(INBOX)+sizeof(SENT)-1) &&
-@@ -486,12 +508,13 @@
- 		if ((q=strrchr(p, '/')) != 0)
- 			p=q+1;
- 
--		printf("<tr class=\"folder-index-bg-%d\" id=\"row%d\"><td align=\"right\" class=\"message-number\">%s%ld.%s</td><td class=\"message-status\"><input type=\"checkbox\" name=\"MOVE-%ld\" id=\"MOVE-%ld",
-+		printf("<tr class=\"folder-index-bg-%d\" id=\"row%d\"><td align=\"right\" class=\"message-number\">%s%ld.%s</td><td class=\"message-flag\">%s</td><td class=\"message-select\"><input type=\"checkbox\" name=\"MOVE-%ld\" id=\"MOVE-%ld",
- 		       (i & 1)+1,
- 		       i,
- 		       folder_index_entry_start,
- 		       (long)(i+pos+1),
- 		       folder_index_entry_end,
-+		       maildirfile_flag(MSGINFO_FILENAME(contents[i])) ? "<font color=\"red\">!</font>" : "",
- 		       (long) (pos+i),
- 		       (long) (pos+i));
- 		printf("\" onchange=\"setsel('MOVE-%ld', 'row%d', 'folder-index-bg-%d');\"%s /><input type=\"hidden\" name=\"MOVEFILE-%ld\" value=\"",
-@@ -499,7 +522,7 @@
- 			(type[0] == MSGTYPE_DELETED ? " disabled=\"disabled\"":""),
- 			(long)(pos+i));
- 		output_attrencoded(p);
--		printf("\" />&nbsp;%s%s%s</td><td class=\"message-date\">%s",
-+		printf("\" /></td><td class=\"message-status\">%s%s%s</td><td class=\"message-date\">%s",
- 		       folder_index_entry_start,
- 		       type,
- 		       folder_index_entry_end,
-@@ -545,9 +568,9 @@
+@@ -531,9 +553,9 @@
  
  	if (found)
  	{
 -		puts("<tr class=\"folder-index-bg-1\"><td colspan=\"6\"><hr /></td></tr>");
 -		puts("<tr class=\"folder-index-bg-2\"><td>&nbsp;</td>");
 -		puts("<td colspan=\"5\">");
 +		puts("<tr class=\"folder-index-bg-3\"><td colspan=\"8\"><hr /></td></tr>");
 +		puts("<tr class=\"folder-index-bg-4\"><td>&nbsp;</td>");
 +		puts("<td colspan=\"7\">");
  
  		puts("<script type=\"text/javascript\">");
  		puts("/* <![CDATA[ */");
-@@ -578,7 +601,7 @@
+@@ -565,7 +587,7 @@
  	}
  	if (!found && nomsg)
  	{
 -		puts("<tr class=\"folder-index-bg-1\"><td colspan=\"6\" align=\"left\"><p>");
 +		puts("<tr class=\"folder-index-bg-1\"><td colspan=\"8\" align=\"left\"><p>");
  		puts(nomsg);
  		puts("<br /></p></td></tr>");
  		printf("</table>\n");
-@@ -3364,7 +3387,7 @@
+@@ -630,12 +652,13 @@
+ 	if ((q=strrchr(p, '/')) != 0)
+ 		p=q+1;
+ 
+-	printf("<tr class=\"folder-index-bg-%d\" id=\"row%d\"><td align=\"right\" class=\"message-number\">%s%ld.%s</td><td class=\"message-status\"><input type=\"checkbox\" name=\"MOVE-%ld\" id=\"MOVE-%ld",
++	printf("<tr class=\"folder-index-bg-%d\" id=\"row%d\"><td align=\"right\" class=\"message-number\">%s%ld.%s</td><td class=\"message-flag\">%s</td><td class=\"message-select\"><input type=\"checkbox\" name=\"MOVE-%ld\" id=\"MOVE-%ld",
+ 	       (row & 1)+1,
+ 	       row,
+ 	       folder_index_entry_start,
+ 	       (long)(msgnum+1),
+ 	       folder_index_entry_end,
++	       maildirfile_flag(MSGINFO_FILENAME(contents[i])) ? "<font color=\"red\">!</font>" : "",
+ 	       (long) (msgnum),
+ 	       (long) (msgnum));
+ 	printf("\" onchange=\"setsel('MOVE-%ld', 'row%d', 'folder-index-bg-%d');\"%s /><input type=\"hidden\" name=\"MOVEFILE-%ld\" value=\"",
+@@ -643,7 +666,7 @@
+ 	       (type[0] == MSGTYPE_DELETED ? " disabled=\"disabled\"":""),
+ 	       (long)(msgnum));
+ 	output_attrencoded(p);
+-	printf("\" />&nbsp;%s%s%s</td><td class=\"message-date\">%s",
++	printf("\" /></td><td class=\"message-status\">%s%s%s</td><td class=\"message-date\">%s",
+ 	       folder_index_entry_start,
+ 	       type,
+ 	       folder_index_entry_end,
+@@ -3645,7 +3668,7 @@
  	if ((strcmp(sqwebmail_folder, INBOX "." TRASH) == 0) && (strlen(getarg("PURGEALL"))))
- 	    printf("<input type=\"submit\" name=\"cmdpurgeall\" value=\"%s\" onclick=\"javascript: return deleteAll();\" />", 
+ 	    printf("<input type=\"submit\" name=\"cmdpurgeall\" value=\"%s\" onclick=\"javascript: return deleteAll();\" />",
  		getarg("PURGEALL"));
 -	printf("<input type=\"submit\" name=\"cmddel\" value=\"%s\" />%s<select name=\"moveto\">",
 +	printf("<input type=\"submit\" name=\"cmddel\" value=\"%s\" />, <input type=\"submit\" name=\"cmdmark\" value=\"Mark\" />, <input type=\"submit\" name=\"cmdunmark\" value=\"Unmark\" />%s<select name=\"moveto\">",
  		strcmp(sqwebmail_folder, INBOX "." TRASH) == 0
  		? purgelab:deletelab,
  		movelab);
diff --git a/mail/courier/files/extra-patch-webmail__images__sqwebmail.css b/mail/courier/files/extra-patch-webmail__images__sqwebmail.css
index adedc27b6ec5..de75c1143f8f 100644
--- a/mail/courier/files/extra-patch-webmail__images__sqwebmail.css
+++ b/mail/courier/files/extra-patch-webmail__images__sqwebmail.css
@@ -1,28 +1,23 @@
---- webmail/images/sqwebmail.css.orig	2009-06-04 08:27:30.000000000 +0200
-+++ webmail/images/sqwebmail.css	2009-06-04 08:33:54.000000000 +0200
-@@ -142,6 +142,9 @@
+--- libs/sqwebmail/images/sqwebmail.css.orig	2009-06-04 08:27:30.000000000 +0200
++++ libs/sqwebmail/images/sqwebmail.css	2009-06-04 08:33:54.000000000 +0200
+@@ -169,6 +169,9 @@
  .folder-index-bg-1:hover { background-color: #bbbbbb }
  .folder-index-bg-2 { background-color: #ddddbb }
  .folder-index-bg-2:hover { background-color: #bbbbbb }
 +/* for <HR> and buttons under message list */
 +.folder-index-bg-3 { background-color: #ffffff }
 +.folder-index-bg-4 { background-color: #eeeecc }
  
- 	/* Selected message */
+ .folder-index-bg-1, .folder-index-bg-2 { white-space: nowrap }
  
-@@ -159,11 +162,13 @@
+@@ -188,7 +191,9 @@
  */
  
  .message-number { }
 -.message-status { }
 +.message-flag { padding: 0 }
 +.message-select { padding: 0 }
 +.message-status { padding: 0 }
  .message-date { }
  .message-from { }
  .message-subject { }
--.message-size { font-family: monospace}
-+.message-size { font-family: monospace }
- 
- /***************************** Folder permissions ***********************/
- 
diff --git a/mail/courier/files/extra-patch-webmail__maildir.c b/mail/courier/files/extra-patch-webmail__maildir.c
index dfd1f2a1e132..a6b96b375296 100644
--- a/mail/courier/files/extra-patch-webmail__maildir.c
+++ b/mail/courier/files/extra-patch-webmail__maildir.c
@@ -1,75 +1,75 @@
---- webmail/maildir.c.orig	2008-07-20 05:15:08.000000000 +0200
-+++ webmail/maildir.c	2009-06-03 22:41:49.000000000 +0200
+--- libs/sqwebmail/maildir.c.orig	2008-07-20 05:15:08.000000000 +0200
++++ libs/sqwebmail/maildir.c	2009-06-03 22:41:49.000000000 +0200
 @@ -1091,6 +1091,42 @@
  	return (rc);
  }
  
 +void maildir_msgmarkfile(const char *folder, const char *file, size_t pos)
 +{
 +char *filename=maildir_find(folder, file);
 +char *new_filename;
 +
 +	if (filename)
 +	{
 +		if ((new_filename=maildir_addflagfilename(filename, 'F')) != 0)
 +		{
 +			rename(filename, new_filename);
 +			update_foldermsgs(folder, new_filename, pos);
 +			free(new_filename);
 +		}
 +
 +		free(filename);
 +	}
 +}
 +
 +void maildir_msgunmarkfile(const char *folder, const char *file, size_t pos)
 +{
 +char *filename=maildir_find(folder, file);
 +char *new_filename;
 +
 +	if (filename)
 +	{
 +		if ((new_filename = strdup(filename)) != 0)
 +		{
 +			maildir_remflagname(new_filename, 'F');
 +			rename(filename, new_filename);
 +			update_foldermsgs(folder, new_filename, pos);
 +			free(new_filename);
 +		}
 +		free(filename);
 +	}
 +}
 +
  static char *foldercountfilename(const char *folder)
  {
  	char *f=malloc(sizeof(MAILDIRCURCACHE "/cnt.") + strlen(folder));
 @@ -1604,6 +1640,29 @@
  	return (MSGTYPE_NEW);
  }
  
 +/*
 +** maildirfile_flag(directory, filename) - boolean:
 +**
 +*/
 +
 +int maildirfile_flag(const char *p)
 +{
 +const char *q=strrchr(p, '/');
 +int	seen_flag=0;
 +
 +	if (q)	p=q;
 +
 +	if ( !(p=strchr(p, ':')) || *++p != '2' || *++p != ',')
 +		return (0);		/* No :2,info */
 +
 +	++p;
 +	while (p && isalpha((int)(unsigned char)*p))
 +		if (*p++ == 'F')
 +			seen_flag=1;
 +
 +	return (seen_flag);
 +}
 +
  static int docount(const char *fn, unsigned *new_cnt, unsigned *other_cnt)
  {
  const char *filename=strrchr(fn, '/');
diff --git a/mail/courier/files/extra-patch-webmail__maildir.h b/mail/courier/files/extra-patch-webmail__maildir.h
index 71d4700415cc..6dff5f0ff87d 100644
--- a/mail/courier/files/extra-patch-webmail__maildir.h
+++ b/mail/courier/files/extra-patch-webmail__maildir.h
@@ -1,18 +1,19 @@
---- webmail/maildir.h.orig	2004-02-17 01:58:24.000000000 +0100
-+++ webmail/maildir.h	2009-06-04 08:40:43.000000000 +0200
-@@ -35,12 +35,15 @@
+--- libs/sqwebmail/maildir.h.orig	2004-02-17 01:58:24.000000000 +0100
++++ libs/sqwebmail/maildir.h	2009-06-04 08:40:43.000000000 +0200
+@@ -49,6 +49,7 @@
  extern int maildir_name2pos(const char *, const char *, size_t *);
  
  extern char maildirfile_type(const char *);
 +extern int maildirfile_flag(const char *);
  extern void maildir_markread(const char *, size_t);
  extern void maildir_markreplied(const char *, const char *);
  extern void maildir_msgdeletefile(const char *, const char *, size_t);
- extern void maildir_msgpurge(const char *, size_t);
+@@ -56,6 +57,8 @@
  extern void maildir_msgpurgefile(const char *, const char *);
  extern void maildir_purgemimegpg();
+ extern void maildir_purgesearch();
 +extern void maildir_msgmarkfile(const char *, const char *, size_t);
 +extern void maildir_msgunmarkfile(const char *, const char *, size_t);
  
  extern int maildir_msgmove(const char *, size_t, const char *);
  extern int maildir_msgmovefile(const char *, const char *, const char *, size_t);
diff --git a/mail/courier/files/extra-patch-webmail__msg2html.c b/mail/courier/files/extra-patch-webmail__msg2html.c
index 00b5445f55f6..5e310aad1bad 100644
--- a/mail/courier/files/extra-patch-webmail__msg2html.c
+++ b/mail/courier/files/extra-patch-webmail__msg2html.c
@@ -1,44 +1,44 @@
---- webmail/msg2html.c.orig	2007-07-11 03:36:04.000000000 +0200
-+++ webmail/msg2html.c	2007-12-21 08:42:02.000000000 +0100
+--- libs/sqwebmail/msg2html.c.orig	2007-07-11 03:36:04.000000000 +0200
++++ libs/sqwebmail/msg2html.c	2007-12-21 08:42:02.000000000 +0100
 @@ -451,6 +451,7 @@
  char	*header, *value;
  char	*save_subject=0;
  char	*save_date=0;
 +char	*save_xface=0;
  off_t	start_pos, end_pos, start_body;
  struct	rfc2045id *p, newpart;
  off_t	dummy;
 @@ -523,6 +524,13 @@
  			free(header);
  			continue;
  		}
 +		if (strcmp(header, "x-face") == 0)
 +		{
 +			if (save_xface)	free(save_xface);
 +			save_xface=strdup(value);
 +			free(header);
 +			continue;
 +		}
  		if (isaddressheader(header))
  		{
  			print_header_uc(info, header);
 @@ -575,7 +583,18 @@
  	if (flag && info->message_rfc822_action)
  		(*info->message_rfc822_action)(idptr);
  
 -	printf("</table>\n<hr width=\"100%%\" />\n");
 +	if (save_xface)
 +	{
 +		char *q=cgiurlencode(save_xface);
 +		printf("</table>\n</td><td align=\"right\"><img width=\"48\" heigth=\"48\" src=\"http://www.dairiki.org/xface/xface.php?xface=");
 +	        printf("%s", q);
 +		printf("&amp;preview=1\"></td></tr><tr><td colspan=\"2\"><hr width=\"100%%\">\n");
 +	        free(q);
 +	}
 +	else
 +	{
 +		printf("</table>\n<hr width=\"100%%\" />\n");
 +	}
  
  	if (!flag && info->gpgdir && libmail_gpg_has_gpg(info->gpgdir) == 0
  	    && libmail_gpgmime_has_mimegpg(rfc)
diff --git a/mail/courier/files/patch-courier__cmlmfetch.C b/mail/courier/files/patch-courier__cmlmfetch.C
deleted file mode 100644
index 80a27c2f0156..000000000000
--- a/mail/courier/files/patch-courier__cmlmfetch.C
+++ /dev/null
@@ -1,11 +0,0 @@
---- courier/cmlmfetch.C.orig	2009-11-08 18:14:47 UTC
-+++ courier/cmlmfetch.C
-@@ -334,7 +334,7 @@ int doindex(const char *n)
- 			ack << std::setiosflags(std::ios::right)
- 			    << std::setw(10)
- 			    << msgs[i]
--			    << resetiosflags(std::ios::right) << " "
-+			    << std::resetiosflags(std::ios::right) << " "
- 			    << std::setw(0) << msginfo[i].msgsubj << std::endl;
- 			ack << std::setiosflags(std::ios::right)
- 			    << std::setw(10)
diff --git a/mail/courier/files/patch-courier__configure b/mail/courier/files/patch-courier__configure
index db86e5bf09ce..304d1ca004a2 100644
--- a/mail/courier/files/patch-courier__configure
+++ b/mail/courier/files/patch-courier__configure
@@ -1,63 +1,54 @@
---- courier/configure.orig	2009-09-05 13:59:59.000000000 +0200
-+++ courier/configure	2010-02-15 20:05:20.000000000 +0100
-@@ -819,6 +819,7 @@
+--- courier/configure.orig	2019-11-16 22:02:20.000000000 +0100
++++ courier/configure	2020-04-20 23:15:06.000000000 +0200
+@@ -667,6 +667,7 @@
+ distdirlist
  dirlist
  transport
- MODE
 +piddir
- COPYRIGHT
- testmode
- COURIERAUTHCONFIG
-@@ -954,6 +955,7 @@
+ LIBIDN_LIBS
+ LIBIDN_CFLAGS
+ PKG_CONFIG_LIBDIR
+@@ -818,6 +819,7 @@
+ with_sysroot
  enable_libtool_lock
  with_softlinkdir
- with_testmode
 +with_piddir
  with_transport
  with_db
  with_courierlogger
-@@ -1629,6 +1631,7 @@
-   --with-softlinks=dir:link,dir:link...   specify soft links for
-                                           installation subdirectories.
-  -- This space intentionally left blank --
-+  --with-piddir         Directory where webmlm.pid is created
-   --with-transport='local esmtp ...'
-                           Specify list of modules to install
- 
-@@ -2553,7 +2556,7 @@
+@@ -2927,7 +2929,7 @@
  fi
  
  fi
 -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 +INSTALL_STRIP_PROGRAM="install  -s -o root -g wheel -m 555 -s"
  
- { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
  $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-@@ -15882,6 +15885,14 @@
- esac
- 
+@@ -16512,6 +16514,13 @@
+   ac_configure_args="$ac_configure_args --with-softlinkdir=$prefix"
+ fi
  
 +# Check whether --with-piddir was given.
 +if test "${with_piddir+set}" = set; then
 +  withval=$with_piddir; piddir="$withval"
 +  else
 +    piddir=$localstatedir/run
 +fi
 +
-+
+ 
  version=`cat ../version`
  
- COPYRIGHT="Courier $version Copyright 1999-2008 Double Precision, Inc."
-@@ -18397,9 +18408,9 @@
- 
- if test "$testmode" = "0"
- then
--	INSTALL_PROGRAM='${INSTALL} -m 700'
--	INSTALL_SCRIPT='${INSTALL} -m 700'
--	INSTALL_DATA='${INSTALL} -m 600'
-+	INSTALL_PROGRAM='${BSD_INSTALL_PROGRAM}'
-+	INSTALL_SCRIPT='${BSD_INSTALL_SCRIPT}'
-+	INSTALL_DATA='${BSD_INSTALL_DATA}'
- fi
+@@ -18135,9 +18144,9 @@
+ 
+ # Automake stupidity
+ 
+-INSTALL_PROGRAM='${INSTALL} -m 700'
+-INSTALL_SCRIPT='${INSTALL} -m 700'
+-INSTALL_DATA='${INSTALL} -m 600'
++INSTALL_PROGRAM='${BSD_INSTALL_PROGRAM}'
++INSTALL_SCRIPT='${BSD_INSTALL_SCRIPT}'
++INSTALL_DATA='${BSD_INSTALL_DATA}'
  
  ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
diff --git a/mail/courier/files/patch-courier__doc__Makefile.in b/mail/courier/files/patch-courier__doc__Makefile.in
deleted file mode 100644
index 1d70f7f64cf6..000000000000
--- a/mail/courier/files/patch-courier__doc__Makefile.in
+++ /dev/null
@@ -1,71 +0,0 @@
---- courier/doc/Makefile.in.orig	Sun Jul  3 00:15:30 2005
-+++ courier/doc/Makefile.in	Sun Jul  3 00:15:30 2005
-@@ -1136,18 +1136,18 @@
- 	$(MAKE) do-man-install
- 
- do-man-install:
--	for f in $(mandir) $(man1dir) $(man7dir) $(man8dir) ; do test -d $(DESTDIR)$$f && chmod 755 $(DESTDIR)$$f ; done ; exit 0
-+#	for f in $(mandir) $(man1dir) $(man7dir) $(man8dir) ; do test -d $(DESTDIR)$$f && chmod 755 $(DESTDIR)$$f ; done ; exit 0
- 	for f in $(man1) ; do test -f $(DESTDIR)$(man1dir)/$$f && chmod 644 $(DESTDIR)$(man1dir)/$$f ; done ; exit 0
- 	for f in $(man5) ; do test -f $(DESTDIR)$(man5dir)/$$f && chmod 644 $(DESTDIR)$(man5dir)/$$f ; done ; exit 0
- 	for f in $(man7) ; do test -f $(DESTDIR)$(man7dir)/$$f && chmod 644 $(DESTDIR)$(man7dir)/$$f ; done ; exit 0
- 	for f in $(man8) ; do test -f $(DESTDIR)$(man8dir)/$$f && chmod 644 $(DESTDIR)$(man8dir)/$$f ; done ; exit 0
--	test -w /etc || exit 0 ; for f in $(mandir) $(man1dir) $(man5dir) $(man7dir) $(man8dir) ; do test -d $(DESTDIR)$$f && chown bin $(DESTDIR)$$f && chgrp bin $(DESTDIR)$$f ; done ; exit 0
--	test -w /etc || exit 0 ; for f in $(man1) ; do test -f $(DESTDIR)$(man1dir)/$$f && chown bin $(DESTDIR)$(man1dir)/$$f && chgrp bin $(DESTDIR)$(man1dir)/$$f ; done ; exit 0
--	test -w /etc || exit 0 ; for f in $(man5) ; do test -f $(DESTDIR)$(man5dir)/$$f && chown bin $(DESTDIR)$(man5dir)/$$f && chgrp bin $(DESTDIR)$(man5dir)/$$f ; done ; exit 0
--	test -w /etc || exit 0 ; for f in $(man7) ; do test -f $(DESTDIR)$(man7dir)/$$f && chown bin $(DESTDIR)$(man7dir)/$$f && chgrp bin $(DESTDIR)$(man7dir)/$$f ; done ; exit 0
--	test -w /etc || exit 0 ; for f in $(man8) ; do test -f $(DESTDIR)$(man8dir)/$$f && chown bin $(DESTDIR)$(man8dir)/$$f && chgrp bin $(DESTDIR)$(man8dir)/$$f ; done ; exit 0
-+#	test -w /etc || exit 0 ; for f in $(mandir) $(man1dir) $(man5dir) $(man7dir) $(man8dir) ; do test -d $(DESTDIR)$$f && chown bin $(DESTDIR)$$f && chgrp bin $(DESTDIR)$$f ; done ; exit 0
-+#	test -w /etc || exit 0 ; for f in $(man1) ; do test -f $(DESTDIR)$(man1dir)/$$f && chown bin $(DESTDIR)$(man1dir)/$$f && chgrp bin $(DESTDIR)$(man1dir)/$$f ; done ; exit 0
-+#	test -w /etc || exit 0 ; for f in $(man5) ; do test -f $(DESTDIR)$(man5dir)/$$f && chown bin $(DESTDIR)$(man5dir)/$$f && chgrp bin $(DESTDIR)$(man5dir)/$$f ; done ; exit 0
-+#	test -w /etc || exit 0 ; for f in $(man7) ; do test -f $(DESTDIR)$(man7dir)/$$f && chown bin $(DESTDIR)$(man7dir)/$$f && chgrp bin $(DESTDIR)$(man7dir)/$$f ; done ; exit 0
-+#	test -w /etc || exit 0 ; for f in $(man8) ; do test -f $(DESTDIR)$(man8dir)/$$f && chown bin $(DESTDIR)$(man8dir)/$$f && chgrp bin $(DESTDIR)$(man8dir)/$$f ; done ; exit 0
- 	for f in $(htmldoc_DATA) ; do chmod 444 $(DESTDIR)$(htmldocdir)/$$f ; done
--	test -w /etc || exit 0; for f in $(htmldoc_DATA) ; do chown bin $(DESTDIR)$(htmldocdir)/$$f ; chgrp bin $(DESTDIR)$(htmldocdir)/$$f ; done
-+#	test -w /etc || exit 0; for f in $(htmldoc_DATA) ; do chown bin $(DESTDIR)$(htmldocdir)/$$f ; chgrp bin $(DESTDIR)$(htmldocdir)/$$f ; done
- 
- status.html: config.status
- 
-@@ -1160,24 +1160,24 @@
- 	@SUBDIRS="$(SUBDIRS)" ; for f in $$SUBDIRS ; do ( cd $$f && $(MAKE) $(AM_MAKEFLAGS) install-perms ) ; cat /dev/null >>$$f/permissions.dat ; cat $$f/permissions.dat >>permissions.dat ; done
- 
- install-perms-local:
--	@echo @mandir@ 755 bin bin >>permissions.dat
--	@echo $(man1dir) 755 bin bin >>permissions.dat
--	@echo $(man5dir) 755 bin bin >>permissions.dat
--	@echo $(man7dir) 755 bin bin >>permissions.dat
--	@echo $(man8dir) 755 bin bin >>permissions.dat
--	@for f in $(man1) ; do	\
--	echo $(man1dir)/$$f 644 bin bin man >>permissions.dat ; done
--	@for f in $(man5) ; do	\
--	echo $(man5dir)/$$f 644 bin bin man >>permissions.dat ; done
--	@for f in $(man7) ; do	\
--	echo $(man7dir)/$$f 644 bin bin man >>permissions.dat ; done
--	@for f in $(man8) ; do	\
--	echo $(man8dir)/$$f 644 bin bin man >>permissions.dat ; done
--	@for f in $(man_LINKS) ; do	\
--	echo $$f 644 bin bin man >>permissions.dat ; done
--	@echo $(htmldocdir) 755 bin bin >>permissions.dat
--	@for f in $(htmldoc_DATA) ; do \
--	echo $(htmldocdir)/$$f 444 bin bin doc >>permissions.dat ; done
-+#	@echo @mandir@ 755 bin bin >>permissions.dat
-+#	@echo $(man1dir) 755 bin bin >>permissions.dat
-+#	@echo $(man5dir) 755 bin bin >>permissions.dat
-+#	@echo $(man7dir) 755 bin bin >>permissions.dat
-+#	@echo $(man8dir) 755 bin bin >>permissions.dat
-+#	@for f in $(man1) ; do	\
-+#	echo $(man1dir)/$$f 644 bin bin man >>permissions.dat ; done
-+#	@for f in $(man5) ; do	\
-+#	echo $(man5dir)/$$f 644 bin bin man >>permissions.dat ; done
-+#	@for f in $(man7) ; do	\
-+#	echo $(man7dir)/$$f 644 bin bin man >>permissions.dat ; done
-+#	@for f in $(man8) ; do	\
-+#	echo $(man8dir)/$$f 644 bin bin man >>permissions.dat ; done
-+#	@for f in $(man_LINKS) ; do	\
-+#	echo $$f 644 bin bin man >>permissions.dat ; done
-+#	@echo $(htmldocdir) 755 bin bin >>permissions.dat
-+#	@for f in $(htmldoc_DATA) ; do \
-+#	echo $(htmldocdir)/$$f 444 bin bin doc >>permissions.dat ; done
- 
- htmldoc: $(htmldocfiles)
- 	echo '/icon\.gif/a'"\\" >htmldoc.sed
diff --git a/mail/courier/files/patch-courier__imapd-ssl.rc.in b/mail/courier/files/patch-courier__imapd-ssl.rc.in
new file mode 100644
index 000000000000..afc057c9cf7a
--- /dev/null
+++ b/mail/courier/files/patch-courier__imapd-ssl.rc.in
@@ -0,0 +1,11 @@
+--- courier/imapd-ssl.rc.in.orig	2018-07-29 05:16:41.000000000 +0200
++++ courier/imapd-ssl.rc.in	2020-04-26 13:47:03.472951000 +0200
+@@ -31,7 +31,7 @@
+ 	then
+ 		rm -f "$TLS_CACHEFILE"
+ 		touch "$TLS_CACHEFILE"
+-		chown @mailuser@ "$TLS_CACHEFILE"
++		/usr/sbin/chown @mailuser@ "$TLS_CACHEFILE"
+ 		chgrp @mailgroup@  "$TLS_CACHEFILE"
+ 		chmod 600  "$TLS_CACHEFILE"
+ 	fi
diff --git a/mail/courier/files/patch-courier__imapd.rc.in b/mail/courier/files/patch-courier__imapd.rc.in
new file mode 100644
index 000000000000..63060d99c3bd
--- /dev/null
+++ b/mail/courier/files/patch-courier__imapd.rc.in
@@ -0,0 +1,11 @@
+--- courier/imapd.rc.in.orig	2018-08-23 13:12:13.000000000 +0200
++++ courier/imapd.rc.in	2020-04-26 13:47:12.593117000 +0200
+@@ -30,7 +30,7 @@
+ 	then
+ 		rm -f "$TLS_CACHEFILE"
+ 		touch "$TLS_CACHEFILE"
+-		chown @mailuser@ "$TLS_CACHEFILE"
++		/usr/sbin/chown @mailuser@ "$TLS_CACHEFILE"
+ 		chgrp @mailgroup@  "$TLS_CACHEFILE"
+ 		chmod 600  "$TLS_CACHEFILE"
+ 	fi
diff --git a/mail/courier/files/patch-courier__libs__Makefile.in b/mail/courier/files/patch-courier__libs__Makefile.in
new file mode 100644
index 000000000000..4234fdaf3bac
--- /dev/null
+++ b/mail/courier/files/patch-courier__libs__Makefile.in
@@ -0,0 +1,13 @@
+--- courier/libs/Makefile.in.orig	2023-06-08 14:44:27.714775000 +0200
++++ courier/libs/Makefile.in	2023-06-08 14:47:08.188863000 +0200
+@@ -1213,8 +1213,8 @@
+ .PRECIOUS: Makefile
+ 
+ 
+-courier_version.h: ../../version
+-	echo '#define COURIER_VERSION "'`cat ../../version`'"' >courier_version.h
++courier_version.h: ../../version.txt
++	echo '#define COURIER_VERSION "'`cat ../../version.txt`'"' >courier_version.h
+ 
+ #
+ # lcrwstatic.h is dynamically built to link with initialization functions
diff --git a/mail/courier/files/patch-courier__module.esmtp__configure b/mail/courier/files/patch-courier__module.esmtp__configure
new file mode 100644
index 000000000000..42df669e9815
--- /dev/null
+++ b/mail/courier/files/patch-courier__module.esmtp__configure
@@ -0,0 +1,44 @@
+--- courier/module.esmtp/configure.orig	2021-05-23 09:20:27.435950000 +0200
++++ courier/module.esmtp/configure	2021-05-23 09:03:40.994588000 +0200
+@@ -661,6 +661,7 @@
+ PKG_CONFIG_LIBDIR
+ PKG_CONFIG_PATH
+ PKG_CONFIG
++certsdir
+ COURIERAUTHCONFIG
+ CPP
+ LT_SYS_LIBRARY_PATH
+@@ -788,6 +789,7 @@
+ with_gnu_ld
+ with_sysroot
+ enable_libtool_lock
++with_certsdir
+ with_mailuser
+ with_mailgroup
+ with_piddir
+@@ -1455,6 +1457,7 @@
+   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                           compiler's sysroot if not specified).
++ --with-certsdir Directory where certs are created
+ 
+   --with-piddir         Directory where PID files are located
+   --with-shellpath=path   Initialize PATH to path for .courier programs
+@@ -12332,6 +12335,17 @@
+ then
+ 	as_fn_error $? "courierauthconfig not found" "$LINENO" 5
+ fi
++
++
++# Check whether --with-certsdir was given.
++if test "${with_certsdir+set}" = set; then :
++  withval=$with_certsdir; certsdir="$withval"
++else
++  certsdir="$datadir"
++fi
++
++
++
+ 
+ 
+ 
diff --git a/mail/courier/files/patch-courier__module.esmtp__mkesmtpdcert.in b/mail/courier/files/patch-courier__module.esmtp__mkesmtpdcert.in
index aa6d563837a5..6b8bbb7f8ff2 100644
--- a/mail/courier/files/patch-courier__module.esmtp__mkesmtpdcert.in
+++ b/mail/courier/files/patch-courier__module.esmtp__mkesmtpdcert.in
@@ -1,11 +1,20 @@
---- courier/module.esmtp/mkesmtpdcert.in.orig	2010-02-15 21:37:57.000000000 +0100
-+++ courier/module.esmtp/mkesmtpdcert.in	2010-02-15 21:37:16.000000000 +0100
-@@ -36,7 +36,7 @@
+--- courier/module.esmtp/mkesmtpdcert.in.orig	2021-05-23 14:00:04.926537000 +0200
++++ courier/module.esmtp/mkesmtpdcert.in	2021-05-23 14:04:14.542517000 +0200
+@@ -44,7 +44,7 @@
  then
- 	cp /dev/null @mydatadir@/esmtpd.pem
- 	chmod 600 @mydatadir@/esmtpd.pem
--	chown @mailuser@ @mydatadir@/esmtpd.pem
-+	/usr/sbin/chown @mailuser@ @mydatadir@/esmtpd.pem
- 	dd if=@RANDOMV@ of=@mydatadir@/esmtpd.rand count=1 2>/dev/null
+ 	cp /dev/null "$PEMFILE".pem
+ 	chmod 600 "$PEMFILE".pem
+-	chown @mailuser@ "$PEMFILE".pem
++	/usr/sbin/chown @mailuser@ "$PEMFILE".pem
+ 	dd if=@RANDOMV@ of="$PEMFILE".rand count=1 2>/dev/null
  	@OPENSSL@ req -new -x509 -days 365 -nodes \
- 		  -config @sysconfdir@/esmtpd.cnf -out @mydatadir@/esmtpd.pem -keyout @mydatadir@/esmtpd.pem || cleanup
+ 		  -config @sysconfdir@/esmtpd.cnf -out "$PEMFILE".pem -keyout "$PEMFILE".pem || cleanup
+@@ -74,7 +74,7 @@
+ 
+ 	cp /dev/null "$PEMFILE".pem
+ 	chmod 600 "$PEMFILE".pem
+-	chown @mailuser@ "$PEMFILE".pem
++	/usr/sbin/chown @mailuser@ "$PEMFILE".pem
+ 	cat "$PEMFILE".key "$PEMFILE".cert >"$PEMFILE".pem
+ 	rm -f "$PEMFILE".key "$PEMFILE".cert
+ fi
diff --git a/mail/courier/files/patch-courier__perms.sh.in b/mail/courier/files/patch-courier__perms.sh.in
index fe80b2bf349b..9532318b2369 100644
--- a/mail/courier/files/patch-courier__perms.sh.in
+++ b/mail/courier/files/patch-courier__perms.sh.in
@@ -1,70 +1,42 @@
---- courier/perms.sh.in.orig	2007-07-01 11:36:31.000000000 -0400
-+++ courier/perms.sh.in	2007-07-01 11:36:31.000000000 -0400
-@@ -11,9 +11,6 @@
- datarootdir="@datarootdir@"
- 
+--- courier/perms.sh.in.orig	2019-02-03 21:11:16.000000000 +0100
++++ courier/perms.sh.in	2020-04-20 23:34:40.000000000 +0200
+@@ -12,7 +12,6 @@
  PERMS="
--.			755
--
+ .			755
+ 
 -@localstatedir@		755	x	bin	bin
  @localstatedir@/tmp	770
  @localstatedir@/msgs	750
  @localstatedir@/msgq	750
-@@ -47,7 +44,6 @@
- @sysconfdir@/rfcerr2046.txt	444	config
- @sysconfdir@/rfcerr2047.txt	444	config
+@@ -44,7 +43,6 @@
+ @sysconfdir@/webmlmrc.dist	644	config
+ @sysconfdir@/quotawarnmsg.example	444
  
 -@libexecdir@		755	x	bin	bin
  @libexecdir@/courier	755	x	bin	bin
  @libexecdir@/courier/modules	755	x	bin	bin
  @libexecdir@/courier/submitmkdir	4550
-@@ -61,14 +57,13 @@
+@@ -58,14 +56,13 @@
  @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		500	x	root	bin
  @libexecdir@/courier/webmail/webmail	555	x	root	bin
  @libexecdir@/courier/webmail/webmlm	555	x	root	bin
  @libexecdir@/courier/sqwebmaild		555
--@libexecdir@/courier/sqwebpasswd	2755
--@libexecdir@/courier/webmail/webadmin	4555	x	root	bin
-+@libexecdir@/courier/sqwebpasswd	2555
-+@libexecdir@/courier/webmail/webadmin	4511	x	root	bin
+ @libexecdir@/courier/sqwebpasswd	2555
+ @libexecdir@/courier/webmail/webadmin	511	x	root	root
  
 -@sbindir@			755	x	bin	bin
  @sbindir@/courier		555
  @sbindir@/showconfig		555
  @sbindir@/showmodules		550
-@@ -82,7 +77,6 @@
+@@ -79,7 +76,6 @@
  @datadir@/imapd			555	x	bin	bin
  @datadir@/imapd-ssl		555	x	bin	bin
  
 -@bindir@			755	x	bin	bin
  @bindir@/cancelmsg		6555
  @bindir@/courier-config		555
  @bindir@/mailq			2555
-@@ -111,10 +105,10 @@
- @sbindir@/makealiases		550
- @datadir@/makehosteddomains	555
- @sbindir@/makehosteddomains	555
--@datadir@/pop3d			755
--@sbindir@/pop3d			755
--@datadir@/pop3d-ssl		755
--@sbindir@/pop3d-ssl		755
-+@datadir@/pop3d			555
-+@sbindir@/pop3d			555
-+@datadir@/pop3d-ssl		555
-+@sbindir@/pop3d-ssl		555
- @sbindir@/webgpg		555
- 
- @datadir@			755	x	bin	bin
-@@ -226,7 +220,7 @@
- if test "@HAVE_LDAP@" != 0
- then
- 	echo @sysconfdir@/ldapaliasrc.dist 640 @mailuser@ @mailgroup@ config
--	echo @sbindir@/courierldapaliasd 700 @mailuser@ @mailgroup@
-+	echo @sbindir@/courierldapaliasd 500 @mailuser@ @mailgroup@
- fi
- 
- echo @datadir@/sqwebmail/images 755 @mailuser@ @mailgroup@
diff --git a/mail/courier/files/patch-courier__pop3d-ssl.in b/mail/courier/files/patch-courier__pop3d-ssl.in
new file mode 100644
index 000000000000..b64718f47462
--- /dev/null
+++ b/mail/courier/files/patch-courier__pop3d-ssl.in
@@ -0,0 +1,11 @@
+--- courier/pop3d-ssl.in.orig	2018-07-29 05:16:41.000000000 +0200
++++ courier/pop3d-ssl.in	2020-04-26 13:47:23.904914000 +0200
+@@ -32,7 +32,7 @@
+ 	then
+ 		rm -f "$TLS_CACHEFILE"
+ 		touch "$TLS_CACHEFILE"
+-		chown @mailuser@ "$TLS_CACHEFILE"
++		/usr/sbin/chown @mailuser@ "$TLS_CACHEFILE"
+ 		chgrp @mailgroup@  "$TLS_CACHEFILE"
+ 		chmod 600  "$TLS_CACHEFILE"
+ 	fi
diff --git a/mail/courier/files/patch-courier__pop3d.in b/mail/courier/files/patch-courier__pop3d.in
new file mode 100644
index 000000000000..9e085a6b8f06
--- /dev/null
+++ b/mail/courier/files/patch-courier__pop3d.in
@@ -0,0 +1,11 @@
+--- courier/pop3d.in.orig	2018-08-23 13:12:38.000000000 +0200
++++ courier/pop3d.in	2020-04-26 13:47:34.041051000 +0200
+@@ -58,7 +58,7 @@
+ then
+ 	rm -f "$TLS_CACHEFILE"
+ 	touch "$TLS_CACHEFILE"
+-	chown @mailuser@ "$TLS_CACHEFILE"
++	/usr/sbin/chown @mailuser@ "$TLS_CACHEFILE"
+ 	chgrp @mailgroup@  "$TLS_CACHEFILE"
+ 	chmod 600  "$TLS_CACHEFILE"
+ fi
diff --git a/mail/courier/files/patch-courier__submit2.C b/mail/courier/files/patch-courier__submit2.C
deleted file mode 100644
index a85379056c20..000000000000
--- a/mail/courier/files/patch-courier__submit2.C
+++ /dev/null
@@ -1,11 +0,0 @@
---- courier/submit2.C.orig	2008-01-29 13:06:47.000000000 +0100
-+++ courier/submit2.C	2009-10-03 22:34:47.000000000 +0200
-@@ -860,7 +860,7 @@
- 	if (sizelimit && bytecount > sizelimit)
- 	{
- 		std::cout << "523 Message length (" <<
--			sizelimit << " bytes) exceeds administrative limit."
-+			bytecount << " bytes) exceeds administrative limit(" << sizelimit << ")."
- 			<< std::endl << std::flush;
- 		return (1);
- 	}
diff --git a/mail/courier/files/patch-courier__webmlmd.H b/mail/courier/files/patch-courier__webmlmd.H
deleted file mode 100644
index 0af669fecaf4..000000000000
--- a/mail/courier/files/patch-courier__webmlmd.H
+++ /dev/null
@@ -1,11 +0,0 @@
---- courier/webmlmd.H.orig	2007-12-17 12:09:18 UTC
-+++ courier/webmlmd.H
-@@ -49,7 +49,7 @@ namespace webmlmd {
- 		T t;
- 
- 		t.reserve(s.size() * 6 / 5);
--		class T::iterator b=s.begin(), e=s.end(), p=b;
-+		typename T::iterator b=s.begin(), e=s.end(), p=b;
- 
- 		while (b != e)
- 		{
diff --git a/mail/courier/files/patch-courier__webmlmd.rc.in b/mail/courier/files/patch-courier__webmlmd.rc.in
index e947e3631820..92ec155a5f1b 100644
--- a/mail/courier/files/patch-courier__webmlmd.rc.in
+++ b/mail/courier/files/patch-courier__webmlmd.rc.in
@@ -1,61 +1,58 @@
---- courier/webmlmd.rc.in.orig	2007-03-05 05:43:24.000000000 +0100
-+++ courier/webmlmd.rc.in	2009-10-03 22:18:39.000000000 +0200
-@@ -1,48 +1,48 @@
- #! @SHELL@
- 
--case "$1" in
-+case "$0" in
+--- courier/webmlmd.rc.in.orig	2013-08-25 20:57:42.000000000 +0200
++++ courier/webmlmd.rc.in	2020-04-20 23:41:05.000000000 +0200
+@@ -3,46 +3,46 @@
+ case "$1" in
  
  /*)
 -	prog="$1"
 +	prog="$0"
  	;;
  *)
 -	prog="`which $1`"
 +	prog="`which $0`"
  	;;
  esac
  
  set -e
  
 -case "$2" in
 +case "$1" in
  start)
 -	if test "$3" = ""
 +	if test "$2" = ""
  	then
  		echo "Usage: $prog start [configfile]" >&2
  		exit 1
  	fi
  
 -	@SETENV@ -i @SHELL@ -c "set -a; . $3; $prog check || exit 1; \
 +	@SETENV@ -i @SHELL@ -c "set -a; . $2; $prog check || exit 1; \
  		@courierlogger@ -pid="'"${PIDFILE}"'" $LOGGEROPTS -start $prog"
  	exit $?
  	;;
  stop)
 -	if test "$3" = ""
 +	if test "$2" = ""
  	then
  		echo "Usage: $prog stop [configfile]" >&2
  		exit 1
  	fi
  
 -	@SETENV@ -i @SHELL@ -c "set -a; . $3;\
 +	@SETENV@ -i @SHELL@ -c "set -a; . $2;\
  		@courierlogger@ -pid="'"${PIDFILE}"'" $LOGGEROPTS -stop $prog"
  	exit $?
  	;;
  restart)
 -	if test "$3" = ""
 +	if test "$2" = ""
  	then
  		echo "Usage: $prog restart [configfile]" >&2
  		exit 1
  	fi
  
 -	@SETENV@ -i @SHELL@ -c "set -a; . $3; $prog check || exit 1; \
 +	@SETENV@ -i @SHELL@ -c "set -a; . $2; $prog check || exit 1; \
+ 		@MKDIR_P@ `dirname $PIDFILE` ; \
  		@courierlogger@ -pid="'"${PIDFILE}"'" $LOGGEROPTS -restart $prog"
  	exit $?
- 	;;
diff --git a/mail/courier/files/patch-imap__mkimapdcert.in b/mail/courier/files/patch-imap__mkimapdcert.in
deleted file mode 100644
index e44fb39c2d5b..000000000000
--- a/mail/courier/files/patch-imap__mkimapdcert.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- imap/mkimapdcert.in.orig	2010-02-15 21:42:15.000000000 +0100
-+++ imap/mkimapdcert.in	2010-02-15 21:36:46.000000000 +0100
-@@ -40,7 +40,7 @@
- then
- 	cp /dev/null @certsdir@/imapd.pem
- 	chmod 600 @certsdir@/imapd.pem
--	chown @mailuser@ @certsdir@/imapd.pem
-+	/usr/sbin/chown @mailuser@ @certsdir@/imapd.pem
- 
- 	dd if=@RANDOMV@ of=@certsdir@/imapd.rand count=1 2>/dev/null
- 	@OPENSSL@ req -new -x509 -days 365 -nodes \
diff --git a/mail/courier/files/patch-imap__mkpop3dcert.in b/mail/courier/files/patch-imap__mkpop3dcert.in
deleted file mode 100644
index 3bc4e84df091..000000000000
--- a/mail/courier/files/patch-imap__mkpop3dcert.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- imap/mkpop3dcert.in.orig	2010-02-15 21:45:23.000000000 +0100
-+++ imap/mkpop3dcert.in	2010-02-15 21:37:01.000000000 +0100
-@@ -40,7 +40,7 @@
- then
- 	cp /dev/null @certsdir@/pop3d.pem
- 	chmod 600 @certsdir@/pop3d.pem
--	chown @mailuser@ @certsdir@/pop3d.pem
-+	/usr/sbin/chown @mailuser@ @certsdir@/pop3d.pem
- 
- 	dd if=@RANDOMV@ of=@certsdir@/pop3d.rand count=1 2>/dev/null
- 	@OPENSSL@ req -new -x509 -days 365 -nodes \
diff --git a/mail/courier/files/patch-liblock__locktest.c b/mail/courier/files/patch-liblock__locktest.c
deleted file mode 100644
index 9f701700d7f2..000000000000
--- a/mail/courier/files/patch-liblock__locktest.c
+++ /dev/null
@@ -1,81 +0,0 @@
---- liblock/locktest.c.orig	Mon Dec  6 08:18:55 1999
-+++ liblock/locktest.c	Mon Dec  6 08:18:55 1999
-@@ -5,6 +5,7 @@
- 
- /* $Id */
- 
-+#include	<paths.h>
- #include	"liblock.h"
- #if	USE_FCNTL
- #include	"lockfcntl.c"
-@@ -20,11 +21,23 @@
- 
- int main()
- {
-+#define FILENAME	"courier-authlib.locktest.XXXXX"
- int	fd[2];
- pid_t	p;
- int	s;
- int	f;
- 
-+	char *name;
-+	const char *tmpdir;
-+	if ((tmpdir = (char *)getenv("TMPDIR")) == NULL)
-+		tmpdir = _PATH_TMP;
-+	(void)asprintf(&name, "%s%s%s", tmpdir,
-+		(tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME);
-+	if (name == NULL) {
-+		perror("get filename");
-+		exit(1);
-+	}
-+
- 	signal(SIGCHLD, SIG_DFL);
- 	if (pipe(fd))
- 	{
-@@ -32,6 +45,12 @@
- 		return (1);
- 	}
- 
-+	if ((f=mkstemp(name)) < 0)
-+	{
-+		perror("open");
-+		exit(1);
-+	}
-+
- 	if ((p=fork()) == (pid_t)-1)
- 	{
- 		perror("fork");
-@@ -46,7 +65,7 @@
- 		read(fd[0], &c, 1);
- 		close(fd[0]);
- 
--		if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
-+		if ((f=open(name, O_RDWR)) < 0)
- 		{
- 			perror("open");
- 			exit(1);
-@@ -56,22 +75,18 @@
- 		if (ll_lockfd(f, ll_writelock, 0, 0))
- 		{
- 			close(f);
-+			unlink(name);
- 			exit(0);
- 		}
- 		close(f);
- 		exit(1);
- 	}
--	
--	if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
--	{
--		perror("open");
--		exit(1);
--	}
- 
- 	if (ll_lockfd(f, ll_writelock, 0, 0))
- 	{
- 		perror("lock");
- 		close(f);
-+		unlink(name);
- 		exit(1);
- 	}
- 	close(fd[1]);
diff --git a/mail/courier/files/patch-libs__imap__mkdhparams.in b/mail/courier/files/patch-libs__imap__mkdhparams.in
new file mode 100644
index 000000000000..be5754183c1d
--- /dev/null
+++ b/mail/courier/files/patch-libs__imap__mkdhparams.in
@@ -0,0 +1,11 @@
+--- libs/imap/mkdhparams.in.orig	2015-04-27 14:11:25.000000000 +0200
++++ libs/imap/mkdhparams.in	2020-04-26 17:12:26.338330000 +0200
+@@ -37,7 +37,7 @@
+ umask 077
+ cp /dev/null $TLS_DHPARAMS.tmp
+ umask 022
+-chown @mailuser@ $TLS_DHPARAMS.tmp
++/usr/sbin/chown @mailuser@ $TLS_DHPARAMS.tmp
+ 
+ BITS="$DH_BITS"
+ if test "@ssllib@" = "openssl"
diff --git a/mail/courier/files/patch-libs__imap__mkimapdcert.in b/mail/courier/files/patch-libs__imap__mkimapdcert.in
new file mode 100644
index 000000000000..9d7e05a3dc0d
--- /dev/null
+++ b/mail/courier/files/patch-libs__imap__mkimapdcert.in
@@ -0,0 +1,20 @@
+--- libs/imap/mkimapdcert.in.orig	2013-11-10 19:11:25.000000000 +0100
++++ libs/imap/mkimapdcert.in	2020-04-20 23:44:26.000000000 +0200
+@@ -42,7 +42,7 @@
+ then
+ 	cp /dev/null @certsdir@/imapd.pem
+ 	chmod 600 @certsdir@/imapd.pem
+-	chown @mailuser@ @certsdir@/imapd.pem
++	/usr/sbin/chown @mailuser@ @certsdir@/imapd.pem
+ 
+ 	dd if=@RANDOMV@ of=@certsdir@/imapd.rand count=1 2>/dev/null
+ 	@OPENSSL@ req -new -x509 -days 365 -nodes \
+@@ -60,7 +60,7 @@
+ 	chmod 600 @certsdir@/imapd.cert
+ 	cp /dev/null @certsdir@/imapd.pem
+ 	chmod 600 @certsdir@/imapd.pem
+-	chown @mailuser@ @certsdir@/imapd.pem
++	/usr/sbin/chown @mailuser@ @certsdir@/imapd.pem
+ 	cp /dev/null @certsdir@/imapd.pem
+ 	cp /dev/null @certsdir@/imapd.cert
+ 	cp /dev/null @certsdir@/imapd.key
diff --git a/mail/courier/files/patch-libs__imap__mkpop3dcert.in b/mail/courier/files/patch-libs__imap__mkpop3dcert.in
new file mode 100644
index 000000000000..3b93a955094d
--- /dev/null
+++ b/mail/courier/files/patch-libs__imap__mkpop3dcert.in
@@ -0,0 +1,20 @@
+--- libs/imap/mkpop3dcert.in.orig	2013-11-11 00:39:01.000000000 +0100
++++ libs/imap/mkpop3dcert.in	2020-04-20 23:46:52.000000000 +0200
+@@ -43,7 +43,7 @@
+ then
+ 	cp /dev/null @certsdir@/pop3d.pem
+ 	chmod 600 @certsdir@/pop3d.pem
+-	chown @mailuser@ @certsdir@/pop3d.pem
++	/usr/sbin/chown @mailuser@ @certsdir@/pop3d.pem
+ 
+ 	dd if=@RANDOMV@ of=@certsdir@/pop3d.rand count=1 2>/dev/null
+ 	@OPENSSL@ req -new -x509 -days 365 -nodes \
+@@ -62,7 +62,7 @@
+ 	chmod 600 @certsdir@/pop3d.cert
+ 	cp /dev/null @certsdir@/pop3d.pem
+ 	chmod 600 @certsdir@/pop3d.pem
+-	chown @mailuser@ @certsdir@/pop3d.pem
++	/usr/sbin/chown @mailuser@ @certsdir@/pop3d.pem
+ 
+ 	@CERTTOOL@ --generate-privkey --sec-param=$BITS --outfile pop3d.key
+ 	@CERTTOOL@ --generate-self-signed --load-privkey pop3d.key --outfile pop3d.cert --template @sysconfdir@/pop3d.cnf
diff --git a/mail/courier/files/patch-tcpd__libcouriertls.c b/mail/courier/files/patch-tcpd__libcouriertls.c
deleted file mode 100644
index 993d5cf2aded..000000000000
--- a/mail/courier/files/patch-tcpd__libcouriertls.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- tcpd/libcouriertls.c.orig	2009-11-21 21:07:32.000000000 +0100
-+++ tcpd/libcouriertls.c	2015-03-07 22:46:47.521076321 +0100
-@@ -551,9 +551,13 @@
- 	if (!protocol || !*protocol)
- 		protocol="SSL23";
- 
--	ctx=SSL_CTX_new(protocol && strcmp(protocol, "SSL2") == 0
--							? SSLv2_method():
-+	ctx=SSL_CTX_new(
-+#ifndef OPENSSL_NO_SSL2
-+		protocol && strcmp(protocol, "SSL2") == 0 ? SSLv2_method():
-+#endif
-+#ifndef OPENSSL_NO_SSL3
- 		protocol && strcmp(protocol, "SSL3") == 0 ? SSLv3_method():
-+#endif
- 		protocol && strcmp(protocol, "SSL23") == 0 ? SSLv23_method():
- 		TLSv1_method());
- 
diff --git a/mail/courier/files/pkg-message.in b/mail/courier/files/pkg-message.in
index be4785ddd199..0636aaa9be92 100644
--- a/mail/courier/files/pkg-message.in
+++ b/mail/courier/files/pkg-message.in
@@ -1,66 +1,93 @@
 [
 { type: install
   message: <<EOM
 	RTFM before configuring and running Courier!!!
 
 Check and/or modify the following configuration files to suit your needs:
 
 	%%PREFIX%%/etc/courier/courierd
 	%%PREFIX%%/etc/courier/esmtpd
 	%%PREFIX%%/etc/courier/esmtpd-msa
 	%%PREFIX%%/etc/courier/esmtpd-ssl
 %%WITHFAX%%	%%PREFIX%%/etc/courier/faxcoverpage.tr
 %%WITHFAX%%	%%PREFIX%%/etc/courier/faxnotifyrc
 %%WITHFAX%%	%%PREFIX%%/etc/courier/faxrc
 	%%PREFIX%%/etc/courier/imapd
 	%%PREFIX%%/etc/courier/imapd-ssl
 	%%PREFIX%%/etc/courier/ldapaddressbook
 %%WITHLDAP%%	%%PREFIX%%/etc/courier/ldapaliasrc
 	%%PREFIX%%/etc/courier/pop3d
 	%%PREFIX%%/etc/courier/pop3d-ssl
 
 Do not forget to update /etc/pam.d/ or /etc/pam.conf with the contents of
 %%PREFIX%%/etc/courier/*.authpam.
 
 To enable Courier-MTA to start at boot time, set these variables in your
 /etc/rc.conf file:
 
 	courier_enable="YES"
 	sendmail_enable="NONE"
 
 Note: as in newer OS versions NONE for sendmail_enable is deprecated and
 will be not supported in future, use following instead:
 
 	courier_enable="YES"
 	sendmail_enable="NO"
 	sendmail_submit_enable="NO"
 	sendmail_outbound_enable="NO"
 	sendmail_msp_queue_enable="NO"
 
 Usually editing /etc/mail/mailer.conf is necessary, too, so it contains
 following lines:
 
 	sendmail	%%PREFIX%%/bin/sendmail
 	send-mail	%%PREFIX%%/bin/sendmail
 	mailq		%%PREFIX%%/bin/mailq
 	newaliases	%%PREFIX%%/sbin/makealiases
 
 Also, you will want to disable some Sendmail specific daily maintenance
 routines in your /etc/periodic.conf file:
 
 	daily_clean_hoststat_enable="NO"
 	daily_status_mail_rejects_enable="NO"
 	daily_status_include_submit_mailq="NO"
 	daily_submit_queuerun="NO"
 
 Documentation (if installed locally) is located in %%DOCSDIR%%,
 otherwise see http://www.Courier-MTA.org/
 
 If you are planning to serve shared maildirs, then you should create a cron
 job that runs at regular intervals (once every few hours is fine) that
 executes the following script to update the shared folder index:
 
 	%%PREFIX%%/share/courier/sharedindexupdate
+
+VERY IMPORTANT NOTICE - unicode Maildirs:
+
+For those:
+
+  Updating Courier-IMAP to version 5.0, and later, from prior versions of Courier-IMAP, or:
+  Updating SqWebmail to version 6.0, and later, from prior versions of SqWebmail, or:
+  Updating Courier to version 1.0, and later, from prior versions of Courier. 
+
+These versions have been updated to implement native Unicode support in several 
+E-mail-related protocols.
+
+Be absolutely sure to Read the instructions in the maildirmake
+manual page (see "Converting pre-unicode format maildirs" at
+http://www.courier-mta.org/maildirmake.html, or in the man page in
+this package) about updating from earlier versions; specifically the
+need to convert any existing maildirs to a Unicode naming scheme,
+and the need to update any other Courier packages together with
+updating this one.
+
+This message is only meant to make sure you are aware of the contents
+of the man page about updating from earlier versions, and the need for
+manual steps to update any existing maildirs.
+
+If you are installing for the first time, you can simply rerun configure
+with this option.	
+
 EOM
 }
 ]
diff --git a/mail/courier/pkg-plist b/mail/courier/pkg-plist
index 5f4fb076dc25..37baa150a6d7 100644
--- a/mail/courier/pkg-plist
+++ b/mail/courier/pkg-plist
@@ -1,646 +1,578 @@
-@unexec rm -f %D/etc/courier/*.dat 2>/dev/null || true
+@postunexec rm -f %D/etc/courier/*.dat 2>/dev/null || true
 bin/addcr
 @(%%MAILOWN%%,%%MAILGRP%%,) bin/cancelmsg
 bin/courier-config
 bin/couriermlm
 bin/couriertls
 bin/deliverquota
 bin/dotforward
 bin/imapd
 bin/lockmail
 bin/mailbot
 bin/maildiracl
 bin/maildirkw
 bin/maildirmake
-bin/maildrop
-bin/mailq
+@(,%%MAILGRP%%,4511) bin/maildrop
+@(%%MAILOWN%%,%%MAILGRP%%,2555) bin/mailq
 bin/makedat
 bin/makemime
 bin/mimegpg
 bin/preline
 bin/reformail
 bin/reformime
-bin/rmail
-bin/sendmail
+@(,%%MAILGRP%%,4511) bin/rmail
+@(,%%MAILGRP%%,4511) bin/sendmail
 bin/testmxlookup
+bin/verifysmtp
 bin/webmlmd
 bin/webmlmd.rc
 etc/courier/aliases/system
 %%WITHSYSTEMALIASES%%@exec [ -e /etc/aliases ] && ln -sf /etc/aliases %D/etc/courier/aliases/system
 %%WITHEMPTYALIASES%%@exec true > %D/etc/courier/aliases/system
-@unexec cmp -s %D/etc/courier/courierd %D/etc/courier/courierd.dist && rm -f %D/etc/courier/courierd 2>/dev/null || true
-etc/courier/courierd.dist
-@exec [ -f %D/etc/courier/courierd.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/courierd.dist
-@comment etc/courier/courierd
+@sample etc/courier/courierd.sample
 etc/courier/crontab
 etc/courier/dsndelayed.txt
 etc/courier/dsndelivered.txt
 etc/courier/dsnfailed.txt
 etc/courier/dsnfooter.txt
 etc/courier/dsnheader.txt
 etc/courier/dsnrelayed.txt
 etc/courier/dsnsubjectnotice.txt
 etc/courier/dsnsubjectwarn.txt
 etc/courier/enablefiltering
 etc/courier/esmtp.authpam
-etc/courier/esmtpauthclient
-@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
-etc/courier/esmtpd-msa.dist
-@exec [ -f %D/etc/courier/esmtpd-msa.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/esmtpd-msa.dist
-@comment etc/courier/esmtpd-msa
-@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
-etc/courier/esmtpd-ssl.dist
-@exec [ -f %D/etc/courier/esmtpd-ssl.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/esmtpd-ssl.dist
-@comment etc/courier/esmtpd-ssl
-etc/courier/esmtpd.cnf
-@unexec cmp -s %D/etc/courier/esmtpd %D/etc/courier/esmtpd.dist && rm -f %D/etc/courier/esmtpd 2>/dev/null || true
-etc/courier/esmtpd.dist
-@exec [ -f %D/etc/courier/esmtpd.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/esmtpd.dist
-@comment etc/courier/esmtpd
-%%WITHFAX%%@unexec cmp -s %D/etc/courier/faxcoverpage.tr %D/etc/courier/faxcoverpage.tr.dist && rm -f %D/etc/courier/faxcoverpage.tr 2>/dev/null || true
-%%WITHFAX%%etc/courier/faxcoverpage.tr.dist
-%%WITHFAX%%@exec [ -f %D/etc/courier/faxcoverpage.tr.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/faxcoverpage.tr.dist
-%%WITHFAX%%@comment etc/courier/faxcoverpage.tr
-%%WITHFAX%%@unexec cmp -s %D/etc/courier/faxnotifyrc %D/etc/courier/faxnotifyrc.dist && rm -f %D/etc/courier/faxnotifyrc 2>/dev/null || true
-%%WITHFAX%%etc/courier/faxnotifyrc.dist
-%%WITHFAX%%@exec [ -f %D/etc/courier/faxnotifyrc.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/faxnotifyrc.dist
-%%WITHFAX%%@comment etc/courier/faxnotifyrc
-%%WITHFAX%%@unexec cmp -s %D/etc/courier/faxrc %D/etc/courier/faxrc.dist && rm -f %D/etc/courier/faxrc 2>/dev/null || true
-%%WITHFAX%%etc/courier/faxrc.dist
-%%WITHFAX%%@exec [ -f %D/etc/courier/faxrc.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/faxrc.dist
-%%WITHFAX%%@comment etc/courier/faxrc
-@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
-etc/courier/imapd-ssl.dist
-@exec [ -f %D/etc/courier/imapd-ssl.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/imapd-ssl.dist
-@comment etc/courier/imapd-ssl
+@(%%MAILOWN%%,,) etc/courier/esmtpauthclient
+@sample etc/courier/esmtpd-msa.sample
+@sample etc/courier/esmtpd-ssl.sample
+@sample etc/courier/esmtpd.cnf.sample
+@sample etc/courier/esmtpd.sample
+%%WITHFAX%%@sample etc/courier/faxcoverpage.tr.sample
+%%WITHFAX%%@sample etc/courier/faxnotifyrc.sample
+%%WITHFAX%%@sample etc/courier/faxrc.sample
+@sample etc/courier/imapd-ssl.sample
 etc/courier/imapd.authpam
-etc/courier/imapd.cnf
-@unexec cmp -s %D/etc/courier/imapd %D/etc/courier/imapd.dist && rm -f %D/etc/courier/imapd 2>/dev/null || true
-etc/courier/imapd.dist
-@exec [ -f %D/etc/courier/imapd.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/imapd.dist
-@comment etc/courier/imapd
-@unexec cmp -s %D/etc/courier/ldapaddressbook %D/etc/courier/ldapaddressbook.dist && rm -f %D/etc/courier/ldapaddressbook 2>/dev/null || true
-etc/courier/ldapaddressbook.dist
-@exec [ -f %D/etc/courier/ldapaddressbook.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/ldapaddressbook.dist
-@comment etc/courier/ldapaddressbook
-%%WITHLDAP%%@unexec cmp -s %D/etc/courier/ldapaliasrc %D/etc/courier/ldapaliasrc.dist && rm -f %D/etc/courier/ldapaliasrc 2>/dev/null || true
-%%WITHLDAP%%etc/courier/ldapaliasrc.dist
-%%WITHLDAP%%@exec [ -f %D/etc/courier/ldapaliasrc.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/ldapaliasrc.dist
-%%WITHLDAP%%@comment etc/courier/ldapaliasrc
+@sample etc/courier/imapd.cnf.sample
+@sample etc/courier/imapd.sample
+@sample etc/courier/ldapaddressbook.sample
+%%WITHLDAP%%@sample etc/courier/ldapaliasrc.sample
 etc/courier/locallowercase
 etc/courier/maildrop
 etc/courier/maildropfilter
 etc/courier/module.dsn
 etc/courier/module.esmtp
 %%WITHFAX%%etc/courier/module.fax
 etc/courier/module.local
 %%WITHUUCP%%etc/courier/module.uucp
-@unexec cmp -s %D/etc/courier/pop3d-ssl %D/etc/courier/pop3d-ssl.dist && rm -f %D/etc/courier/pop3d-ssl 2>/dev/null || true
-etc/courier/pop3d-ssl.dist
-@exec [ -f %D/etc/courier/pop3d-ssl.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/pop3d-ssl.dist
-@comment etc/courier/pop3d-ssl
+@sample etc/courier/pop3d-ssl.sample
 etc/courier/pop3d.authpam
-etc/courier/pop3d.cnf
-@unexec cmp -s %D/etc/courier/pop3d %D/etc/courier/pop3d.dist && rm -f %D/etc/courier/pop3d 2>/dev/null || true
-etc/courier/pop3d.dist
-@exec [ -f %D/etc/courier/pop3d.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/pop3d.dist
-@comment etc/courier/pop3d
+@sample etc/courier/pop3d.cnf.sample
+@sample etc/courier/pop3d.sample
 etc/courier/quotawarnmsg.example
-etc/courier/rfcerr2045.txt
-etc/courier/rfcerr2046.txt
-etc/courier/rfcerr2047.txt
-etc/courier/rfcerrheader.txt
 etc/courier/smtpaccess/default
-@unexec cmp -s %D/etc/courier/sqwebmaild %D/etc/courier/sqwebmaild.dist && rm -f %D/etc/courier/sqwebmaild 2>/dev/null || true
-etc/courier/sqwebmaild.dist
-@exec [ -f %D/etc/courier/sqwebmaild.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/sqwebmaild.dist
-@comment etc/courier/sqwebmaild
+@sample etc/courier/sqwebmaild.sample
 etc/courier/webmail.authpam
-@unexec cmp -s %D/etc/courier/webmlmrc %D/etc/courier/webmlmrc.dist && rm -f %D/etc/courier/webmlmrc 2>/dev/null || true
-etc/courier/webmlmrc.dist
-@exec [ -f %D/etc/courier/webmlmrc.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/webmlmrc.dist
-@comment etc/courier/webmlmrc
-libexec/courier/aliascombine
-libexec/courier/aliascreate
-libexec/courier/aliasexp
-libexec/courier/courierd
+@sample etc/courier/webmlmrc.sample
+@(%%MAILOWN%%,,) libexec/courier/aliascombine
+@(%%MAILOWN%%,,) libexec/courier/aliascreate
+@(%%MAILOWN%%,,) libexec/courier/aliasexp
+@(%%MAILOWN%%,,) libexec/courier/courierd
+libexec/courier/courierfilter
 libexec/courier/courierpop3d
 libexec/courier/courierpop3login
 libexec/courier/imaplogin
 libexec/courier/makedatprog
-@owner %%MAILOWN%%
-@group %%MAILGRP%%
-libexec/courier/modules/dsn/courierdsn
-libexec/courier/modules/esmtp/addcr
-libexec/courier/modules/esmtp/courieresmtp
-libexec/courier/modules/esmtp/courieresmtpd
-%%WITHFAX%%libexec/courier/modules/fax/courierfax
-libexec/courier/modules/local/courierdeliver
-libexec/courier/modules/local/courierlocal
-%%WITHUUCP%%libexec/courier/modules/uucp/courieruucp
-@owner
-@group
+@(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/dsn/courierdsn
+@(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/esmtp/addcr
+@(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/esmtp/courieresmtp
+@(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/esmtp/courieresmtpd
+%%WITHFAX%%@(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/fax/courierfax
+@(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/local/courierdeliver
+@(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/local/courierlocal
+%%WITHUUCP%%@(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/uucp/courieruucp
 libexec/courier/pcpd
 libexec/courier/sqwebmaild
-libexec/courier/sqwebpasswd
-libexec/courier/submit
-libexec/courier/submitmkdir
+@(%%MAILOWN%%,%%MAILGRP%%,2555) libexec/courier/sqwebpasswd
+@(%%MAILOWN%%,,) libexec/courier/submit
+@(%%MAILOWN%%,,) libexec/courier/submitmkdir
 libexec/courier/webmail/webadmin
 libexec/courier/webmail/webmail
 libexec/courier/webmail/webmlm
 libexec/filters/dupfilter
 libexec/filters/perlfilter
+libexec/filters/ratefilter
+libexec/filters/verifyfilter
 man/man1/cancelmsg.1.gz
 man/man1/couriermlm.1.gz
 man/man1/couriertcpd.1.gz
 man/man1/couriertls.1.gz
 man/man1/dot-forward.1.gz
 man/man1/dotforward.1.gz
 man/man1/lockmail.1.gz
 man/man1/mailbot.1.gz
 man/man1/maildiracl.1.gz
 man/man1/maildirkw.1.gz
 man/man1/maildirmake.1.gz
+man/man1/maildirwatch.1.gz
 man/man1/maildrop.1.gz
 man/man1/mailq.1.gz
 man/man1/makedat.1.gz
 man/man1/makemime.1.gz
 man/man1/mimegpg.1.gz
 man/man1/preline.1.gz
 man/man1/reformail.1.gz
 man/man1/reformime.1.gz
 man/man1/rmail.1.gz
 man/man1/sendmail.1.gz
 man/man1/testmxlookup.1.gz
 man/man1/webmlmd.1.gz
 man/man5/dot-courier.5.gz
 man/man5/maildir.5.gz
 man/man7/localmailfilter.7.gz
 man/man7/maildirquota.7.gz
 man/man7/maildropex.7.gz
 man/man7/maildropfilter.7.gz
 man/man7/maildropgdbm.7.gz
 man/man8/aliaslookup.8.gz
 man/man8/courier.8.gz
 man/man8/courierfilter.8.gz
-man/man8/courierldapaliasd.8.gz
+%%WITHLDAP%%man/man8/courierldapaliasd.8.gz
 man/man8/courierperlfilter.8.gz
 man/man8/courierpop3d.8.gz
 man/man8/courierpop3login.8.gz
 man/man8/deliverquota.8.gz
 man/man8/dupfilter.8.gz
 man/man8/esmtpd-msa.8.gz
 man/man8/esmtpd.8.gz
 man/man8/filterctl.8.gz
 man/man8/imapd.8.gz
 man/man8/makeacceptmailfor.8.gz
 man/man8/makealiases.8.gz
 man/man8/makehosteddomains.8.gz
+man/man8/makeimapaccess.8.gz
 man/man8/makepercentrelay.8.gz
 man/man8/makesmtpaccess-msa.8.gz
 man/man8/makesmtpaccess.8.gz
+man/man8/mkdhparams.8.gz
 man/man8/mkesmtpdcert.8.gz
 man/man8/mkimapdcert.8.gz
 man/man8/mkpop3dcert.8.gz
 man/man8/pop3d-ssl.8.gz
 man/man8/pop3d.8.gz
+man/man8/ratefilter.8.gz
 man/man8/submit.8.gz
+man/man8/verifyfilter.8.gz
+man/man8/verifysmtp.8.gz
 sbin/aliaslookup
 sbin/courier
 sbin/courieresmtpd
 sbin/courierfilter
 %%WITHLDAP%%sbin/courierldapaliasd
 sbin/couriertcpd
 sbin/esmtpd
 sbin/esmtpd-msa
 sbin/esmtpd-ssl
 sbin/filterctl
 sbin/imapd
 sbin/imapd-ssl
 sbin/makeacceptmailfor
 sbin/makealiases
 sbin/makehosteddomains
+sbin/makeimapaccess
 sbin/makepercentrelay
 sbin/makesmtpaccess
 sbin/makesmtpaccess-msa
 %%WITHUUCP%%sbin/makeuucpneighbors
+sbin/mkdhparams
 sbin/mkesmtpdcert
 sbin/mkimapdcert
 sbin/mkpop3dcert
 sbin/pop3d
 sbin/pop3d-ssl
 sbin/sharedindexinstall
 sbin/sharedindexsplit
 sbin/showconfig
-sbin/showmodules
+@(%%MAILOWN%%,,) sbin/showmodules
 sbin/webgpg
 sbin/webmaild
-share/courier/courierctl.start
-share/courier/couriermlm/adminrequest.tmpl
-share/courier/couriermlm/confsubj.tmpl
-share/courier/couriermlm/digestsubj.tmpl
-share/courier/couriermlm/fetch.tmpl
-share/courier/couriermlm/fetchsubj.tmpl
-share/courier/couriermlm/help.tmpl
-share/courier/couriermlm/idxheader2html.tmpl
-share/courier/couriermlm/idxheaderhtml.tmpl
-share/courier/couriermlm/idxheadertxt.tmpl
-share/courier/couriermlm/idxsubject.tmpl
-share/courier/couriermlm/modrejbody.tmpl
-share/courier/couriermlm/modrejheader.tmpl
-share/courier/couriermlm/modsubject.tmpl
-share/courier/couriermlm/modtext.tmpl
-share/courier/couriermlm/modtext2.tmpl
-share/courier/couriermlm/style.css.tmpl
-share/courier/couriermlm/sub.tmpl
-share/courier/couriermlm/sub2.tmpl
-share/courier/couriermlm/sub3.tmpl
-share/courier/couriermlm/sub4.tmpl
-share/courier/couriermlm/sub5.tmpl
-share/courier/couriermlm/suback.tmpl
-share/courier/couriermlm/subjrequest.tmpl
-share/courier/couriermlm/subreportfooter.tmpl
-share/courier/couriermlm/subreporthdr.tmpl
-share/courier/couriermlm/subreporthdr1.tmpl
-share/courier/couriermlm/subreporthdr2.tmpl
-share/courier/couriermlm/subreporthdr3.tmpl
-share/courier/couriermlm/unsub.tmpl
-share/courier/couriermlm/unsub2.tmpl
-share/courier/couriermlm/unsub3.tmpl
-share/courier/couriermlm/warn1headers.tmpl
-share/courier/couriermlm/warn1text.tmpl
-share/courier/couriermlm/warn1text2.tmpl
-share/courier/couriermlm/warn2msg.tmpl
-share/courier/couriermlm/webmlm.tmpl
-share/courier/couriermlm/webmlm.tmpl.html
-share/courier/couriermlm/webmlmconfirm.html
-share/courier/couriermlm/webmlmerror.tmpl.html
-share/courier/couriermlm/webmlmidx.html
-share/courier/couriermlm/webmlmlistadmin.tmpl.html
-share/courier/couriermlm/webmlmlistadminmod.tmpl.html
-share/courier/couriermlm/webmlmlistadminpw.tmpl.html
-share/courier/couriermlm/webmlmlistindex.tmpl.html
-share/courier/couriermlm/webmlmnotprocessed.html
-share/courier/couriermlm/webmlmpleasewait.tmpl.html
-share/courier/couriermlm/webmlmprocessed.html
-share/courier/couriermlm/webmlmrequestreceived.tmpl.html
-share/courier/couriermlm/webmlmsubinfo.tmpl.html
-share/courier/couriermlm/webmlmsublist.tmpl.html
-share/courier/courierwebadmin/admin-00machine.html
-share/courier/courierwebadmin/admin-00machine.pl
-share/courier/courierwebadmin/admin-05local.html
-share/courier/courierwebadmin/admin-05local.pl
-share/courier/courierwebadmin/admin-10password.html
-share/courier/courierwebadmin/admin-10password.pl
-share/courier/courierwebadmin/admin-15ldap.html
-share/courier/courierwebadmin/admin-15ldap.pl
-share/courier/courierwebadmin/admin-15ldapa.html
-share/courier/courierwebadmin/admin-15ldapa.pl
-share/courier/courierwebadmin/admin-15mysql.html
-share/courier/courierwebadmin/admin-15mysql.pl
-share/courier/courierwebadmin/admin-15pgsql.html
-share/courier/courierwebadmin/admin-15pgsql.pl
-share/courier/courierwebadmin/admin-20aliases.html
-share/courier/courierwebadmin/admin-20aliases.pl
-share/courier/courierwebadmin/admin-30esmtp.html
-share/courier/courierwebadmin/admin-30esmtp.pl
-share/courier/courierwebadmin/admin-31esmtp.html
-share/courier/courierwebadmin/admin-31esmtp.pl
-share/courier/courierwebadmin/admin-30xspf.html
-share/courier/courierwebadmin/admin-30xspf.pl
-share/courier/courierwebadmin/admin-34fax.html
-share/courier/courierwebadmin/admin-34fax.pl
-share/courier/courierwebadmin/admin-35fax.html
-share/courier/courierwebadmin/admin-35fax.pl
-share/courier/courierwebadmin/admin-40imap.html
-share/courier/courierwebadmin/admin-40imap.pl
-share/courier/courierwebadmin/admin-45pop3.html
-share/courier/courierwebadmin/admin-45pop3.pl
-share/courier/courierwebadmin/admin-47webmail.html
-share/courier/courierwebadmin/admin-47webmail.pl
-share/courier/courierwebadmin/admin-50bofh.html
-share/courier/courierwebadmin/admin-50bofh.pl
-share/courier/courierwebadmin/admin-cancel.pl
-share/courier/courierwebadmin/admin-main.html
-share/courier/courierwebadmin/admin-main.pl
-share/courier/courierwebadmin/admin-save.html
-share/courier/courierwebadmin/admin-save.pl
-share/courier/courierwebadmin/dumpenv.pl
-share/courier/courierwebadmin/login.html
-share/courier/courierwebadmin/notsupp.html
-share/courier/courierwebadmin/unsecure.html
-share/courier/courierwebadmin/webadmin.pl
-share/courier/courierwebadmin/webadmin.pm
-share/courier/esmtpd
-share/courier/esmtpd-ssl
-%%WITHFAX%%share/courier/faxmail/application-pdf.filter
-%%WITHFAX%%share/courier/faxmail/application-postscript.filter
-%%WITHFAX%%share/courier/faxmail/coverpage
-%%WITHFAX%%share/courier/faxmail/image-gif.filter
-%%WITHFAX%%share/courier/faxmail/image-jpeg.filter
-%%WITHFAX%%share/courier/faxmail/image-png.filter
-%%WITHFAX%%share/courier/faxmail/init
-%%WITHFAX%%share/courier/faxmail/new_fax
-%%WITHFAX%%share/courier/faxmail/text-plain.filter
-share/courier/filterctl
-share/courier/imapd
-share/courier/imapd-ssl
-share/courier/makeacceptmailfor
-share/courier/makealiases
-share/courier/makedat
-share/courier/makehosteddomains
-share/courier/makepercentrelay
-share/courier/makesmtpaccess
-%%WITHUUCP%%share/courier/makeuucpneighbors
-share/courier/mkesmtpdcert
-share/courier/mkimapdcert
-share/courier/mkpop3dcert
-share/courier/perlfilter-example.pl
-share/courier/perlfilter-wrapper.pl
-share/courier/pop3d
-share/courier/pop3d-ssl
-share/courier/sharedindexupdate
-share/courier/sqwebmail/cleancache.pl
-share/courier/sqwebmail/html/en-us/CHARSET
-share/courier/sqwebmail/html/en-us/ISPELLDICT
-share/courier/sqwebmail/html/en-us/LANGUAGE
-share/courier/sqwebmail/html/en-us/LANGUAGE_PREF
-share/courier/sqwebmail/html/en-us/LOCALE
-share/courier/sqwebmail/html/en-us/TIMEZONELIST
-share/courier/sqwebmail/html/en-us/abooklist.html
-share/courier/sqwebmail/html/en-us/acl.html
-share/courier/sqwebmail/html/en-us/attachments.html
-share/courier/sqwebmail/html/en-us/autoresponder.html
-share/courier/sqwebmail/html/en-us/calendarlogin.inc.html
-share/courier/sqwebmail/html/en-us/empty.html
-share/courier/sqwebmail/html/en-us/eventacl.html
-share/courier/sqwebmail/html/en-us/eventdaily.html
-share/courier/sqwebmail/html/en-us/eventdelete.html
-share/courier/sqwebmail/html/en-us/eventmonthly.html
-share/courier/sqwebmail/html/en-us/eventnotifydelete.txt
-share/courier/sqwebmail/html/en-us/eventnotifynew.txt
-share/courier/sqwebmail/html/en-us/eventnotifysubject.txt
-share/courier/sqwebmail/html/en-us/eventshow.html
-share/courier/sqwebmail/html/en-us/eventweekly.html
-share/courier/sqwebmail/html/en-us/expired.html
-share/courier/sqwebmail/html/en-us/filter.html
-share/courier/sqwebmail/html/en-us/folder.html
-share/courier/sqwebmail/html/en-us/folders.html
-share/courier/sqwebmail/html/en-us/gpg.html
-share/courier/sqwebmail/html/en-us/gpgcreate.html
-share/courier/sqwebmail/html/en-us/gpgerr.html
-share/courier/sqwebmail/html/en-us/index.html
-share/courier/sqwebmail/html/en-us/invalid.html
-share/courier/sqwebmail/html/en-us/keyimport.html
-share/courier/sqwebmail/html/en-us/ldaplist.html
-share/courier/sqwebmail/html/en-us/ldapsearch.html
-share/courier/sqwebmail/html/en-us/login.html
-share/courier/sqwebmail/html/en-us/loginform.inc.html
-share/courier/sqwebmail/html/en-us/navbar.inc.html
-share/courier/sqwebmail/html/en-us/navbar2.inc.html
-share/courier/sqwebmail/html/en-us/navbar3.inc.html
-share/courier/sqwebmail/html/en-us/newevent.html
-share/courier/sqwebmail/html/en-us/newmsg.html
-share/courier/sqwebmail/html/en-us/preferences.html
-share/courier/sqwebmail/html/en-us/print.html
-share/courier/sqwebmail/html/en-us/printnocookie.html
-share/courier/sqwebmail/html/en-us/printredirect.html
-share/courier/sqwebmail/html/en-us/quickadd.html
-share/courier/sqwebmail/html/en-us/readmsg.html
-share/courier/sqwebmail/html/en-us/redirect.html
-share/courier/sqwebmail/html/en-us/refreshfr.html
-share/courier/sqwebmail/html/en-us/smileys.txt
-share/courier/sqwebmail/html/en-us/spellchk.html
-share/courier/sqwebmail/html/en
-share/courier/sqwebmail/images/bg.png
-share/courier/sqwebmail/images/bluebottomleft.png
-share/courier/sqwebmail/images/bluebottomright.png
-share/courier/sqwebmail/images/bluetopleft.png
-share/courier/sqwebmail/images/bluetopright.png
-share/courier/sqwebmail/images/calendar.png
-share/courier/sqwebmail/images/cancel.png
-share/courier/sqwebmail/images/eventadd.png
-share/courier/sqwebmail/images/eventedit.png
-share/courier/sqwebmail/images/first.png
-share/courier/sqwebmail/images/folder.png
-share/courier/sqwebmail/images/folder2.png
-share/courier/sqwebmail/images/folders.png
-share/courier/sqwebmail/images/forward.png
-share/courier/sqwebmail/images/forwardatt.png
-share/courier/sqwebmail/images/fullheaders.png
-share/courier/sqwebmail/images/graybottomleft.png
-share/courier/sqwebmail/images/graybottomright.png
-share/courier/sqwebmail/images/graytopleft.png
-share/courier/sqwebmail/images/graytopright.png
-share/courier/sqwebmail/images/key.png
-share/courier/sqwebmail/images/last.png
-share/courier/sqwebmail/images/left.png
-share/courier/sqwebmail/images/left2.png
-share/courier/sqwebmail/images/logo.png
-share/courier/sqwebmail/images/print.png
-share/courier/sqwebmail/images/reply.png
-share/courier/sqwebmail/images/replyall.png
-share/courier/sqwebmail/images/replylist.png
-share/courier/sqwebmail/images/right.png
-share/courier/sqwebmail/images/right2.png
-share/courier/sqwebmail/images/save.png
-share/courier/sqwebmail/images/sep.png
-share/courier/sqwebmail/images/signin.png
-share/courier/sqwebmail/images/sm-frowney.png
-share/courier/sqwebmail/images/sm-frowney2.png
-share/courier/sqwebmail/images/sm-notsmiley.png
-share/courier/sqwebmail/images/sm-notsmiley2.png
-share/courier/sqwebmail/images/sm-ohno.png
-share/courier/sqwebmail/images/sm-smiley.png
-share/courier/sqwebmail/images/sm-smiley2.png
-share/courier/sqwebmail/images/sm-wink.png
-share/courier/sqwebmail/images/sm-wink2.png
-share/courier/sqwebmail/images/sqwebmail.css
-share/courier/sqwebmail/images/trash2.png
-share/courier/sqwebmail/images/uncancel.png
-share/courier/sqwebmail/images/wikifmt.html
-share/courier/sqwebmail/ldapsearch
-share/courier/sqwebmail/sendit.sh
-share/courier/sqwebmail/webgpg
+@owner %%SHAREOWN%%
+@group %%SHAREGRP%%
+%%DATADIR%%/courierctl.start
+%%DATADIR%%/couriermlm/adminrequest.tmpl
+%%DATADIR%%/couriermlm/confsubj.tmpl
+%%DATADIR%%/couriermlm/couriermlm-rcptfilter-ctlmsg
+%%DATADIR%%/couriermlm/couriermlm-rcptfilter-msg
+%%DATADIR%%/couriermlm/couriermlm-smtpfilter-ctlmsg
+%%DATADIR%%/couriermlm/couriermlm-smtpfilter-msg
+%%DATADIR%%/couriermlm/digestsubj.tmpl
+%%DATADIR%%/couriermlm/fetch.tmpl
+%%DATADIR%%/couriermlm/fetchsubj.tmpl
+%%DATADIR%%/couriermlm/help.tmpl
+%%DATADIR%%/couriermlm/idxheader2html.tmpl
+%%DATADIR%%/couriermlm/idxheaderhtml.tmpl
+%%DATADIR%%/couriermlm/idxheadertxt.tmpl
+%%DATADIR%%/couriermlm/idxsubject.tmpl
+%%DATADIR%%/couriermlm/modrejbody.tmpl
+%%DATADIR%%/couriermlm/modrejheader.tmpl
+%%DATADIR%%/couriermlm/modsubject.tmpl
+%%DATADIR%%/couriermlm/modtext.tmpl
+%%DATADIR%%/couriermlm/modtext2.tmpl
+%%DATADIR%%/couriermlm/style.css.tmpl
+%%DATADIR%%/couriermlm/sub.tmpl
+%%DATADIR%%/couriermlm/sub2.tmpl
+%%DATADIR%%/couriermlm/sub3.tmpl
+%%DATADIR%%/couriermlm/sub4.tmpl
+%%DATADIR%%/couriermlm/sub5.tmpl
+%%DATADIR%%/couriermlm/suback.tmpl
+%%DATADIR%%/couriermlm/subjrequest.tmpl
+%%DATADIR%%/couriermlm/subreportfooter.tmpl
+%%DATADIR%%/couriermlm/subreporthdr.tmpl
+%%DATADIR%%/couriermlm/subreporthdr1.tmpl
+%%DATADIR%%/couriermlm/subreporthdr2.tmpl
+%%DATADIR%%/couriermlm/subreporthdr3.tmpl
+%%DATADIR%%/couriermlm/unsub.tmpl
+%%DATADIR%%/couriermlm/unsub2.tmpl
+%%DATADIR%%/couriermlm/unsub3.tmpl
+%%DATADIR%%/couriermlm/warn1headers.tmpl
+%%DATADIR%%/couriermlm/warn1text.tmpl
+%%DATADIR%%/couriermlm/warn1text2.tmpl
+%%DATADIR%%/couriermlm/warn2msg.tmpl
+%%DATADIR%%/couriermlm/webmlm.tmpl
+%%DATADIR%%/couriermlm/webmlm.tmpl.html
+%%DATADIR%%/couriermlm/webmlmconfirm.html
+%%DATADIR%%/couriermlm/webmlmerror.tmpl.html
+%%DATADIR%%/couriermlm/webmlmidx.html
+%%DATADIR%%/couriermlm/webmlmlistadmin.tmpl.html
+%%DATADIR%%/couriermlm/webmlmlistadminmod.tmpl.html
+%%DATADIR%%/couriermlm/webmlmlistadminpw.tmpl.html
+%%DATADIR%%/couriermlm/webmlmlistindex.tmpl.html
+%%DATADIR%%/couriermlm/webmlmnotprocessed.html
+%%DATADIR%%/couriermlm/webmlmpleasewait.tmpl.html
+%%DATADIR%%/couriermlm/webmlmprocessed.html
+%%DATADIR%%/couriermlm/webmlmrequestreceived.tmpl.html
+%%DATADIR%%/couriermlm/webmlmsubinfo.tmpl.html
+%%DATADIR%%/couriermlm/webmlmsublist.tmpl.html
+%%DATADIR%%/courierwebadmin/admin-00machine.html
+%%DATADIR%%/courierwebadmin/admin-00machine.pl
+%%DATADIR%%/courierwebadmin/admin-05local.html
+%%DATADIR%%/courierwebadmin/admin-05local.pl
+%%DATADIR%%/courierwebadmin/admin-10password.html
+%%DATADIR%%/courierwebadmin/admin-10password.pl
+%%DATADIR%%/courierwebadmin/admin-15ldap.html
+%%DATADIR%%/courierwebadmin/admin-15ldap.pl
+%%DATADIR%%/courierwebadmin/admin-15ldapa.html
+%%DATADIR%%/courierwebadmin/admin-15ldapa.pl
+%%DATADIR%%/courierwebadmin/admin-15mysql.html
+%%DATADIR%%/courierwebadmin/admin-15mysql.pl
+%%DATADIR%%/courierwebadmin/admin-15pgsql.html
+%%DATADIR%%/courierwebadmin/admin-15pgsql.pl
+%%DATADIR%%/courierwebadmin/admin-20aliases.html
+%%DATADIR%%/courierwebadmin/admin-20aliases.pl
+%%DATADIR%%/courierwebadmin/admin-30esmtp.html
+%%DATADIR%%/courierwebadmin/admin-30esmtp.pl
+%%DATADIR%%/courierwebadmin/admin-30xspf.html
+%%DATADIR%%/courierwebadmin/admin-30xspf.pl
+%%DATADIR%%/courierwebadmin/admin-31esmtp.html
+%%DATADIR%%/courierwebadmin/admin-31esmtp.pl
+%%DATADIR%%/courierwebadmin/admin-34fax.html
+%%DATADIR%%/courierwebadmin/admin-34fax.pl
+%%DATADIR%%/courierwebadmin/admin-35fax.html
+%%DATADIR%%/courierwebadmin/admin-35fax.pl
+%%DATADIR%%/courierwebadmin/admin-40imap.html
+%%DATADIR%%/courierwebadmin/admin-40imap.pl
+%%DATADIR%%/courierwebadmin/admin-45pop3.html
+%%DATADIR%%/courierwebadmin/admin-45pop3.pl
+%%DATADIR%%/courierwebadmin/admin-47webmail.html
+%%DATADIR%%/courierwebadmin/admin-47webmail.pl
+%%DATADIR%%/courierwebadmin/admin-50bofh.html
+%%DATADIR%%/courierwebadmin/admin-50bofh.pl
+%%DATADIR%%/courierwebadmin/admin-cancel.pl
+%%DATADIR%%/courierwebadmin/admin-main.html
+%%DATADIR%%/courierwebadmin/admin-main.pl
+%%DATADIR%%/courierwebadmin/admin-save.html
+%%DATADIR%%/courierwebadmin/admin-save.pl
+%%DATADIR%%/courierwebadmin/dumpenv.pl
+%%DATADIR%%/courierwebadmin/login.html
+%%DATADIR%%/courierwebadmin/notsupp.html
+%%DATADIR%%/courierwebadmin/unsecure.html
+%%DATADIR%%/courierwebadmin/webadmin.pl
+%%DATADIR%%/courierwebadmin/webadmin.pm
+%%DATADIR%%/esmtpd
+%%DATADIR%%/esmtpd-ssl
+%%WITHFAX%%%%DATADIR%%/faxmail/application-pdf.filter
+%%WITHFAX%%%%DATADIR%%/faxmail/application-postscript.filter
+%%WITHFAX%%%%DATADIR%%/faxmail/coverpage
+%%WITHFAX%%%%DATADIR%%/faxmail/image-gif.filter
+%%WITHFAX%%%%DATADIR%%/faxmail/image-jpeg.filter
+%%WITHFAX%%%%DATADIR%%/faxmail/image-png.filter
+%%WITHFAX%%%%DATADIR%%/faxmail/init
+%%WITHFAX%%%%DATADIR%%/faxmail/new_fax
+%%WITHFAX%%%%DATADIR%%/faxmail/text-plain.filter
+%%DATADIR%%/filterctl
+%%DATADIR%%/imapd
+%%DATADIR%%/imapd-ssl
+%%DATADIR%%/makeacceptmailfor
+%%DATADIR%%/makealiases
+%%DATADIR%%/makedat
+%%DATADIR%%/makehosteddomains
+%%DATADIR%%/makeimapaccess
+%%DATADIR%%/makepercentrelay
+%%DATADIR%%/makesmtpaccess
+%%WITHUUCP%%%%DATADIR%%/makeuucpneighbors
+%%DATADIR%%/mkdhparams
+%%DATADIR%%/mkesmtpdcert
+%%DATADIR%%/mkimapdcert
+%%DATADIR%%/mkpop3dcert
+%%DATADIR%%/perlfilter-example.pl
+%%DATADIR%%/perlfilter-ratelimit.pl
+%%DATADIR%%/perlfilter-wrapper.pl
+%%DATADIR%%/pop3d
+%%DATADIR%%/pop3d-ssl
+%%DATADIR%%/sharedindexupdate
+%%DATADIR%%/sqwebmail/cleancache.pl
+%%DATADIR%%/sqwebmail/html/en
+%%DATADIR%%/sqwebmail/html/en-us/CHARSET
+%%DATADIR%%/sqwebmail/html/en-us/ISPELLDICT
+%%DATADIR%%/sqwebmail/html/en-us/LANGUAGE
+%%DATADIR%%/sqwebmail/html/en-us/LANGUAGE_PREF
+%%DATADIR%%/sqwebmail/html/en-us/LOCALE
+%%DATADIR%%/sqwebmail/html/en-us/TIMEZONELIST
+%%DATADIR%%/sqwebmail/html/en-us/abooklist.html
+%%DATADIR%%/sqwebmail/html/en-us/acl.html
+%%DATADIR%%/sqwebmail/html/en-us/attachments.html
+%%DATADIR%%/sqwebmail/html/en-us/autoresponder.html
+%%DATADIR%%/sqwebmail/html/en-us/calendarlogin.inc.html
+%%DATADIR%%/sqwebmail/html/en-us/empty.html
+%%DATADIR%%/sqwebmail/html/en-us/eventacl.html
+%%DATADIR%%/sqwebmail/html/en-us/eventdaily.html
+%%DATADIR%%/sqwebmail/html/en-us/eventdelete.html
+%%DATADIR%%/sqwebmail/html/en-us/eventmonthly.html
+%%DATADIR%%/sqwebmail/html/en-us/eventnotifydelete.txt
+%%DATADIR%%/sqwebmail/html/en-us/eventnotifynew.txt
+%%DATADIR%%/sqwebmail/html/en-us/eventnotifysubject.txt
+%%DATADIR%%/sqwebmail/html/en-us/eventshow.html
+%%DATADIR%%/sqwebmail/html/en-us/eventweekly.html
+%%DATADIR%%/sqwebmail/html/en-us/expired.html
+%%DATADIR%%/sqwebmail/html/en-us/filter.html
+%%DATADIR%%/sqwebmail/html/en-us/folder.html
+%%DATADIR%%/sqwebmail/html/en-us/folders.html
+%%DATADIR%%/sqwebmail/html/en-us/gpg.html
+%%DATADIR%%/sqwebmail/html/en-us/gpgcreate.html
+%%DATADIR%%/sqwebmail/html/en-us/gpgerr.html
+%%DATADIR%%/sqwebmail/html/en-us/index.html
+%%DATADIR%%/sqwebmail/html/en-us/invalid.html
+%%DATADIR%%/sqwebmail/html/en-us/keyimport.html
+%%DATADIR%%/sqwebmail/html/en-us/ldaplist.html
+%%DATADIR%%/sqwebmail/html/en-us/ldapsearch.html
+%%DATADIR%%/sqwebmail/html/en-us/login.html
+%%DATADIR%%/sqwebmail/html/en-us/loginform.inc.html
+%%DATADIR%%/sqwebmail/html/en-us/navbar.inc.html
+%%DATADIR%%/sqwebmail/html/en-us/navbar2.inc.html
+%%DATADIR%%/sqwebmail/html/en-us/navbar3.inc.html
+%%DATADIR%%/sqwebmail/html/en-us/newevent.html
+%%DATADIR%%/sqwebmail/html/en-us/newmsg.html
+%%DATADIR%%/sqwebmail/html/en-us/preferences.html
+%%DATADIR%%/sqwebmail/html/en-us/print.html
+%%DATADIR%%/sqwebmail/html/en-us/printnocookie.html
+%%DATADIR%%/sqwebmail/html/en-us/printredirect.html
+%%DATADIR%%/sqwebmail/html/en-us/quickadd.html
+%%DATADIR%%/sqwebmail/html/en-us/readmsg.html
+%%DATADIR%%/sqwebmail/html/en-us/redirect.html
+%%DATADIR%%/sqwebmail/html/en-us/refreshfr.html
+%%DATADIR%%/sqwebmail/html/en-us/smileys.txt
+%%DATADIR%%/sqwebmail/html/en-us/spellchk.html
+%%DATADIR%%/sqwebmail/images/bg.png
+%%DATADIR%%/sqwebmail/images/bluebottomleft.png
+%%DATADIR%%/sqwebmail/images/bluebottomright.png
+%%DATADIR%%/sqwebmail/images/bluetopleft.png
+%%DATADIR%%/sqwebmail/images/bluetopright.png
+%%DATADIR%%/sqwebmail/images/calendar.png
+%%DATADIR%%/sqwebmail/images/cancel.png
+%%DATADIR%%/sqwebmail/images/eventadd.png
+%%DATADIR%%/sqwebmail/images/eventedit.png
+%%DATADIR%%/sqwebmail/images/first.png
+%%DATADIR%%/sqwebmail/images/folder.png
+%%DATADIR%%/sqwebmail/images/folder2.png
+%%DATADIR%%/sqwebmail/images/folders.png
+%%DATADIR%%/sqwebmail/images/forward.png
+%%DATADIR%%/sqwebmail/images/forwardatt.png
+%%DATADIR%%/sqwebmail/images/fullheaders.png
+%%DATADIR%%/sqwebmail/images/graybottomleft.png
+%%DATADIR%%/sqwebmail/images/graybottomright.png
+%%DATADIR%%/sqwebmail/images/graytopleft.png
+%%DATADIR%%/sqwebmail/images/graytopright.png
+%%DATADIR%%/sqwebmail/images/key.png
+%%DATADIR%%/sqwebmail/images/last.png
+%%DATADIR%%/sqwebmail/images/left.png
+%%DATADIR%%/sqwebmail/images/left2.png
+%%DATADIR%%/sqwebmail/images/logo.png
+%%DATADIR%%/sqwebmail/images/print.png
+%%DATADIR%%/sqwebmail/images/reply.png
+%%DATADIR%%/sqwebmail/images/replyall.png
+%%DATADIR%%/sqwebmail/images/replylist.png
+%%DATADIR%%/sqwebmail/images/right.png
+%%DATADIR%%/sqwebmail/images/right2.png
+%%DATADIR%%/sqwebmail/images/save.png
+%%DATADIR%%/sqwebmail/images/sep.png
+%%DATADIR%%/sqwebmail/images/signin.png
+%%DATADIR%%/sqwebmail/images/sm-frowney.png
+%%DATADIR%%/sqwebmail/images/sm-frowney2.png
+%%DATADIR%%/sqwebmail/images/sm-notsmiley.png
+%%DATADIR%%/sqwebmail/images/sm-notsmiley2.png
+%%DATADIR%%/sqwebmail/images/sm-ohno.png
+%%DATADIR%%/sqwebmail/images/sm-smiley.png
+%%DATADIR%%/sqwebmail/images/sm-smiley2.png
+%%DATADIR%%/sqwebmail/images/sm-wink.png
+%%DATADIR%%/sqwebmail/images/sm-wink2.png
+%%DATADIR%%/sqwebmail/images/sqwebmail.css
+%%DATADIR%%/sqwebmail/images/trash2.png
+%%DATADIR%%/sqwebmail/images/uncancel.png
+%%DATADIR%%/sqwebmail/images/wikifmt.html
+%%DATADIR%%/sqwebmail/ldapsearch
+%%DATADIR%%/sqwebmail/sendit.sh
+%%DATADIR%%/sqwebmail/webgpg
+%%DATADIR%%/verifysender
+%%DATADIR%%/verifysenderfull
+@owner
+@group
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BENCHMARKS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS.imap
-%%PORTDOCS%%%%DOCSDIR%%/BUGS.webmail
+%%PORTDOCS%%%%DOCSDIR%%/BUGS.sqwebmail
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2001
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.couriertls
 %%PORTDOCS%%%%DOCSDIR%%/README.imap
 %%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.proxy
 %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
-%%PORTDOCS%%%%DOCSDIR%%/SECURITY.webmail
+%%PORTDOCS%%%%DOCSDIR%%/SECURITY.sqwebmail
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/html/BUGS.imap.html
-%%PORTDOCS%%%%DOCSDIR%%/html/BUGS.webmail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/BUGS.sqwebmail.html
 %%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
 %%PORTDOCS%%%%DOCSDIR%%/html/NEWS.html
 %%PORTDOCS%%%%DOCSDIR%%/html/README.gpglib.html
 %%PORTDOCS%%%%DOCSDIR%%/html/README.imap.html
 %%PORTDOCS%%%%DOCSDIR%%/html/README.maildirfilter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/README.maildirquota.html
 %%PORTDOCS%%%%DOCSDIR%%/html/README.maildrop.html
 %%PORTDOCS%%%%DOCSDIR%%/html/README.pcp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/README.proxy.html
 %%PORTDOCS%%%%DOCSDIR%%/html/README.sharedfolders.html
-%%PORTDOCS%%%%DOCSDIR%%/html/SECURITY.webmail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/SECURITY.sqwebmail.html
 %%PORTDOCS%%%%DOCSDIR%%/html/aliases.html
 %%PORTDOCS%%%%DOCSDIR%%/html/aliaslookup.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bg.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/bg.png
 %%PORTDOCS%%%%DOCSDIR%%/html/cancelmsg.html
-%%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/html/chinese_flag.png
 %%PORTDOCS%%%%DOCSDIR%%/html/courier.html
 %%PORTDOCS%%%%DOCSDIR%%/html/courierd.html
 %%PORTDOCS%%%%DOCSDIR%%/html/courierdsn.html
 %%WITHFAX%%%%PORTDOCS%%%%DOCSDIR%%/html/courierfax.html
 %%PORTDOCS%%%%DOCSDIR%%/html/courierfilter.html
-%%PORTDOCS%%%%DOCSDIR%%/html/courierldapaliasd.html
+%%WITHLDAP%%%%PORTDOCS%%%%DOCSDIR%%/html/courierldapaliasd.html
 %%PORTDOCS%%%%DOCSDIR%%/html/couriermlm.html
 %%PORTDOCS%%%%DOCSDIR%%/html/courierperlfilter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/courierpop3d.html
 %%PORTDOCS%%%%DOCSDIR%%/html/couriertcpd.html
 %%PORTDOCS%%%%DOCSDIR%%/html/couriertls.html
 %%WITHUUCP%%%%PORTDOCS%%%%DOCSDIR%%/html/courieruucp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cvs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/deliverquota.html
 %%PORTDOCS%%%%DOCSDIR%%/html/documentation.html
 %%PORTDOCS%%%%DOCSDIR%%/html/dot-courier.html
 %%PORTDOCS%%%%DOCSDIR%%/html/dot-forward.html
+%%PORTDOCS%%%%DOCSDIR%%/html/download.html
 %%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-exdata-smtpext.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-security-smtpext.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-verp-smtpext.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/dupfilter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/esmtp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/esmtpd.html
-%%PORTDOCS%%%%DOCSDIR%%/html/footer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/frame.js
-%%PORTDOCS%%%%DOCSDIR%%/html/header.html
 %%PORTDOCS%%%%DOCSDIR%%/html/icon.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/imapd.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index2.html
 %%PORTDOCS%%%%DOCSDIR%%/html/install.html
-%%PORTDOCS%%%%DOCSDIR%%/html/intro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/japanese_flag.png
 %%PORTDOCS%%%%DOCSDIR%%/html/layout.html
 %%PORTDOCS%%%%DOCSDIR%%/html/links.html
 %%PORTDOCS%%%%DOCSDIR%%/html/local.html
 %%PORTDOCS%%%%DOCSDIR%%/html/localmailfilter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lockmail.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mailbot.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildir.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildiracl.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildirkw.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildirmake.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildirquota.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildrop.README.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildrop.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildropex.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildropfilter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildropgdbm.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildroptips.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mailq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/main.html
 %%PORTDOCS%%%%DOCSDIR%%/html/makeacceptmailfor.html
 %%PORTDOCS%%%%DOCSDIR%%/html/makealiases.html
 %%PORTDOCS%%%%DOCSDIR%%/html/makedat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/makehosteddomains.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makeimapaccess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/makemime.html
 %%PORTDOCS%%%%DOCSDIR%%/html/makepercentrelay.html
 %%PORTDOCS%%%%DOCSDIR%%/html/makesmtpaccess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manpage.css
 %%PORTDOCS%%%%DOCSDIR%%/html/menu.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mimegpg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mkdhparams.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mkesmtpdcert.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mkimapdcert.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mkpop3dcert.html
 %%PORTDOCS%%%%DOCSDIR%%/html/modules.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pcp_README.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pop3d.html
 %%PORTDOCS%%%%DOCSDIR%%/html/preline.html
 %%PORTDOCS%%%%DOCSDIR%%/html/queue.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ratefilter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/reformail.html
 %%PORTDOCS%%%%DOCSDIR%%/html/reformime.html
+%%PORTDOCS%%%%DOCSDIR%%/html/repo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rpm.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sendmail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/socks.html
 %%PORTDOCS%%%%DOCSDIR%%/html/status.html
 %%PORTDOCS%%%%DOCSDIR%%/html/structures.html
-%%PORTDOCS%%%%DOCSDIR%%/html/style.css
 %%PORTDOCS%%%%DOCSDIR%%/html/submit.html
 %%PORTDOCS%%%%DOCSDIR%%/html/testmxlookup.html
+%%PORTDOCS%%%%DOCSDIR%%/html/verifyfilter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/webmlmd.html
-@comment @exec chown %%MAILOWN%%:%%MAILGRP%% %D/bin/cancelmsg
-@comment @exec chown %%BINOWN%%:mail %D/bin/maildrop
-@comment @exec chown %%BINOWN%%:%%MAILGRP%% %D/bin/mailq
-@comment @exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier
-@comment @exec chown -Rh %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/aliases
-@comment @exec chown %%BINOWN%%:%%BINGRP%% %D/etc/courier/courierd.dist
-@comment @exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/*.txt
-@comment @exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/esmtpauthclient
-@comment @exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.*
-@comment @exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliascombine
-@comment @exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliascreate
-@comment @exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliasexp
-@comment @exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/courierd
-@comment @exec chown -Rh %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/*
-@comment @exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/submit
-@comment @exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/submitmkdir
-@comment @exec chown %%MAILOWN%%:%%MAILGRP%% %D/sbin/showmodules
-@comment @exec chmod 0555 %D/libexec/courier
-@comment @exec chmod 0555 %D/libexec/courier/modules
-@comment @exec chmod 0555 %D/libexec/courier/modules/dsn
-@comment @exec chmod 0555 %D/libexec/courier/modules/esmtp
-@comment %%WITHFAX%%@exec chmod 0555 %D/libexec/courier/modules/fax
-@comment @exec chmod 0555 %D/libexec/courier/modules/local
-@comment %%WITHUUCP%%@exec chmod 0555 %D/libexec/courier/modules/uucp
-@comment @exec chmod 0555 %D/libexec/courier/webmail
-@comment @exec chmod 0555 %D/libexec/filters
-@comment @exec chmod 0555 %D/share/courier
-@comment @exec chmod 0555 %D/share/courier/couriermlm
-@comment @exec chmod 0555 %D/share/courier/courierwebadmin
-@comment %%WITHFAX%%@exec chmod 0555 %D/share/courier/faxmail
-@comment @exec chmod 0555 %D/share/courier/sqwebmail
-@comment @exec chmod 0555 %D/share/courier/sqwebmail/html
-@comment @exec chmod 0555 %D/share/courier/sqwebmail/html/en-us
-@comment @exec chmod 0555 %D/share/courier/sqwebmail/images
-@unexec echo y | crontab -u %%CACHEOWN%% -r 2>/dev/null || true
-@dir(%%MAILOWN%%,%%MAILGRP%%,0755) etc/courier/aliasdir
-@dir(%%MAILOWN%%,%%MAILGRP%%,0750) etc/courier/aliases
-@dir(%%MAILOWN%%,%%MAILGRP%%,0755) etc/courier/esmtpacceptmailfor.dir
-@dir(%%MAILOWN%%,%%MAILGRP%%,0755) etc/courier/esmtppercentrelay.dir
-@dir(%%MAILOWN%%,%%MAILGRP%%,0750) etc/courier/filters
-@dir(%%MAILOWN%%,%%MAILGRP%%,0750) etc/courier/filters/active
-@dir(%%MAILOWN%%,%%MAILGRP%%,0755) etc/courier/shared
-@dir(%%MAILOWN%%,%%MAILGRP%%,0755) etc/courier/shared.tmp
-@dir(%%MAILOWN%%,%%MAILGRP%%,0755) etc/courier/smtpaccess
-@dir(%%MAILOWN%%,%%MAILGRP%%,0700) etc/courier/webadmin
-@dir(%%MAILOWN%%,%%MAILGRP%%,0700) etc/courier/webadmin/added
-@dir(%%MAILOWN%%,%%MAILGRP%%,0700) etc/courier/webadmin/removed
-@dir(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/dsn
-@dir(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/esmtp
-%%WITHFAX%%@dir(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/fax
-@dir(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/local
-%%WITHUUCP%%@dir(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/uucp
-@dir(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules
-@dir %%CALENDIR%%/localcache
-@dir %%CALENDIR%%/private
-@dir %%CALENDIR%%/public
-@dir %%CALENDIR%%
-@dir %%LOCALSTATEDIR%%/allfilters
-@dir %%LOCALSTATEDIR%%/filters
-@dir %%LOCALSTATEDIR%%/msgq
-@dir %%LOCALSTATEDIR%%/msgs
-@dir %%LOCALSTATEDIR%%/tmp
-@dir %%LOCALSTATEDIR%%/track
+%%WITHCERTSDIR%%@dir(%%MAILOWN%%,%%MAILGRP%%,) etc/courier/.pem
+@dir(%%MAILOWN%%,%%MAILGRP%%,) etc/courier/aliasdir
+@dir(%%MAILOWN%%,%%MAILGRP%%,) etc/courier/aliases
+@dir etc/courier/esmtpacceptmailfor.dir
+@dir etc/courier/esmtppercentrelay.dir
+@dir(%%MAILOWN%%,%%MAILGRP%%,750) etc/courier/filters/active
+@dir(%%MAILOWN%%,%%MAILGRP%%,750) etc/courier/filters
+@dir etc/courier/imapaccess
+@dir etc/courier/shared
+@dir etc/courier/shared.tmp
+@dir(%%MAILOWN%%,%%MAILGRP%%,) etc/courier/webadmin/added
+@dir(%%MAILOWN%%,%%MAILGRP%%,) etc/courier/webadmin/removed
+@dir(%%MAILOWN%%,%%MAILGRP%%,700) etc/courier/webadmin
+etc/courier/webadmin/restartauthcmd
+@dir(%%MAILOWN%%,%%MAILGRP%%,) etc/courier
+@dir(%%CACHEOWN%%,%%MAILGRP%%,700) %%CALENDIR%%/localcache
+@dir(%%CACHEOWN%%,%%MAILGRP%%,750) %%CALENDIR%%/private
+@dir(%%CACHEOWN%%,%%MAILGRP%%,755) %%CALENDIR%%/public
+@dir(%%BINOWN%%,%%BINGRP%%,755) %%CALENDIR%%
+@dir(%%MAILOWN%%,%%MAILGRP%%,750) %%LOCALSTATEDIR%%/allfilters
+@dir(%%MAILOWN%%,%%MAILGRP%%,750) %%LOCALSTATEDIR%%/filters
+@dir(%%MAILOWN%%,%%MAILGRP%%,750) %%LOCALSTATEDIR%%/msgq
+@dir(%%MAILOWN%%,%%MAILGRP%%,750) %%LOCALSTATEDIR%%/msgs
+@dir(%%MAILOWN%%,%%MAILGRP%%,755) %%LOCALSTATEDIR%%/sts
+@dir(%%MAILOWN%%,%%MAILGRP%%,770) %%LOCALSTATEDIR%%/tmp
+@dir(%%MAILOWN%%,%%MAILGRP%%,755) %%LOCALSTATEDIR%%/track
 @dir %%LOCALSTATEDIR%%
 @dir %%CACHEDIR%%