General tidy up of files due to space consumption. new rev bump for security bug #198379

Package-Manager: portage-2.1.2-r9

8 files changed, 358 insertions, 1058 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index f3a64097c8ac..f06c82d28091 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/exim
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.112 2007/12/02 20:49:32 peitolm Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.113 2008/01/13 22:06:42 peitolm Exp $
+
+*exim-4.69 (13 Jan 2008)
+
+  13 Jan 2008; Colin Morey <peitolm@gentoo.org>
+  -files/exim-4.10-gentoo.diff, -files/exim-4.50-srs_update-1.0.patch,
+  -files/exim-4.66-openssl.patch, -files/configure, +exim-4.69.ebuild:
+  General tidy up of files due to space consumption. new rev bump for security
+  bug #198379
 
   02 Dec 2007; Colin Morey <peitolm@gentoo.org> -exim-4.60-r1.ebuild,
   -exim-4.62.ebuild, -exim-4.66.ebuild, -exim-4.67.ebuild,
@@ -16,10 +24,10 @@
   14 Nov 2007; Jeroen Roovers <jer@gentoo.org> exim-4.68.ebuild:
   Stable for HPPA (bug #198489). Fixed many quoting issues.
 
-  11 Nov 2007; Raúl Porcel <armin76@gentoo.org> exim-4.68.ebuild:
+  11 Nov 2007; Raúl Porcel <armin76@gentoo.org> exim-4.68.ebuild:
   alpha/ia64/sparc stable wrt #198489
 
-  10 Nov 2007; Dawid Węgliński <cla@gentoo.org> exim-4.68.ebuild:
+  10 Nov 2007; Dawid Węgliński <cla@gentoo.org> exim-4.68.ebuild:
   Stable on x86 (bug #198489)
 
   10 Nov 2007; Markus Rothe <corsair@gentoo.org> exim-4.68.ebuild:
@@ -39,13 +47,13 @@
   04 Sep 2007; Colin Morey <peitolm@gentoo.org> +exim-4.68.ebuild:
   Version Bump to 4.68
 
-  09 Aug 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67-r1.ebuild:
+  09 Aug 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67-r1.ebuild:
   alpha stable
 
   30 Jul 2007; Colin Morey <peitolm@gentoo.org> exim-4.67-r2.ebuild:
   Re-instating missing archs that were accidently dropped in the new revision. #176487
 
-  25 Jul 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67-r2.ebuild:
+  25 Jul 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67-r2.ebuild:
   Re-add ~alpha wrt #176487
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; exim-4.60-r1.ebuild,
@@ -59,7 +67,7 @@
   Fixes for bugs 180894 (Broken symlinks) 184697 (missing -lcrypto when
   building with domainkeys)
 
-  30 Jun 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67-r1.ebuild:
+  30 Jun 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67-r1.ebuild:
   Add ~alpha wrt #176487
 
   17 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org> exim-4.67-r1.ebuild:
@@ -89,7 +97,7 @@
   01 May 2007; Markus Rothe <corsair@gentoo.org> exim-4.67.ebuild:
   Added ~ppc64; bug #176487
 
-  01 May 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67.ebuild:
+  01 May 2007; Raúl Porcel <armin76@gentoo.org> exim-4.67.ebuild:
   Add ~ia64 wrt bug 176487
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> exim-4.60-r1.ebuild,
@@ -97,7 +105,7 @@
   exim-4.67.ebuild:
   Fix *initd, *confd and *envd calls (#17388, #174266)
 
-  21 Apr 2007; Raúl Porcel <armin76@gentoo.org> exim-4.62.ebuild:
+  21 Apr 2007; Raúl Porcel <armin76@gentoo.org> exim-4.62.ebuild:
   ia64 stable
 
 
@@ -111,7 +119,7 @@
   exim-4.61.ebuild, exim-4.62.ebuild, exim-4.63.ebuild:
   add libtasn1 as dependency for USE=gnutls, as reported in bug 143519 by zmedico
 
-  19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove pfeifer from metadata.xml due to retirement.
 
   18 Mar 2007; Marius Mauch <genone@gentoo.org> exim-4.60-r1.ebuild,
@@ -125,7 +133,7 @@
   Version bump, also adding dovecot-sasl suport and openssl patch from
   http://bugs.gentoo.org/show_bug.cgi?id=161572
 
-  08 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
+  08 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
 
   20 Dec 2006; Colin Morey <peitolm@gentoo.org> files/mailer.conf:
@@ -291,7 +299,7 @@
   05 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> exim-4.50-r1.ebuild:
   Stable on hppa.
 
-  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> exim-4.50-r1.ebuild:
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> exim-4.50-r1.ebuild:
   Add ~alpha keyword.
 
   26 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> exim-4.50-r1.ebuild:
@@ -374,7 +382,7 @@
   exim-4.43.ebuild:
   KEYWORDS ~amd64 to close bug 61163.
 
-  10 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.42.ebuild:
+  10 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.42.ebuild:
   Stable on alpha.
 
   08 Oct 2004; Guy Martin <gmsoft@gentoo.org> exim-4.42.ebuild:
@@ -386,7 +394,7 @@
   +exim-4.43.ebuild:
   New Version Bump and Bump of 4.42 to stable.
 
-  04 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.42.ebuild:
+  04 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.42.ebuild:
   Keyword ~alpha.
 
   05 Sep 2004; Guy Martin <gmsoft@gentoo.org> exim-4.41.ebuild,
@@ -473,7 +481,7 @@
   11 May 2004; Guy Martin <gmsoft@gentoo.org> exim-4.34.ebuild:
   Marked stable on hppa.
 
-  11 May 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.34.ebuild:
+  11 May 2004; Bryan Østergaard <kloeri@gentoo.org> exim-4.34.ebuild:
   Stable on alpha, bug #50217.
 
   11 May 2004; Jon Portnoy <avenj@gentoo.org> exim-4.34.ebuild :
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 138400c8ba46..3f84a2d0211b 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -2,14 +2,6 @@ AUX auth_conf.sub 790 RMD160 5d6a71cf9fb593fc34ddce8dc421fcd843356c82 SHA1 57445
 MD5 ac8d0e9813e9471f350fa39347dc2e6e files/auth_conf.sub 790
 RMD160 5d6a71cf9fb593fc34ddce8dc421fcd843356c82 files/auth_conf.sub 790
 SHA256 d0631d487f115c07a178d48bc7168cd16d7b22c8879b1e926923152cde95ba78 files/auth_conf.sub 790
-AUX configure 16346 RMD160 7826da9ebcf9d9318894bb3a412532a371e62032 SHA1 8e1b61ede8c86fc6efa50eca0e5da52e9be3dfaf SHA256 c0b8dee099095963d77d19a44ed9305759b4db2a1048ae77d1f839f75e017d6e
-MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346
-RMD160 7826da9ebcf9d9318894bb3a412532a371e62032 files/configure 16346
-SHA256 c0b8dee099095963d77d19a44ed9305759b4db2a1048ae77d1f839f75e017d6e files/configure 16346
-AUX exim-4.10-gentoo.diff 1889 RMD160 5e3b7424901e8ce55c43ed1d87193f915d633285 SHA1 49c5ad9efbfd5e380f4bd4485ea5771203be3029 SHA256 b9c4c055c0992362f16e02d64f81e0427cc87729d67f9ac4e275d0360709b40b
-MD5 369b42cafcbe5631c2d03cbbfd4aeddd files/exim-4.10-gentoo.diff 1889
-RMD160 5e3b7424901e8ce55c43ed1d87193f915d633285 files/exim-4.10-gentoo.diff 1889
-SHA256 b9c4c055c0992362f16e02d64f81e0427cc87729d67f9ac4e275d0360709b40b files/exim-4.10-gentoo.diff 1889
 AUX exim-4.14-tail.patch 446 RMD160 685e27ff995710f3b8d77d8785b04503170e7e27 SHA1 d52b5d10656ead546beda128068ed2f9dbc67200 SHA256 74d1044bb94e167180fd8f8aba7449ca3d2b09b1ce170a1a2e4e54ca0cd660da
 MD5 5d5aabea7d56a91803df1312c04d32c0 files/exim-4.14-tail.patch 446
 RMD160 685e27ff995710f3b8d77d8785b04503170e7e27 files/exim-4.14-tail.patch 446
@@ -26,14 +18,6 @@ AUX exim-4.43-r2-localscan_dlopen.patch 9236 RMD160 d33f7bcf72f947e8d1a3d9177136
 MD5 c76437104cbde9184f01eb0987bfd738 files/exim-4.43-r2-localscan_dlopen.patch 9236
 RMD160 d33f7bcf72f947e8d1a3d917713630100c175491 files/exim-4.43-r2-localscan_dlopen.patch 9236
 SHA256 3ec15d2dfdf251c70647c3def09711385f23983eceeecb6ec9d42b39f54b198d files/exim-4.43-r2-localscan_dlopen.patch 9236
-AUX exim-4.50-srs_update-1.0.patch 18372 RMD160 1ac6d641f8c1b8c9c6378bfc0de9dce4c59a7413 SHA1 b4d8b531b267cedfd1b293d1a46d02f18931186e SHA256 df0e4f4901abb53a3ada0367d1682d5b25846804330b37abb2fecc7f0fed1563
-MD5 67d515cfd03abf9c207c28c997de4177 files/exim-4.50-srs_update-1.0.patch 18372
-RMD160 1ac6d641f8c1b8c9c6378bfc0de9dce4c59a7413 files/exim-4.50-srs_update-1.0.patch 18372
-SHA256 df0e4f4901abb53a3ada0367d1682d5b25846804330b37abb2fecc7f0fed1563 files/exim-4.50-srs_update-1.0.patch 18372
-AUX exim-4.66-openssl.patch 503 RMD160 ca964980e6d5622327cdd6103f2e11a132d78339 SHA1 f41ad4679f09cb80ae6eb15826e6db60a5bd6f5f SHA256 6db4bc7e932beeeb51f1e8daae4cd71d727363979e5e175a54ca51fe1790363a
-MD5 2b384258dcdcb4a7ec7267b5718931ed files/exim-4.66-openssl.patch 503
-RMD160 ca964980e6d5622327cdd6103f2e11a132d78339 files/exim-4.66-openssl.patch 503
-SHA256 6db4bc7e932beeeb51f1e8daae4cd71d727363979e5e175a54ca51fe1790363a files/exim-4.66-openssl.patch 503
 AUX exim.confd 62 RMD160 d8dcabf184ffb9066ad45c3e77cce1ec0392a143 SHA1 c56feda3c3193fad26852310da8ef24ef91f60f6 SHA256 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401
 MD5 f442b68d435598831bab8536ade071b8 files/exim.confd 62
 RMD160 d8dcabf184ffb9066ad45c3e77cce1ec0392a143 files/exim.confd 62
@@ -55,15 +39,20 @@ MD5 4c0b8ee742360c08f0bc0b526fcaad10 files/system_filter.exim 8120
 RMD160 267545af6dd333e0e5f05e1d4d02a0e8ee638d45 files/system_filter.exim 8120
 SHA256 35539f6d20f2847b4093824618797b4d602dcc5b7d920e49bf5c26f0fd89858e files/system_filter.exim 8120
 DIST exim-4.68.tar.bz2 1641636 RMD160 764cc258ee969bb27975d8009bacb6489103e3a5 SHA1 510df6a2c38094a55ea54b19dd0e61b88ed78325 SHA256 31e79e045bfbb730dbe86fdfc7793055d21b78367bae5b8e7bb9494c6ea760b0
+DIST exim-4.69.tar.bz2 1658939 RMD160 ae97c807c63f858ba4a0ab402677225da9337d05 SHA1 321e238b6e6b32498110511ce72a911538305a39 SHA256 18e856cfdb682ba8e8ccb943ab538734d34d0ecefd63465ecc5430bc15915069
 DIST exiscan.conf 22113 RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 SHA1 74dc6e30f49402f5e6fefc280ea325d17f6af8c4 SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964
 EBUILD exim-4.68.ebuild 9805 RMD160 33d24e6e4195f3f8c2154b398accfae8a3a216c0 SHA1 49d3edaeb11c4ab8484cc4b17c5666ac87bedcbf SHA256 6a765637023777fa7c0eadb70645e2e497c3f7d1bd0ce48e32351b8ea972b4d7
 MD5 818ce25e6d881e255c5f100140e38c01 exim-4.68.ebuild 9805
 RMD160 33d24e6e4195f3f8c2154b398accfae8a3a216c0 exim-4.68.ebuild 9805
 SHA256 6a765637023777fa7c0eadb70645e2e497c3f7d1bd0ce48e32351b8ea972b4d7 exim-4.68.ebuild 9805
-MISC ChangeLog 27015 RMD160 9e81e0117290cac743cf893e35541af57dbde55a SHA1 bb3d2ead2030847f47952538c829a97818662729 SHA256 0fa058301fbfc28aad28f2447035401a68bc32a618a292ad94e8a4abd5424745
-MD5 500b91481656dace64d2c47586998c0b ChangeLog 27015
-RMD160 9e81e0117290cac743cf893e35541af57dbde55a ChangeLog 27015
-SHA256 0fa058301fbfc28aad28f2447035401a68bc32a618a292ad94e8a4abd5424745 ChangeLog 27015
+EBUILD exim-4.69.ebuild 9814 RMD160 bdcdfd776924d6b599e2ead76c6bcf5b13b5d754 SHA1 e437d6f2ecc6c6bbe5de263fffed7ee9e26037b8 SHA256 7b25200f76022ff956e4380df7c09893836c05a354c543f6b6e9d2191fc4f95b
+MD5 04ff1a6aeee06b38332145ff5151f8ee exim-4.69.ebuild 9814
+RMD160 bdcdfd776924d6b599e2ead76c6bcf5b13b5d754 exim-4.69.ebuild 9814
+SHA256 7b25200f76022ff956e4380df7c09893836c05a354c543f6b6e9d2191fc4f95b exim-4.69.ebuild 9814
+MISC ChangeLog 27381 RMD160 a65e52984d6248955b1593a50611acced145fb36 SHA1 a0f44bea28d090633d04fc832a2fee1024d468fd SHA256 8b32085fa7cc61d645bf835a7d90c341e906e21987c0f5e2dc188f448cb91287
+MD5 61033f317e7f9ddbce20c96ae1f0ecf3 ChangeLog 27381
+RMD160 a65e52984d6248955b1593a50611acced145fb36 ChangeLog 27381
+SHA256 8b32085fa7cc61d645bf835a7d90c341e906e21987c0f5e2dc188f448cb91287 ChangeLog 27381
 MISC metadata.xml 863 RMD160 963b1a80f7d3ec06f670ceea9d8451b7aa1243e8 SHA1 096ec5e2f0957fc0dabc5d1145a73611fb048222 SHA256 8af9e235beb4ba6aedde75b11f5223f0d1eb3ccff4978f3b3acf3d025492984b
 MD5 b6c82f8f9ebef12d06ac62b268691bdd metadata.xml 863
 RMD160 963b1a80f7d3ec06f670ceea9d8451b7aa1243e8 metadata.xml 863
@@ -71,3 +60,6 @@ SHA256 8af9e235beb4ba6aedde75b11f5223f0d1eb3ccff4978f3b3acf3d025492984b metadata
 MD5 a74e782c0f25ffd4f99d59df881e5807 files/digest-exim-4.68 449
 RMD160 3226b125c109866f5e1d83cef0c38737475f2676 files/digest-exim-4.68 449
 SHA256 3c4fcfa87d5f5898542d78f429376f53bac57efa037d1aa7300102e04a37a909 files/digest-exim-4.68 449
+MD5 4929cac32195b850cd8fc2e7a1113d8f files/digest-exim-4.69 449
+RMD160 1e1d034c44a26962cbb4e4ba56a9d1a908967c12 files/digest-exim-4.69 449
+SHA256 ccef4933678fdb8d6d85ef272858e461927c00526a0e5db4422192392e2e2411 files/digest-exim-4.69 449
diff --git a/mail-mta/exim/exim-4.69.ebuild b/mail-mta/exim/exim-4.69.ebuild
new file mode 100644
index 000000000000..a5944c084598
--- /dev/null
+++ b/mail-mta/exim/exim-4.69.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69.ebuild,v 1.1 2008/01/13 22:06:42 peitolm Exp $
+
+inherit eutils
+
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbx mbox X exiscan nis syslog spf srs gnutls sqlite dovecot-sasl radius domainkeys"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2 mirror://gentoo/exiscan.conf"
+HOMEPAGE="http://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+PROVIDE="virtual/mta"
+DEPEND=">=sys-apps/sed-4.0.5
+	perl? ( sys-devel/libperl )
+	>=sys-libs/db-3.2
+	pam? ( >=sys-libs/pam-0.75 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	gnutls? ( net-libs/gnutls
+			  dev-libs/libtasn1 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	mysql? ( virtual/mysql )
+	postgres? ( >=dev-db/postgresql-7 )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.14 )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	srs? ( mail-filter/libsrs_alt )
+	X? ( x11-proto/xproto
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/radiusclient )
+	domainkeys? ( mail-filter/libdomainkeys )
+	"
+	# added X check for #57206
+RDEPEND="${DEPEND}
+	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	!mailwrapper? ( !virtual/mta )
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	local myconf
+
+	epatch "${FILESDIR}"/exim-4.14-tail.patch
+	epatch "${FILESDIR}"/exim-4.43-r2-localscan_dlopen.patch
+
+	if ! use mbox; then
+		einfo "Patching maildir support into exim.conf"
+		epatch "${FILESDIR}"/exim-4.20-maildir.patch
+	fi
+	sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/mail/aliases'" "${S}"/src/configure.default
+	cp "${S}"/src/configure.default "${S}"/src/configure.default.orig
+
+	# Includes Typo fix for bug 47106
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
+		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
+		-e "s:COMPRESS_COMMAND=/usr/bin/gzip:COMPRESS_COMMAND=/bin/gzip:" \
+		-e "s:ZCAT_COMMAND=/usr/bin/zcat:ZCAT_COMMAND=/bin/zcat:" \
+		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/exim.conf:" \
+		-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
+		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
+		-e "s:# LOG_FILE_PATH=/var/log/exim_%slog:LOG_FILE_PATH=/var/log/exim/exim_%s.log:" \
+		-e "s:# PID_FILE_PATH=/var/lock/exim.pid:PID_FILE_PATH=/var/run/exim.pid:" \
+		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
+		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
+		-e "s:# SUPPORT_MAILSTORE=yes:SUPPORT_MAILSTORE=yes:" \
+		-e "s:EXIM_USER=:EXIM_USER=mail:" \
+		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
+		-e "s:^ZCAT_COMMAND.*$:ZCAT_COMMAND=/bin/zcat:" \
+		-e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \
+		src/EDITME > Local/Makefile
+
+	# exiscan-acl is now integrated - enabled it when use-flag set
+	if use exiscan-acl; then
+		sed -i "s:# WITH_CONTENT_SCAN=yes:WITH_CONTENT_SCAN=yes:" Local/Makefile
+		sed -i "s:# WITH_OLD_DEMIME=yes:WITH_OLD_DEMIME=yes:" Local/Makefile
+	elif (use spf || use srs ) then
+		eerror SPF and SRS support require exiscan-acl to be enabled, please add
+		eerror to your USE settings.
+		exit 1
+	fi
+	if use spf; then
+		myconf="${myconf} -lspf2"
+		sed -i "s:# EXPERIMENTAL_SPF=yes:EXPERIMENTAL_SPF=yes:" Local/Makefile
+		mycflags="${mycflags} -DEXPERIMENTAL_SPF"
+	fi
+	if use srs; then
+		myconf="${myconf} -lsrs_alt"
+		sed -i "s:# EXPERIMENTAL_SRS=yes:EXPERIMENTAL_SRS=yes:" Local/Makefile
+	fi
+
+	cd Local
+	# enable optional exim_monitor support via X use flag bug #46778
+	if use X; then
+		einfo "Configuring eximon"
+		cp ../exim_monitor/EDITME eximon.conf
+		sed -i "s:# EXIM_MONITOR=eximon.bin:EXIM_MONITOR=eximon.bin:" Makefile
+	fi
+	#These next two should resolve 37964
+	if use perl; then
+		sed -i "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" Makefile
+	fi
+	# mbox useflag renamed, see bug 110741
+	if use mbx; then
+		sed -i "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" Makefile
+	fi
+	if use pam; then
+		sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile
+		myconf="${myconf} -lpam"
+	fi
+	if use sasl; then
+		sed -i "s:# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux:"  Makefile
+		sed -i "s:# AUTH_CYRUS_SASL=yes:AUTH_CYRUS_SASL=yes:" Makefile
+		myconf="${myconf} -lsasl2"
+	fi
+	if use tcpd; then
+		sed -i "s:# \(USE_TCP_WRAPPERS=yes\):\1:" Makefile
+		myconf="${myconf} -lwrap"
+	fi
+	if use lmtp; then
+		sed -i "s:# \(TRANSPORT_LMTP=yes\):\1:" Makefile
+	fi
+	if use ipv6; then
+		echo "HAVE_IPV6=YES" >> Makefile
+		#To fix bug 41196
+		echo "IPV6_USE_INET_PTON=yes" >> Makefile
+	fi
+
+	if use dovecot-sasl; then
+		sed -i "s:# AUTH_DOVECOT=yes:AUTH_DOVECOT=yes:" Makefile
+	fi
+	if use radius; then
+		myconf="${myconf} -lradiusclient"
+		sed -i "s:# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:" Local/Makefile
+		sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Local/Makefile
+	fi
+
+	if [ -n "$myconf" ] ; then
+		echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile
+	fi
+
+	cd "${S}"
+	if use ssl; then
+		sed -i \
+			-e "s:# \(SUPPORT_TLS=yes\):\1:" Local/Makefile
+		if use gnutls; then
+			sed -i \
+				-e "s:# \(USE_GNUTLS=yes\):\1:" \
+				-e "s:# \(TLS_LIBS=-lgnutls -ltasn1 -lgcrypt\):\1:" Local/Makefile
+		else
+			sed -i \
+				-e "s:# \(TLS_LIBS=-lssl -lcrypto\):\1:" Local/Makefile
+		fi
+	fi
+
+	LOOKUP_INCLUDE=
+	LOOKUP_LIBS=
+
+	if use ldap; then
+		sed -i \
+			-e "s:# \(LOOKUP_LDAP=yes\):\1:" \
+			-e "s:# \(LDAP_LIB_TYPE=OPENLDAP2\):\1:" Local/Makefile
+		LOOKUP_INCLUDE="-I/usr/include/ldap"
+		LOOKUP_LIBS="-L/usr/lib -lldap -llber"
+	fi
+
+	if use mysql; then
+		sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Local/Makefile
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/mysql"
+		LOOKUP_LIBS="$LOOKUP_LIBS -L/usr/lib -lmysqlclient"
+	fi
+
+	if use postgres; then
+		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Local/Makefile
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/postgresql"
+		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
+	fi
+	if use sqlite; then
+		sed -i "s:# LOOKUP_SQLITE=yes: LOOKUP_SQLITE=yes:" Local/Makefile
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/sqlite"
+		LOOKUP_LIBS="$LOOKUP_LIBS -lsqlite3"
+	fi
+	if [ -n "$LOOKUP_INCLUDE" ]; then
+		sed -i "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=$LOOKUP_INCLUDE:" \
+			Local/Makefile
+	fi
+
+	if [ -n "$LOOKUP_LIBS" ]; then
+		sed -i "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3:LOOKUP_LIBS=$LOOKUP_LIBS:" \
+			Local/Makefile
+	fi
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile
+
+	sed -i "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Local/Makefile
+
+	if use dnsdb; then
+		sed -i "s:# LOOKUP_DNSDB=yes:LOOKUP_DNSDB=yes:" Local/Makefile
+	fi
+	sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Local/Makefile
+
+	if use nis; then
+		sed -i "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" Local/Makefile
+		sed -i "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Local/Makefile
+	fi
+	if use syslog; then
+		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Local/Makefile
+	fi
+	if use domainkeys; then
+		echo "
+		EXPERIMENTAL_DOMAINKEYS=yes
+		CFLAGS  += -I/usr/include/libdomainkeys
+		LDFLAGS += -lcrypto -ldomainkeys -L/usr/lib/libdomainkeys" >> Local/Makefile
+	fi
+
+# Use the "native" interface to the DBM library
+	echo "USE_DB=yes" >> "${S}"/Local/Makefile
+}
+
+src_compile() {
+	make || die "make failed"
+}
+
+src_install () {
+	cd "${S}"/build-exim-gentoo
+	exeinto /usr/sbin
+	doexe exim
+	if use X; then
+			doexe eximon.bin
+			doexe eximon
+	fi
+	fperms 4755 /usr/sbin/exim
+
+	dodir /usr/bin /usr/sbin /usr/lib
+	if \[ ! -e /usr/lib/sendmail \];
+	then
+		dosym /usr/sbin/sendmail /usr/lib/sendmail
+	fi
+
+	if use mailwrapper
+	then
+		insinto /etc/mail
+		doins "${FILESDIR}"/mailer.conf
+	else
+		dosym exim /usr/sbin/sendmail
+		dosym /usr/sbin/exim /usr/bin/mailq
+		dosym /usr/sbin/exim /usr/bin/newaliases
+		einfo "The Exim ebuild will no longer touch /usr/bin/mail, so as not to interfere with mailx/nail."
+		dosym exim /usr/sbin/rsmtp
+		dosym exim /usr/sbin/rmail
+	fi
+
+	exeinto /usr/sbin
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+		convert4r3 convert4r4 exipick
+	do
+		doexe $i
+	done
+
+	dodoc "${S}"/doc/*
+	doman "${S}"/doc/exim.8
+
+	# conf files
+	insinto /etc/exim
+	newins "${S}"/src/configure.default.orig exim.conf.dist
+	if use exiscan-acl; then
+		newins "${S}"/src/configure.default exim.conf.exiscan-acl
+	fi
+	doins "${FILESDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
+	if use exiscan; then
+		newins "${S}"/src/configure.default exim.conf.exiscan
+		doins "${FILESDIR}"/exiscan.conf
+	fi
+
+	if use pam
+	then
+		# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
+		insinto /etc/pam.d
+		newins "${FILESDIR}"/pam.d-exim exim
+	fi
+
+	newinitd "${FILESDIR}"/exim.rc6 exim
+
+	newconfd "${FILESDIR}"/exim.confd exim
+
+	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
+	dodir /var/log/${PN}
+}
+
+pkg_postinst() {
+	einfo "/etc/exim/system_filter.exim is a sample system_filter."
+	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
+	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
+
+	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
+	then
+		einfo
+		einfo "Since you emerged $PN without mailwrapper in USE,"
+		einfo "you probably want to 'emerge -C mailwrapper' now."
+		einfo
+	fi
+}
diff --git a/mail-mta/exim/files/configure b/mail-mta/exim/files/configure
deleted file mode 100644
index 740da7fc501a..000000000000
--- a/mail-mta/exim/files/configure
+++ /dev/null
@@ -1,419 +0,0 @@
-######################################################################
-#                  Runtime configuration file for Exim               #
-######################################################################
-
-
-# This is a default configuration file which will operate correctly in
-# uncomplicated installations. Please see the manual for a complete list
-# of all the runtime configuration options that can be included in a
-# configuration file. There are many more than are mentioned here. The
-# manual is in the file doc/spec.txt in the Exim distribution as a plain
-# ASCII file. Other formats (PostScript, Texinfo, HTML, PDF) are available
-# from the Exim ftp sites. The manual is also online via the Exim web sites.
-
-
-# This file is divided into several parts, all but the last of which are
-# terminated by a line containing the word "end". The parts must appear
-# in the correct order, and all must be present (even if some of them are
-# in fact empty). Blank lines, and lines starting with # are ignored.
-
-
-############ IMPORTANT ########## IMPORTANT ########### IMPORTANT ############
-#                                                                            #
-# Whenever you change Exim's configuration file, you *must* remember to HUP  #
-# the Exim daemon, because it will not pick up the new configuration until   #
-# until you do this. It is usually a good idea to test a new configuration   #
-# for syntactic correctness (e.g. using "exim -C /config/file -bV") first.   #
-#                                                                            #
-############ IMPORTANT ########## IMPORTANT ########### IMPORTANT ############
-
-
-
-######################################################################
-#                    MAIN CONFIGURATION SETTINGS                     #
-######################################################################
-
-# Specify your host's canonical name here. This should normally be the fully
-# qualified "official" name of your host. If this option is not set, the
-# uname() function is called to obtain the name.
-
-# primary_hostname =
-
-
-# Specify the domain you want to be added to all unqualified addresses
-# here. An unqualified address is one that does not contain an "@" character
-# followed by a domain. For example, "caesar@rome.ex" is a fully qualified
-# address, but the string "caesar" (i.e. just a login name) is an unqualified
-# email address. Unqualified addresses are accepted only from local callers by
-# default. See the receiver_unqualified_{hosts,nets} options if you want
-# to permit unqualified addresses from remote sources. If this option is
-# not set, the primary_hostname value is used for qualification.
-
-# qualify_domain =
-
-
-# If you want unqualified recipient addresses to be qualified with a different
-# domain to unqualified sender addresses, specify the recipient domain here.
-# If this option is not set, the qualify_domain value is used.
-
-# qualify_recipient =
-
-
-# Specify your local domains as a colon-separated list here. If this option
-# is not set (i.e. not mentioned in the configuration file), the
-# qualify_recipient value is used as the only local domain. If you do not want
-# to do any local deliveries, uncomment the following line, but do not supply
-# any data for it. This sets local_domains to an empty string, which is not
-# the same as not mentioning it at all. An empty string specifies that there
-# are no local domains; not setting it at all causes the default value (the
-# setting of qualify_recipient) to be used.
-
-# local_domains =
-
-
-# If you want to accept mail addressed to your host's literal IP address, for
-# example, mail addressed to "user@[111.111.111.111]", then uncomment the
-# following line, or supply the literal domain(s) as part of "local_domains"
-# above. You also need to comment "forbid_domain_literals" below. This is not
-# recommended for today's Internet.
-
-# local_domains_include_host_literals
-
-
-# The following line prevents Exim from recognizing addresses of the form
-# "user@[111.111.111.111]" that is, with a "domain literal" (an IP address)
-# instead of a named domain. The RFCs still require this form, but it makes
-# little sense to permit mail to be sent to specific hosts by their IP address
-# in the modern Internet, and this ancient format has been used by those
-# seeking to abuse hosts by using them for unwanted relaying. If you really
-# do want to support domain literals, remove the following line, and see
-# also the "domain_literal" router below.
-
-forbid_domain_literals
-
-
-# No local deliveries will ever be run under the uids of these users (a colon-
-# separated list). An attempt to do so gets changed so that it runs under the
-# uid of "nobody" instead. This is a paranoic safety catch. Note the default
-# setting means you cannot deliver mail addressed to root as if it were a
-# normal user. This isn't usually a problem, as most sites have an alias for
-# root that redirects such mail to a human administrator.
-
-never_users = root
-
-
-# The use of your host as a mail relay by any host, including the local host
-# calling its own SMTP port, is locked out by default. If you want to permit
-# relaying from the local host, you should set
-#
-# host_accept_relay = localhost
-#
-# If you want to permit relaying through your host from certain hosts or IP
-# networks, you need to set the option appropriately, for example
-#
-# host_accept_relay = my.friends.host : 192.168.0.0/16
-#
-# If you are an MX backup or gateway of some kind for some domains, you must
-# set relay_domains to match those domains. This will allow any host to
-# relay through your host to those domains.
-#
-# relay_domains =
-#
-# See the section of the manual entitled "Control of relaying" for more
-# information.
-
-
-# The setting below causes Exim to do a reverse DNS lookup on all incoming
-# IP calls, in order to get the true host name. If you feel this is too
-# expensive, you can specify the networks for which a lookup is done, or
-# remove the setting entirely.
-
-host_lookup = *
-
-
-# By default, Exim expects all envelope addresses to be fully qualified, that
-# is, they must contain both a local part and a domain. If you want to accept
-# unqualified addresses (just a local part) from certain hosts, you can specify
-# these hosts by setting one or both of
-#
-# receiver_unqualified_hosts =
-# sender_unqualified_hosts =
-#
-# to control sender and receiver addresses, respectively. When this is done,
-# unqualified addresses are qualified using the settings of qualify_domain
-# and/or qualify_recipient (see above).
-
-
-# By default, Exim does not make any checks, other than syntactic ones, on
-# incoming addresses during the SMTP dialogue. This reduces delays in SMTP
-# transactions, but it does mean that you might accept messages with unknown
-# recipients, and/or bad senders.
-
-# Uncomment this line if you want incoming recipient addresses to be verified
-# during the SMTP dialogue. Unknown recipients are then rejected at this stage,
-# and the generation of a failure message is the job of the sending host.
-
-# receiver_verify
-
-# Uncomment this line if you want incoming sender addresses (return-paths) to
-# be verified during the SMTP dialogue. Verification can normally only check
-# that the domain exists.
-
-# sender_verify
-
-
-# Exim contains support for the Realtime Blocking List (RBL) that is being
-# maintained as part of the DNS. See http://maps.vix.com/rbl/ for background.
-# Uncommenting the first line below will make Exim reject mail from any
-# host whose IP address is blacklisted in the RBL at maps.vix.com. Some
-# others have followed the RBL lead and have produced other lists: DUL is
-# a list of dial-up addresses, and ORBS is a list of open relay systems. The
-# second line below checks all three lists.
-
-# rbl_domains = rbl.maps.vix.com
-# rbl_domains = rbl.maps.vix.com:dul.maps.vix.com:relays.orbs.org
-
-
-# If you want Exim to support the "percent hack" for all your local domains,
-# uncomment the following line. This is the feature by which mail addressed
-# to x%y@z (where z is one of your local domains) is locally rerouted to
-# x@y and sent on. Otherwise x%y is treated as an ordinary local part.
-
-# percent_hack_domains = *
-
-
-# When Exim can neither deliver a message nor return it to sender, it "freezes"
-# the delivery error message (aka "bounce message"). There are also other
-# circumstances in which messages get frozen. They will stay on the queue for
-# ever unless one of the following options is set.
-
-# This option unfreezes unfreezes bounce messages after two days, tries
-# once more to deliver them, and ignores any delivery failures.
-
-ignore_errmsg_errors_after = 2d
-
-# This option cancels (removes) frozen messages that are older than a week.
-
-timeout_frozen_after = 7d
-
-end
-
-
-
-######################################################################
-#                      TRANSPORTS CONFIGURATION                      #
-######################################################################
-#                       ORDER DOES NOT MATTER                        #
-#     Only one appropriate transport is called for each delivery.    #
-######################################################################
-
-# A transport is used only when referenced from a director or a router that
-# successfully handles an address.
-
-
-# This transport is used for delivering messages over SMTP connections.
-
-remote_smtp:
-  driver = smtp
-
-
-# This transport is used for local delivery to user mailboxes in traditional
-# BSD mailbox format. By default it will be run under the uid and gid of the
-# local user, and requires the sticky bit to be set on the /var/mail directory.
-# Some systems use the alternative approach of running mail deliveries under a
-# particular group instead of using the sticky bit. The commented options below
-# show how this can be done.
-
-local_delivery:
-  driver = appendfile
-#  file = /var/mail/$local_part
-  directory = $home/.maildir
-  maildir_format
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-# group = mail
-# mode = 0660
-
-
-# This transport is used for handling pipe deliveries generated by alias
-# or .forward files. If the pipe generates any standard output, it is returned
-# to the sender of the message as a delivery error. Set return_fail_output
-# instead of return_output if you want this to happen only when the pipe fails
-# to complete normally. You can set different transports for aliases and
-# forwards if you want to - see the references to address_pipe in the directors
-# section below.
-
-address_pipe:
-  driver = pipe
-  return_output
-
-
-# This transport is used for handling deliveries directly to files that are
-# generated by aliasing or forwarding.
-
-address_file:
-  driver = appendfile
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-
-
-# This transport is used for handling autoreplies generated by the filtering
-# option of the forwardfile director.
-
-address_reply:
-  driver = autoreply
-
-
-end
-
-
-
-######################################################################
-#                      DIRECTORS CONFIGURATION                       #
-#             Specifies how local addresses are handled              #
-######################################################################
-#                          ORDER DOES MATTER                         #
-#   A local address is passed to each in turn until it is accepted.  #
-######################################################################
-
-# Local addresses are those with a domain that matches some item in the
-# "local_domains" setting above, or those which are passed back from the
-# routers because of a "self=local" setting (not used in this configuration).
-
-
-# This director handles aliasing using a traditional /etc/aliases file.
-# If any of your aliases expand to pipes or files, you will need to set
-# up a user and a group for these deliveries to run under. You can do
-# this by uncommenting the "user" option below (changing the user name
-# as appropriate) and adding a "group" option if necessary. Alternatively, you
-# can specify "user" on the transports that are used. Note that those
-# listed below are the same as are used for .forward files; you might want
-# to set up different ones for pipe and file deliveries from aliases.
-
-system_aliases:
-  driver = aliasfile
-  file = /etc/mail/aliases
-  search_type = lsearch
-# user = exim
-  file_transport = address_file
-  pipe_transport = address_pipe
-
-
-# This director handles forwarding using traditional .forward files.
-# If you want it also to allow mail filtering when a forward file
-# starts with the string "# Exim filter", uncomment the "filter" option.
-
-# The no_verify setting means that this director will be skipped when
-# verifying addresses if sender_verify or receiver_verify is set (though
-# they are not set by default). Similarly, no_expn means that this director
-# will be skipped if smtp_expn_hosts is set to allow any hosts to use the
-# EXPN command.
-
-# The check_ancestor option means that if the forward file generates an
-# address that is an ancestor of the current one, the current one gets
-# passed on instead. This covers the case where A is aliased to B and B
-# has a .forward file pointing to A.
-
-# The three transports specified at the end are those that are used when
-# forwarding generates a direct delivery to a file, or to a pipe, or sets
-# up an auto-reply, respectively.
-
-userforward:
-  driver = forwardfile
-  file = .forward
-  no_verify
-  no_expn
-  check_ancestor
-# filter
-  file_transport = address_file
-  pipe_transport = address_pipe
-  reply_transport = address_reply
-
-
-# This director matches local user mailboxes.
-
-localuser:
-  driver = localuser
-  transport = local_delivery
-
-
-end
-
-
-
-######################################################################
-#                      ROUTERS CONFIGURATION                         #
-#            Specifies how remote addresses are handled              #
-######################################################################
-#                          ORDER DOES MATTER                         #
-#  A remote address is passed to each in turn until it is accepted.  #
-######################################################################
-
-# Remote addresses are those with a domain that does not match any item
-# in the "local_domains" setting above.
-
-
-# This router routes to remote hosts over SMTP using a DNS lookup with
-# default options.
-
-lookuphost:
-  driver = lookuphost
-  transport = remote_smtp
-
-
-# This router routes to remote hosts over SMTP by explicit IP address,
-# when an email address is given in "domain literal" form, for example,
-# <user@[192.168.35.64]>. The RFCs require this facility. However, it is
-# little-known these days, and has been exploited by evil people seeking
-# to abuse SMTP relays. Consequently it is commented out in the default
-# configuration. If you uncomment this router, you also need to comment out
-# "forbid_domain_literals" above, so that Exim can recognize the syntax of
-# domain literal addresses.
-
-# domain_literal:
-#   driver = ipliteral
-#   transport = remote_smtp
-
-
-end
-
-
-
-######################################################################
-#                      RETRY CONFIGURATION                           #
-######################################################################
-
-# This single retry rule applies to all domains and all errors. It specifies
-# retries every 15 minutes for 2 hours, then increasing retry intervals,
-# starting at 1 hour and increasing each time by a factor of 1.5, up to 16
-# hours, then retries every 8 hours until 4 days have passed since the first
-# failed delivery.
-
-# Domain               Error       Retries
-# ------               -----       -------
-
-*                      *           F,2h,15m; G,16h,1h,1.5; F,4d,8h
-
-end
-
-
-
-######################################################################
-#                      REWRITE CONFIGURATION                         #
-######################################################################
-
-# There are no rewriting specifications in this default configuration file.
-
-end
-
-
-
-######################################################################
-#                   AUTHENTICATION CONFIGURATION                     #
-######################################################################
-
-# There are no authenticator specifications in this default configuration file.
-
-# End of Exim configuration file
diff --git a/mail-mta/exim/files/digest-exim-4.69 b/mail-mta/exim/files/digest-exim-4.69
new file mode 100644
index 000000000000..369fa41098b0
--- /dev/null
+++ b/mail-mta/exim/files/digest-exim-4.69
@@ -0,0 +1,6 @@
+MD5 6f29f073328c858d8554b08cc0c3c2be exim-4.69.tar.bz2 1658939
+RMD160 ae97c807c63f858ba4a0ab402677225da9337d05 exim-4.69.tar.bz2 1658939
+SHA256 18e856cfdb682ba8e8ccb943ab538734d34d0ecefd63465ecc5430bc15915069 exim-4.69.tar.bz2 1658939
+MD5 eb249c90af3ab11e5a4d307e184a75ac exiscan.conf 22113
+RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 exiscan.conf 22113
+SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964 exiscan.conf 22113
diff --git a/mail-mta/exim/files/exim-4.10-gentoo.diff b/mail-mta/exim/files/exim-4.10-gentoo.diff
deleted file mode 100644
index 6be612358fa0..000000000000
--- a/mail-mta/exim/files/exim-4.10-gentoo.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-*** exim-4.10/src/daemon.c  Mon Jul 22 09:59:48 2002
-- --- daemon.c   Wed Dec  4 10:52:04 2002
-***************
-*** 960,991 ****
-    (b) When -bd is used and -oX is not used, or
-    (c) When -oP is used to supply a path.
-
-! The variable daemon_write_pid is used to control this.
-
-- - Note re use of sprintf: spool_directory and pid_file_path are checked on
-- - input to be < 200 characters. */
-- -
-  if (running_in_test_harness || daemon_write_pid)
-    {
-    FILE *f;
-- -   uschar buff[256];
-- -
-    if (pid_file_path[0] == 0)
-!     sprintf(CS buff, "%s/exim-daemon.pid", spool_directory);
-!   else
-!     sprintf(CS buff, CS pid_file_path, "");   /* Backward compatibility */
-
-!   f = Ufopen(buff, "wb");
-    if (f != NULL)
-      {
-      fprintf(f, "%d\n", (int)getpid());
-      fchmod(fileno(f), 0644);
-      fclose(f);
-!     DEBUG(D_any) debug_printf("pid written to %s\n", buff);
-      }
-    else
-      DEBUG(D_any)
-!       debug_printf("%s\n", string_open_failed(errno, "pid file %s", buff));
-    }
-
-  /* Set up the handler for SIGHUP, which causes a restart of the daemon. */
-- --- 960,987 ----
-    (b) When -bd is used and -oX is not used, or
-    (c) When -oP is used to supply a path.
-
-! The variable daemon_write_pid is used to control this. */
-
-  if (running_in_test_harness || daemon_write_pid)
-    {
-    FILE *f;
-    if (pid_file_path[0] == 0)
-!     pid_file_path = string_sprintf("%s/exim-daemon.pid", spool_directory);
-
-!   f = Ufopen(pid_file_path, "wb");
-    if (f != NULL)
-      {
-      fprintf(f, "%d\n", (int)getpid());
-      fchmod(fileno(f), 0644);
-      fclose(f);
-!     DEBUG(D_any) debug_printf("pid written to %s\n", pid_file_path);
-      }
-    else
-+     {
-      DEBUG(D_any)
-!       debug_printf("%s\n", string_open_failed(errno, "pid file %s",
-!         pid_file_path));
-!     }
-    }
-
-  /* Set up the handler for SIGHUP, which causes a restart of the daemon. */
diff --git a/mail-mta/exim/files/exim-4.50-srs_update-1.0.patch b/mail-mta/exim/files/exim-4.50-srs_update-1.0.patch
deleted file mode 100644
index 055686f42d1b..000000000000
--- a/mail-mta/exim/files/exim-4.50-srs_update-1.0.patch
+++ /dev/null
@@ -1,527 +0,0 @@
-diff -Naur exim-4.50/src/deliver.c exim-4.50-patched/src/deliver.c
---- exim-4.50/src/deliver.c	2005-02-17 14:49:11.000000000 +0000
-+++ exim-4.50-patched/src/deliver.c	2005-04-01 21:03:14.000000000 +0100
-@@ -859,6 +859,11 @@
- 
-   if ((log_extra_selector & LX_sender_on_delivery) != 0)
-     s = string_append(s, &size, &ptr, 3, US" F=<", sender_address, US">");
-+    
-+  #ifdef EXPERIMENTAL_SRS
-+  if(addr->p.srs_sender)
-+    s = string_append(s, &size, &ptr, 3, US" SRS=<", addr->p.srs_sender, US">");
-+  #endif
- 
-   /* You might think that the return path must always be set for a successful
-   delivery; indeed, I did for some time, until this statement crashed. The case
-@@ -1516,8 +1521,14 @@
- /* Set up the return path from the errors or sender address. If the transport
- has its own return path setting, expand it and replace the existing value. */
- 
--return_path = (addr->p.errors_address != NULL)?
--  addr->p.errors_address : sender_address;
-+if(addr->p.errors_address != NULL)
-+  return_path = addr->p.errors_address;
-+#ifdef EXPERIMENTAL_SRS
-+else if(addr->p.srs_sender != NULL)
-+  return_path = addr->p.srs_sender;
-+#endif
-+else
-+  return_path = sender_address;
- 
- if (tp->return_path != NULL)
-   {
-@@ -3505,8 +3516,14 @@
-   /* Compute the return path, expanding a new one if required. The old one
-   must be set first, as it might be referred to in the expansion. */
- 
--  return_path = (addr->p.errors_address != NULL)?
--    addr->p.errors_address : sender_address;
-+  if(addr->p.errors_address != NULL)
-+    return_path = addr->p.errors_address;
-+#ifdef EXPERIMENTAL_SRS
-+  else if(addr->p.srs_sender != NULL)
-+    return_path = addr->p.srs_sender;
-+#endif
-+  else
-+    return_path = sender_address;
- 
-   if (tp->return_path != NULL)
-     {
-diff -Naur exim-4.50/src/globals.c exim-4.50-patched/src/globals.c
---- exim-4.50/src/globals.c	2005-02-17 14:49:11.000000000 +0000
-+++ exim-4.50-patched/src/globals.c	2005-04-01 19:03:23.000000000 +0100
-@@ -279,6 +279,9 @@
-     NULL,               /* errors_address */
-     NULL,               /* extra_headers */
-     NULL,               /* remove_headers */
-+#ifdef EXPERIMENTAL_SRS
-+    NULL,               /* srs_sender */
-+#endif
-   }
- };
- 
-@@ -1031,10 +1034,16 @@
- uschar *srs_config             = NULL;
- uschar *srs_db_address         = NULL;
- uschar *srs_db_key             = NULL;
-+int     srs_hashlength         = 6;
-+int     srs_hashmin            = -1;
-+int     srs_maxage             = 31;
- uschar *srs_orig_recipient     = NULL;
- uschar *srs_orig_sender        = NULL;
- uschar *srs_recipient          = NULL;
-+uschar *srs_secrets            = NULL;
- uschar *srs_status             = NULL;
-+BOOL    srs_usehash            = TRUE;
-+BOOL    srs_usetimestamp       = TRUE;
- #endif
- int     string_datestamp_offset= -1;
- BOOL    strip_excess_angle_brackets = FALSE;
-diff -Naur exim-4.50/src/globals.h exim-4.50-patched/src/globals.h
---- exim-4.50/src/globals.h	2005-02-17 14:49:11.000000000 +0000
-+++ exim-4.50-patched/src/globals.h	2005-04-01 18:55:30.000000000 +0100
-@@ -634,10 +634,16 @@
- extern uschar *srs_config;             /* SRS config secret:max age:hash length:use timestamp:use hash */
- extern uschar *srs_db_address;         /* SRS db address */
- extern uschar *srs_db_key;             /* SRS db key */
-+extern int     srs_hashlength;         /* SRS hash length */
-+extern int     srs_hashmin;            /* SRS minimum hash length */
-+extern int     srs_maxage;             /* SRS max age */
- extern uschar *srs_orig_sender;        /* SRS original sender */
- extern uschar *srs_orig_recipient;     /* SRS original recipient */
- extern uschar *srs_recipient;          /* SRS recipient */
-+extern uschar *srs_secrets;            /* SRS secrets list */
- extern uschar *srs_status;             /* SRS staus */
-+extern BOOL    srs_usehash;            /* SRS use hash flag */
-+extern BOOL    srs_usetimestamp;       /* SRS use timestamp flag */
- #endif
- extern int     string_datestamp_offset;/* After insertion by string_format */
- extern BOOL    strip_excess_angle_brackets; /* Surrounding route-addrs */
-diff -Naur exim-4.50/src/readconf.c exim-4.50-patched/src/readconf.c
---- exim-4.50/src/readconf.c	2005-02-17 14:49:11.000000000 +0000
-+++ exim-4.50-patched/src/readconf.c	2005-04-01 18:56:06.000000000 +0100
-@@ -334,6 +334,12 @@
-   { "spool_directory",          opt_stringptr,   &spool_directory },
- #ifdef EXPERIMENTAL_SRS
-   { "srs_config",               opt_stringptr,   &srs_config },
-+  { "srs_hashlength",           opt_int,         &srs_hashlength },
-+  { "srs_hashmin",              opt_int,         &srs_hashmin },
-+  { "srs_maxage",               opt_int,         &srs_maxage },
-+  { "srs_secrets",              opt_stringptr,   &srs_secrets },
-+  { "srs_usehash",              opt_bool,        &srs_usehash },
-+  { "srs_usetimestamp",         opt_bool,        &srs_usetimestamp },
- #endif
-   { "strip_excess_angle_brackets", opt_bool,     &strip_excess_angle_brackets },
-   { "strip_trailing_dot",       opt_bool,        &strip_trailing_dot },
-diff -Naur exim-4.50/src/routers/redirect.c exim-4.50-patched/src/routers/redirect.c
---- exim-4.50/src/routers/redirect.c	2005-02-17 14:49:11.000000000 +0000
-+++ exim-4.50-patched/src/routers/redirect.c	2005-04-02 01:31:32.000000000 +0100
-@@ -108,8 +108,10 @@
-       (void *)offsetof(redirect_router_options_block, srs_alias) },
-   { "srs_condition",      opt_stringptr,
-       (void *)offsetof(redirect_router_options_block, srs_condition) },
--  { "srs_db",             opt_stringptr,
--      (void *)offsetof(redirect_router_options_block, srs_db) },
-+  { "srs_dbinsert",       opt_stringptr,
-+      (void *)offsetof(redirect_router_options_block, srs_dbinsert) },
-+  { "srs_dbselect",       opt_stringptr,
-+      (void *)offsetof(redirect_router_options_block, srs_dbselect) },
- #endif
-   { "syntax_errors_text", opt_stringptr,
-       (void *)offsetof(redirect_router_options_block, syntax_errors_text) },
-@@ -146,9 +148,10 @@
-   NULL,        /* owngroups */
- #ifdef EXPERIMENTAL_SRS
-   NULL,        /* srs */
--  NULL,        /* srs_condition */
--  NULL,        /* srs_db */
-   NULL,        /* srs_alias */
-+  NULL,        /* srs_condition */
-+  NULL,        /* srs_dbinsert */
-+  NULL,        /* srs_dbselect */
- #endif
-   022,         /* modemask */
-   RDO_REWRITE, /* bit_options */
-@@ -517,6 +520,10 @@
- addr_prop.extra_headers = NULL;
- addr_prop.remove_headers = NULL;
- 
-+#ifdef EXPERIMENTAL_SRS
-+addr_prop.srs_sender = NULL;
-+#endif
-+
- /* When verifying and testing addresses, the "logwrite" command in filters
- must be bypassed. */
- 
-@@ -543,8 +550,8 @@
-   }
- 
- #ifdef EXPERIMENTAL_SRS
--  /* For reverse SRS, fill the srs_recipient expandsion variable,
--  on failure, return decline/fail as relevant */
-+  /* Perform SRS on recipient/return-path as required  */
-+  
-   if(ob->srs != NULL)
-   {
-     BOOL usesrs = TRUE;
-@@ -553,22 +560,78 @@
-       usesrs = expand_check_condition(ob->srs_condition, "srs_condition expansion failed", NULL);
- 
-     if(usesrs)
--      if(Ustrcmp(ob->srs, "reverse") == 0 || Ustrcmp(ob->srs, "reverseandforward") == 0)
-+    {
-+      int srs_action, n_srs;
-+      uschar *res;
-+      uschar *usedomain;
-+
-+      /* What are we doing? */      
-+      if(Ustrcmp(ob->srs, "forward") == 0)
-+        srs_action = 1;
-+      else if(Ustrcmp(ob->srs, "reverseandforward") == 0)
-       {
--        uschar *res;
--        int n_srs;
-+        srs_action = 3;
- 
-+        if((ob->srs_dbinsert == NULL) ^ (ob->srs_dbselect == NULL))
-+          return DEFER;
-+      }
-+      else if(Ustrcmp(ob->srs, "reverse") == 0)
-+        srs_action = 2;
-+      
-+      /* Reverse SRS */
-+      if(srs_action & 2)
-+      {
-         srs_orig_recipient = addr->address;
-+        
-         eximsrs_init();
--        if(ob->srs_db)
--          eximsrs_db_set(TRUE, ob->srs_db);
--        if((n_srs = eximsrs_reverse(&res, addr->address)) != OK)
-+        if(ob->srs_dbselect)
-+          eximsrs_db_set(TRUE, ob->srs_dbselect);
-+// Comment this out for now...
-+//        else
-+//          eximsrs_db_set(TRUE, NULL);
-+          
-+        if((n_srs = eximsrs_reverse(&res, addr->address)) == OK)
-+        {
-+          srs_recipient = res;
-+          DEBUG(D_any)
-+            debug_printf("SRS (reverse): Recipient '%s' rewritten to '%s'\n", srs_orig_recipient, srs_recipient);
-+        }
-+        
-+        eximsrs_done();
-+        
-+        if(n_srs != OK)
-           return n_srs;
--        srs_recipient = res;
-+      }
-+
-+      /* Forward SRS */
-+      /* No point in actually performing SRS if we are just verifying a recipient */
-+      if((srs_action & 1) && !verify && (sender_address ? sender_address[0] != 0 : FALSE))
-+      {
-+
-+        srs_orig_sender = sender_address;
-+        eximsrs_init();
-+        if(ob->srs_dbinsert)
-+          eximsrs_db_set(FALSE, ob->srs_dbinsert);
-+// Comment this out for now...
-+//        else
-+//          eximsrs_db_set(FALSE, NULL);
-+
-+        if(ob->srs_alias != NULL ? (usedomain = expand_string(ob->srs_alias)) == NULL : 1)
-+          usedomain = deliver_domain;
-+
-+        if((n_srs = eximsrs_forward(&res, sender_address, usedomain)) == OK)
-+        {
-+          addr_prop.srs_sender = res;
-+          DEBUG(D_any)
-+            debug_printf("SRS (forward): Sender '%s' rewritten to '%s'\n", srs_orig_sender, res);
-+        }
-+        
-         eximsrs_done();
--        DEBUG(D_any)
--          debug_printf("SRS: Recipient '%s' rewritten to '%s'\n", srs_orig_recipient, srs_recipient);
-+        
-+        if(n_srs != OK)
-+          return n_srs;
-       }
-+    }
-   }
- #endif
- 
-@@ -795,39 +858,6 @@
-     (addr_prop.errors_address != NULL)? "\n" : "");
-   }
- 
--#ifdef EXPERIMENTAL_SRS
--  /* On successful redirection, check for SRS forwarding and adjust sender */
--  if(ob->srs != NULL)
--  {
--    BOOL usesrs = TRUE;
--
--    if(ob->srs_condition != NULL)
--      usesrs = expand_check_condition(ob->srs_condition, "srs_condition expansion failed", NULL);
--
--    if(usesrs)
--      if((Ustrcmp(ob->srs, "forward") == 0 || Ustrcmp(ob->srs, "reverseandforward") == 0) && !verify)
--      {
--        uschar *res;
--        uschar *usedomain;
--        int n_srs;
--
--        srs_orig_sender = sender_address;
--        eximsrs_init();
--        if(ob->srs_db)
--          eximsrs_db_set(FALSE, ob->srs_db);
--
--        if(ob->srs_alias != NULL ? (usedomain = expand_string(ob->srs_alias)) == NULL : 1)
--          usedomain = deliver_domain;
--
--        if((n_srs = eximsrs_forward(&res, sender_address, usedomain)) != OK)
--          return n_srs;
--        sender_address = res;
--        DEBUG(D_any)
--          debug_printf("SRS: Sender '%s' rewritten to '%s'\n", srs_orig_sender, sender_address);
--    }
--  }
--#endif
--
- /* Control gets here only when the address has been completely handled. Put the
- original address onto the succeed queue so that any retry items that get
- attached to it get processed. */
-diff -Naur exim-4.50/src/routers/redirect.h exim-4.50-patched/src/routers/redirect.h
---- exim-4.50/src/routers/redirect.h	2005-02-17 14:49:11.000000000 +0000
-+++ exim-4.50-patched/src/routers/redirect.h	2005-04-02 01:22:45.000000000 +0100
-@@ -35,9 +35,10 @@
- 
- #ifdef EXPERIMENTAL_SRS
-   uschar *srs;
--  uschar *srs_condition;
--  uschar *srs_db;
-   uschar *srs_alias;
-+  uschar *srs_condition;
-+  uschar *srs_dbinsert;
-+  uschar *srs_dbselect;
- #endif
- 
-   int   modemask;
-diff -Naur exim-4.50/src/srs.c exim-4.50-patched/src/srs.c
---- exim-4.50/src/srs.c	2005-02-17 14:49:11.000000000 +0000
-+++ exim-4.50-patched/src/srs.c	2005-04-01 22:33:39.000000000 +0100
-@@ -1,11 +1,12 @@
--/* $Cambridge: exim/exim-src/src/srs.c,v 1.4 2005/02/17 11:58:26 ph10 Exp $ */
--
- /*************************************************
- *     Exim - an Internet mail transport agent    *
- *************************************************/
- 
- /* SRS - Sender rewriting scheme support
--  ©2004 Miles Wilton <miles@mirtol.com>
-+  (C)2004 Miles Wilton <miles@mirtol.com>
-+
-+  SRS Support Version: 1.0
-+
-   License: GPL */
- 
- #include "exim.h"
-@@ -24,72 +25,88 @@
- 
- int eximsrs_init()
- {
--  int co;
-   uschar *list = srs_config;
-   char secret_buf[SRS_MAX_SECRET_LENGTH];
-   char *secret;
-   char sbuf[4];
-   char *sbufp;
--  int hashlen, maxage;
--
- 
-+  // Check if this instance of Exim has not initialized SRS
-   if(!srs)
-   {
--    /* Check config */
--    if(!srs_config)
-+    int co = 0;
-+    int hashlen, maxage;
-+    BOOL usetimestamp, usehash;
-+
-+    /* Copy config vars */
-+    hashlen = srs_hashlength;
-+    maxage = srs_maxage;
-+    usetimestamp = srs_usetimestamp;
-+    usehash = srs_usehash;
-+
-+    /* Pass srs_config var (overrides new config vars) */
-+    co = 0;
-+    if(srs_config)
-     {
--      log_write(0, LOG_MAIN | LOG_PANIC,
--          "SRS Configuration Error");
--      return DEFER;
-+      secret = string_nextinlist(&list, &co, secret_buf, SRS_MAX_SECRET_LENGTH);
-+
-+      if((sbufp = string_nextinlist(&list, &co, sbuf, sizeof(sbuf))) != NULL)
-+        maxage = atoi(sbuf);
-+
-+      if((sbufp = string_nextinlist(&list, &co, sbuf, sizeof(sbuf))) != NULL)
-+        hashlen = atoi(sbuf);
-+
-+      if((sbufp = string_nextinlist(&list, &co, sbuf, sizeof(sbuf))) != NULL)
-+        usetimestamp = atoi(sbuf);
-+
-+      if((sbufp = string_nextinlist(&list, &co, sbuf, sizeof(sbuf))) != NULL)
-+        usehash = atoi(sbuf);
-     }
-+    
-+    if(srs_hashmin == -1)
-+      srs_hashmin = hashlen;
- 
--    /* Get config */
-+    /* First secret specified in secrets? */
-     co = 0;
--    if((secret = string_nextinlist(&list, &co, secret_buf,
--                                   SRS_MAX_SECRET_LENGTH)) == NULL)
-+    list = srs_secrets;
-+    if(secret == NULL)
-     {
--      log_write(0, LOG_MAIN | LOG_PANIC,
--          "SRS Configuration Error: No secret specified");
--      return DEFER;
-+      if((secret = string_nextinlist(&list, &co, secret_buf, SRS_MAX_SECRET_LENGTH)) == NULL)
-+      {
-+        log_write(0, LOG_MAIN | LOG_PANIC,
-+            "SRS Configuration Error: No secret specified");
-+        return DEFER;
-+      }
-     }
--
--    if((sbufp = string_nextinlist(&list, &co, sbuf, sizeof(sbuf))) == NULL)
--      maxage = 31;
--    else
--      maxage = atoi(sbuf);
-+   
-+    /* Check config */
-     if(maxage < 0 || maxage > 365)
-     {
-       log_write(0, LOG_MAIN | LOG_PANIC,
-           "SRS Configuration Error: Invalid maximum timestamp age");
-       return DEFER;
-     }
--
--    if((sbufp = string_nextinlist(&list, &co, sbuf, sizeof(sbuf))) == NULL)
--      hashlen = 6;
--    else
--      hashlen = atoi(sbuf);
--    if(hashlen < 1 || hashlen > 20)
-+    if(hashlen < 1 || hashlen > 20 || srs_hashmin < 1 || srs_hashmin > 20)
-     {
-       log_write(0, LOG_MAIN | LOG_PANIC,
-           "SRS Configuration Error: Invalid hash length");
-       return DEFER;
-     }
- 
--
-     if((srs = srs_open(secret, strnlen(secret, SRS_MAX_SECRET_LENGTH),
--                      maxage, hashlen, hashlen)) == NULL)
-+                        maxage, hashlen, srs_hashmin)) == NULL)
-     {
-       log_write(0, LOG_MAIN | LOG_PANIC,
-           "Failed to allocate SRS memory");
-       return DEFER;
-     }
- 
-+    srs_set_option(srs, SRS_OPTION_USETIMESTAMP, usetimestamp);
-+    srs_set_option(srs, SRS_OPTION_USEHASH, usehash);
- 
--    if((sbufp = string_nextinlist(&list, &co, sbuf, sizeof(sbuf))) != NULL)
--      srs_set_option(srs, SRS_OPTION_USETIMESTAMP, atoi(sbuf));
--
--    if((sbufp = string_nextinlist(&list, &co, sbuf, sizeof(sbuf))) != NULL)
--      srs_set_option(srs, SRS_OPTION_USEHASH, atoi(sbuf));
-+    /* Extra secrets? */
-+    while((secret = string_nextinlist(&list, &co, secret_buf, SRS_MAX_SECRET_LENGTH)) != NULL)
-+        srs_add_secret(srs, secret, strnlen(secret, SRS_MAX_SECRET_LENGTH));
- 
-     DEBUG(D_any)
-       debug_printf("SRS initialized\n");
-@@ -151,11 +168,12 @@
- int eximsrs_db_set(BOOL reverse, uschar *srs_db)
- {
-   if(reverse)
--    srs_db_reverse = string_copy(srs_db);
-+    srs_db_reverse = (srs_db == NULL ? NULL : string_copy(srs_db));
-   else
--    srs_db_forward = string_copy(srs_db);
-+    srs_db_forward = (srs_db == NULL ? NULL : string_copy(srs_db));
- 
--  if(srs_set_db_functions(srs, eximsrs_db_insert, eximsrs_db_lookup) * SRS_RESULT_FAIL)
-+  if(srs_set_db_functions(srs, (srs_db_forward ? eximsrs_db_insert : NULL),
-+                               (srs_db_reverse ? eximsrs_db_lookup : NULL)) & SRS_RESULT_FAIL)
-     return DEFER;
- 
-   return OK;
-@@ -167,9 +185,12 @@
-   uschar *res;
-   char buf[64];
- 
-+  if(!srs_db_forward)
-+    return SRS_RESULT_DBERROR;
-+
-   srs_db_address = string_copyn(data, data_len);
-   if(srs_generate_unique_id(srs, srs_db_address, buf, 64) & SRS_RESULT_FAIL)
--    return DEFER;
-+    return SRS_RESULT_DBERROR;
- 
-   srs_db_key = string_copyn(buf, 16);
- 
-@@ -188,6 +209,9 @@
- srs_result eximsrs_db_lookup(srs_t *srs, char *data, uint data_len, char *result, uint result_len)
- {
-   uschar *res;
-+  
-+  if(!srs_db_reverse)
-+    return SRS_RESULT_DBERROR;
- 
-   srs_db_key = string_copyn(data, data_len);
-   if((res = expand_string(srs_db_reverse)) == NULL)
-diff -Naur exim-4.50/src/structs.h exim-4.50-patched/src/structs.h
---- exim-4.50/src/structs.h	2005-02-17 14:49:11.000000000 +0000
-+++ exim-4.50-patched/src/structs.h	2005-04-01 18:55:45.000000000 +0100
-@@ -469,6 +469,10 @@
-   uschar *errors_address;         /* where to send errors (NULL => sender) */
-   header_line *extra_headers;     /* additional headers */
-   uschar *remove_headers;         /* list of those to remove */
-+
-+  #ifdef EXPERIMENTAL_SRS
-+  uschar *srs_sender;             /* Change return path when delivering */
-+  #endif
- } address_item_propagated;
- 
- /* Bits for the flags field below */
-@@ -551,7 +555,7 @@
-   uschar *cipher;                 /* Cipher used for transport */
-   uschar *peerdn;                 /* DN of server's certificate */
-   #endif
--
-+  
-   uid_t   uid;                    /* uid for transporting */
-   gid_t   gid;                    /* gid for transporting */
- 
-diff -Naur exim-4.50/src/verify.c exim-4.50-patched/src/verify.c
---- exim-4.50/src/verify.c	2005-02-17 14:49:11.000000000 +0000
-+++ exim-4.50-patched/src/verify.c	2005-04-01 22:34:52.000000000 +0100
-@@ -1228,6 +1228,10 @@
-     addr_list = addr->next;
- 
-     fprintf(f, "%s", CS addr->address);
-+#ifdef EXPERIMENTAL_SRS
-+    if(addr->p.srs_sender)
-+      fprintf(f, "    [srs = %s]", addr->p.srs_sender);
-+#endif
-     while (p != NULL)
-       {
-       fprintf(f, "\n    <-- %s", p->address);
diff --git a/mail-mta/exim/files/exim-4.66-openssl.patch b/mail-mta/exim/files/exim-4.66-openssl.patch
deleted file mode 100644
index 7e5ddd56411f..000000000000
--- a/mail-mta/exim/files/exim-4.66-openssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- exim-4.66/src/tls-openssl.c.orig	2007-03-07 11:38:23.000000000 +0200
-+++ exim-4.66/src/tls-openssl.c	2007-03-07 12:01:07.000000000 +0200
-@@ -343,8 +343,7 @@
- /* Set up the information callback, which outputs if debugging is at a suitable
- level. */
- 
--if (!(SSL_CTX_set_info_callback(ctx, (void (*)())info_callback)))
--  return tls_error(US"SSL_CTX_set_info_callback", host);
-+SSL_CTX_set_info_callback(ctx, (void (*)())info_callback);
- 
- /* The following patch was supplied by Robert Roselius */
-