diff options
Diffstat (limited to 'mail/courier/files')
16 files changed, 150 insertions, 84 deletions
diff --git a/mail/courier/files/courier.in b/mail/courier/files/courier.in index 45a3e5a54bf5..4de6995efeba 100644 --- a/mail/courier/files/courier.in +++ b/mail/courier/files/courier.in @@ -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" diff --git a/mail/courier/files/extra-patch-webmail__folder.c b/mail/courier/files/extra-patch-libs__sqwebmail__folder.c index d62fbc5703e3..57e46767947c 100644 --- a/mail/courier/files/extra-patch-webmail__folder.c +++ b/mail/courier/files/extra-patch-libs__sqwebmail__folder.c @@ -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); -+ } ++ } + + maildir_cleanup(); - fprintf(ofp, "%s\n%s\n", maildir, path); - fclose(ofp); -@@ -510,7 +532,7 @@ +@@ -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")); diff --git a/mail/courier/files/extra-patch-webmail__images__sqwebmail.css b/mail/courier/files/extra-patch-libs__sqwebmail__images__sqwebmail.css index de75c1143f8f..de75c1143f8f 100644 --- a/mail/courier/files/extra-patch-webmail__images__sqwebmail.css +++ b/mail/courier/files/extra-patch-libs__sqwebmail__images__sqwebmail.css diff --git a/mail/courier/files/extra-patch-webmail__maildir.c b/mail/courier/files/extra-patch-libs__sqwebmail__maildir.c index a6b96b375296..a6b96b375296 100644 --- a/mail/courier/files/extra-patch-webmail__maildir.c +++ b/mail/courier/files/extra-patch-libs__sqwebmail__maildir.c diff --git a/mail/courier/files/extra-patch-webmail__maildir.h b/mail/courier/files/extra-patch-libs__sqwebmail__maildir.h index 6dff5f0ff87d..6dff5f0ff87d 100644 --- a/mail/courier/files/extra-patch-webmail__maildir.h +++ b/mail/courier/files/extra-patch-libs__sqwebmail__maildir.h diff --git a/mail/courier/files/extra-patch-webmail__msg2html.c b/mail/courier/files/extra-patch-libs__sqwebmail__msg2html.c index 5e310aad1bad..5e310aad1bad 100644 --- a/mail/courier/files/extra-patch-webmail__msg2html.c +++ b/mail/courier/files/extra-patch-libs__sqwebmail__msg2html.c diff --git a/mail/courier/files/patch-courier__Makefile.in b/mail/courier/files/patch-courier__Makefile.in index 392829115f58..8be18d04d16b 100644 --- a/mail/courier/files/patch-courier__Makefile.in +++ b/mail/courier/files/patch-courier__Makefile.in @@ -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 diff --git a/mail/courier/files/patch-courier__filters__Makefile.in b/mail/courier/files/patch-courier__filters__Makefile.in new file mode 100644 index 000000000000..0aa5fecd839a --- /dev/null +++ b/mail/courier/files/patch-courier__filters__Makefile.in @@ -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) diff --git a/mail/courier/files/patch-courier__module.esmtp__Makefile.in b/mail/courier/files/patch-courier__module.esmtp__Makefile.in new file mode 100644 index 000000000000..53d73b7bf5e2 --- /dev/null +++ b/mail/courier/files/patch-courier__module.esmtp__Makefile.in @@ -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; \ diff --git a/mail/courier/files/patch-courier__module.uucp__Makefile.in b/mail/courier/files/patch-courier__module.uucp__Makefile.in new file mode 100644 index 000000000000..259a5315202c --- /dev/null +++ b/mail/courier/files/patch-courier__module.uucp__Makefile.in @@ -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 diff --git a/mail/courier/files/patch-courier__submit.C b/mail/courier/files/patch-courier__submit.C deleted file mode 100644 index ad3ac19f74b0..000000000000 --- a/mail/courier/files/patch-courier__submit.C +++ /dev/null @@ -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; - } - diff --git a/mail/courier/files/patch-libs__rfc2045__rfc2045.h b/mail/courier/files/patch-libs__rfc2045__rfc2045.h new file mode 100644 index 000000000000..2f6eec155b20 --- /dev/null +++ b/mail/courier/files/patch-libs__rfc2045__rfc2045.h @@ -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; diff --git a/mail/courier/files/patch-libs__rfc2045__testsuitecpp.C b/mail/courier/files/patch-libs__rfc2045__testsuitecpp.C new file mode 100644 index 000000000000..e6d63464db48 --- /dev/null +++ b/mail/courier/files/patch-libs__rfc2045__testsuitecpp.C @@ -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 + > diff --git a/mail/courier/files/patch-libs__rfc2045__testsuitecpp2.C b/mail/courier/files/patch-libs__rfc2045__testsuitecpp2.C new file mode 100644 index 000000000000..a59cd8a1d70a --- /dev/null +++ b/mail/courier/files/patch-libs__rfc2045__testsuitecpp2.C @@ -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}; diff --git a/mail/courier/files/pkg-install.in b/mail/courier/files/pkg-install.in index d1321bf6521a..d64eda646153 100644 --- a/mail/courier/files/pkg-install.in +++ b/mail/courier/files/pkg-install.in @@ -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 diff --git a/mail/courier/files/pkg-message.in b/mail/courier/files/pkg-message.in index 0636aaa9be92..eed537a65475 100644 --- a/mail/courier/files/pkg-message.in +++ b/mail/courier/files/pkg-message.in @@ -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 |