Fixed bug 40010.

5 files changed, 59 insertions, 6 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/Manifest b/mail-mta/qmail/Manifest
index f539f32a009e..1bd4a7897f5e 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -2,12 +2,12 @@ MD5 326c3d12fa42f7d77ec25d0034c6386c qmail-1.03-r11.ebuild 11387
 MD5 b29fd46e11237b9ee8c69b705a91b1bf qmail-1.03-r8.ebuild 8060
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
 MD5 d18a1222087e80a39b2588e0f12e6e13 qmail-1.03-r10.ebuild 11111
-MD5 ca64c82e7ca1d334fb177927b2b8409d ChangeLog 21029
-MD5 e02137c4ecfe39e088025cf77e0163e4 qmail-1.03-r16.ebuild 19510
+MD5 1e8f3938945e5c1ce7516246b1df8fa9 ChangeLog 21194
+MD5 c1ba22b8b7547ad00c37bb520e49a49a qmail-1.03-r16.ebuild 19662
 MD5 48561c5b6846d4b381dfdd498b1955f4 qmail-1.03-r9.ebuild 9887
 MD5 a0cae8f720499509864d8c17c7aac5a3 qmail-1.03-r12.ebuild 13710
 MD5 f322d995494a3c1b6198916537b6b907 qmail-1.03-r14.ebuild 15817
-MD5 f422a36088fbed8d19087639312a19b8 qmail-1.03-r15.ebuild 17607
+MD5 0d63a2548b5f660e1d2877ea2df6b936 qmail-1.03-r15.ebuild 17756
 MD5 34671e603198bb00d35292bbe392affe qmail-1.03-r13.ebuild 14098
 MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
 MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098
@@ -167,6 +167,7 @@ MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r12/qmail-smtpd-relay-reject.gen
 MD5 118a42c2a167a1081ccd820f5b7f76db files/1.03-r15/spawn-alloc-h.patch 256
 MD5 d0aef5e4c492dbdc768bc1e0f7558870 files/1.03-r15/Makefile-relaymxlookup.patch 1947
 MD5 fe69ece20420ed8c2400dc423cdd5c22 files/1.03-r15/qmail-macos-dns-fix.patch 336
+MD5 47aab2c1e0357f8cf6f173caeca60419 files/1.03-r15/tlsbeforeauth-fix.patch 969
 MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574
 MD5 5cb0c8c4c9feeee55362d77a99076c2f files/1.03-r10/99qmail 44
 MD5 dd5158b78a3878d78a68878f1910e0e4 files/1.03-r10/tls.patch.bz2 10458
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"