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.

1 files changed, 5 insertions, 9 deletions

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