diff options
author | adam <adam> | 2012-06-09 11:45:38 +0000 |
---|---|---|
committer | adam <adam> | 2012-06-09 11:45:38 +0000 |
commit | c90cd5afb9875dbbf388e0aa7d1ec9ca20ef9375 (patch) | |
tree | 8c32f493ed8d0cbbf18158ced837e09e67518736 /mail/courier-mta/patches | |
parent | ad00d9d27371371531b0c996d3602bcf15878ee6 (diff) | |
download | pkgsrc-c90cd5afb9875dbbf388e0aa7d1ec9ca20ef9375.tar.gz |
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.
Diffstat (limited to 'mail/courier-mta/patches')
-rw-r--r-- | mail/courier-mta/patches/patch-aa | 24 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ab | 4 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ac | 4 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ad | 6 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ae | 4 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-af | 4 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ag | 6 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ah | 6 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ai | 4 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-aj | 14 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-an | 6 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ax | 4 |
12 files changed, 41 insertions, 45 deletions
diff --git a/mail/courier-mta/patches/patch-aa b/mail/courier-mta/patches/patch-aa index 1f1117c35fe..a7b2d271f75 100644 --- a/mail/courier-mta/patches/patch-aa +++ b/mail/courier-mta/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2010/06/15 23:01:23 pettai Exp $ +$NetBSD: patch-aa,v 1.7 2012/06/09 11:45:38 adam Exp $ ---- courier/Makefile.in.orig 2007-11-23 22:26:43.000000000 -0500 +--- courier/Makefile.in.orig 2011-04-04 13:07:49.000000000 +0000 +++ courier/Makefile.in -@@ -47,16 +47,16 @@ build_triplet = @build@ +@@ -46,16 +46,16 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \ @@ -24,10 +24,10 @@ $NetBSD: patch-aa,v 1.6 2010/06/15 23:01:23 pettai Exp $ @EXTRASBIN@ $(am__empty) cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@ subdir = . -@@ -477,29 +477,26 @@ BUILT_SOURCES = prefix.h exec_prefix.h s +@@ -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 - RFCERRTXTIN = rfcerrheader.txt - RFCERRTXTNOIN = rfcerr2045.txt rfcerr2046.txt rfcerr2047.txt -extrapkglib = makedatprog courierpop3login pcpd +extrapkglib = webmaildir = $(libexecdir)/courier/webmail @@ -51,8 +51,8 @@ $NetBSD: patch-aa,v 1.6 2010/06/15 23:01:23 pettai Exp $ +sysconf_DATA = \ courierd.dist @LDAPALIASRC@ \ - imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \ -- quotawarnmsg.example $(RFCERRTXTNOIN) $(RFCERRTXTIN) webmlmrc.dist -+ $(RFCERRTXTNOIN) $(RFCERRTXTIN) webmlmrc.dist +- quotawarnmsg.example webmlmrc.dist ++ webmlmrc.dist databindir = $(datadir) -databin_SCRIPTS = courierctl.start makedat makealiases makehosteddomains \ @@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.6 2010/06/15 23:01:23 pettai Exp $ mlmdatadir = $(datadir)/couriermlm mlmdata_DATA = \ -@@ -555,7 +552,7 @@ mlmdata_DATA = \ +@@ -551,7 +548,7 @@ mlmdata_DATA = \ webmlmsublist.tmpl.html \ webmlm.tmpl.html @@ -70,7 +70,7 @@ $NetBSD: patch-aa,v 1.6 2010/06/15 23:01:23 pettai Exp $ cmdlibdir = @libexecdir@/courier # Subdirectories -@@ -1896,6 +1893,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$ +@@ -1890,6 +1887,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$ courierpop3login$(EXEEXT): ../imap/pop3login$(EXEEXT) cp -f ../imap/pop3login$(EXEEXT) courierpop3login$(EXEEXT) @@ -83,7 +83,7 @@ $NetBSD: patch-aa,v 1.6 2010/06/15 23:01:23 pettai Exp $ sort.h: echo '#define SORT "$(SORT)"' >sort.h -@@ -2051,39 +2054,21 @@ dist-hook: +@@ -2045,39 +2048,21 @@ dist-hook: install-exec-hook: for d in $(bindir) $(sbindir) $(libexecdir) $(libexecdir)/courier \ @@ -125,7 +125,7 @@ $NetBSD: patch-aa,v 1.6 2010/06/15 23:01:23 pettai Exp $ test -f $(DESTDIR)$(sysconfdir)/enablefiltering && exit 0; \ echo esmtp >$(DESTDIR)$(sysconfdir)/enablefiltering test -f $(DESTDIR)$(sysconfdir)/aliases/system && exit 0; \ -@@ -2095,10 +2080,6 @@ install-data-hook: +@@ -2089,10 +2074,6 @@ install-data-hook: rm -f $(DESTDIR)$(bindir)/rmail $(LN_S) sendmail $(DESTDIR)$(bindir)/rmail -$(mkinstalldirs) $(DESTDIR)@mandir@/man8 diff --git a/mail/courier-mta/patches/patch-ab b/mail/courier-mta/patches/patch-ab index fa783b67638..8f745cc0994 100644 --- a/mail/courier-mta/patches/patch-ab +++ b/mail/courier-mta/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2010/06/15 23:01:23 pettai Exp $ +$NetBSD: patch-ab,v 1.7 2012/06/09 11:45:38 adam Exp $ --- courier/configure.orig 2007-11-24 03:26:42.000000000 +0000 +++ courier/configure -@@ -18398,9 +18398,9 @@ done +@@ -16102,9 +16102,9 @@ done if test "$testmode" = "0" then diff --git a/mail/courier-mta/patches/patch-ac b/mail/courier-mta/patches/patch-ac index 6e607aea42b..63c21a45d28 100644 --- a/mail/courier-mta/patches/patch-ac +++ b/mail/courier-mta/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.6 2010/06/15 23:01:23 pettai Exp $ +$NetBSD: patch-ac,v 1.7 2012/06/09 11:45:38 adam Exp $ --- courier/doc/Makefile.in.orig 2007-11-17 19:48:53.000000000 -0500 +++ courier/doc/Makefile.in @@ -98,7 +98,7 @@ $NetBSD: patch-ac,v 1.6 2010/06/15 23:01:23 pettai Exp $ $(man1dir)/rmail.1 $(man1dir)/dotforward.1 \ $(man8dir)/makesmtpaccess-msa.8 \ $(man8dir)/esmtpd-msa.8 -@@ -1215,8 +1186,7 @@ preline.1: preline.1.in +@@ -1216,8 +1187,7 @@ preline.1: preline.1.in install-man-extra: cd $(DESTDIR)$(man8dir) ; \ diff --git a/mail/courier-mta/patches/patch-ad b/mail/courier-mta/patches/patch-ad index ebb711f3d41..9d6863b597a 100644 --- a/mail/courier-mta/patches/patch-ad +++ b/mail/courier-mta/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.5 2010/06/15 23:01:23 pettai Exp $ +$NetBSD: patch-ad,v 1.6 2012/06/09 11:45:38 adam Exp $ --- courier/filters/Makefile.in.orig 2007-11-17 19:49:01.000000000 -0500 +++ courier/filters/Makefile.in -@@ -283,11 +283,12 @@ SUBDIRS = libfilter perlfilter +@@ -282,11 +282,12 @@ SUBDIRS = libfilter perlfilter CLEANFILES = $(htmldoc_DATA) $(man_MANS) filtersocketdir.h filteractivedir.h \ pidfile.h permissions.dat @@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.5 2010/06/15 23:01:23 pettai Exp $ filtersocketdir = $(localstatedir)/filters allfiltersocketdir = $(localstatedir)/allfilters filterconfdir = $(sysconfdir)/filters -@@ -1083,16 +1084,12 @@ install-exec-hook: +@@ -1080,16 +1081,12 @@ install-exec-hook: install-data-hook: -$(mkinstalldirs) $(DESTDIR)$(filtersocketdir) -$(mkinstalldirs) $(DESTDIR)$(allfiltersocketdir) diff --git a/mail/courier-mta/patches/patch-ae b/mail/courier-mta/patches/patch-ae index dc23360bec4..931cc02b0f7 100644 --- a/mail/courier-mta/patches/patch-ae +++ b/mail/courier-mta/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2007/08/10 17:57:04 jlam Exp $ +$NetBSD: patch-ae,v 1.3 2012/06/09 11:45:38 adam Exp $ --- courier/filters/filterctl.in.orig 2004-01-31 23:46:27.000000000 -0500 +++ courier/filters/filterctl.in -@@ -11,8 +11,9 @@ libexecdir="@libexecdir@" +@@ -10,8 +10,9 @@ libexecdir="@libexecdir@" sysconfdir="@sysconfdir@" localstatedir="@localstatedir@" piddir="@piddir@" diff --git a/mail/courier-mta/patches/patch-af b/mail/courier-mta/patches/patch-af index dfbb65a6496..447f7c99427 100644 --- a/mail/courier-mta/patches/patch-af +++ b/mail/courier-mta/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.4 2010/06/15 23:01:23 pettai Exp $ +$NetBSD: patch-af,v 1.5 2012/06/09 11:45:38 adam Exp $ --- courier/filters/perlfilter/Makefile.in.orig Sat Jul 21 20:31:15 2007 +++ courier/filters/perlfilter/Makefile.in -@@ -234,7 +234,8 @@ top_srcdir = @top_srcdir@ +@@ -233,7 +233,8 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = perlfilter-wrapper.pl perlfilter-example.pl BUILT_SOURCES = filtersocketdir.h wrapperpl.h xsinit.c CLEANFILES = $(BUILT_SOURCES) permissions.dat diff --git a/mail/courier-mta/patches/patch-ag b/mail/courier-mta/patches/patch-ag index 042c2469c3c..faf174bb4cb 100644 --- a/mail/courier-mta/patches/patch-ag +++ b/mail/courier-mta/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.3 2008/02/19 18:45:24 jlam Exp $ +$NetBSD: patch-ag,v 1.4 2012/06/09 11:45:38 adam Exp $ --- courier/module.esmtp/mkesmtpdcert.in.orig 2007-11-04 16:17:03.000000000 -0500 +++ courier/module.esmtp/mkesmtpdcert.in -@@ -9,7 +9,13 @@ +@@ -8,7 +8,13 @@ # ESMTP STARTTLS. Normally this script would get called by an automatic # package installation routine. @@ -17,7 +17,7 @@ $NetBSD: patch-ag,v 1.3 2008/02/19 18:45:24 jlam Exp $ then test -x @OPENSSL@ || exit 0 else -@@ -32,7 +38,7 @@ cleanup() { +@@ -31,7 +37,7 @@ cleanup() { cd @mydatadir@ diff --git a/mail/courier-mta/patches/patch-ah b/mail/courier-mta/patches/patch-ah index 042dec94035..c06004e4017 100644 --- a/mail/courier-mta/patches/patch-ah +++ b/mail/courier-mta/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.3 2010/06/15 23:01:23 pettai Exp $ +$NetBSD: patch-ah,v 1.4 2012/06/09 11:45:38 adam Exp $ --- courier/module.local/deliver.c.orig 2006-05-28 11:29:52.000000000 -0400 +++ courier/module.local/deliver.c -@@ -649,7 +649,7 @@ static int docommand(const char *extensi +@@ -648,7 +648,7 @@ static int docommand(const char *extensi const char *defaultmail, int recursion_level) { @@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.3 2010/06/15 23:01:23 pettai Exp $ const char *p; const char *hostp; pid_t pid; -@@ -741,7 +741,9 @@ const char *shell=getenv("SHELL"); +@@ -740,7 +740,9 @@ const char *shell=getenv("SHELL"); envs[17]=courier_malloc(strlen(shell) +sizeof("SHELL=")); strcat(strcpy(envs[17], "SHELL="), shell); diff --git a/mail/courier-mta/patches/patch-ai b/mail/courier-mta/patches/patch-ai index 0df8e498607..73ff50396ed 100644 --- a/mail/courier-mta/patches/patch-ai +++ b/mail/courier-mta/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.4 2008/02/19 18:45:24 jlam Exp $ +$NetBSD: patch-ai,v 1.5 2012/06/09 11:45:38 adam Exp $ --- courier/module.local/local.c.orig 2007-10-16 22:04:01.000000000 -0400 +++ courier/module.local/local.c -@@ -747,6 +747,8 @@ const char *quota; +@@ -746,6 +746,8 @@ const char *quota; strlen(argv[7])), "SENDER="), argv[7])); diff --git a/mail/courier-mta/patches/patch-aj b/mail/courier-mta/patches/patch-aj index d90614b4d14..5f00e952e4c 100644 --- a/mail/courier-mta/patches/patch-aj +++ b/mail/courier-mta/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.5 2008/02/19 18:45:24 jlam Exp $ +$NetBSD: patch-aj,v 1.6 2012/06/09 11:45:38 adam Exp $ ---- courier/perms.sh.in.orig 2007-07-01 11:36:31.000000000 -0400 +--- courier/perms.sh.in.orig 2011-04-04 13:01:21.000000000 +0000 +++ courier/perms.sh.in -@@ -11,119 +11,41 @@ exec_prefix="@exec_prefix@" +@@ -10,115 +10,41 @@ exec_prefix="@exec_prefix@" datarootdir="@datarootdir@" PERMS=" @@ -37,10 +37,6 @@ $NetBSD: patch-aj,v 1.5 2008/02/19 18:45:24 jlam Exp $ -@sysconfdir@/webmail.authpam 644 config -@sysconfdir@/webmlmrc.dist 644 config -@sysconfdir@/quotawarnmsg.example 444 --@sysconfdir@/rfcerrheader.txt 444 config --@sysconfdir@/rfcerr2045.txt 444 config --@sysconfdir@/rfcerr2046.txt 444 config --@sysconfdir@/rfcerr2047.txt 444 config - -@libexecdir@ 755 x bin bin @libexecdir@/courier 755 x bin bin @@ -122,7 +118,7 @@ $NetBSD: patch-aj,v 1.5 2008/02/19 18:45:24 jlam Exp $ @datadir@/couriermlm 755 @datadir@/couriermlm/adminrequest.tmpl 644 -@@ -191,11 +113,20 @@ do +@@ -186,11 +112,20 @@ do if test "$USER" = "" then USER="@mailuser@" @@ -143,7 +139,7 @@ $NetBSD: patch-aj,v 1.5 2008/02/19 18:45:24 jlam Exp $ fi case $FILE in -@@ -216,26 +147,7 @@ do +@@ -211,26 +146,7 @@ do echo $FILE $MODE $USER $GROUP $SPECIAL done diff --git a/mail/courier-mta/patches/patch-an b/mail/courier-mta/patches/patch-an index 384581096da..a11f67d0ff6 100644 --- a/mail/courier-mta/patches/patch-an +++ b/mail/courier-mta/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.5 2010/11/10 10:40:16 adam Exp $ +$NetBSD: patch-an,v 1.6 2012/06/09 11:45:38 adam Exp $ --- courier/webmlmd.C.orig Thu Jul 5 01:47:38 2007 +++ courier/webmlmd.C -@@ -22,6 +22,7 @@ +@@ -21,6 +21,7 @@ #include <string.h> #include <signal.h> @@ -10,7 +10,7 @@ $NetBSD: patch-an,v 1.5 2010/11/10 10:40:16 adam Exp $ #include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> -@@ -41,6 +42,39 @@ +@@ -40,6 +41,39 @@ #include <sstream> #include <map> diff --git a/mail/courier-mta/patches/patch-ax b/mail/courier-mta/patches/patch-ax index e98f002ffd9..b4828ba931a 100644 --- a/mail/courier-mta/patches/patch-ax +++ b/mail/courier-mta/patches/patch-ax @@ -1,8 +1,8 @@ -$NetBSD: patch-ax,v 1.2 2010/06/15 23:01:23 pettai Exp $ +$NetBSD: patch-ax,v 1.3 2012/06/09 11:45:38 adam Exp $ --- courier/module.esmtp/Makefile.in.orig 2007-11-17 19:49:38.000000000 -0500 +++ courier/module.esmtp/Makefile.in -@@ -955,17 +955,11 @@ install-data-local: +@@ -954,17 +954,11 @@ install-data-local: 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) $(moduledir)/addcr $(DESTDIR)$(bindir)/addcr |