Update to exim-3.34:

* Mostly incorporates patches already carried by the port.

* Fixes a vulnerability in pipe handling, which was not exposed
  by the default configuration, but which could have been exposed
  if the configuration were altered appropriately.

12 files changed, 6 insertions, 210 deletions

diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index 5409d9731389..3e79d6e9764a 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	exim
-PORTVERSION=	3.33
-PORTREVISION=	6
+PORTVERSION=	3.34
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/ \
 		http://www.exim.org/ftp/exim3/ \
 		ftp://ftp.is.co.za/networking/mail/transport/exim/exim3/
-DISTFILES=	exim-3.33.tar.bz2 exim-texinfo-3.30.tar.bz2
+DISTFILES=	exim-3.34.tar.bz2 exim-texinfo-3.30.tar.bz2
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
diff --git a/mail/exim-old/distinfo b/mail/exim-old/distinfo
index 5f3ac9e4caa8..5c5610a448e7 100644
--- a/mail/exim-old/distinfo
+++ b/mail/exim-old/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-3.33.tar.bz2) = d93a6f6387e18cf94c709f93c725b823
+MD5 (exim-3.34.tar.bz2) = 7ccaee3a714780b29b8b5485ed10454d
 MD5 (exim-texinfo-3.30.tar.bz2) = 6400cc7988036991b6bbe7ed9b4d9eeb
diff --git a/mail/exim-old/files/patch-..::texinfo-3.30::doc::spec.texinfo b/mail/exim-old/files/patch-..::texinfo-3.30::doc::spec.texinfo
deleted file mode 100644
index 8053631d6c83..000000000000
--- a/mail/exim-old/files/patch-..::texinfo-3.30::doc::spec.texinfo
+++ /dev/null
@@ -1,40 +0,0 @@
---- ../exim-texinfo-3.30/doc/spec.texinfo.orig	Tue Jun 12 12:20:49 2001
-+++ ../exim-texinfo-3.30/doc/spec.texinfo	Mon Jun 18 17:50:02 2001
-@@ -6571,20 +6571,24 @@
- 
- 
- @cindex gid: caller
--@center aller_gid: The group id under which the process that called Exim was
-+$caller_gid:
-+The group id under which the process that called Exim was
- running. This is not the same as the group id of the originator of a message
- (see $originator_gid). If Exim re-execs itself, this variable in the new
- incarnation normally contains the Exim gid.
- 
- @cindex uid: caller
--@center aller_uid: The user id under which the process that called Exim was
-+$caller_uid:
-+The user id under which the process that called Exim was
- running. This is not the same as the user id of the originator of a message
- (see $originator_uid). If Exim re-execs itself, this variable in the new
- incarnation normally contains the Exim uid.
- 
--@center ompile_date: The date on which the Exim binary was compiled.
-+$compile_date:
-+The date on which the Exim binary was compiled.
- 
--@center ompile_number: The building process for Exim keeps a count of the number
-+$compile_number:
-+The building process for Exim keeps a count of the number
- of times it has been compiled. This serves to distinguish different
- compilations of the same version of the program.
- 
-@@ -6630,7 +6634,7 @@
- transport, the value is available in that transport. In all other situations,
- this variable expands to nothing.
- 
--							rrmsg_recipient:
-+$errmsg_recipient:
- This is set to the recipient address of an error message while Exim is creating
- it. It is useful if a customized error message text file is in use (see
- chapter "Customizing error and warning messages").
diff --git a/mail/exim-old/files/patch-src::exim.c b/mail/exim-old/files/patch-src::exim.c
deleted file mode 100644
index c16f4a861e8e..000000000000
--- a/mail/exim-old/files/patch-src::exim.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/exim.c.orig	Wed Aug 15 13:09:09 2001
-+++ src/exim.c	Fri Nov  2 12:22:38 2001
-@@ -2197,7 +2197,8 @@
- 
- if (!admin_user)
-   {
--  if (deliver_give_up || daemon_listen || count_queue ||
-+  if (deliver_give_up || daemon_listen ||
-+     (count_queue && queue_list_requires_admin) ||
-      (list_queue && queue_list_requires_admin) ||
-      (queue_interval >= 0 && prod_requires_admin))
-     {
-@@ -3462,6 +3463,7 @@
-     }
- 
-   /* The loop will repeat if more is TRUE. */
-+  while (waitpid(-1, NULL, WNOHANG) > 0);
-   }
- 
- exim_exit(EXIT_SUCCESS);   /* Never returns */
diff --git a/mail/exim-old/files/patch-src::filter.c b/mail/exim-old/files/patch-src::filter.c
deleted file mode 100644
index 5b662add1022..000000000000
--- a/mail/exim-old/files/patch-src::filter.c
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix the message_body_size filter variable bug reported by Phil Chambers
-to the exim-users mailing list on 2001-09-19 using the patch posted to
-the list by the author on 2001-09-24.
-
---- src/filter.c.orig	Wed Aug 15 13:09:09 2001
-+++ src/filter.c	Wed Sep 26 18:16:20 2001
-@@ -2566,7 +2566,7 @@
- BOOL
- filter_runtest(int fd, BOOL is_system, BOOL dot_ended)
- {
--int rc, body_len, action;
-+int rc, body_len, action, header_size;
- register int ch;
- BOOL yield, delivered;
- struct stat statbuf;
-@@ -2658,6 +2658,7 @@
- s = message_body_end;
- body_len = 0;
- body_linecount = 0;
-+header_size = message_size;
- 
- if (!dot_ended && !feof(stdin))
-   {
-@@ -2713,6 +2714,7 @@
-   }
- 
- message_body[body_len] = 0;
-+message_body_size = message_size - header_size;
- 
- /* body_len stops at message_body_visible; it if got there, we may have
- wrapped round in message_body_end. */
diff --git a/mail/exim-old/files/patch-src::smtp_in.c b/mail/exim-old/files/patch-src::smtp_in.c
deleted file mode 100644
index 4edda1daf19c..000000000000
--- a/mail/exim-old/files/patch-src::smtp_in.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/smtp_in.c.orig	Wed Aug 15 13:09:12 2001
-+++ src/smtp_in.c	Wed Nov 14 13:24:12 2001
-@@ -2482,6 +2482,7 @@
-             mail_from_size + 5000 : 0))
-       {
-       smtp_printf("452 space shortage, please try later\r\n");
-+      sender_address = NULL;
-       break;
-       }
- 
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 5409d9731389..3e79d6e9764a 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	exim
-PORTVERSION=	3.33
-PORTREVISION=	6
+PORTVERSION=	3.34
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/ \
 		http://www.exim.org/ftp/exim3/ \
 		ftp://ftp.is.co.za/networking/mail/transport/exim/exim3/
