Fix dsn patch to apply, bug #366835

Package-Manager: portage-2.2.01.18252-prefix/cvs/Darwin powerpc

4 files changed, 34 insertions, 8 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index d0b34fb6a9cf..05bdbe9eb42a 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.195 2011/05/12 17:22:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.196 2011/05/12 18:15:50 grobian Exp $
+
+  12 May 2011; Fabian Groffen <grobian@gentoo.org> exim-4.76.ebuild,
+  +files/exim-4.76-dsn.patch:
+  Fix dsn patch to apply, bug #366835
 
   12 May 2011; Fabian Groffen <grobian@gentoo.org> exim-4.76.ebuild:
   Allow for msmtp with optional mta support, by Christian Aistleitner, bug
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index dc3196bd505e..0bef221e5f77 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -13,6 +13,7 @@ AUX exim-4.74-pcre.patch 901 RMD160 9092fddcbe708324edf97c61e5054ad96cc2e9b6 SHA
 AUX exim-4.74-radius-db-ENV-clash.patch 667 RMD160 8c71dce1c622bc80580cc81b5a5c2646fe18f222 SHA1 d29358b74b3ad1e921f652e04e064ced59a4361d SHA256 a4150c9b73203dd284faa646a67e39f431d07c6a378af8fabc97a4ad9e078437
 AUX exim-4.75-CVE-2011-1764.patch 1292 RMD160 6b676c2b15bc9e1f7656397e1dcab98ca79c5869 SHA1 d63bd68da6414f9af279d4a98137a438fe24649b SHA256 169b20a7038570621062074e54d6f18c1852eed0af3ad39a3c4c37dcd27a790c
 AUX exim-4.75-makefile-freebsd.patch 1206 RMD160 a0e394d04a1ff7a4caf09fb0a078dbf1f04da7dc SHA1 12bd58038523d87d943796139310e9236c593acb SHA256 f219c59168cf591bde202ab32586b09c52eab695feb00d64e288fe9b1e45086a
+AUX exim-4.76-dsn.patch 822 RMD160 4daa5e72ae8617cb8ad233450dd8c52f939af1a4 SHA1 91d44aa2ef34b718ea640c053a33d767996d6d9f SHA256 2b36099285ff271f1c6db189435ebe3c2d3f3e8407ac11a041c7ea21b1997463
 AUX exim.confd 62 RMD160 d8dcabf184ffb9066ad45c3e77cce1ec0392a143 SHA1 c56feda3c3193fad26852310da8ef24ef91f60f6 SHA256 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401
 AUX exim.logrotate 193 RMD160 af18b62c88fd86b421abe487a232f26bf5287dd5 SHA1 c12f3b44de8a51dd41c4dbf2179a2b0f9d4cbaf4 SHA256 41930f48d934dea0ad14a868c591fe1c47a5f6403d66f8a2d5f4092cd13f8b5c
 AUX exim.rc6 731 RMD160 07036a18cf072edb4a44b2ecdee21274542d1740 SHA1 bc92933d66befc68906bf9a5b83091c606323c1e SHA256 7c13ad60d4c6c9a29071aff8b68e81a6dd513b018cf0774e446c1afc3dcdc3c4
@@ -25,13 +26,13 @@ EBUILD exim-4.74-r1.ebuild 10444 RMD160 439ae1edecb5574bfc162c04f32856f4751712bd
 EBUILD exim-4.74-r2.ebuild 10448 RMD160 f864ecaad8a329f93d6f65354eb9c24c1505cc9a SHA1 3cf4b693f404dc903c386a1ef3882a04dc7bf75f SHA256 69401dd653880d72972844346b705754f006ae4ced1e5be4547179e91b2c0ea8
 EBUILD exim-4.75-r1.ebuild 10388 RMD160 f67430e2325f6dcf8541dcfd209f1b14184c6132 SHA1 ea6d66c314bfd3a0b376012d02dbfe12b4edeadb SHA256 1861b473b3e2aa48348f8deae486d4f2702611513e877e7ca67d69bc93a285da
 EBUILD exim-4.75.ebuild 10287 RMD160 b77ebd1519b26f97965159ec0208370c2224a6b0 SHA1 fec2250cdc652c40042433b43269049ed98a64e1 SHA256 0fc8df2f0b8d936d368ae21aa3e4c7508cab38bf75ee41b2897b8a457e7144ce
