diff options
| author |   Michael Hanselmann <hansmi@gentoo.org> | 2005-01-04 22:16:05 +0000 |
|---|---|---|
| committer | Michael Hanselmann <hansmi@gentoo.org> | 2005-01-04 22:16:05 +0000 |
| commit | 22d31d53cf14c360a8203222bd4803be3798d667 (patch) | |
| tree | f482484209490c605ec1cafac1aa8b83622d555a /mail-mta | |
| parent | version bump (Manifest recommit) (diff) | |
| download | gentoo-2-22d31d53cf14c360a8203222bd4803be3798d667.tar.gz gentoo-2-22d31d53cf14c360a8203222bd4803be3798d667.tar.bz2 gentoo-2-22d31d53cf14c360a8203222bd4803be3798d667.zip | |
Fixed bug 40010.
Diffstat (limited to 'mail-mta')
| -rw-r--r-- | mail-mta/qmail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail-mta/qmail/files/1.03-r15/tlsbeforeauth-fix.patch | 39 | ||||
| -rw-r--r-- | mail-mta/qmail/qmail-1.03-r15.ebuild | 6 | ||||
| -rw-r--r-- | mail-mta/qmail/qmail-1.03-r16.ebuild | 6 |
4 files changed, 55 insertions, 3 deletions
diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog index 198e7be46aef..071e74514e15 100644 --- a/mail-mta/qmail/ChangeLog +++ b/mail-mta/qmail/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-mta/qmail # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.21 2005/01/04 21:35:13 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.22 2005/01/04 22:16:05 hansmi Exp $ + + 04 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> + +files/1.03-r15/tlsbeforeauth-fix.patch, qmail-1.03-r15.ebuild, + qmail-1.03-r16.ebuild: + Fixed bug 40010. 04 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> files/run-qmailpop3dlog, files/run-qmailqmqpdlog, files/run-qmailqmtpdlog, diff --git a/mail-mta/qmail/files/1.03-r15/tlsbeforeauth-fix.patch b/mail-mta/qmail/files/1.03-r15/tlsbeforeauth-fix.patch new file mode 100644 index 000000000000..c7e8c21afb52 --- /dev/null +++ b/mail-mta/qmail/files/1.03-r15/tlsbeforeauth-fix.patch @@ -0,0 +1,39 @@ +diff -Nur qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c +--- qmail-1.03.orig/qmail-smtpd.c 2004-01-30 21:32:02.923302000 +0100 ++++ qmail-1.03/qmail-smtpd.c 2004-01-30 21:32:16.412351168 +0100 +@@ -563,7 +563,7 @@ + if (!ssl) out("\r\n250-STARTTLS"); + #endif //TLS + +-#ifdef TLS && TLS_BEFORE_AUTH ++#if defined(TLS) && defined(TLS_BEFORE_AUTH) + if(ssl) smtp_authout(); + #else // TLS && TLS_BEFORE_AUTH + smtp_authout(); +@@ -1019,7 +1019,7 @@ + { + int r; + +-#ifdef TLS && TLS_BEFORE_AUTH ++#if defined(TLS) && defined(TLS_BEFORE_AUTH) + if (!ssl) return err_wantstarttls(); + #endif + if (*arg) { +@@ -1046,7 +1046,7 @@ + { + int r, id = 0; + +-#ifdef TLS && TLS_BEFORE_AUTH ++#if defined(TLS) && defined(TLS_BEFORE_AUTH) + if (!ssl) return err_wantstarttls(); + #endif + if (*arg) { +@@ -1075,7 +1075,7 @@ + int i, r; + char *s; + +-#ifdef TLS && TLS_BEFORE_AUTH ++#if defined(TLS) && defined(TLS_BEFORE_AUTH) + if (!ssl) return err_wantstarttls(); + #endif + diff --git a/mail-mta/qmail/qmail-1.03-r15.ebuild b/mail-mta/qmail/qmail-1.03-r15.ebuild index f87a22fb8175..a64c322ebefe 100644 --- a/mail-mta/qmail/qmail-1.03-r15.ebuild +++ b/mail-mta/qmail/qmail-1.03-r15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.16 2005/01/03 22:08:32 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.17 2005/01/04 22:16:05 hansmi Exp $ inherit toolchain-funcs eutils fixheadtails @@ -218,6 +218,10 @@ src_unpack() { # Doesn't affect other platforms epatch ${FILESDIR}/${PVR}/spawn-alloc-h.patch + # Fixes bug 40010 + EPATCH_SINGLE_MSG="Fixing broken #ifdef's to #if (TLS && TLS_BEFORE_AUTH)" \ + epatch ${FILESDIR}/${PVR}/tlsbeforeauth-fix.patch + echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc if use ssl; then einfo "Enabling SSL/TLS functionality" diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild index fd0db77f5ef5..e8b0c8d6e85c 100644 --- a/mail-mta/qmail/qmail-1.03-r16.ebuild +++ b/mail-mta/qmail/qmail-1.03-r16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.5 2005/01/04 21:35:13 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.6 2005/01/04 22:16:05 hansmi Exp $ inherit toolchain-funcs eutils fixheadtails @@ -249,6 +249,10 @@ src_unpack() { EPATCH_SINGLE_MSG="Adding double-bounce-trim-patch" \ epatch ${FILESDIR}/${PVR}/double-bounce-trim.patch + # Fixes bug 40010 + EPATCH_SINGLE_MSG="Fixing broken #ifdef's to #if (TLS && TLS_BEFORE_AUTH)" \ + epatch ${FILESDIR}/${PV}-r15/tlsbeforeauth-fix.patch + echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc if use ssl; then einfo "Enabling SSL/TLS functionality" |