freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mail/courier: Update to 1.5.1

Browse Source 
The update fixes build with devel/courier-unicode 2.4.0

While here modernize and cleanup port:

- Modernize RUN_DEPENDS syntax
- Convert to USES=localbase
- Retire Noop options RCCONF and PERIODIC
- Convert to option helpers where possible/convenient
- Configure script unconditionally checks for gnupg, but in wrong
  path. So, moved it as unconditional RUN_DEPENDS, using helper ENV
  var to point to correct executable
- Sort variable and values (intentionally keeping ASPELL and ISPELL
  near though)
- Removed redundant pre-everything echoing well known information
- Fixed sqwebmail extra patches names/paths
- Fixed sqwebmail extra patch generating code that failed to compile

PR:		290504, 285602
This commit is contained in:
Guido Falsi
2025-10-27 22:17:30 +01:00
parent b178f485e8
commit d177096538
19 changed files with 311 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail/courier/Makefile
+127 -214
View File
@@ -1,6 +1,5 @@
PORTNAME= courier
PORTVERSION= 1.1.11
PORTREVISION= 4
PORTVERSION= 1.5.1
CATEGORIES= mail
MASTER_SITES= SF
@@ -12,25 +11,18 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING.GPL
BUILD_DEPENDS= courierauthconfig:security/courier-authlib-base \
gpg2:security/gnupg \
wget:ftp/wget
LIB_DEPENDS= libidn.so:dns/libidn \
libpcre.so:devel/pcre \
LIB_DEPENDS= libcourier-unicode.so:devel/courier-unicode \
libgdbm.so:databases/gdbm \
libcourier-unicode.so:devel/courier-unicode \
libidn2.so:dns/libidn2 \
libpcre2-8.so:devel/pcre2
RUN_DEPENDS= courierauthconfig:security/courier-authlib-base \
RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support \
${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 \
${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.*
courierauthconfig:security/courier-authlib-base \
p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
wget:ftp/wget
#
# User-serviceable variables
@@ -43,9 +35,9 @@ CONFLICTS= courier-imap-2.* couriermlm-0.* \
# recomended values are: /var/mail, ./Mailbox or ./Maildir
#
IMAGEURL?= /webmail
CACHEOWN?= pop
MAILDROPDEFAULT?=./Maildir
IMAGEURL?= /webmail
CACHEOWN?= pop
MAILDROPDEFAULT?= ./Maildir
# End of user-serviceable variables
@@ -53,7 +45,6 @@ MAILOWN?= courier
MAILGRP?= courier
MAILUID?= 465
MAILGID?= 465
ETCDIR= ${PREFIX}/etc
SYSCONFDIR= ${ETCDIR}/courier
LIBEXECDIR= ${PREFIX}/libexec
LOCALSTATEDIR= /var/spool/courier
@@ -62,217 +53,149 @@ CALENDIR= /var/spool/calendar
MIMETYPES= ${LOCALBASE}/etc/mime.types
WITH_TRANSPORT= local esmtp dsn
USES= fam gettext gmake libtool perl5 pkgconfig tar:bzip2 ssl shebangfix
USE_SUBMAKE= yes
USES= fam gettext gmake libtool localbase perl5 pkgconfig shebangfix \
ssl tar:bzip2
USE_RC_SUBR= courier
USE_SUBMAKE= yes
SHEBANG_FILES= courier/filters/perlfilter/perlfilter-ratelimit.pl \
courier/filters/perlfilter/perlfilter-wrapper.pl
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ARGS= --disable-root-check \
--with-db=gdbm \
--enable-syslog=1 --enable-use-flock \
--program-transform-name=s,^,, \
--enable-utf7-folder-encoding \
GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
CONFIGURE_ARGS= --datadir=${DATADIR} \
--disable-root-check \
--enable-imageurl=${IMAGEURL} \
--enable-mimetypes=${MIMETYPES} \
--enable-syslog=1 \
--enable-unicode \
--with-mailuser=${MAILOWN} \
--with-mailgroup=${MAILGRP} \
--with-mailuid=${MAILUID} \
--with-mailgid=${MAILGID} \
--with-etcdir=${ETCDIR} \
--sysconfdir=${SYSCONFDIR} \
--datadir=${DATADIR} \
--enable-use-flock \
--enable-utf7-folder-encoding \
--enable-workarounds-for-imap-client-bugs \
--libexecdir=${LIBEXECDIR} \
--localstatedir=${LOCALSTATEDIR} \
--enable-mimetypes=${MIMETYPES} \
--enable-imageurl=${IMAGEURL} \
--program-transform-name=s,^,, \
--sysconfdir=${SYSCONFDIR} \
--with-cachedir=${CACHEDIR} \
--with-cacheowner=${CACHEOWN} \
--with-calendardir=${CALENDIR} \
--with-mydatadir=${SYSCONFDIR} \
--with-transport='${WITH_TRANSPORT}' \
--with-db=gdbm \
--with-default-maildrop=${MAILDROPDEFAULT} \
--with-etcdir=${ETCDIR} \
--with-mailgid=${MAILGID} \
--with-mailgroup=${MAILGRP} \
--with-mailuid=${MAILUID} \
--with-mailuser=${MAILOWN} \
--with-mydatadir=${SYSCONFDIR} \
--with-notice=unicode \
--with-paranoid-smtpext \
--enable-workarounds-for-imap-client-bugs \
--with-notice=unicode
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
--with-transport='${WITH_TRANSPORT}'
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}" \
SHAREOWN="${SHAREOWN}" SHAREGRP="${SHAREGRP}"
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.*
ETCDIR= ${PREFIX}/etc
SUB_FILES+= crontab pkg-message sharedindexupdate
SUB_LIST:= ${PLIST_SUB}
SUB_FILES+= pkg-message crontab sharedindexupdate
OPTIONS_DEFINE= LDAP PROCMAIL SENDFAX UUCP IPV6 DOCS CERTSDIR
OPTIONS_GROUP= WEBMAIL
OPTIONS_GROUP_WEBMAIL= GNUPG WEBMAILRSENT WEBMAILFLAGS WEBMAILXFACE
OPTIONS_RADIO= ALIASES SPELL
OPTIONS_RADIO_ALIASES= SYSTEMALIASES EMPTYALIASES
PLIST_SUB+= BINGRP="${BINGRP}" \
BINOWN="${BINOWN}" \
CACHEDIR="${CACHEDIR}" \
CACHEOWN="${CACHEOWN}" \
CALENDIR="${CALENDIR}" \
LOCALSTATEDIR="${LOCALSTATEDIR}" \
MAILGID="${MAILGID}" \
MAILGRP="${MAILGRP}" \
MAILOWN="${MAILOWN}" \
MAILUID="${MAILUID}" \
SHAREGRP="${SHAREGRP}" \
SHAREOWN="${SHAREOWN}"
OPTIONS_DEFINE= CERTSDIR DOCS IPV6 LDAP MAILCONF PROCMAIL SENDFAX UUCP
OPTIONS_DEFAULT= SYSTEMALIASES WEBMAILRSENT
OPTIONS_GROUP= WEBMAIL
OPTIONS_GROUP_WEBMAIL= GNUPG WEBMAILFLAGS WEBMAILRSENT WEBMAILXFACE
OPTIONS_RADIO= ALIASES SPELL
OPTIONS_RADIO_ALIASES= EMPTYALIASES SYSTEMALIASES
OPTIONS_RADIO_SPELL= ASPELL ISPELL
OPTIONS_DEFAULT=WEBMAILRSENT SYSTEMALIASES
OPTIONS_SUB= yes
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
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
ASPELL_DESC= ASpell support for WebMail
ISPELL_DESC= ISpell support for WebMail
CERTSDIR_DESC= separate .pem directory for certificates
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
GNUPG_DESC= GNU Privacy Guard support for WebMail
LDAP_DESC= LDAP-based mail aliasing support
MAILCONF_DESC= modify mailer.conf to use courier instead of sendmail
PROCMAIL_DESC= Procmail local delivery support
SENDFAX_DESC= mgetty+sendfax support
SYSTEMALIASES_DESC= symlink system /etc/aliases
UUCP_DESC= UUCP support
WEBMAILFLAGS_DESC= webmail show flags patch
WEBMAILRSENT_DESC= enable Autorename Sent folder
WEBMAILXFACE_DESC= experimental webmail X-Face patch
ASPELL_BUILD_DEPENDS= aspell:textproc/aspell
ASPELL_RUN_DEPENDS= aspell:textproc/aspell
ASPELL_CONFIGURE_ON= --with-ispell=${LOCALBASE}/bin/aspell
ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell
ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell
ISPELL_CONFIGURE_ON= --with-ispell=${LOCALBASE}/bin/ispell
CERTSDIR_CONFIGURE_ON= --with-certsdir=${SYSCONFDIR}/.pem
CERTSDIR_CONFIGURE_OFF= --with-certsdir=${SYSCONFDIR}
CERTSDIR_SUB_LIST= CERTSDIRPATH="${SYSCONFDIR}/.pem"
CERTSDIR_SUB_LIST_OFF= CERTSDIRPATH="${SYSCONFDIR}"
GNUPG_RUN_DEPENDS= gpg2:security/gnupg
GNUPG_CONFIGURE_ENV= GPG="${LOCALBASE}/bin/gpg2"
IPV6_CONFIGURE_WITH= ipv6
LDAP_RUN_DEPENDS= ${LOCALBASE}/lib/courier-authlib/libauthldap.so:net/courier-authlib-ldap
LDAP_USES= ldap
LDAP_CONFIGURE_WITH= ldapaliasd
MAILCONF_SUB_LIST= MAILCONFACT="y"
MAILCONF_SUB_LIST_OFF= MAILCONFACT="n"
PROCMAIL_BUILD_DEPENDS= procmail:mail/procmail
PROCMAIL_RUN_DEPENDS= procmail:mail/procmail
SENDFAX_BUILD_DEPENDS= pnmscale:graphics/netpbm \
sendfax:comms/mgetty+sendfax
SENDFAX_RUN_DEPENDS= pnmscale:graphics/netpbm \
sendfax:comms/mgetty+sendfax
SENDFAX_USES= ghostscript
SENDFAX_VARS= WITH_TRANSPORT+=fax
UUCP_BUILD_DEPENDS= uux:net/freebsd-uucp
UUCP_RUN_DEPENDS= uux:net/freebsd-uucp
UUCP_VARS= WITH_TRANSPORT+=uucp
WEBMAILFLAGS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-libs__sqwebmail__folder.c \
${FILESDIR}/extra-patch-libs__sqwebmail__maildir.c \
${FILESDIR}/extra-patch-libs__sqwebmail__maildir.h \
${FILESDIR}/extra-patch-libs__sqwebmail__images__sqwebmail.css
WEBMAILRSENT_CONFIGURE_ENABLE= autorenamesent
WEBMAILXFACE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-libs__sqwebmail__msg2html.c
.include <bsd.port.options.mk>
.if !${PORT_OPTIONS:MASPELL} && !${PORT_OPTIONS:MISPELL}
CONFIGURE_ARGS+= --without-ispell
.endif
.include "${.CURDIR}/Makefile.doc"
.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:MWEBMAILXFACE}
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libs__sqwebmail__msg2html.c
.endif
.if ${PORT_OPTIONS:MWEBMAILFLAGS}
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 ${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
@@ -293,11 +216,6 @@ _DISTEXFILES= courierd.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}
@@ -339,11 +257,6 @@ post-patch:
${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;' \
@@ -383,13 +296,13 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/html
.endfor
${INSTALL_DATA} ${STAGEDIR}${DATADIR}/htmldoc/* ${STAGEDIR}${DOCSDIR}/html
.endif
.if ${PORT_OPTIONS:MCERTSDIR}
${MKDIR} ${STAGEDIR}${SYSCONFDIR}/.pem
.endif
${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*
post-install-CERTSDIR-on:
${MKDIR} ${STAGEDIR}${SYSCONFDIR}/.pem
.include <bsd.port.mk>
mail/courier/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1686226592
SHA256 (courier-1.1.11.tar.bz2) = 4fe3b73e7da159351ab973b52044996aa0006076f2effdcc4c004be087c5f777
SIZE (courier-1.1.11.tar.bz2) = 7895772
TIMESTAMP = 1761292733
SHA256 (courier-1.5.1.tar.bz2) = 521d1dcbb5038ff635d8e264eee2c45d4638b05a8551c3107d47b227df41a162
SIZE (courier-1.5.1.tar.bz2) = 8470196
mail/courier/files/courier.in
+1 -1
View File
@@ -13,7 +13,7 @@
prefix="%%PREFIX%%"
exec_prefix="${prefix}"
sysconfdir="${prefix}/etc/courier"
certsdir="%%CERTSDIR%%"
certsdir="%%CERTSDIRPATH%%"
sbindir="${exec_prefix}/sbin"
bindir="${exec_prefix}/bin"
libexecdir="${prefix}/libexec"
mail/courier/files/extra-patch-webmail__folder.c → mail/courier/files/extra-patch-libs__sqwebmail__folder.c
+19 -19
View File
@@ -1,7 +1,7 @@
--- 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":"";
--- libs/sqwebmail/folder.c.orig 2025-05-12 00:23:26 UTC
+++ libs/sqwebmail/folder.c
@@ -251,6 +251,18 @@ static int groupmove(const char *folder, const char *f
return (maildir_msgmovefile(folder, file, cgi("moveto"), pos));
}
+static int groupmark(const char *folder, const char *file, size_t pos)
@@ -16,12 +16,12 @@
+ return (0);
+}
+
void folder_delmsgs(const char *dir, size_t pos)
static const char *do_folder_delmsgs(const char *dir, size_t pos)
{
const char *status=do_folder_delmsgs(dir, pos);
@@ -392,6 +404,16 @@
}
fclose(fp);
int rc=0;
@@ -320,6 +332,16 @@ static const char *do_folder_delmsgs(const char *dir,
rc=group_movedel( dir, &groupmove );
maildir_savefoldermsgs(dir);
}
+ else if (*cgi("cmdmark"))
+ {
@@ -32,11 +32,11 @@
+ {
+ rc=group_movedel( dir, &groupunmark );
+ maildir_savefoldermsgs(dir);
+ }
+ }
fprintf(ofp, "%s\n%s\n", maildir, path);
fclose(ofp);
@@ -510,7 +532,7 @@
maildir_cleanup();
@@ -505,7 +527,7 @@ unsigned long *last_message_searched_ptr=NULL;
folder_navigate(dir, pos, highend, morebefore, moreafter,
last_message_searched_ptr);
@@ -45,7 +45,7 @@
getarg("NUM"),
getarg("DATE"),
(strncmp(dir, INBOX "." SENT, sizeof(INBOX)+sizeof(SENT)-1) &&
@@ -531,9 +553,9 @@
@@ -526,9 +548,9 @@ unsigned long *last_message_searched_ptr=NULL;
if (found)
{
@@ -58,7 +58,7 @@
puts("<script type=\"text/javascript\">");
puts("/* <![CDATA[ */");
@@ -565,7 +587,7 @@
@@ -560,7 +582,7 @@ unsigned long *last_message_searched_ptr=NULL;
}
if (!found && nomsg)
{
@@ -67,7 +67,7 @@
puts(nomsg);
puts("<br /></p></td></tr>");
printf("</table>\n");
@@ -630,12 +652,13 @@
@@ -625,12 +647,13 @@ static void show_msg(const char *dir,
if ((q=strrchr(p, '/')) != 0)
p=q+1;
@@ -78,11 +78,11 @@
folder_index_entry_start,
(long)(msgnum+1),
folder_index_entry_end,
+ maildirfile_flag(MSGINFO_FILENAME(contents[i])) ? "<font color=\"red\">!</font>" : "",
+ maildirfile_flag(MSGINFO_FILENAME(msg)) ? "<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 @@
@@ -638,7 +661,7 @@ static void show_msg(const char *dir,
(type[0] == MSGTYPE_DELETED ? " disabled=\"disabled\"":""),
(long)(msgnum));
output_attrencoded(p);
@@ -91,7 +91,7 @@
folder_index_entry_start,
type,
folder_index_entry_end,
@@ -3645,7 +3668,7 @@
@@ -3640,7 +3663,7 @@ void folder_showtransfer()
if ((strcmp(sqwebmail_folder, INBOX "." TRASH) == 0) && (strlen(getarg("PURGEALL"))))
printf("<input type=\"submit\" name=\"cmdpurgeall\" value=\"%s\" onclick=\"javascript: return deleteAll();\" />",
getarg("PURGEALL"));
mail/courier/files/extra-patch-webmail__images__sqwebmail.css → mail/courier/files/extra-patch-libs__sqwebmail__images__sqwebmail.css
View File
mail/courier/files/extra-patch-webmail__maildir.c → mail/courier/files/extra-patch-libs__sqwebmail__maildir.c
View File
mail/courier/files/extra-patch-webmail__maildir.h → mail/courier/files/extra-patch-libs__sqwebmail__maildir.h
View File
mail/courier/files/extra-patch-webmail__msg2html.c → mail/courier/files/extra-patch-libs__sqwebmail__msg2html.c
View File
mail/courier/files/patch-courier__Makefile.in
+31 -1
View File
@@ -1,6 +1,6 @@
--- courier/Makefile.in.orig 2010-02-15 18:58:00.000000000 +0100
+++ courier/Makefile.in 2010-02-15 19:11:12.000000000 +0100
@@ -441,6 +441,7 @@
@@ -626,6 +626,7 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
@@ -8,3 +8,33 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -2478,21 +2479,21 @@
$(INSTALL_SCRIPT) imapd.rc $(DESTDIR)$(datadir)/imapd
$(INSTALL_SCRIPT) imapd-ssl.rc $(DESTDIR)$(datadir)/imapd-ssl
rm -f $(DESTDIR)$(sbindir)/imapd
- $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/imapd` $(DESTDIR)$(sbindir)/imapd
+ $(LN_S) $(datadir)/imapd $(DESTDIR)$(sbindir)/imapd
rm -f $(DESTDIR)$(sbindir)/imapd-ssl
- $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/imapd-ssl` $(DESTDIR)$(sbindir)/imapd-ssl
+ $(LN_S) $(datadir)/imapd-ssl $(DESTDIR)$(sbindir)/imapd-ssl
rm -f $(DESTDIR)$(sbindir)/mkdhparams
- $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/mkdhparams` $(DESTDIR)$(sbindir)/mkdhparams
+ $(LN_S) $(datadir)/mkdhparams $(DESTDIR)$(sbindir)/mkdhparams
rm -f $(DESTDIR)$(sbindir)/mkimapdcert
- $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/mkimapdcert` $(DESTDIR)$(sbindir)/mkimapdcert
+ $(LN_S) $(datadir)/mkimapdcert $(DESTDIR)$(sbindir)/mkimapdcert
rm -f $(DESTDIR)$(sbindir)/mkpop3dcert
- $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/mkpop3dcert` $(DESTDIR)$(sbindir)/mkpop3dcert
+ $(LN_S) $(datadir)/mkpop3dcert $(DESTDIR)$(sbindir)/mkpop3dcert
rm -f $(DESTDIR)$(bindir)/makedat
- $(LN_S) `realpath -m --relative-to $(bindir) $(datadir)/makedat` $(DESTDIR)$(bindir)/makedat
+ $(LN_S) $(datadir)/makedat $(DESTDIR)$(bindir)/makedat
for f in makealiases makehosteddomains makeimapaccess pop3d pop3d-ssl \
; do rm -f $(DESTDIR)$(sbindir)/$$f ; \
- $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
- rm -f $(DESTDIR)$(sbindir)/webgpg ; $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/sqwebmail/webgpg` $(DESTDIR)$(sbindir)/webgpg
+ $(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
+ rm -f $(DESTDIR)$(sbindir)/webgpg ; $(LN_S) $(datadir)/sqwebmail/webgpg $(DESTDIR)$(sbindir)/webgpg
$(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/webadmin
mkdir -p $(DESTDIR)$(sysconfdir)/shared
chmod 755 $(DESTDIR)$(sysconfdir)/shared
mail/courier/files/patch-courier__filters__Makefile.in
+11
View File
@@ -0,0 +1,11 @@
--- courier/filters/Makefile.in.orig 2025-05-10 16:36:14.144694000 +0200
+++ courier/filters/Makefile.in 2025-05-10 16:36:42.732908000 +0200
@@ -1441,7 +1441,7 @@
-$(mkinstalldirs) $(DESTDIR)$(bindir)
chmod 500 $(DESTDIR)$(datadir)/filterctl
rm -f $(DESTDIR)$(sbindir)/filterctl
- $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/filterctl` $(DESTDIR)$(sbindir)/filterctl
+ $(LN_S) $(datadir)/filterctl $(DESTDIR)$(sbindir)/filterctl
chmod 755 $(DESTDIR)$(filterbindir)
chmod 750 $(DESTDIR)$(filtersocketdir)
chmod 750 $(DESTDIR)$(allfiltersocketdir)
mail/courier/files/patch-courier__module.esmtp__Makefile.in
+21
View File
@@ -0,0 +1,21 @@
--- courier/module.esmtp/Makefile.in.orig 2025-05-10 16:15:59.314380000 +0200
+++ courier/module.esmtp/Makefile.in 2025-05-10 16:18:34.251641000 +0200
@@ -1239,15 +1239,15 @@
test `id -u` = 0 || exit 0 ; cd $(DESTDIR)$(moduledir) || exit 1 ; chown @mailuser@ . ; chgrp @mailgroup@ .
install-data-local:
- test -f $(DESTDIR)$(sbindir)/courieresmtpd && exit 0; $(mkinstalldirs) $(DESTDIR)$(sbindir) || :; rm -f $(DESTDIR)$(sbindir)/courieresmtpd && $(LN_S) `realpath --relative-to $(sbindir) -m $(moduledir)/courieresmtpd` $(DESTDIR)$(sbindir)/courieresmtpd
+ test -f $(DESTDIR)$(sbindir)/courieresmtpd && exit 0; $(mkinstalldirs) $(DESTDIR)$(sbindir) || :; rm -f $(DESTDIR)$(sbindir)/courieresmtpd && $(LN_S) $(moduledir)/courieresmtpd $(DESTDIR)$(sbindir)/courieresmtpd
-$(mkinstalldirs) $(DESTDIR)$(bindir)
- test -f $(DESTDIR)$(bindir)/addcr && exit 0; rm -f $(DESTDIR)$(bindir)/addcr && $(LN_S) `realpath -m --relative-to $(bindir) $(moduledir)/addcr` $(DESTDIR)$(bindir)/addcr
+ test -f $(DESTDIR)$(bindir)/addcr && exit 0; rm -f $(DESTDIR)$(bindir)/addcr && $(LN_S) $(moduledir)/addcr $(DESTDIR)$(bindir)/addcr
-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/esmtpacceptmailfor.dir
-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/esmtppercentrelay.dir
-$(mkinstalldirs) $(DESTDIR)$(sbindir)
for f in $(databin_SCRIPTS) ; do \
rm -f $(DESTDIR)$(sbindir)/$$f ; \
- $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
+ $(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
cat </dev/null >>$(DESTDIR)$(sysconfdir)/esmtpauthclient
chmod 600 $(DESTDIR)$(sysconfdir)/esmtpauthclient
test `id -u` = 0 || exit 0; \
mail/courier/files/patch-courier__module.uucp__Makefile.in
+11
View File
@@ -0,0 +1,11 @@
--- courier/module.uucp/Makefile.in.orig 2025-05-10 16:20:56.345335000 +0200
+++ courier/module.uucp/Makefile.in 2025-05-10 16:21:12.492588000 +0200
@@ -1145,7 +1145,7 @@
chmod 755 $(DESTDIR)$(moduledir)
@test `id -u` = 0 || exit 0 ; cd $(DESTDIR)$(moduledir) || exit 1 ; chown @mailuser@ . ; chgrp @mailgroup@ .
rm -f $(DESTDIR)$(sbindir)/makeuucpneighbors ; \
- $(LN_S) `realpath --relative-to $(sbindir) -m $(datadir)/makeuucpneighbors` \
+ $(LN_S) $(datadir)/makeuucpneighbors \
$(DESTDIR)$(sbindir)/makeuucpneighbors
rm -f $(DESTDIR)$(man8dir)/makeuucpneighbors.8
mail/courier/files/patch-courier__submit.C
-54
View File
@@ -1,54 +0,0 @@
--- courier/submit.C.orig Fri Apr 22 21:38:00 2005
+++ courier/submit.C Fri Apr 22 21:38:00 2005
@@ -531,6 +531,7 @@
(*hdrOut) += str;
(*hdrOut) += " (";
(*hdrOut) += errmsg_buf;
+/*
(*hdrOut) += ")\n SPF=";
(*hdrOut) += checkname;
(*hdrOut) += ";\n";
@@ -550,6 +551,43 @@
(*hdrOut) += v ? v:strerror(errno);
(*hdrOut) += ";\n";
}
+*/
+ (*hdrOut) += ")\n ";
+ (*hdrOut) += checkname;
+ {
+ char *v=strdup(values[0] ? values[0] : "");
+
+ for (q=v; q && *q; q++)
+ if (*q < ' ' || *q >= 127)
+ *q='?';
+ else if (*q == ';')
+ *q=' ';
+ (*hdrOut) += " ";
+ (*hdrOut) += v ? v:strerror(errno);
+ }
+ {
+ char *v=strdup(values[2] ? values[2] : "");
+
+ for (q=v; q && *q; q++)
+ if (*q < ' ' || *q >= 127)
+ *q='?';
+ else if (*q == ';')
+ *q=' ';
+ (*hdrOut) += " (";
+ (*hdrOut) += v ? v:strerror(errno);
+ }
+ {
+ char *v=strdup(values[1] ? values[1] : "");
+
+ for (q=v; q && *q; q++)
+ if (*q < ' ' || *q >= 127)
+ *q='?';
+ else if (*q == ';')
+ *q=' ';
+ (*hdrOut) += " [";
+ (*hdrOut) += v ? v:strerror(errno);
+ }
+ (*hdrOut) += "]);\n";
return str;
}
mail/courier/files/patch-libs__rfc2045__rfc2045.h
+11
View File
@@ -0,0 +1,11 @@
--- libs/rfc2045/rfc2045.h.orig 2025-10-05 18:47:55.000000000 +0200
+++ libs/rfc2045/rfc2045.h 2025-10-24 13:26:29.985150000 +0200
@@ -3224,7 +3224,7 @@
if (decode_header)
{
- typename rfc2045::entity::line_iter<crlf>::headers<
+ typename rfc2045::entity::line_iter<crlf>::template headers<
src_type> parser{e, src };
parser.name_lc=header_name_lc;
mail/courier/files/patch-libs__rfc2045__testsuitecpp.C
+11
View File
@@ -0,0 +1,11 @@
--- libs/rfc2045/testsuitecpp.C.orig 2025-10-03 19:53:41.000000000 +0200
+++ libs/rfc2045/testsuitecpp.C 2025-10-24 14:00:53.643970000 +0200
@@ -19,7 +19,7 @@
auto b=s.begin();
auto e=s.end();
- typename rfc2045::entity::line_iter<crlf>::iter<
+ typename rfc2045::entity::line_iter<crlf>::template iter<
std::string_view::iterator,
std::string_view::iterator
>
mail/courier/files/patch-libs__rfc2045__testsuitecpp2.C
+29
View File
@@ -0,0 +1,29 @@
--- libs/rfc2045/testsuitecpp2.C.orig 2025-09-10 11:00:08.000000000 +0200
+++ libs/rfc2045/testsuitecpp2.C 2025-10-24 14:02:10.528663000 +0200
@@ -217,7 +217,7 @@
auto b=std::istreambuf_iterator<char>{ss};
auto e=std::istreambuf_iterator<char>{};
- typename rfc2045::entity::line_iter<crlf>::iter<
+ typename rfc2045::entity::line_iter<crlf>::template iter<
std::istreambuf_iterator<char>,
std::istreambuf_iterator<char>
> iter{b, e};
@@ -310,7 +310,7 @@
auto b=std::istreambuf_iterator<char>{ss};
auto e=std::istreambuf_iterator<char>{};
- typename rfc2045::entity::line_iter<crlf>::iter<
+ typename rfc2045::entity::line_iter<crlf>::template iter<
std::istreambuf_iterator<char>,
std::istreambuf_iterator<char>
> iter{b, e};
@@ -488,7 +488,7 @@
auto b=std::istreambuf_iterator<char>{ss};
auto e=std::istreambuf_iterator<char>{};
- typename rfc2045::entity::line_iter<crlf>::iter<
+ typename rfc2045::entity::line_iter<crlf>::template iter<
std::istreambuf_iterator<char>,
std::istreambuf_iterator<char>
> iter{b, e};
mail/courier/files/pkg-install.in
+1 -5
View File
@@ -6,7 +6,7 @@ USER=%%MAILOWN%%; UID=%%MAILUID%%
GROUP=%%MAILGRP%%; GID=%%MAILGID%%
if [ ":$2" = ":POST-INSTALL" ]; then
if [ "%%MAILCONF%%" = "y" ]; then
if [ "%%MAILCONFACT%%" = "y" ]; then
mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
echo "# created by courier's pkg-install" > /etc/mail/mailer.conf
echo -n "# Execute the Courier sendmail program" >> /etc/mail/mailer.conf
@@ -18,8 +18,4 @@ if [ ":$2" = ":POST-INSTALL" ]; then
echo "newaliases ${PKG_PREFIX}/sbin/makealiases" >> /etc/mail/mailer.conf
echo "Done."
fi
if [ "%%RCCONF%%" = "y" ]; then
fi
if [ "%%PERIODIC%%" = "y" ]; then
fi
fi
mail/courier/files/pkg-message.in
+4 -4
View File
@@ -9,13 +9,13 @@ Check and/or modify the following configuration files to suit your needs:
%%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
%%SENDFAX%% %%PREFIX%%/etc/courier/faxcoverpage.tr
%%SENDFAX%% %%PREFIX%%/etc/courier/faxnotifyrc
%%SENDFAX%% %%PREFIX%%/etc/courier/faxrc
%%PREFIX%%/etc/courier/imapd
%%PREFIX%%/etc/courier/imapd-ssl
%%PREFIX%%/etc/courier/ldapaddressbook
%%WITHLDAP%% %%PREFIX%%/etc/courier/ldapaliasrc
%%LDAP%% %%PREFIX%%/etc/courier/ldapaliasrc
%%PREFIX%%/etc/courier/pop3d
%%PREFIX%%/etc/courier/pop3d-ssl
mail/courier/pkg-plist
+31 -27
View File
@@ -27,8 +27,8 @@ bin/verifysmtp
bin/webmlmd
bin/webmlmd.rc
etc/courier/aliases/system
%%WITHSYSTEMALIASES%%@postexec [ -e /etc/aliases ] && ln -sf /etc/aliases %D/etc/courier/aliases/system
%%WITHEMPTYALIASES%%@postexec true > %D/etc/courier/aliases/system
%%SYSTEMALIASES%%@postexec [ -e /etc/aliases ] && ln -sf /etc/aliases %D/etc/courier/aliases/system
%%EMPTYALIASES%%@postexec true > %D/etc/courier/aliases/system
@sample etc/courier/courierd.sample
etc/courier/crontab
etc/courier/dsndelayed.txt
@@ -46,23 +46,23 @@ etc/courier/esmtp.authpam
@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
%%SENDFAX%%@sample etc/courier/faxcoverpage.tr.sample
%%SENDFAX%%@sample etc/courier/faxnotifyrc.sample
%%SENDFAX%%@sample etc/courier/faxrc.sample
@sample etc/courier/imapd-ssl.sample
etc/courier/imapd.authpam
@sample etc/courier/imapd.cnf.sample
@sample etc/courier/imapd.sample
@sample etc/courier/ldapaddressbook.sample
%%WITHLDAP%%@sample etc/courier/ldapaliasrc.sample
%%LDAP%%@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
%%SENDFAX%%etc/courier/module.fax
etc/courier/module.local
%%WITHUUCP%%etc/courier/module.uucp
%%UUCP%%etc/courier/module.uucp
@sample etc/courier/pop3d-ssl.sample
etc/courier/pop3d.authpam
@sample etc/courier/pop3d.cnf.sample
@@ -85,10 +85,10 @@ libexec/courier/makedatprog
@(%%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
%%SENDFAX%%@(%%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
%%UUCP%%@(%%MAILOWN%%,%%MAILGRP%%,) libexec/courier/modules/uucp/courieruucp
libexec/courier/pcpd
libexec/courier/sqwebmaild
@(%%MAILOWN%%,%%MAILGRP%%,2555) libexec/courier/sqwebpasswd
@@ -134,11 +134,13 @@ share/man/man7/maildropfilter.7.gz
share/man/man7/maildropgdbm.7.gz
share/man/man8/aliaslookup.8.gz
share/man/man8/courier.8.gz
%%SENDFAX%%share/man/man8/courierfax.8.gz
share/man/man8/courierfilter.8.gz
%%WITHLDAP%%share/man/man8/courierldapaliasd.8.gz
%%LDAP%%share/man/man8/courierldapaliasd.8.gz
share/man/man8/courierperlfilter.8.gz
share/man/man8/courierpop3d.8.gz
share/man/man8/courierpop3login.8.gz
%%UUCP%%share/man/man8/courieruucp.8.gz
share/man/man8/deliverquota.8.gz
share/man/man8/dupfilter.8.gz
share/man/man8/esmtpd-msa.8.gz
@@ -152,6 +154,7 @@ share/man/man8/makeimapaccess.8.gz
share/man/man8/makepercentrelay.8.gz
share/man/man8/makesmtpaccess-msa.8.gz
share/man/man8/makesmtpaccess.8.gz
%%UUCP%%share/man/man8/makeuucpneighbors.8.gz
share/man/man8/mkdhparams.8.gz
share/man/man8/mkesmtpdcert.8.gz
share/man/man8/mkimapdcert.8.gz
@@ -166,7 +169,7 @@ sbin/aliaslookup
sbin/courier
sbin/courieresmtpd
sbin/courierfilter
%%WITHLDAP%%sbin/courierldapaliasd
%%LDAP%%sbin/courierldapaliasd
sbin/couriertcpd
sbin/esmtpd
sbin/esmtpd-msa
@@ -181,7 +184,7 @@ sbin/makeimapaccess
sbin/makepercentrelay
sbin/makesmtpaccess
sbin/makesmtpaccess-msa
%%WITHUUCP%%sbin/makeuucpneighbors
%%UUCP%%sbin/makeuucpneighbors
sbin/mkdhparams
sbin/mkesmtpdcert
sbin/mkimapdcert
@@ -298,15 +301,15 @@ sbin/webmaild
%%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
%%SENDFAX%%%%DATADIR%%/faxmail/application-pdf.filter
%%SENDFAX%%%%DATADIR%%/faxmail/application-postscript.filter
%%SENDFAX%%%%DATADIR%%/faxmail/coverpage
%%SENDFAX%%%%DATADIR%%/faxmail/image-gif.filter
%%SENDFAX%%%%DATADIR%%/faxmail/image-jpeg.filter
%%SENDFAX%%%%DATADIR%%/faxmail/image-png.filter
%%SENDFAX%%%%DATADIR%%/faxmail/init
%%SENDFAX%%%%DATADIR%%/faxmail/new_fax
%%SENDFAX%%%%DATADIR%%/faxmail/text-plain.filter
%%DATADIR%%/filterctl
%%DATADIR%%/imapd
%%DATADIR%%/imapd-ssl
@@ -317,7 +320,7 @@ sbin/webmaild
%%DATADIR%%/makeimapaccess
%%DATADIR%%/makepercentrelay
%%DATADIR%%/makesmtpaccess
%%WITHUUCP%%%%DATADIR%%/makeuucpneighbors
%%UUCP%%%%DATADIR%%/makeuucpneighbors
%%DATADIR%%/mkdhparams
%%DATADIR%%/mkesmtpdcert
%%DATADIR%%/mkimapdcert
@@ -470,15 +473,15 @@ sbin/webmaild
%%PORTDOCS%%%%DOCSDIR%%/html/courier.html
%%PORTDOCS%%%%DOCSDIR%%/html/courierd.html
%%PORTDOCS%%%%DOCSDIR%%/html/courierdsn.html
%%WITHFAX%%%%PORTDOCS%%%%DOCSDIR%%/html/courierfax.html
%%SENDFAX%%%%PORTDOCS%%%%DOCSDIR%%/html/courierfax.html
%%PORTDOCS%%%%DOCSDIR%%/html/courierfilter.html
%%WITHLDAP%%%%PORTDOCS%%%%DOCSDIR%%/html/courierldapaliasd.html
%%LDAP%%%%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
%%UUCP%%%%PORTDOCS%%%%DOCSDIR%%/html/courieruucp.html
%%PORTDOCS%%%%DOCSDIR%%/html/deliverquota.html
%%PORTDOCS%%%%DOCSDIR%%/html/documentation.html
%%PORTDOCS%%%%DOCSDIR%%/html/dot-courier.html
@@ -546,7 +549,7 @@ sbin/webmaild
%%PORTDOCS%%%%DOCSDIR%%/html/testmxlookup.html
%%PORTDOCS%%%%DOCSDIR%%/html/verifyfilter.html
%%PORTDOCS%%%%DOCSDIR%%/html/webmlmd.html
%%WITHCERTSDIR%%@dir(%%MAILOWN%%,%%MAILGRP%%,) etc/courier/.pem
%%CERTSDIR%%@dir(%%MAILOWN%%,%%MAILGRP%%,) etc/courier/.pem
@dir(%%MAILOWN%%,%%MAILGRP%%,) etc/courier/aliasdir
@dir(%%MAILOWN%%,%%MAILGRP%%,) etc/courier/aliases
@dir etc/courier/esmtpacceptmailfor.dir
@@ -573,4 +576,5 @@ etc/courier/webadmin/restartauthcmd
@dir(%%MAILOWN%%,%%MAILGRP%%,770) %%LOCALSTATEDIR%%/tmp
@dir(%%MAILOWN%%,%%MAILGRP%%,755) %%LOCALSTATEDIR%%/track
@dir %%LOCALSTATEDIR%%
%%SENDFAX%%@dir %%LOCALSTATEDIR%%/faxtmp
@dir %%CACHEDIR%%