From: Michael Hanselmann <hansmi@gentoo.org>
Date: Thu, 5 Apr 2007 22:14:18 +0000 (+0000)
Subject: Try to fix bug 169591 by adding a patch.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=68835c3b4fcd935480a443e9588f1d5e4e60ba67;p=gentoo.git

Try to fix bug 169591 by adding a patch.
Package-Manager: portage-2.1.2.3
---

diff --git a/mail-mta/netqmail/ChangeLog b/mail-mta/netqmail/ChangeLog
index 11712243a656..d2cb66d89d4e 100644
--- a/mail-mta/netqmail/ChangeLog
+++ b/mail-mta/netqmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/netqmail
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/ChangeLog,v 1.29 2007/04/04 19:46:21 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/ChangeLog,v 1.30 2007/04/05 22:14:18 hansmi Exp $
+
+*netqmail-1.05-r7 (06 Apr 2007)
+
+  05 Apr 2007; Michael Hanselmann <hansmi@gentoo.org>
+  +files/1.05-r7-sslfix.diff, -netqmail-1.05-r6.ebuild,
+  +netqmail-1.05-r7.ebuild:
+  Try to fix bug 169591 by adding a patch.
 
 *netqmail-1.05-r6 (04 Apr 2007)
 
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 4e506925a112..30c447c2da6e 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -1,3 +1,7 @@
+AUX 1.05-r7-sslfix.diff 473 RMD160 88b997ec74482fca96b8f507c2fceaa69b957d98 SHA1 9a941698ab047c466963e41ccde8a71a6f4464a1 SHA256 ae545c7f22ed9d52045328697b396ae27089a7a652f18406a98c7418f210fe53
+MD5 94c96d2675574649286b64096d429dfc files/1.05-r7-sslfix.diff 473
+RMD160 88b997ec74482fca96b8f507c2fceaa69b957d98 files/1.05-r7-sslfix.diff 473
+SHA256 ae545c7f22ed9d52045328697b396ae27089a7a652f18406a98c7418f210fe53 files/1.05-r7-sslfix.diff 473
 AUX 99qmail 137 RMD160 bb1d8b76562c60df05b1e10811d479ca24fdad48 SHA1 d370193dd2be29226fecd399c3bef93aec0011b8 SHA256 b721c405ab3a13803c4647b98a3c0ffbdfb450e4a0f9e5476c1633470b0d6e50
 MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
 RMD160 bb1d8b76562c60df05b1e10811d479ca24fdad48 files/99qmail 137
@@ -119,14 +123,14 @@ EBUILD netqmail-1.05-r4.ebuild 13077 RMD160 2e216cf6a9dc59e40cbe77e4164e022a25ea
 MD5 36b5fa4992bbb3113e9c118b9f40a368 netqmail-1.05-r4.ebuild 13077
 RMD160 2e216cf6a9dc59e40cbe77e4164e022a25ea421f netqmail-1.05-r4.ebuild 13077
 SHA256 1ee475dcca885783fc700aff335447d3b5b97fd93b0fd22df8f62d1c452b9edb netqmail-1.05-r4.ebuild 13077
-EBUILD netqmail-1.05-r6.ebuild 13641 RMD160 ea83c8dd7ab46557f9d405aabd8232fe08c82eeb SHA1 5cb1ca744baa10304d1e62c6903378c4ba0c088a SHA256 9b4ea4f48aeae524164daef13d88dfbfab425bce91768ba1bd67ea4eb8915382
-MD5 43f04354dd29ccb5468b7d24b4415ddf netqmail-1.05-r6.ebuild 13641
-RMD160 ea83c8dd7ab46557f9d405aabd8232fe08c82eeb netqmail-1.05-r6.ebuild 13641
-SHA256 9b4ea4f48aeae524164daef13d88dfbfab425bce91768ba1bd67ea4eb8915382 netqmail-1.05-r6.ebuild 13641
-MISC ChangeLog 4551 RMD160 735f61a7d5cc8b741468fe321e40f0c95153d7b5 SHA1 46d986efadfbc1dab0814d08bd32ab1e0e78c7d0 SHA256 3b9dc25313129ab3ba84f2f5c925ec557bea8676788a664c724483e5a78cfb50
-MD5 e346314645bda7fffbef3b3fe3f773cd ChangeLog 4551
-RMD160 735f61a7d5cc8b741468fe321e40f0c95153d7b5 ChangeLog 4551
-SHA256 3b9dc25313129ab3ba84f2f5c925ec557bea8676788a664c724483e5a78cfb50 ChangeLog 4551
+EBUILD netqmail-1.05-r7.ebuild 13726 RMD160 fd297f8241faf4442514537b0ed53d1e8465cd56 SHA1 e1221d68fb6268ebb9fa1f0b717e98cf409a0c87 SHA256 282ac257411cef7be04208d4849c2c83e4115ab5b7f808709b61c3383500565a
+MD5 b7f9f6754d6b5ecc1df019af8cad56bf netqmail-1.05-r7.ebuild 13726
+RMD160 fd297f8241faf4442514537b0ed53d1e8465cd56 netqmail-1.05-r7.ebuild 13726
+SHA256 282ac257411cef7be04208d4849c2c83e4115ab5b7f808709b61c3383500565a netqmail-1.05-r7.ebuild 13726
+MISC ChangeLog 4766 RMD160 882cecfe4cb743e4fe0bcfd62f8ec0c9849e0ba6 SHA1 45b61ef3116d11944dd73d91d1c63d32c8ea46e7 SHA256 3cd2c252c538b3f18186731f3d5a3aeed1785cc75ab917595cda20ed62af4209
+MD5 73273be9609c926484243cff82088798 ChangeLog 4766
+RMD160 882cecfe4cb743e4fe0bcfd62f8ec0c9849e0ba6 ChangeLog 4766
+SHA256 3cd2c252c538b3f18186731f3d5a3aeed1785cc75ab917595cda20ed62af4209 ChangeLog 4766
 MISC metadata.xml 278 RMD160 be877359df23e815e5acd94ecc97df2560671fa7 SHA1 2ea5039fde031f70169844e9ff5bcd4a20e32666 SHA256 0d8d56eeab2c34a34acb9f558c9198d843e4666bdbe061f6ec87ab4396a75d2a
 MD5 1f12f659d2cf9550971387cb78c2f0af metadata.xml 278
 RMD160 be877359df23e815e5acd94ecc97df2560671fa7 metadata.xml 278
