diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2011-05-12 18:15:50 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2011-05-12 18:15:50 +0000 |
| commit | 592620b9d66bed91b0081b76e8fe436a6b0a0f99 (patch) | |
| tree | a933df105bf5a8a6c6f69bbcadede27a341a6298 /mail-mta/exim | |
| parent | Update HOMEPAGE/SRC_URI (diff) | |
| download | gentoo-2-592620b9d66bed91b0081b76e8fe436a6b0a0f99.tar.gz gentoo-2-592620b9d66bed91b0081b76e8fe436a6b0a0f99.tar.bz2 gentoo-2-592620b9d66bed91b0081b76e8fe436a6b0a0f99.zip | |
Fix dsn patch to apply, bug #366835
(Portage version: 2.2.01.18252-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'mail-mta/exim')
| -rw-r--r-- | mail-mta/exim/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-mta/exim/exim-4.76.ebuild | 7 | ||||
| -rw-r--r-- | mail-mta/exim/files/exim-4.76-dsn.patch | 18 |
3 files changed, 28 insertions, 3 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/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 |