Pullup ticket #3329 - requested by gls

mail/exim-html: security update

Revisions pulled up:
- mail/exim-html/Makefile			1.19
- mail/exim-html/PLIST				1.12
- mail/exim-html/distinfo			1.14
---
Module Name:	pkgsrc
Committed By:	adam
Date:		Wed Jan 12 07:52:45 UTC 2011

Modified Files:
	pkgsrc/mail/exim: Makefile distinfo
	pkgsrc/mail/exim/patches: patch-aa
Added Files:
	pkgsrc/mail/exim/patches: patch-ba patch-bb patch-bc patch-bd

Log Message:
Changes 4.73:
* Date: & Message-Id: revert to normally being appended to a message,
  only prepend for the Resent-* case.  Fixes regression introduced in
  Exim 4.70 by NM/22 for Bugzilla 607.
* Include check_rfc2047_length in configure.default because we're seeing
  increasing numbers of administrators be bitten by this.
* Added DISABLE_DKIM and comment to src/EDITME
* Bugzilla 994: added openssl_options main configuration option.
* Bugzilla 995: provide better SSL diagnostics on failed reads.
* Bugzilla 834: provide a permit_coredump option for pipe transports.
* Adjust NTLM authentication to handle SASL Initial Response.
* If TLS negotiated an anonymous cipher, we could end up with SSL but
  without a peer certificate, leading to a segfault because of an
  assumption that peers always have certificates.  Be a little more
paranoid.
* Bugzilla 926: switch ClamAV to use the new zINSTREAM API for content
  filtering; old API available if built with WITH_OLD_CLAMAV_STREAM=yes
  NB: ClamAV planning to remove STREAM in "middle of 2010".
  CL also introduces -bmalware, various -d+acl logging additions and
  more caution in buffer sizes.
* Implemented reverse_ip expansion operator.
* Bugzilla 937: provide a "debug" ACL control.
* Bugzilla 922: Documentation dusting, patch provided by John Horne.
* Bugzilla 973: Implement --version.
* Bugzilla 752: Refuse to build/run if Exim user is root/0.
* Build without WITH_CONTENT_SCAN. Path from Andreas Metzler.
* Bugzilla 816: support multiple condition rules on Routers.
* Add bool_lax{} expansion operator and use that for combining multiple
  condition rules, instead of bool{}.  Make both bool{} and bool_lax{}
  ignore trailing whitespace.
* prevent non-panic DKIM error from being sent to paniclog
* added tcp_wrappers_daemon_name to allow host entries other than
  "exim" to be used
* Fix malware regression for cmdline scanner introduced in PP/08.
  Notification from Dr Andrew Aitchison.
* Change ClamAV response parsing to be more robust and to handle ClamAV's
  ExtendedDetectionInfo response format.
* OpenSSL 1.0.0a compatibility const-ness change, should be backwards
  compatible.

3 files changed, 16 insertions, 12 deletions

diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index e9c0e76da17..5d05ba1d814 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2010/11/08 07:52:46 adam Exp $
+# $NetBSD: Makefile,v 1.18.2.1 2011/01/22 10:59:16 tron Exp $
 
-DISTNAME=	exim-html-4.72
+DISTNAME=	exim-html-4.73
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
diff --git a/mail/exim-html/PLIST b/mail/exim-html/PLIST
index b50e7aa78f8..f2b3a9f2680 100644
--- a/mail/exim-html/PLIST
+++ b/mail/exim-html/PLIST
@@ -1,8 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2010/11/08 07:52:46 adam Exp $
-share/doc/exim/html/filter-txt.html
-share/doc/exim/html/filter.html
-share/doc/exim/html/index.html
-share/doc/exim/html/spec-txt.html
+@comment $NetBSD: PLIST,v 1.11.2.1 2011/01/22 10:59:16 tron Exp $
 share/doc/exim/html/spec_html/ch01.html
 share/doc/exim/html/spec_html/ch02.html
 share/doc/exim/html/spec_html/ch03.html
@@ -58,5 +54,13 @@ share/doc/exim/html/spec_html/ch52.html
 share/doc/exim/html/spec_html/ch53.html
 share/doc/exim/html/spec_html/ch54.html
 share/doc/exim/html/spec_html/ch55.html
+share/doc/exim/html/spec_html/ch56.html
+share/doc/exim/html/spec_html/ch57.html
+share/doc/exim/html/spec_html/ch58.html
+share/doc/exim/html/spec_html/filter.html
+share/doc/exim/html/spec_html/filter_ch01.html
+share/doc/exim/html/spec_html/filter_ch02.html
+share/doc/exim/html/spec_html/filter_ch03.html
+share/doc/exim/html/spec_html/filter_toc.xml
 share/doc/exim/html/spec_html/index.html
-share/doc/exim/html/spec_html/ix01.html
+share/doc/exim/html/spec_html/index_toc.xml
diff --git a/mail/exim-html/distinfo b/mail/exim-html/distinfo
index 9acc1da95db..01343a0e43d 100644
--- a/mail/exim-html/distinfo
+++ b/mail/exim-html/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2010/11/08 07:52:46 adam Exp $
+$NetBSD: distinfo,v 1.13.2.1 2011/01/22 10:59:17 tron Exp $
 
-SHA1 (exim-html-4.72.tar.bz2) = 3e8434b1a07bcb92235233db6a7f6dbda8802c75
-RMD160 (exim-html-4.72.tar.bz2) = 80fed8c38510936db9492d3d2436a1cf02352f41
-Size (exim-html-4.72.tar.bz2) = 794072 bytes
+SHA1 (exim-html-4.73.tar.bz2) = c3973f9c41ae8d7f3b28d572f2e1dcb87ae6f996
+RMD160 (exim-html-4.73.tar.bz2) = 5e85f6136df57ec4872d78473065030378bd4afa
+Size (exim-html-4.73.tar.bz2) = 412706 bytes