Fixed bug 95637, added patch from bug 94257.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 46 insertions, 5 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index 1b08e4c5da71..df835ee54bcb 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,10 @@
 # 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.43 2005/06/12 19:35:43 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.44 2005/06/12 19:53:55 hansmi Exp $
+
+  12 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r16.ebuild,
+  +files/qmail-1.03-env-servercert.patch:
+  Fixed bug 95637, added patch from bug 94257.
 
   12 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   files/qmail-genrsacert.sh:
diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index fdb0f555ec8f..0b3ae9f79d50 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -1,6 +1,6 @@
 MD5 e60e7e9ed6a2c7d3a2ebcee6a6af429e metadata.xml 277
-MD5 75fb2feea06209d4e72600fc02486aea ChangeLog 29292
-MD5 3a59517e6fec441ff7f7a8c62398d768 qmail-1.03-r16.ebuild 21224
+MD5 25babfa34ab78f13408ed946b39be550 ChangeLog 29459
+MD5 eae6b800d79e145c2cc20fbbabe579c3 qmail-1.03-r16.ebuild 21301
 MD5 21fc9651e8bb292a5fbaa4fd0bdf5ac1 qmail-1.03-r15.ebuild 18081
 MD5 7db09ceb9337348431fb9f8418e5892e files/dot_qmail-log 276
 MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
@@ -49,6 +49,7 @@ MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r14/smtp-auth-close3.patch 728
 MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r14/qmail-smtpd-relay-reject.gentoo.patch 1433
 MD5 a963429b55bc3713ff3a22674101dfdb files/1.03-r16/auth-after-tls-only.patch 2241
 MD5 c0d3c5bd70a49284eb8cc8a5f952202e files/1.03-r16/Makefile-relaymxlookup.patch 1988
+MD5 0600d03067d6a112ff8fef64f8952f5c files/1.03-r16/qmail-1.03-env-servercert.patch 1306
 MD5 dbfe7d95b274567088123575d5da00ba files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch 571
 MD5 a1e8f454e96a2b23e9daae34fa6b6b5e files/1.03-r16/qmail-1.03-accept-5xx.tls.patch 930
 MD5 8f196c7649132af2c0c3745c1a5f1e9c files/1.03-r16/famd-dnotify.patch 555
diff --git a/mail-mta/qmail/files/1.03-r16/qmail-1.03-env-servercert.patch b/mail-mta/qmail/files/1.03-r16/qmail-1.03-env-servercert.patch
new file mode 100644
index 000000000000..132992b332e4
--- /dev/null
+++ b/mail-mta/qmail/files/1.03-r16/qmail-1.03-env-servercert.patch
@@ -0,0 +1,33 @@
+diff -Nru qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
+--- qmail-1.03.orig/qmail-smtpd.c	2005-06-06 00:32:59.000000000 +0300
++++ qmail-1.03/qmail-smtpd.c	2005-06-06 08:18:58.051312616 +0300
+@@ -1314,6 +1314,11 @@
+   stralloc saciphers = {0};
+   X509_STORE *store;
+   X509_LOOKUP *lookup;
++  const char *servercert;
++
++  /* if set, use servercert selected through SMTP_SERVERCERT env var */
++  servercert = env_get("SMTP_SERVERCERT");
++  if (!servercert) servercert = SERVERCERT;
+ 
+   SSL_library_init();
+ 
+@@ -1321,7 +1326,7 @@
+   ctx = SSL_CTX_new(SSLv23_server_method());
+   if (!ctx) { tls_err("unable to initialize ctx"); return; }
+ 
+-  if (!SSL_CTX_use_certificate_chain_file(ctx, SERVERCERT))
++  if (!SSL_CTX_use_certificate_chain_file(ctx, servercert))
+     { SSL_CTX_free(ctx); tls_err("missing certificate"); return; }
+   SSL_CTX_load_verify_locations(ctx, CLIENTCA, NULL);
+ 
+@@ -1343,7 +1348,7 @@
+   if (!myssl) { tls_err("unable to initialize ssl"); return; }
+ 
+   /* this will also check whether public and private keys match */
+-  if (!SSL_use_RSAPrivateKey_file(myssl, SERVERCERT, SSL_FILETYPE_PEM))
++  if (!SSL_use_RSAPrivateKey_file(myssl, servercert, SSL_FILETYPE_PEM))
+     { SSL_free(myssl); tls_err("no valid RSA private key"); return; }
+ 
+   ciphers = env_get("TLSCIPHERS");
diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
index 1fe442c43632..ed8a81551f92 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.18 2005/06/05 15:21:17 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.19 2005/06/12 19:53:55 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails flag-o-matic
 
@@ -253,7 +253,7 @@ src_unpack() {
 	# TODO Should be fixed with new TLS-patch
 	#epatch ${FILESDIR}/${PVR}/starttls-recordio.patch
 
-	# Add double-bounce-trim-patch from bug 45782
+	# Add double-bounce-trim-patch from bug 67810
 	EPATCH_SINGLE_MSG="Adding double-bounce-trim-patch" \
 	epatch ${FILESDIR}/${PVR}/double-bounce-trim.patch
 
@@ -261,6 +261,9 @@ src_unpack() {
 	EPATCH_SINGLE_MSG="Applying fix for a special case with courier-imapd" \
 	epatch ${FILESDIR}/${PVR}/famd-dnotify.patch
 
+	# See bug 94257
+	epatch ${FILESDIR}/${PVR}/qmail-1.03-env-servercert.patch
+
 	# See bug #90631
 	if use logmail; then
 		EPATCH_SINGLE_MSG='Enabling logging of all mails via ~alias/.qmail-log' \