Add support for Delivery Status Notifications (DSN) via external patch, bug #135308, thanks Martin Hierling

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 32 insertions, 16 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index b0fb08e89625..e60e22d720ae 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.154 2009/12/04 18:12:09 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.155 2009/12/04 19:04:51 grobian Exp $
+
+  04 Dec 2009; Fabian Groffen <grobian@gentoo.org> exim-4.71.ebuild,
+  metadata.xml:
+  Add support for Delivery Status Notifications (DSN) via external patch,
+  bug #135308, thanks Martin Hierling
 
 *exim-4.71 (04 Dec 2009)
 
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 2424ae655d6c..f23863beb947 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -14,11 +14,12 @@ AUX mailer.conf 259 RMD160 6412ac421b836f9425af443084dbaa49feb14df6 SHA1 690b15b
 AUX pam.d-exim 101 RMD160 8ad4e0a05068ae20d5e8d401146456945d068322 SHA1 bdca3fb37937baa5da5e656c07ec333abfaa0f7d SHA256 80d94cb0b3ded20ed1513f4d5627969c4ce85d3006c702eb24920ffa01eec674
 DIST exim-4.69.tar.bz2 1658939 RMD160 ae97c807c63f858ba4a0ab402677225da9337d05 SHA1 321e238b6e6b32498110511ce72a911538305a39 SHA256 18e856cfdb682ba8e8ccb943ab538734d34d0ecefd63465ecc5430bc15915069
 DIST exim-4.71.tar.bz2 1560170 RMD160 22e4ad1d43693d61fa1f2f2de40dda647599a087 SHA1 4b8f853843edcfa4f3bfbb4bef45d8dcff2fc990 SHA256 e754756f1d6cf393a0d58a2569e7ef4860aa8f797d030ec9887c2b310030bbc5
+DIST exim_469_dsn_1_3.patch 40222 RMD160 c744d6b5b388716e423529eda5b807aa8b9da2eb SHA1 3d1d7115dd80a974d40febbdef844d87860b8729 SHA256 605c520ea79507fd387772796c62303c5a49d1dc47b744b4267301096eedd49a
 DIST exiscan.conf 22113 RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 SHA1 74dc6e30f49402f5e6fefc280ea325d17f6af8c4 SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964
 DIST system_filter.exim.gz 3075 RMD160 47bcc6de402d896b73fd01d7f0d3c3ecbad9cf0b SHA1 384d138d8612f3a80b2b68f272b43cd69bc4411a SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437
 EBUILD exim-4.69-r3.ebuild 9858 RMD160 94d8246f56a582dab235058632964f1d4bdd8bc6 SHA1 27b887ae56f4a95f77378df3d24816e4ab902822 SHA256 6f260c1d318255ece90ab77dd6ee768ae28b36678303f8025efa35090cb5e7f5
 EBUILD exim-4.69-r4.ebuild 9925 RMD160 74fa2da80bc46823bb9be8c5e2250be838034df9 SHA1 89849a8c8c669aa118d33d16f1b245457008ecd9 SHA256 cf2d76519d1f6244ceb5d19e136a7d0bb9c4ff56e71f37f399e15a2661e5eeca
 EBUILD exim-4.69.ebuild 9906 RMD160 9b244dbbde9d454ea7be15bc46071e99943ec163 SHA1 ab0cfcfbe15b98681d79e077dab3195b0c1aadbe SHA256 6f5a4c76b40df44e203d86afbeba637b1a752349e0e3568cc08127fea204f915
