Update to exim-4.00, the long awaited next release of Exim.

Version-chasers beware; exim-4 configuration files are significantly
different from exim-3 configuration files.  Do not attempt to upgrade
without reading POST-INSTALL-NOTES.

7 files changed, 38 insertions, 54 deletions

diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index 14d68828ae1d..3c7dfb25beca 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	exim
-PORTVERSION=	3.952
-PORTREVISION=	1
+PORTVERSION=	4.00
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/Testing/ \
-		http://www.exim.org/ftp/Testing/ \
-		ftp://ftp.is.co.za/networking/mail/transport/exim/Testing/
-DISTFILES=	exim-3.952.tar.bz2 exim-texinfo-3.951.tar.bz2
+MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
+		http://www.exim.org/ftp/exim4/ \
+		ftp://ftp.is.co.za/networking/mail/transport/exim/exim4/
+DISTFILES=	exim-4.00.tar.bz2 exim-texinfo-4.00.tar.bz2
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
@@ -199,7 +198,7 @@ do-configure:
 	${MKDIR} ${WRKSRC}/Local
 	${SED} ${SEDLIST} < ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile
 	cd ${WRKSRC}/doc && \
-	for i in ../../exim-texinfo-3.951/doc/* ; do \
+	for i in ../../exim-texinfo-4.00/doc/* ; do \
 		${LN} -sf $$i ; \
 	done
 
diff --git a/mail/exim-devel/distinfo b/mail/exim-devel/distinfo
index 7237b5558133..08269f15a4d2 100644
--- a/mail/exim-devel/distinfo
+++ b/mail/exim-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-3.952.tar.bz2) = 5c57f7b6c8a5f493f7874aa91fa4bd99
-MD5 (exim-texinfo-3.951.tar.bz2) = 9b8b8e781a4ca338aee97d9feb4ac5b3
+MD5 (exim-4.00.tar.bz2) = 4dcd226632b794a03f14bc990e350ce3
+MD5 (exim-texinfo-4.00.tar.bz2) = c124671a94f931b977e46f8a56fbf587
diff --git a/mail/exim-devel/files/POST-INSTALL-NOTES b/mail/exim-devel/files/POST-INSTALL-NOTES
index 90301c248dda..e6382630d635 100644
--- a/mail/exim-devel/files/POST-INSTALL-NOTES
+++ b/mail/exim-devel/files/POST-INSTALL-NOTES
@@ -25,3 +25,14 @@ You may also want to configure newsyslog(8) to rotate Exim log files:
 /var/log/exim/mainlog	mailnull:mail 640 7 * @T00 Z
 /var/log/exim/rejectlog	mailnull:mail 640 7 * @T00 Z
 
+NOTE TO OPERATORS UPGRADING FROM exim-3.xx:
+
+There was a big reworking of the way mail routing works for release
+4.00. Previously used "directors" were abolished, and all routing is
+now done by routers. Policy controls for incoming mail are now done by
+Access Control Lists instead of separate options. All this means that
+pre-4.00 configuration files have to be massively converted. If you
+are coming from a 3.xx release, please read the document in the file
+${PREFIX}/share/doc/exim/Exim4.upgrade, and allow some time to complete
+the upgrade.
+
diff --git a/mail/exim-devel/files/patch-..::exim-texinfo-3.30::doc::spec.texinfo b/mail/exim-devel/files/patch-..::exim-texinfo-3.30::doc::spec.texinfo
deleted file mode 100644
index ed22783134b3..000000000000
--- a/mail/exim-devel/files/patch-..::exim-texinfo-3.30::doc::spec.texinfo
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../exim-texinfo-3.951/doc/spec.texinfo.orig	Tue Jun 12 12:20:49 2001
-+++ ../exim-texinfo-3.951/doc/spec.texinfo	Tue Jan 15 17:19:46 2002
-@@ -20785,6 +20785,19 @@
- may be adequate for all your requirements if you are mainly interested in
- encrypting transfers, and not in secure identification.
- 
-+However, many clients require that the certificate presented by Exim be a user
-+(also called "leaf" or "site") certificate, and not a self-signed certificate.
-+In this case, the self-signed certificate described above must be installed on
-+the client host as a trusted root certification authority and the certificate
-+used by Exim must be a user certificate signed with that self-signed
-+certificate.
-+
-+For information on creating self-signed CA certificates and using them to sign
-+user certificates, see the "General implementation overview" chapter of the
-+Open-source PKI Book, available online at:
-+
-+http://ospkibook.sourceforge.net/
-+
- 
- 
- 
diff --git a/mail/exim-devel/files/patch-src::EDITME b/mail/exim-devel/files/patch-src::EDITME
index 7dfc0926d464..f35e54ba6e63 100644
--- a/mail/exim-devel/files/patch-src::EDITME
+++ b/mail/exim-devel/files/patch-src::EDITME
@@ -1,6 +1,6 @@
 --- src/EDITME.orig	Tue Dec 18 22:01:44 2001
 +++ src/EDITME	Tue Dec 18 22:11:42 2001
-@@ -95,7 +95,7 @@
+@@ -98,7 +98,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
  # and any superior directories, if they do not exist.
  
@@ -9,7 +9,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -110,7 +110,7 @@
+@@ -113,7 +113,7 @@
  # directories if they don't exist. It will also install a default run time
  # configuration if this file does not exist.
  
@@ -18,18 +18,24 @@
  
  
  #------------------------------------------------------------------------------
-@@ -123,8 +123,8 @@
+@@ -126,14 +126,14 @@
  # owner of a local mailbox.) Specifying these values as root is very strongly
  # discouraged. These values are compiled into the binary.
  
 -EXIM_USER=
--EXIM_GROUP=
 +EXIM_USER=mailnull
-+EXIM_GROUP=mail
  
  # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
  # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
-@@ -266,8 +266,8 @@
+ # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
+ # you want to use a group other than the default group for the given user.
+ 
+-# EXIM_GROUP=
++EXIM_GROUP=mail
+ 
+ # Many sites define a user called "exim", with an appropriate default group,
+ # and use
+@@ -269,8 +269,8 @@
  # don't need to set LOOKUP_INCLUDE if the relevant directories are already
  # specified in INCLUDE.
  
@@ -40,7 +46,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -278,7 +278,7 @@
+@@ -281,7 +281,7 @@
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
  
@@ -49,7 +55,7 @@
  
  
  
-@@ -312,7 +312,7 @@
+@@ -316,7 +316,7 @@
  # settings commented out.
  
  # SUPPORT_TLS=yes
@@ -58,7 +64,7 @@
  
  # If you are running Exim as a server, note that just building it with TLS
  # support is not all you need to do. You also need to set up a suitable
-@@ -354,7 +354,7 @@
+@@ -358,7 +358,7 @@
  # Once you have done this, "make install" will build the info files and
  # install them in the directory you have defined.
  
@@ -67,7 +73,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -367,7 +367,7 @@
+@@ -371,7 +371,7 @@
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  # to form the final file names. Some installations may want something like this:
  
@@ -76,7 +82,7 @@
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -455,7 +455,7 @@
+@@ -459,7 +459,7 @@
  
  #  USE_TCP_WRAPPERS=yes
  #  CFLAGS=-O -I/usr/local/include
@@ -85,7 +91,7 @@
  
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
-@@ -652,7 +652,7 @@
+@@ -678,7 +678,7 @@
  # (process id) to a file so that it can easily be identified. The path of the
  # file can be specified here. Some installations may want something like this:
  
diff --git a/mail/exim-devel/files/patch-src::readconf.c b/mail/exim-devel/files/patch-src::readconf.c
deleted file mode 100644
index 0f6839f91ec6..000000000000
--- a/mail/exim-devel/files/patch-src::readconf.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/readconf.c.orig	Fri Nov 23 17:31:21 2001
-+++ src/readconf.c	Thu Dec 20 17:24:58 2001
-@@ -1990,6 +1990,7 @@
- while (isalnum(*s) || *s == '_') s++;
- t = store_get(sizeof(tree_node) + s-ss);
- Ustrncpy(t->name, ss, s-ss);
-+t->name[s-ss] = 0;
- while (isspace(*s)) s++;
- 
- if (!tree_insertnode(anchorp, t))
diff --git a/mail/exim-devel/pkg-plist b/mail/exim-devel/pkg-plist
index b94e6d79618f..9b8bd1269394 100644
--- a/mail/exim-devel/pkg-plist
+++ b/mail/exim-devel/pkg-plist
@@ -2,7 +2,7 @@ etc/exim/configure.default
 info/exim.info
 info/exim_filter.info
 sbin/exim
-sbin/exim-3.951-1
+sbin/exim-4.00-1
 sbin/exim_checkaccess
 sbin/exim_dumpdb
 sbin/exim_fixdb