Fix bug 145901 by adding a patch.

Package-Manager: portage-2.1.1_rc1-r4

4 files changed, 37 insertions, 10 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index 55c559491aeb..7bd2d50d929e 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/qmail
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.81 2006/07/01 19:31:55 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.82 2006/09/05 19:47:30 hansmi Exp $
+
+  05 Sep 2006; Michael Hanselmann <hansmi@gentoo.org>
+  +files/1.03-r16/tls-fix.patch, qmail-1.03-r16.ebuild:
+  Fix bug 145901 by adding a patch.
 
   01 Jul 2006; Michael Hanselmann <hansmi@gentoo.org>
   -files/qmail-dhparam.sh, qmail-1.03-r16.ebuild:
diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index 7d7840e77a68..efc34fb4e540 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -126,6 +126,10 @@ AUX 1.03-r16/starttls-recordio.patch 390 RMD160 c7d66e8888c0cd23dec427969481ac78
 MD5 81330827d80408f9bb6eab01857849dc files/1.03-r16/starttls-recordio.patch 390
 RMD160 c7d66e8888c0cd23dec427969481ac789fb12abc files/1.03-r16/starttls-recordio.patch 390
 SHA256 5c23f52779a855873f44a0efb047090c6513825b34fcbce5cee639ba4a3c8eed files/1.03-r16/starttls-recordio.patch 390
+AUX 1.03-r16/tls-fix.patch 484 RMD160 64b4b0ba5427d6dc4629cfee150d4770ae65ce4f SHA1 3238e3ff33d5c3ca5134499807d92a0cb211cefd SHA256 ad90eef056adf66db226933140ce3101814c27441eb4c2e81aad34cdd6bc5a30
+MD5 d7415de87446b70773bd0a44cf95abe7 files/1.03-r16/tls-fix.patch 484
+RMD160 64b4b0ba5427d6dc4629cfee150d4770ae65ce4f files/1.03-r16/tls-fix.patch 484
+SHA256 ad90eef056adf66db226933140ce3101814c27441eb4c2e81aad34cdd6bc5a30 files/1.03-r16/tls-fix.patch 484
 AUX 1.03-r16/virtual-domain-outgoing-IP-address.patch 4040 RMD160 fd48351d15f08cb408e75d9cd2821c964dcc7238 SHA1 b77a5271f4f79a96c4a48c8720b36ecdd1a0ab56 SHA256 7592632dc56a6148bf53183034d3682a3ffa120945c446ac2d521d323ec08362
 MD5 0494b42b8f85e67f82f892024b18e6af files/1.03-r16/virtual-domain-outgoing-IP-address.patch 4040
 RMD160 fd48351d15f08cb408e75d9cd2821c964dcc7238 files/1.03-r16/virtual-domain-outgoing-IP-address.patch 4040
@@ -298,14 +302,14 @@ EBUILD qmail-1.03-r15.ebuild 18747 RMD160 bd296b760947249ef2517be3048d2bc4189af7
 MD5 0d7852135a4316296951bbc86b1aa93a qmail-1.03-r15.ebuild 18747
 RMD160 bd296b760947249ef2517be3048d2bc4189af7d4 qmail-1.03-r15.ebuild 18747
 SHA256 ee8c41cb359a9272bf494eb3d172aa302bab40f56c898ef30fde6c4b6cd58c88 qmail-1.03-r15.ebuild 18747