-EBUILD exim-4.71.ebuild 9809 RMD160 75fd5b0889eb84fb24ca48e8b0dbd52e7e4e40c8 SHA1 e2bac117df5ce65bb852c41be5b6126d3d8ea7e1 SHA256 63397bc41a680773d6d81dc13e3db3733ea2dd94998d24b47fa6d1b69384eb27
-MISC ChangeLog 34089 RMD160 648f97aa74f4521f71a039db81f60c3757ffce26 SHA1 6a4868d4362de90c05aff93a8f6601d6622c8207 SHA256 d70d7212454232f3b75c0c72be8233033cebb10768f7e042e1de43de1eccdf11
-MISC metadata.xml 1710 RMD160 cd1c4d4b8caa5a4b41541692b5f0beb0e0494764 SHA1 2a751c6c338ad478f0d570dac0e9b95a5d4a0696 SHA256 7601303088deabcd3e519ef34baae11a0442d5f710a96c1b039ee04e9763087b
+EBUILD exim-4.71.ebuild 10058 RMD160 2830d7435c680a289bf743a8b51c033f4ab2fa4b SHA1 05e33c72dbf5ade612b7383070826cb019454383 SHA256 d72dcad8eda92f11b94d95ec3b25bbb9d6d7b22ececc2625debddd8fe1cb271f
+MISC ChangeLog 34287 RMD160 b69370a275bdd34ebce0375ac9be9f80ea50a374 SHA1 46cbde873e1b35fd231ba0a03d583ea7612f5667 SHA256 5ab59181405bc5dc9f50bd999b8231af2b6884bea13d7af48e405006f50fd3ce
+MISC metadata.xml 1792 RMD160 6220368a815bce6ab738abc114bad380853e17ae SHA1 0f0ceb106180c7f272f27af27ba1a700fa908d45 SHA256 08b60262a51b692d892ebdafceb4717c06ecfb33cd858d085e978ce28360d041
diff --git a/mail-mta/exim/exim-4.71.ebuild b/mail-mta/exim/exim-4.71.ebuild
index ef29b26f6628..5628066eabd2 100644
--- a/mail-mta/exim/exim-4.71.ebuild
+++ b/mail-mta/exim/exim-4.71.ebuild
@@ -1,16 +1,21 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.71.ebuild,v 1.1 2009/12/04 18:12:09 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.71.ebuild,v 1.2 2009/12/04 19:04:51 grobian Exp $
 
 EAPI="1"
 
 inherit eutils toolchain-funcs multilib pam
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X nis syslog spf srs gnutls sqlite dovecot-sasl radius maildir +dkim dcc"
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl
+mbx X nis syslog spf srs gnutls sqlite dovecot-sasl radius maildir +dkim dcc dsn"
+
+DSN_EXIM_V=469
+DSN_V=1_3
 
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
 SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2
-	mirror://gentoo/system_filter.exim.gz"
+	mirror://gentoo/system_filter.exim.gz
+	dsn? ( mirror://sourceforge/eximdsn/eximdsn-patch-1.3/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch )"
 HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
@@ -65,10 +70,9 @@ src_unpack() {
 	# for cross-compilation, but currently breaks normal compiles :/ #266591
 	#epatch "${FILESDIR}"/${P}-buildconfig-cross-compile.patch
 
-	if use maildir; then
-		einfo "Patching maildir support into exim.conf"
-		epatch "${FILESDIR}"/exim-4.20-maildir.patch
-	fi
+	use maildir && epatch "${FILESDIR}"/exim-4.20-maildir.patch
+	use dsn && epatch "${DISTDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
+
 	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
 
@@ -93,7 +97,7 @@ src_unpack() {
 		-e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \
 		src/EDITME > Local/Makefile
 
-	# exiscan-acl is now integrated - enabled it when use-flag set
+	# exiscan-acl is now integrated - enable 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
@@ -225,8 +229,8 @@ src_unpack() {
 	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
+		sed -i -e "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" \
+			-e "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
@@ -238,6 +242,9 @@ src_unpack() {
 	if use dcc; then
 		echo "EXPERIMENTAL_DCC=yes">> Local/Makefile
 	fi
+	if use dsn; then
+		sed -i -e "s:#define SUPPORT_DSN:define SUPPORT_DSN:" Local/Makefile
+	fi
 
 	# use the "native" interface to the DBM library
 	echo "USE_DB=yes" >> "${S}"/Local/Makefile
@@ -276,6 +283,7 @@ src_install () {
 
 	dodoc "${S}"/doc/*
 	doman "${S}"/doc/exim.8
+	use dsn && dodoc "${S}"/README.DSN
 
 	# conf files
 	insinto /etc/exim
diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index c875b7da8fe3..faa766cd8aba 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/metadata.xml
@@ -18,14 +18,16 @@
 	<use>
 		<flag name='dcc'>Adds support for Distributed Checksum Clearinghouse
 			(DCC)</flag>
-		<flag name='dnsdb'>Adds support for a DNS search for a record whose
-			domain name is the supplied query</flag>
 		<flag name='dkim'>Adds support for DomainKeys Identified Mail
 			(DKIM)</flag>
+		<flag name='dnsdb'>Adds support for a DNS search for a record whose
+			domain name is the supplied query</flag>
 		<flag name='domainkeys'>Adds support for Yahoo!'s DomainKey sender
 			verification system</flag>
 		<flag name='dovecot-sasl'>Adds support for Dovecot's
 			authentication</flag>
+		<flag name='dsn'>Adds support for Delivery Status Notifications
+			(DSN)</flag>
 		<flag name='exiscan-acl'>Patch providing support for content
 			scanning</flag>
 		<flag name='exiscan'>Patch providing support for content scanning