1) Update exiscan-acl patch to -09:

   Improved clamd support.
   New FAQ/example documentation.

2) Enable wildlsearch lookups by default and add new
   WITHOUT_WILDLSEARCH knob for disabling them.

3) Issue a fat warning if 127.0.0.1 is found in the relay_from_hosts
   hostlist of an existing configure file on upgrade.  This is important
   for IPv6 users and doesn't hurt IPv4-only users.

4) Attempt local deliveries as the owner of the mailbox (still group
   mail) and don't fail if the existing mailbox permissions are narrower
   than those with which we would have created it.  This works around
   pw(8) creating mailboxes with 0600 permission (instead of 0660).

Don't advertise Exim's configuration syntax as simple any more.  This
implies that you could leverage Exim's power with just a little reading,
which is not the case.

Bump PORTREVISION accordingly.

Submitted by:	Oliver Eikemeier <eikemeier@fillmore-labs.com> (1)
PR:		ports/52952 (2)
Submitted by:	Tim Bishop <tim@bishnet.net> (2)
Reported by:	Yann Golanski <yann@kierun.org> (3)
Reported by:	"Simon L. Nielsen" <simon@nitro.dk> (4)

6 files changed, 41 insertions, 10 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 37d6b3eb8682..c9d14a17c7dc 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	exim
 PORTVERSION=	${EXIM_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \
 		ftp://gd.tuwien.ac.at/infosys/mail/exim/%SUBDIR%/ \
@@ -60,7 +60,7 @@ MAN8=		exim.8
 
 EXIM_VERSION=		4.20
 EXIM_DOCVERSION=	4.20
-EXISCAN_ACL_VERSION=	${EXIM_VERSION}-08
+EXISCAN_ACL_VERSION=	${EXIM_VERSION}-09
 EXISCAN_VERSION=	${EXIM_VERSION}-26
 
 PLIST_SUB+=     EXIM_VERSION="${EXIM_VERSION}"
@@ -135,10 +135,12 @@ DB_LIB_VERSION?=1
 #WITHOUT_MAILSTORE=	yes
 #WITHOUT_MBX=		yes
 #
-# Define WITHOUT_CDB, WITHOUT_DSEARCH and WITHOUT_NIS to disable support for
-# CDB-style, directory-list and NIS lookups respectively.
+# Define WITHOUT_CDB, WITHOUT_DSEARCH, WILD_LSEARCH and WITHOUT_NIS to
+# disable support for CDB-style, directory-list, wildcarded-file and NIS
+# lookups respectively.
 #WITHOUT_CDB=		yes
 #WITHOUT_DSEARCH=	yes
+#WITHOUT_WILDLSEARCH=	yes
 #WITHOUT_NIS=		yes
 #
 # Disable support for the LMTP (RFC 2033 "SMTP over command pipe")
@@ -157,7 +159,7 @@ PORTDOC_FILES=	Exim3.upgrade Exim4.upgrade OptionLists.txt README \
 		dbm.discuss.txt filter.txt pcrepattern.txt pcretest.txt \
 		spec.txt
 .if defined(WITH_EXISCAN_ACL)
-PORTDOC_FILES+=	exiscan-acl-spec.txt
+PORTDOC_FILES+=	exiscan-acl-examples.txt exiscan-acl-spec.txt
 PLIST_SUB+=             EXISCAN_ACL=""
 PLIST_SUB+=             EXISCAN="@comment "
 .elif !defined(WITHOUT_EXISCAN)
@@ -324,6 +326,10 @@ SEDLIST+=	-e 's,^\# LOOKUP_CDB=,LOOKUP_CDB=,'
 SEDLIST+=	-e 's,^\# LOOKUP_DSEARCH=,LOOKUP_DSEARCH=,'
 .endif
 
+.if !defined(WITHOUT_WILDLSEARCH)
+SEDLIST+=	-e 's,^\# LOOKUP_WILDLSEARCH=,LOOKUP_WILDLSEARCH=,'
+.endif
+
 .if !defined(WITHOUT_NIS)
 SEDLIST+=	-e 's,^\# LOOKUP_NIS=,LOOKUP_NIS=,'
 .endif
@@ -372,5 +378,6 @@ post-install:
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
+	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 1784734ac05d..eb5605def025 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,4 +1,4 @@
 MD5 (exim/exim-4.20.tar.bz2) = 90f9e876b60d00c0a5dd53ece7c85338
 MD5 (exim/exim-texinfo-4.20.tar.bz2) = debc6d3fdd88fd6d9c646ca0495fa92d
 MD5 (exim/exiscan-4.20-26.tar.bz2) = a3ad2a486b52cc32990888a00f8fabca
-MD5 (exim/exiscan-acl-4.20-08.patch.bz2) = d2f426e13a1766df58cc494e94ac362e
+MD5 (exim/exiscan-acl-4.20-09.patch.bz2) = 6c9d664303504ef801a56bfbde1ac671
diff --git a/mail/exim/files/patch-src::configure.default b/mail/exim/files/patch-src::configure.default
index 03ba42184f8f..410792a3e1e3 100644
--- a/mail/exim/files/patch-src::configure.default
+++ b/mail/exim/files/patch-src::configure.default
@@ -1,5 +1,5 @@
---- src/configure.default.orig	Fri Nov 23 17:31:16 2001
-+++ src/configure.default	Tue Dec 18 23:34:07 2001
+--- src/configure.default.orig	Mon May 12 15:39:18 2003
++++ src/configure.default	Thu Jun 12 16:40:25 2003
 @@ -56,7 +56,7 @@
  
  domainlist local_domains = @
@@ -36,14 +36,16 @@
  
  
  # This router matches local user mailboxes.
-@@ -455,8 +459,8 @@
+@@ -455,8 +459,10 @@
    delivery_date_add
    envelope_to_add
    return_path_add
 -# group = mail
 -# mode = 0660
 +  group = mail
++  user = $local_part
 +  mode = 0660
++  no_mode_fail_narrower
  
  
  # This transport is used for handling pipe deliveries generated by alias or
diff --git a/mail/exim/pkg-descr b/mail/exim/pkg-descr
index ad7efb9d986f..ed8f5c477b36 100644
--- a/mail/exim/pkg-descr
+++ b/mail/exim/pkg-descr
@@ -4,6 +4,6 @@ replacement for Sendmail.
 
 Exim is an excellent mailer for an ISP, as its control and flexibility
 are very good and its requeueing and retry algorithms are very powerful.
-Exim's configuration syntax is simple and well documented.
+Exim's configuration syntax is well documented.
 
 WWW: http://www.exim.org/
diff --git a/mail/exim/pkg-install b/mail/exim/pkg-install
index 40ad765f2fcf..317e09529e98 100644
--- a/mail/exim/pkg-install
+++ b/mail/exim/pkg-install
@@ -27,6 +27,27 @@ if [ "$2" = "PRE-INSTALL" ]; then
 	fi
 fi
 
+if [ "$2" = "POST-INSTALL" ]; then
+	cf=$PKG_PREFIX/etc/exim/configure
+	if [ -e $cf ]; then
+		if grep -q '^[^#]*hostlist.*relay_from_hosts.*=.*127.0.0.1' $cf
+		    then
+			echo
+			echo "============================================================"
+			echo "                     !!! WARNING !!!                        "
+			echo "============================================================"
+			echo
+			echo "Existing configure file $cf"
+			echo "contains 127.0.0.1 in relay_from_hosts hostlist!"
+			echo "Use of localhost instead of 127.0.0.1 is highly recommended."
+			echo
+			echo "============================================================"
+			echo "                     !!! WARNING !!!                        "
+			echo "============================================================"
+		fi
+	fi
+fi
+
 # This is naughty, since the directory we create won't be removed along
 # with Exim.  However, logfiles should probably stick around after Exim
 # is removed, until the administrator is sure he doesn't want them
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index c47585aa996f..e647573cd7fc 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -27,6 +27,7 @@ sbin/exiqsumm
 %%PORTDOCS%%share/doc/exim/pcrepattern.txt
 %%PORTDOCS%%share/doc/exim/pcretest.txt
 %%PORTDOCS%%share/doc/exim/spec.txt
+%%PORTDOCS%%%%EXISCAN_ACL%%share/doc/exim/exiscan-acl-examples.txt
 %%PORTDOCS%%%%EXISCAN_ACL%%share/doc/exim/exiscan-acl-spec.txt
 %%PORTDOCS%%%%EXISCAN%%share/doc/exim/exiscan-readme.txt
 @unexec install-info --delete %D/info/exim.info %D/info/dir