@@ -134,6 +138,6 @@ SHA256 0d8d56eeab2c34a34acb9f558c9198d843e4666bdbe061f6ec87ab4396a75d2a metadata
 MD5 b3f63b32fd284e450fa4c057fd563f8b files/digest-netqmail-1.05-r4 1015
 RMD160 225c6860fbfcaf81c448c51d02aff3bd73fa1a44 files/digest-netqmail-1.05-r4 1015
 SHA256 a36f48dee042213e5b7ac5f480422db5bbec2f1d6fa5cf1b623a213d5def387e files/digest-netqmail-1.05-r4 1015
-MD5 12315a018714da299781aa2768a874e9 files/digest-netqmail-1.05-r6 1012
-RMD160 ba27ee348f5cb6f8234f0c64e739ccae88ef1704 files/digest-netqmail-1.05-r6 1012
-SHA256 886d1b3ca737e01b434160e62ec643360c0fc6c60af5098fb05afc863ef0a14e files/digest-netqmail-1.05-r6 1012
+MD5 12315a018714da299781aa2768a874e9 files/digest-netqmail-1.05-r7 1012
+RMD160 ba27ee348f5cb6f8234f0c64e739ccae88ef1704 files/digest-netqmail-1.05-r7 1012
+SHA256 886d1b3ca737e01b434160e62ec643360c0fc6c60af5098fb05afc863ef0a14e files/digest-netqmail-1.05-r7 1012
diff --git a/mail-mta/netqmail/files/1.05-r7-sslfix.diff b/mail-mta/netqmail/files/1.05-r7-sslfix.diff
new file mode 100644
index 000000000000..b7116a4a637c
--- /dev/null
+++ b/mail-mta/netqmail/files/1.05-r7-sslfix.diff
@@ -0,0 +1,11 @@
+--- qmail-smtpd.c.orig	2007-04-06 00:05:37.000000000 +0200
++++ qmail-smtpd.c	2007-04-06 00:05:42.000000000 +0200
+@@ -965,7 +965,7 @@
+ 
+   ciphers = env_get("TLSCIPHERS");
+   if (!ciphers) {
+-    if (control_readfile(&saciphers, "control/tlsserverciphers") == -1)
++    if (control_readfile(&saciphers, "control/tlsserverciphers", 0) == -1)
+       { SSL_free(myssl); die_control(); }
+     if (saciphers.len) { /* convert all '\0's except the last one to ':' */
+       int i;
diff --git a/mail-mta/netqmail/files/digest-netqmail-1.05-r6 b/mail-mta/netqmail/files/digest-netqmail-1.05-r7
similarity index 100%
rename from mail-mta/netqmail/files/digest-netqmail-1.05-r6
rename to mail-mta/netqmail/files/digest-netqmail-1.05-r7
diff --git a/mail-mta/netqmail/netqmail-1.05-r6.ebuild b/mail-mta/netqmail/netqmail-1.05-r7.ebuild
similarity index 99%
rename from mail-mta/netqmail/netqmail-1.05-r6.ebuild
rename to mail-mta/netqmail/netqmail-1.05-r7.ebuild
index a58b43ac1c26..6213d663959a 100644
--- a/mail-mta/netqmail/netqmail-1.05-r6.ebuild
+++ b/mail-mta/netqmail/netqmail-1.05-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.05-r6.ebuild,v 1.1 2007/04/04 19:46:21 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.05-r7.ebuild,v 1.1 2007/04/05 22:14:18 hansmi Exp $
 
 inherit eutils toolchain-funcs fixheadtails flag-o-matic
 
@@ -91,6 +91,9 @@ src_unpack() {
 		fi
 	fi
 
+	# Temporary patch until upstream fixes it
+	epatch "${FILESDIR}/${PVR}-sslfix.diff"
+
 	if [[ -n "${QMAIL_PATCH_DIR}" && -d "${QMAIL_PATCH_DIR}" ]]
 	then
 		echo