From 77e88b517ea1488af7d0ac707fbac507de1b55e4 Mon Sep 17 00:00:00 2001
From: Wietse Venema <wietse@porcupine.org>
Date: Wed, 27 Jun 2012 00:00:00 -0500
Subject: [PATCH] postfix-2.10-20120627

---
 postfix/HISTORY                             | 6 ++++++
 postfix/makedefs                            | 2 +-
 postfix/src/global/mail_version.h           | 2 +-
 postfix/src/postscreen/postscreen_haproxy.c | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 611c9d409..cdc9bdd67 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -17859,3 +17859,9 @@ Apologies for any names omitted.
 
 	Cleanup: don't clobber errno when logging a problem.
 	File util/msg_output.c.
+
+20120627
+
+	Bugfix (introduced: 20120531-617): in the postscreen module
+	for HAproxy sypport, a VSTREAM buffer size request was not
+	LP64-clean.  File: postscreen/postscreen_haproxy.c.
diff --git a/postfix/makedefs b/postfix/makedefs
index 875ecc213..92a9717c3 100644
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -666,7 +666,7 @@ CCARGS="$CCARGS -DSNAPSHOT"
 
 # Non-production: needs thorough testing, or major changes are still
 # needed before the code stabilizes.
-CCARGS="$CCARGS -DNONPROD"
+#CCARGS="$CCARGS -DNONPROD"
 
 sed 's/  / /g' <<EOF
 SYSTYPE	= $SYSTYPE
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index f4306c63f..a287560b6 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20120621"
+#define MAIL_RELEASE_DATE	"20120627"
 #define MAIL_VERSION_NUMBER	"2.10"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/postscreen/postscreen_haproxy.c b/postfix/src/postscreen/postscreen_haproxy.c
index a8cb73689..0bc7fd890 100644
--- a/postfix/src/postscreen/postscreen_haproxy.c
+++ b/postfix/src/postscreen/postscreen_haproxy.c
@@ -145,7 +145,7 @@ static void psc_endpt_haproxy_event(int event, char *context)
 	PSC_CLEAR_EVENT_REQUEST(vstream_fileno(state->stream),
 				psc_endpt_haproxy_event, context);
 	vstream_control(state->stream,
-			VSTREAM_CTL_BUFSIZE, VSTREAM_BUFSIZE,
+			VSTREAM_CTL_BUFSIZE, (ssize_t) VSTREAM_BUFSIZE,
 			VSTREAM_CTL_END);
 	state->notify(status, state->stream,
 		      &smtp_client_addr, &smtp_client_port,