pkgsrc/mail/courier-mta/patches/patch-aa - view

File: [cvs.NetBSD.org] / pkgsrc / mail / courier-mta / patches / patch-aa
Revision 1.8: download - view: text, annotated - select for diffs
Mon Feb 12 21:06:43 2024 UTC (11 months, 1 week ago) by hans
Branches: MAIN
CVS tags: HEAD

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.

$NetBSD: patch-aa,v 1.8 2024/02/12 21:06:43 hans Exp $ --- courier/Makefile.in.orig 2023-08-04 00:12:02.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 $(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