summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hanselmann <hansmi@gentoo.org>2007-04-05 22:14:18 +0000
committerMichael Hanselmann <hansmi@gentoo.org>2007-04-05 22:14:18 +0000
commit297b1830f7d2e15aad9ceb46314f7054f7424d52 (patch)
tree01e668f5d3303787328d8c4274445fb55e51b695 /mail-mta/netqmail
parentVersion bump. (diff)
downloadgentoo-2-297b1830f7d2e15aad9ceb46314f7054f7424d52.tar.gz
gentoo-2-297b1830f7d2e15aad9ceb46314f7054f7424d52.tar.bz2
gentoo-2-297b1830f7d2e15aad9ceb46314f7054f7424d52.zip
Try to fix bug 169591 by adding a patch.
(Portage version: 2.1.2.3)
Diffstat (limited to 'mail-mta/netqmail')
-rw-r--r--mail-mta/netqmail/ChangeLog9
-rw-r--r--mail-mta/netqmail/files/1.05-r7-sslfix.diff11
-rw-r--r--mail-mta/netqmail/files/digest-netqmail-1.05-r7 (renamed from mail-mta/netqmail/files/digest-netqmail-1.05-r6)0
-rw-r--r--mail-mta/netqmail/netqmail-1.05-r7.ebuild (renamed from mail-mta/netqmail/netqmail-1.05-r6.ebuild)5
4 files changed, 23 insertions, 2 deletions
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/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
index a90c705acec8..a90c705acec8 100644
--- a/mail-mta/netqmail/files/digest-netqmail-1.05-r6
+++ b/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
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