From e85209284a59421dd4dd7135fa12f6b2544d27ce Mon Sep 17 00:00:00 2001
From: kim <kim@pkgsrc.org>
Date: Thu, 23 Dec 2004 13:51:27 +0000
Subject: Fix "postfix/smtp killed by signal 11" problem.

---
 mail/postfix/Makefile         |  4 ++--
 mail/postfix/distinfo         |  3 ++-
 mail/postfix/patches/patch-ac | 27 +++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 mail/postfix/patches/patch-ac

(limited to 'mail/postfix')

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 24fb9369542..df445851cd0 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.154 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.155 2004/12/23 13:51:27 kim Exp $
 
 DISTNAME=	postfix-2.1.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 DIST_SUBDIR=	postfix
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 03d40cbf5eb..0a3343c3635 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.78 2004/12/17 19:36:01 kim Exp $
+$NetBSD: distinfo,v 1.79 2004/12/23 13:51:27 kim Exp $
 
 SHA1 (postfix/postfix-2.1.5.tar.gz) = bbc65c9fdc1cbd8e553816a5549b2685255cf69d
 Size (postfix/postfix-2.1.5.tar.gz) = 1971931 bytes
@@ -10,6 +10,7 @@ SHA1 (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = 313d572bcd960e3cafd78ac9ee4b
 Size (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = 239141 bytes
 SHA1 (patch-aa) = 279b54f19289b56a423214716386c5aab79a57d5
 SHA1 (patch-ab) = c506a08b694f94ef4884fa97eec51e44c92812dd
+SHA1 (patch-ac) = f26b493c648c84af6ff70c54da82876eae8c2637
 SHA1 (patch-ag) = d5e9aab43b5d3be6df9ad8e3f03572b9a228f784
 SHA1 (patch-ai) = f166c2d52bfb8a441db22a9090312c0a2de56a6f
 SHA1 (patch-aj) = c2e79b1954dae272e22bb38bf3c0586f1b7c9543
diff --git a/mail/postfix/patches/patch-ac b/mail/postfix/patches/patch-ac
new file mode 100644
index 00000000000..e4821f28113
--- /dev/null
+++ b/mail/postfix/patches/patch-ac
@@ -0,0 +1,27 @@
+$NetBSD: patch-ac,v 1.10 2004/12/23 13:51:28 kim Exp $
+
+See http://archives.neohapsis.com/archives/postfix/2004-08/1114.html
+and the preceding thread.  Fixes "smtp killed by signal 11" problems.
+
+--- src/util/vstream.c.orig	2003-07-09 22:01:21.000000000 -0400
++++ src/util/vstream.c	2004-12-23 01:21:52.000000000 -0500
+@@ -920,6 +920,10 @@
+      * policies. Either this, or the vstream*open() routines would have to
+      * have a really ugly interface with lots of mostly-unused arguments (can
+      * you say VMS?).
++     *
++     * Initialize the I/O time (as documented) so that a time sensitive, "write
++     * before read" application does not force flush the first data written
++     * to a stream, potentially triggering NAGLE delays or other trouble.
+      */
+     stream = (VSTREAM *) mymalloc(sizeof(*stream));
+     stream->fd = fd;
+@@ -933,7 +937,7 @@
+     stream->timeout = 0;
+     stream->context = 0;
+     stream->jbuf = 0;
+-    stream->iotime = 0;
++    stream->iotime = time((time_t *) 0); /* as documented */
+     return (stream);
+ }
+ 
-- 
cgit v1.2.3