-DISTFILES=	exim-3.33.tar.bz2 exim-texinfo-3.30.tar.bz2
+DISTFILES=	exim-3.34.tar.bz2 exim-texinfo-3.30.tar.bz2
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 5f3ac9e4caa8..5c5610a448e7 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-3.33.tar.bz2) = d93a6f6387e18cf94c709f93c725b823
+MD5 (exim-3.34.tar.bz2) = 7ccaee3a714780b29b8b5485ed10454d
 MD5 (exim-texinfo-3.30.tar.bz2) = 6400cc7988036991b6bbe7ed9b4d9eeb
diff --git a/mail/exim/files/patch-..::texinfo-3.30::doc::spec.texinfo b/mail/exim/files/patch-..::texinfo-3.30::doc::spec.texinfo
deleted file mode 100644
index 8053631d6c83..000000000000
--- a/mail/exim/files/patch-..::texinfo-3.30::doc::spec.texinfo
+++ /dev/null
@@ -1,40 +0,0 @@
---- ../exim-texinfo-3.30/doc/spec.texinfo.orig	Tue Jun 12 12:20:49 2001
-+++ ../exim-texinfo-3.30/doc/spec.texinfo	Mon Jun 18 17:50:02 2001
-@@ -6571,20 +6571,24 @@
- 
- 
- @cindex gid: caller
--@center aller_gid: The group id under which the process that called Exim was
-+$caller_gid:
-+The group id under which the process that called Exim was
- running. This is not the same as the group id of the originator of a message
- (see $originator_gid). If Exim re-execs itself, this variable in the new
- incarnation normally contains the Exim gid.
- 
- @cindex uid: caller
--@center aller_uid: The user id under which the process that called Exim was
-+$caller_uid:
-+The user id under which the process that called Exim was
- running. This is not the same as the user id of the originator of a message
- (see $originator_uid). If Exim re-execs itself, this variable in the new
- incarnation normally contains the Exim uid.
- 
--@center ompile_date: The date on which the Exim binary was compiled.
-+$compile_date:
-+The date on which the Exim binary was compiled.
- 
--@center ompile_number: The building process for Exim keeps a count of the number
-+$compile_number:
-+The building process for Exim keeps a count of the number
- of times it has been compiled. This serves to distinguish different
- compilations of the same version of the program.
- 
-@@ -6630,7 +6634,7 @@
- transport, the value is available in that transport. In all other situations,
- this variable expands to nothing.
- 
--							rrmsg_recipient:
-+$errmsg_recipient:
- This is set to the recipient address of an error message while Exim is creating
- it. It is useful if a customized error message text file is in use (see
- chapter "Customizing error and warning messages").
diff --git a/mail/exim/files/patch-src::exim.c b/mail/exim/files/patch-src::exim.c
deleted file mode 100644
index c16f4a861e8e..000000000000
--- a/mail/exim/files/patch-src::exim.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/exim.c.orig	Wed Aug 15 13:09:09 2001
-+++ src/exim.c	Fri Nov  2 12:22:38 2001
-@@ -2197,7 +2197,8 @@
- 
- if (!admin_user)
-   {
--  if (deliver_give_up || daemon_listen || count_queue ||
-+  if (deliver_give_up || daemon_listen ||
-+     (count_queue && queue_list_requires_admin) ||
-      (list_queue && queue_list_requires_admin) ||
-      (queue_interval >= 0 && prod_requires_admin))
-     {
-@@ -3462,6 +3463,7 @@
-     }
- 
-   /* The loop will repeat if more is TRUE. */
-+  while (waitpid(-1, NULL, WNOHANG) > 0);
-   }
- 
- exim_exit(EXIT_SUCCESS);   /* Never returns */
diff --git a/mail/exim/files/patch-src::filter.c b/mail/exim/files/patch-src::filter.c
deleted file mode 100644
index 5b662add1022..000000000000
--- a/mail/exim/files/patch-src::filter.c
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix the message_body_size filter variable bug reported by Phil Chambers
-to the exim-users mailing list on 2001-09-19 using the patch posted to
-the list by the author on 2001-09-24.
-
---- src/filter.c.orig	Wed Aug 15 13:09:09 2001
-+++ src/filter.c	Wed Sep 26 18:16:20 2001
-@@ -2566,7 +2566,7 @@
- BOOL
- filter_runtest(int fd, BOOL is_system, BOOL dot_ended)
- {
--int rc, body_len, action;
-+int rc, body_len, action, header_size;
- register int ch;
- BOOL yield, delivered;
- struct stat statbuf;
-@@ -2658,6 +2658,7 @@
- s = message_body_end;
- body_len = 0;
- body_linecount = 0;
-+header_size = message_size;
- 
- if (!dot_ended && !feof(stdin))
-   {
-@@ -2713,6 +2714,7 @@
-   }
- 
- message_body[body_len] = 0;
-+message_body_size = message_size - header_size;
- 
- /* body_len stops at message_body_visible; it if got there, we may have
- wrapped round in message_body_end. */
diff --git a/mail/exim/files/patch-src::smtp_in.c b/mail/exim/files/patch-src::smtp_in.c
deleted file mode 100644
index 4edda1daf19c..000000000000
--- a/mail/exim/files/patch-src::smtp_in.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/smtp_in.c.orig	Wed Aug 15 13:09:12 2001
-+++ src/smtp_in.c	Wed Nov 14 13:24:12 2001
-@@ -2482,6 +2482,7 @@
-             mail_from_size + 5000 : 0))
-       {
-       smtp_printf("452 space shortage, please try later\r\n");
-+      sender_address = NULL;
-       break;
-       }
-