-EBUILD exim-4.76.ebuild 10173 RMD160 219ef4aae5a7b2b3fd083d528f058d9de198efe2 SHA1 fc8de39c570142c5c767827c9ba6f23ce1d9ebcc SHA256 3771a956d8560ea6d2cf728b2625acbb9f13ad4fd272e92e5eb95b50a30e7a5c
-MISC ChangeLog 40355 RMD160 53a87044291bafb48015ebe77f2c95babae6f7d6 SHA1 f0620050bb5cd30b0798edc0ac39654883240499 SHA256 82f362496352593cfcf92a638ed3144defb98eb5c3a85b5a4e17c900ae6a5648
+EBUILD exim-4.76.ebuild 10262 RMD160 14bb7fa4458d564dc2f35f5ffecbb7b84b1cd5a7 SHA1 e70d17ac20044887a6d32e020d4b5f77b3ec6bb7 SHA256 48463ca4cb0d8dc1bb0cdedf1b820f3897fde769d705a8750a7106f6105856bf
+MISC ChangeLog 40493 RMD160 402daf24dd766b10b3faf25f3879de352ccff887 SHA1 47a2fe6cdc054b0cb877fecda93564d70c9d5ed2 SHA256 43e7ffffb319f4ae87192d6c7db4b50180d8ee0c5a7bfac573272639557020be
 MISC metadata.xml 1745 RMD160 9a78e06e7038d79e2eb1e08017a2a5e6b53aa63f SHA1 892aff75716b8b21fda4d61289cc388ce0b7a3d1 SHA256 6c25800686eeb918e03fbe6caa54c38512c843e8eca3a2db8783289a9b12bea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (Darwin)
 
-iEYEARECAAYFAk3MF0kACgkQX3X2B8XHTomEAwCgk32YNjG83O98vaTGFcad1NE8
-HAgAnAsXSd8cZHX77ohqHLuh3jUFb6v3
-=cmns
+iEYEARECAAYFAk3MI9QACgkQX3X2B8XHTokS5QCcD+qIGeJf0soRk9mnBRNl05UD
+JrkAn0hGX93P7k9bSkgc2LZQYEbAg0fg
+=cNMp
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/exim/exim-4.76.ebuild b/mail-mta/exim/exim-4.76.ebuild
index 7239ed427083..8a0d0f08d8d9 100644
--- a/mail-mta/exim/exim-4.76.ebuild
+++ b/mail-mta/exim/exim-4.76.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.76.ebuild,v 1.2 2011/05/12 17:22:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.76.ebuild,v 1.3 2011/05/12 18:15:50 grobian Exp $
 
 EAPI="3"
 
@@ -75,7 +75,10 @@ src_prepare() {
 	epatch "${FILESDIR}"/exim-4.75-makefile-freebsd.patch
 
 	use maildir && epatch "${FILESDIR}"/exim-4.20-maildir.patch
-	use dsn && epatch "${DISTDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
+
+	cp "${DISTDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch . || die
+	epatch "${FILESDIR}"/${P}-dsn.patch
+	use dsn && epatch exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
 }
 
 src_configure() {
diff --git a/mail-mta/exim/files/exim-4.76-dsn.patch b/mail-mta/exim/files/exim-4.76-dsn.patch
new file mode 100644
index 000000000000..8a608ba62fb2
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.76-dsn.patch
@@ -0,0 +1,18 @@
+http://bugs.gentoo.org/show_bug.cgi?id=366835
+https://sourceforge.net/tracker/?func=detail&aid=3300653&group_id=121058&atid=689120
+
+--- exim_469_dsn_1_3.patch
++++ exim_469_dsn_1_3.patch
+@@ -524,10 +524,10 @@
+ diff -urN exim-4.69-orig/src/readconf.c exim-4.69-dsn/src/readconf.c
+ --- exim-4.69-orig/src/readconf.c	2007-08-23 12:01:49.000000000 +0100
+ +++ exim-4.69-dsn/src/readconf.c	2008-07-28 09:52:55.000000000 +0100
+-@@ -207,6 +207,9 @@
+-   { "dns_ipv4_lookup",          opt_stringptr,   &dns_ipv4_lookup },
++@@ -219,6 +219,9 @@
+    { "dns_retrans",              opt_time,        &dns_retrans },
+    { "dns_retry",                opt_int,         &dns_retry },
++   { "dns_use_edns0",            opt_int,         &dns_use_edns0 },
+ +#ifdef SUPPORT_DSN
+ +  { "dsn",                      opt_bool,        &dsn },
+ +#endif