-EBUILD qmail-1.03-r16.ebuild 22148 RMD160 8a627c0fccd5e770e3c2e8891cfd96c1d575c0d7 SHA1 ea40aefecf3af4e099fadcbcdf1470ff54db60cb SHA256 04e77bbe873058280b446a0bb720dee0d3421c0772c9b7c616cc0f1a65a33221
-MD5 059709c8112b8caeacbaff9368af80ea qmail-1.03-r16.ebuild 22148
-RMD160 8a627c0fccd5e770e3c2e8891cfd96c1d575c0d7 qmail-1.03-r16.ebuild 22148
-SHA256 04e77bbe873058280b446a0bb720dee0d3421c0772c9b7c616cc0f1a65a33221 qmail-1.03-r16.ebuild 22148
-MISC ChangeLog 34228 RMD160 6f9e4382d0341f759a25caeec07d2f12c913682d SHA1 0496c66f43de0e8e91b51dbb06f2b406cb131c31 SHA256 59fa658a657431873f1e282230c851ed6f3929194e0da953e8649f8e9d0238cb
-MD5 ce50ff0c2b1506ccf8154abd4abfbd33 ChangeLog 34228
-RMD160 6f9e4382d0341f759a25caeec07d2f12c913682d ChangeLog 34228
-SHA256 59fa658a657431873f1e282230c851ed6f3929194e0da953e8649f8e9d0238cb ChangeLog 34228
+EBUILD qmail-1.03-r16.ebuild 22189 RMD160 28054c11c98ef1167cc4e00cc5d5bcc6bcb33211 SHA1 adbeaf8432cf51f256fe052fe61d7a40c3c0e6eb SHA256 f125179e006c679b11b50e2564d2fc1d3480d793048a6f8ac02e7b1d5ecf5afd
+MD5 b3bcaa86375afebd1a2b56cb54a8f344 qmail-1.03-r16.ebuild 22189
+RMD160 28054c11c98ef1167cc4e00cc5d5bcc6bcb33211 qmail-1.03-r16.ebuild 22189
+SHA256 f125179e006c679b11b50e2564d2fc1d3480d793048a6f8ac02e7b1d5ecf5afd qmail-1.03-r16.ebuild 22189
+MISC ChangeLog 34375 RMD160 36681aca5273244969d49a36752252a4eae57777 SHA1 92d1615e8657df360aa49bdff42cf957cef70f5e SHA256 970417c1fd3056eb55e21bc9230aafd3e5b001add4a5422a68091750c85dec8d
+MD5 fe3a95910724836cb9de8dec902346b8 ChangeLog 34375
+RMD160 36681aca5273244969d49a36752252a4eae57777 ChangeLog 34375
+SHA256 970417c1fd3056eb55e21bc9230aafd3e5b001add4a5422a68091750c85dec8d ChangeLog 34375
 MISC metadata.xml 277 RMD160 ff3934a893d06e6b10a129469d8bdd7827de103d SHA1 848867d40baa89c695d92a19f95a7348ec118545 SHA256 e04f3f634b6d15f940639a415de9cf571b35189b3925f7fc59f0fe32bbbc9191
 MD5 e60e7e9ed6a2c7d3a2ebcee6a6af429e metadata.xml 277
 RMD160 ff3934a893d06e6b10a129469d8bdd7827de103d metadata.xml 277
diff --git a/mail-mta/qmail/files/1.03-r16/tls-fix.patch b/mail-mta/qmail/files/1.03-r16/tls-fix.patch
new file mode 100644
index 000000000000..6a9a430652cc
--- /dev/null
+++ b/mail-mta/qmail/files/1.03-r16/tls-fix.patch
@@ -0,0 +1,18 @@
+--- tls.c.orig	2006-09-05 21:45:09.000000000 +0200
++++ tls.c	2006-09-05 21:45:17.000000000 +0200
+@@ -2,6 +2,7 @@
+ #include "error.h"
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
++#include <string.h>
+ 
+ int smtps = 0;
+ SSL *ssl = NULL;
+@@ -9,7 +10,6 @@
+ void ssl_free(SSL *myssl) { SSL_shutdown(myssl); SSL_free(myssl); }
+ void ssl_exit(int status) { if (ssl) ssl_free(ssl); _exit(status); }
+ 
+-const char *strerror(int);
+ const char *ssl_error()
+ {
+   int r = ERR_get_error();
diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
index 4517f34b7bac..b6ca810e5412 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-2006 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.56 2006/07/01 19:31:55 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.57 2006/09/05 19:47:30 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails flag-o-matic
 
@@ -271,6 +271,7 @@ src_unpack() {
 
 	# Fix files
 	epatch ${FILESDIR}/${PVR}/fix-manpages.patch
+	epatch ${FILESDIR}/${PVR}/tls-fix.patch
 
 	# See bug #90631
 	if use logmail; then