head 1.9; access; symbols pkgsrc-2026Q2:1.9.0.20 pkgsrc-2026Q2-base:1.9 pkgsrc-2026Q1:1.9.0.18 pkgsrc-2026Q1-base:1.9 pkgsrc-2025Q4:1.9.0.16 pkgsrc-2025Q4-base:1.9 pkgsrc-2025Q3:1.9.0.14 pkgsrc-2025Q3-base:1.9 pkgsrc-2025Q2:1.9.0.12 pkgsrc-2025Q2-base:1.9 pkgsrc-2025Q1:1.9.0.10 pkgsrc-2025Q1-base:1.9 pkgsrc-2024Q4:1.9.0.8 pkgsrc-2024Q4-base:1.9 pkgsrc-2024Q3:1.9.0.6 pkgsrc-2024Q3-base:1.9 pkgsrc-2024Q2:1.9.0.4 pkgsrc-2024Q2-base:1.9 pkgsrc-2024Q1:1.9.0.2 pkgsrc-2024Q1-base:1.9 pkgsrc-2023Q4:1.7.0.94 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.92 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.90 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.88 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.86 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.84 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.82 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.80 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.78 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.76 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.74 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.72 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.70 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.68 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.64 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.44 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.66 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.62 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.60 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.58 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.56 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.54 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.52 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.50 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.48 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.46 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.42 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.40 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.38 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.36 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.34 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.32 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.30 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.28 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.26 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.24 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.22 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.20 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.7.0.18 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.16 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.14 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.12 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.10 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.8 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.6 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.4 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.2 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.6.0.16 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.14 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.12 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.10 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.8 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.6 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.4 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.2 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.5.0.22 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.20 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.18 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.16 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.14 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.12 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.10 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.8 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.6 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.4 pkgsrc-2008Q1:1.5.0.2 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.4.0.2 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.2.0.10 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.8 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.6 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.4 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.9 date 2024.03.16.14.23.28; author tm; state Exp; branches; next 1.8; commitid vvMwOCpvvZ7Noo2F; 1.8 date 2024.02.12.21.06.43; author hans; state Exp; branches; next 1.7; commitid XweFDnIiRZYRFbYE; 1.7 date 2012.06.09.11.45.38; author adam; state Exp; branches; next 1.6; 1.6 date 2010.06.15.23.01.23; author pettai; state Exp; branches; next 1.5; 1.5 date 2008.02.19.18.45.24; author jlam; state Exp; branches; next 1.4; 1.4 date 2007.10.15.15.37.14; author jlam; state Exp; branches; next 1.3; 1.3 date 2007.08.10.17.57.04; author jlam; state Exp; branches; next 1.2; 1.2 date 2006.06.09.22.12.18; author jlam; state Exp; branches; next 1.1; 1.1 date 2006.04.28.18.10.21; author jlam; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2006.04.28.18.10.21; author jlam; state Exp; branches; next ; desc @@ 1.9 log @courier-mta: Fix install on NetBSD @ text @$NetBSD$ --- courier/Makefile.in.orig 2023-11-23 21:09:35.000000000 +0000 +++ courier/Makefile.in @@@@ -101,16 +101,16 @@@@ host_triplet = @@host@@ target_triplet = @@target@@ @@HAVE_SGML_TRUE@@am__append_1 = $(GITFILES) pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \ - aliascreate$(EXEEXT) sqwebmaild$(EXEEXT) submit$(EXEEXT) \ + aliascreate$(EXEEXT) submit$(EXEEXT) \ @@EXTRAPKGLIB@@ $(am__empty) -webmail_PROGRAMS = webmail$(EXEEXT) webmlm$(EXEEXT) +webmail_PROGRAMS = webmlm$(EXEEXT) EXTRA_PROGRAMS = courierldapaliasd$(EXEEXT) bin_PROGRAMS = cancelmsg$(EXEEXT) mailq$(EXEEXT) sendmail$(EXEEXT) \ testmxlookup$(EXEEXT) dotforward$(EXEEXT) couriermlm$(EXEEXT) \ - webmlmd$(EXEEXT) courier-config$(EXEEXT) @@couriertls@@ \ + webmlmd$(EXEEXT) courier-config$(EXEEXT) \ @@EXTRABIN@@ $(am__empty) -sbin_PROGRAMS = courier$(EXEEXT) showconfig$(EXEEXT) \ - showmodules$(EXEEXT) aliaslookup$(EXEEXT) @@COURIERLDAPALIASD@@ \ +sbin_PROGRAMS = courier$(EXEEXT) courier-showconfig$(EXEEXT) \ + courier-showmodules$(EXEEXT) aliaslookup$(EXEEXT) @@COURIERLDAPALIASD@@ \ @@EXTRASBIN@@ $(am__empty) cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @@EXTRACMDLIB@@ noinst_PROGRAMS = testtrack$(EXEEXT) @@@@ -657,30 +657,27 @@@@ BUILT_SOURCES = prefix.h exec_prefix.h s filtersocketdir.h configargs.h sort.h $(am__append_1) \ courierd.dist webmlmrc.dist webmlmdhandlerslist.H @@HAVE_SGML_TRUE@@GITFILES = courierd.dist.in ldapaliasrc.dist webmlmrc.dist.in -extrapkglib = makedatprog courierpop3login pcpd +extrapkglib = webmaildir = $(libexecdir)/courier/webmail webmail_SOURCES = sqwebmaild_SOURCES = # Don't forget to change perms.sh.in, if webmailimagedir moves. webmailimagedir = $(datadir)/sqwebmail/images -extrabin = maildrop lockmail reformail reformime mailbot mimegpg \ - imapd makemime deliverquota maildirmake maildiracl maildirkw +extrabin = bin_SCRIPTS = webmlmd.rc -extrasbin = couriertcpd$(EXEEXT) -sbinscripts = sharedindexsplit sharedindexinstall webmaild +extrasbin = +sbinscripts = sbin_SCRIPTS = @@SBINSCRIPTS@@ EXTRA_SCRIPTS = -sysconf_DATA = pop3d.authpam imapd.authpam webmail.authpam imapd.cnf pop3d.cnf \ +sysconf_DATA = \ courierd.dist @@LDAPALIASRC@@ \ - imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \ - quotawarnmsg.example webmlmrc.dist + webmlmrc.dist databindir = $(datadir) -databin_SCRIPTS = courierctl.start makedat makealiases makehosteddomains \ - makeimapaccess \ - pop3d pop3d-ssl mkimapdcert mkpop3dcert mkdhparams +databin_SCRIPTS = courierctl.start makealiases makehosteddomains + mlmdatadir = $(datadir)/couriermlm mlmdata_DATA = \ @@@@ -741,7 +738,7 @@@@ mlmdata_DATA = \ webmlmsublist.tmpl.html \ webmlm.tmpl.html -extracmdlib = courierpop3d imaplogin +extracmdlib = cmdlibdir = @@libexecdir@@/courier # Subdirectories @@@@ -2314,6 +2311,12 @@@@ couriertls$(EXEEXT): ../libs/tcpd/courie courierpop3login$(EXEEXT): ../libs/imap/pop3login$(EXEEXT) cp -f ../libs/imap/pop3login$(EXEEXT) courierpop3login$(EXEEXT) +courier-showconfig$(EXEEXT): showconfig$(EXEEXT) + cp -f showconfig$(EXEEXT) courier-showconfig$(EXEEXT) + +courier-showmodules$(EXEEXT): showmodules$(EXEEXT) + cp -f showmodules$(EXEEXT) courier-showmodules$(EXEEXT) + sort.h: echo '#define SORT "$(SORT)"' >sort.h @@@@ -2469,43 +2472,23 @@@@ dist-hook: install-exec-hook: for d in $(bindir) $(sbindir) $(libexecdir) $(libexecdir)/courier \ - $(sysconfdir)/filters \ $(localstatedir) $(localstatedir)/tmp\ $(webmaildir)\ $(localstatedir)/track\ $(localstatedir)/sts\ $(localstatedir)/msgs $(localstatedir)/msgq ; do \ $(mkinstalldirs) $(DESTDIR)$$d || :; done - $(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 - rm -f $(DESTDIR)$(sbindir)/imapd-ssl - $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/imapd-ssl` $(DESTDIR)$(sbindir)/imapd-ssl - rm -f $(DESTDIR)$(sbindir)/mkdhparams - $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/mkdhparams` $(DESTDIR)$(sbindir)/mkdhparams - rm -f $(DESTDIR)$(sbindir)/mkimapdcert - $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/mkimapdcert` $(DESTDIR)$(sbindir)/mkimapdcert - rm -f $(DESTDIR)$(sbindir)/mkpop3dcert - $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/mkpop3dcert` $(DESTDIR)$(sbindir)/mkpop3dcert - rm -f $(DESTDIR)$(bindir)/makedat - $(LN_S) `realpath -m --relative-to $(bindir) $(datadir)/makedat` $(DESTDIR)$(bindir)/makedat - for f in makealiases makehosteddomains makeimapaccess pop3d pop3d-ssl \ + for f in makealiases makehosteddomains \ ; 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) `realpath $(datadir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done $(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/webadmin - mkdir -p $(DESTDIR)$(sysconfdir)/shared - chmod 755 $(DESTDIR)$(sysconfdir)/shared - mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp - chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp install-data-hook: -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliases -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/smtpaccess -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/imapaccess - -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliasdir echo @@MAILDROP@@ >$(DESTDIR)$(sysconfdir)/maildrop + echo @@MAILDROP@@ >$(DESTDIR)$(sysconfdir)/maildropfilter test -f $(DESTDIR)$(sysconfdir)/enablefiltering && exit 0; \ echo esmtp >$(DESTDIR)$(sysconfdir)/enablefiltering test -f $(DESTDIR)$(sysconfdir)/aliases/system && exit 0; \ @@@@ -2517,10 +2500,6 @@@@ install-data-hook: rm -f $(DESTDIR)$(bindir)/rmail $(LN_S) sendmail $(DESTDIR)$(bindir)/rmail -$(mkinstalldirs) $(DESTDIR)@@mandir@@/man8 - -$(mkinstalldirs) $(DESTDIR)$(webmailimagedir) - for f in `cat ../libs/sqwebmail/images/filelist` ; do \ - $(INSTALL_DATA) $(srcdir)/../libs/sqwebmail/images/$$f \ - $(DESTDIR)$(webmailimagedir) ; done install-permissions: perms.sh @@chmod +x perms.sh setperms.sh @ 1.8 log @Update Courier-MTA to 1.3.5 This updates the following packages that are all built from the same source: mail/courier-mta mail/courier-maildir net/couriertcpd Changes since 0.68.1: Too many to list here (0.68.1 was released in 2012). The full changelog can be found here: https://sourceforge.net/p/courier/courier.git/ci/713d051033c8d94b594b6bc61f0652b0951af752/tree/courier/ChangeLog Note that the Maildir unicode format has changed in the 1.0 release. See mail/courier-maildir/MESSAGE.UTF8 for details. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2012/06/09 11:45:38 adam Exp $ d3 1 a3 1 --- courier/Makefile.in.orig 2023-08-04 00:12:02.000000000 +0000 d116 1 a116 1 $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done d118 1 @ 1.7 log @Changes 0.68.1: * rfc2045mkboundary.c was broken in 0.68 Changes 0.68: * rfc2045/rfc2045mkboundary.c (rfc2045_mk_boundary): truncate the hostname portion of the boundary to 30 chars. * courier/doc/courier.sgml: Remove descriptions of some configuration files that were moved to the courier-authlib package a while ago. They don't belong here any more. * courier/submit.C: Use the authenticated address, instead of the return address, for domain-based virtual configuration. * courier/libs/cfilename.c (config_has_vhost): Checks whether vhost.[ip] exists. * courier/module.esmtp/courieresmtpd.c (main): Only set a message's virtual host if vhost.[ip] exists. * courier/module.esmtp/esmtpclient.c (get_sourceaddr): Make sure the input buffer is null-terminated. * courier/submit.C (getrcpts): If there's no vhost setting from the sender's IP address (this includes local mail!) if vhost.domain exists, use [domain] as the virtual host. * Remove config_search(), which simply called config_localfilename(). Change all current callers to call config_localfilename(). * courier/libs/cfilename.c (config_set_local_vhost): saves a string that gets appended as a suffix, by config_localfilename(), and if that filename exists, that's returned as the filename, otherwise it's the original string without the suffix. config_get_local_vhost() returns the suffix string. to config_set_local_vhost(). * courier/libs/comsubmitclient.c (submit_fork): If config_get_local_vhost(), add a -vhost parameter to submit(). * courier/submit.C (cppmain): -vhost sets config_set_local_vhost(). * courier/submit2.C (closectl): New COMCTLFILE_VHOST parameter in the config file, taken from the vhost setting. * courier/libs/comctlfile.c (ctlfile_setvhost): If COMCTLFILE_VHOST is set, call ctlfile_setvhost(), return an indication if the vhost has changed. Absence of a COMCTLFILE_VHOST treated as a discrete "(null)" setting. * courier/module.esmtp/esmtpclient.c (esmtpchild): If ctlfile_setvhost() then disconnect the current socket, if one is open. * courier/module.esmtp/esmtpclient.c (get_sourceaddr): The IP address specified in ipout or ip6out overrides SOURCE_ADDRESS and SOURCE_ADDRESS_IPV6 environment variable. * courier/module.local/localmail.c (main): Call ctlfile_setvhost(). * courier/module.uucp/uucp.c (uux): Call ctlfile_setvhost(). * courier/module.dsn/dsn.c (main): Call ctlfile_setvhost(). * liblock/mail.c (dotlock_exists): Quell a compiler warning. * courier/courierd.dist.in SOURCE_ADDRESS: Add a note that this setting is deprecated. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- courier/Makefile.in.orig 2011-04-04 13:07:49.000000000 +0000 d5 1 a5 2 @@@@ -46,16 +46,16 @@@@ build_triplet = @@build@@ host_triplet = @@host@@ d7 1 d26 5 a30 5 subdir = . @@@@ -473,29 +473,26 @@@@ DISTCLEANFILES = uidgid BUILT_SOURCES = prefix.h exec_prefix.h sysconfdir.h localstatedir.h \ libexecdir.h bindir.h sbindir.h datadir.h filtersocketdir.h \ uidgid.h configargs.h sort.h webmlmdhandlerslist.H d59 2 a60 1 - pop3d pop3d-ssl mkimapdcert mkpop3dcert d62 1 d66 1 a66 1 @@@@ -551,7 +548,7 @@@@ mlmdata_DATA = \ d75 3 a77 3 @@@@ -1890,6 +1887,12 @@@@ couriertls$(EXEEXT): ../tcpd/couriertls$ courierpop3login$(EXEEXT): ../imap/pop3login$(EXEEXT) cp -f ../imap/pop3login$(EXEEXT) courierpop3login$(EXEEXT) d88 1 a88 1 @@@@ -2045,39 +2048,21 @@@@ dist-hook: d96 1 d102 1 a102 1 - $(LN_S) $(datadir)/imapd $(DESTDIR)$(sbindir)/imapd d104 3 a106 1 - $(LN_S) $(datadir)/imapd-ssl $(DESTDIR)$(sbindir)/imapd-ssl d108 1 a108 1 - $(LN_S) $(datadir)/mkimapdcert $(DESTDIR)$(sbindir)/mkimapdcert d110 1 a110 1 - $(LN_S) $(datadir)/mkpop3dcert $(DESTDIR)$(sbindir)/mkpop3dcert d112 2 a113 2 - $(LN_S) $(datadir)/makedat $(DESTDIR)$(bindir)/makedat - for f in makealiases makehosteddomains pop3d pop3d-ssl \ d116 2 a117 2 $(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done - rm -f $(DESTDIR)$(sbindir)/webgpg ; $(LN_S) $(datadir)/sqwebmail/webgpg $(DESTDIR)$(sbindir)/webgpg d127 1 d134 1 a134 1 @@@@ -2089,10 +2074,6 @@@@ install-data-hook: d139 2 a140 2 - for f in `cat ../webmail/images/filelist` ; do \ - $(INSTALL_DATA) $(srcdir)/../webmail/images/$$f \ @ 1.6 log @courier-0.65.0 et al: * gpglib/list.c: Handle GnuPG 2 --with-colons output format changes. * gpglib/mimegpgfork.c: GnuPG 2 wants --batch when specifying passphrase-fd. * tcpd/configure.in: Check if explicit linking with libgpg-error is required. * tcpd/libcouriergnutls.c (tls_connect): Fix bad call to gnutls_server_name_set(). Affects Courier compiled with GnuTLS support. * maildrop/mailbot.c (main): Set close-on-exec bit on opened files. * courier/doc/courier.sgml: Move the SPF section to a separate refsect2 to work around misformatting by the manpage stylesheet. * rfc2045/rfc2045reply.c (mkreply): Fix sender's name in the reply salutation. * html/en-us/newmsg.html: Ditto. * rfc2045/reformime.sgml: Document the -c option to reformime. * imapd.c (main): Fix typo in alert message. * Big quota patch (with some changes). (See the Changelog(s) for previous releases) Based on patch(es) from PR pkg/42989 by Brian Candler. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $ d3 1 a3 1 --- courier/Makefile.in.orig 2007-11-23 22:26:43.000000000 -0500 d5 1 a5 1 @@@@ -47,16 +47,16 @@@@ build_triplet = @@build@@ d27 3 a29 1 @@@@ -477,29 +477,26 @@@@ BUILT_SOURCES = prefix.h exec_prefix.h s a30 2 RFCERRTXTIN = rfcerrheader.txt RFCERRTXTNOIN = rfcerr2045.txt rfcerr2046.txt rfcerr2047.txt d54 2 a55 2 - quotawarnmsg.example $(RFCERRTXTNOIN) $(RFCERRTXTIN) webmlmrc.dist + $(RFCERRTXTNOIN) $(RFCERRTXTIN) webmlmrc.dist d64 1 a64 1 @@@@ -555,7 +552,7 @@@@ mlmdata_DATA = \ d73 1 a73 1 @@@@ -1896,6 +1893,12 @@@@ couriertls$(EXEEXT): ../tcpd/couriertls$ d86 1 a86 1 @@@@ -2051,39 +2054,21 @@@@ dist-hook: d128 1 a128 1 @@@@ -2095,10 +2080,6 @@@@ install-data-hook: @ 1.5 log @Update mail/courier-mta to version 0.58.0. Changes from version 0.57.1 include: + Add full DESTDIR support. + Don't create empty, unused directories under ${PREFIX}/share/examples/courier. + Teach mkesmtpdcert generate certificates and keys using the either GNUTLS or OpenSSL tools. * Fix a memory stomp in local delivery agent. * Get rid of the hard 30 minute timeout in sendmail(8). * Rewrite input processing for submit(8) process to use non-blocking I/O to read standard input. When the message source is local (or dsn), get rid of the hard 30 minute timeout, and poll stdin with a 5 minute poll() timeout, at which point the timestamps on all open control and data files are pinged, to keep courierd from purging them based on their old timestamp. Continue to use a hard timeout for all non-local mail. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -46,16 +46,16 @@@@ build_triplet = @@build@@ d27 1 a27 1 @@@@ -433,7 +433,7 @@@@ BUILT_SOURCES = prefix.h exec_prefix.h s a32 1 pkglibexecdir = $(libexecdir)/courier d35 1 a35 1 @@@@ -441,22 +441,19 @@@@ sqwebmaild_SOURCES = d64 1 a64 1 @@@@ -512,7 +509,7 @@@@ mlmdata_DATA = \ d73 1 a73 1 @@@@ -1673,6 +1670,12 @@@@ couriertls$(EXEEXT): ../tcpd/couriertls$ d86 1 a86 1 @@@@ -1828,39 +1831,21 @@@@ dist-hook: d128 1 a128 1 @@@@ -1872,10 +1857,6 @@@@ install-data-hook: @ 1.4 log @Update mail/courier-mta to 0.57.1. Changes from version 0.56.0 include: * Major code cleanup. * "User unknown" reports complete local address, including extensions. * Only run courierfilters after all control files are closed. * "opt BOFHHEADERLIMIT" replaces hardcoded limit of 100,000 bytes of headers per message. * Reject <@@domain.com> for a recipient's address. * Tolerate newline-less responses from the filter. * Document that sysexit 100 from .courier is a permanent failure. * "courier show all" and "courier clear all" commands for managing backscatter suppression list. @ text @d3 1 a3 1 --- courier/Makefile.in.orig Sat Sep 29 14:57:58 2007 d87 7 a93 1 @@@@ -1834,33 +1837,16 @@@@ install-exec-hook: d129 1 a129 1 @@@@ -1872,10 +1858,6 @@@@ install-data-hook: @ 1.3 log @Update mail/courier-mta to 0.56.0. Changes from version 0.53.2 include: + Drop the uucp module from the default option set. + Patch the webmlm sources to not use "stdin" and "stdout" as function or member names as they can be macros according to the C standards. * webadmin: Remove check that prevents multiple virtual domains to be aliased to the same account. * webmlmd: new CGI module that can manage a Courier mailing list created with couriermlm. * Rewrite and code cleanup of couriermlm. * Use domain name, not MX hostname, for looking up authenticated SMTP passwords in esmtpauthclient @ text @d3 1 a3 1 --- courier/Makefile.in.orig 2007-06-23 07:56:06.000000000 -0400 d5 1 a5 1 @@@@ -50,18 +50,18 @@@@ build_triplet = @@build@@ d25 3 a27 6 -cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @@EXTRACMDLIB@@ +cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @@EXTRACMDLIB@@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/courier.h.in $(srcdir)/courierctl.start.in \ @@@@ -420,7 +420,7 @@@@ BUILT_SOURCES = prefix.h exec_prefix.h s d36 1 a36 1 @@@@ -428,22 +428,19 @@@@ sqwebmaild_SOURCES = d65 1 a65 1 @@@@ -499,7 +496,7 @@@@ mlmdata_DATA = \ d74 1 a74 1 @@@@ -1652,6 +1649,12 @@@@ couriertls$(EXEEXT): ../tcpd/couriertls$ d87 1 a87 1 @@@@ -1813,33 +1816,16 @@@@ install-exec-hook: d123 1 a123 1 @@@@ -1851,10 +1837,6 @@@@ install-data-hook: @ 1.2 log @Update mail/courier-mta to 0.53.2. Changes from version 0.53.1 include: * [SECURITY] Fix bug in encoding of usernames that contain '='. This fixes the security advisories noted here: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-2659 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=368834 http://secunia.com/advisories/20519/ * Implemented "Purge" option for mail filters. * Invoke Courier filters in alphabetical order, and uses 050 exit code to accept a message without running the remaining filters, which gets converted to a 250 ESMTP code. * Fix improper parsing of ident/pfix tokens in SPF. * New command line tool "aliaslookup" to look up mail aliases. * Added support for the koi8-u character set. @ text @d3 1 a3 1 --- courier/Makefile.in.orig 2006-06-09 14:58:20.000000000 -0400 d5 1 a5 1 @@@@ -52,17 +52,17 @@@@ build_triplet = @@build@@ a9 2 - @@EXTRAPKGLIB@@ $(am__empty) -webmail_PROGRAMS = webmail$(EXEEXT) d11 3 a13 2 + $(am__empty) +webmail_PROGRAMS = d17 8 a24 5 - courier-config$(EXEEXT) @@couriertls@@ @@EXTRABIN@@ + courier-config$(EXEEXT) sbin_PROGRAMS = courier$(EXEEXT) showconfig$(EXEEXT) \ showmodules$(EXEEXT) aliaslookup$(EXEEXT) @@COURIERLDAPALIASD@@ \ - @@EXTRASBIN@@ $(am__empty) d26 1 a26 2 + $(am__empty) +cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) d30 3 a32 1 @@@@ -402,7 +402,7 @@@@ RFCERRTXTIN = rfcerrheader.txt d34 2 a35 1 extrapkglib = makedatprog courierpop3login pcpd d37 1 a37 2 -webmaildir = $(libexecdir)/courier/webmail +webmaildir = $(pkglibexecdir)/cgi-bin d39 1 a39 1 sqwebmaild_SOURCES = d41 12 a52 6 @@@@ -413,16 +413,14 @@@@ extrabin = maildrop lockmail reformail r extrasbin = couriertcpd$(EXEEXT) sbinscripts = sharedindexsplit sharedindexinstall webmaild -sbin_SCRIPTS = @@SBINSCRIPTS@@ +sbin_SCRIPTS = d58 2 a59 2 - quotawarnmsg.example $(RFCERRTXTNOIN) $(RFCERRTXTIN) + $(RFCERRTXTNOIN) $(RFCERRTXTIN) d67 24 a90 2 mlmdata_DATA = adminrequest.tmpl confsubj.tmpl digestsubj.tmpl fetch.tmpl \ @@@@ -1673,27 +1671,10 @@@@ install-exec-hook: d111 1 a111 1 - $(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/webadmin a115 1 + $(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/courierwebadmin d119 8 a126 1 @@@@ -1711,10 +1692,6 @@@@ install-data-hook: @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- courier/Makefile.in.orig 2006-02-25 12:28:53.000000000 -0500 d5 1 a5 1 @@@@ -52,16 +52,16 @@@@ build_triplet = @@build@@ d21 2 a22 1 - showmodules$(EXEEXT) @@COURIERLDAPALIASD@@ @@EXTRASBIN@@ d24 1 a24 1 + showmodules$(EXEEXT) @@COURIERLDAPALIASD@@ d29 1 a29 1 @@@@ -397,7 +397,7 @@@@ RFCERRTXTIN = rfcerrheader.txt d38 1 a38 1 @@@@ -408,16 +408,14 @@@@ extrabin = maildrop lockmail reformail r d59 1 a59 1 @@@@ -1657,27 +1655,10 @@@@ install-exec-hook: d89 1 a89 1 @@@@ -1695,10 +1676,6 @@@@ install-data-hook: @ 1.1.1.1 log @First cut at packaging the MTA and mailing list components of courier-0.53.1 as mail/courier-mta. The Courier mail transfer agent (MTA) is a modular multiprotocol mail server that's designed to strike a balance between reasonable performance, flexibility and features. This package differs from traditional courier-mta packages in that the webmail, imap/pop3, and maildrop components are not included because they are supplied by the mail/sqwebmail, mail/courier-imap, and mail/maildrop packages, respectively. When Courier-MTA is installed together with Courier-IMAP and SqWebMail, they form an integrated mail/groupware server suite that provides ESMTP, IMAP, POP3, webmail, and mailing list services within a single, consistent, framework. A web-based administration and configuration tool is included for comprehensive configuration of the entire Courier software suite. Many thanks to Yarema whose Courier port for FreeBSD was an invaluable reference. @ text @@