From c2fe348508efdb20936a2971a1058c653973b7aa Mon Sep 17 00:00:00 2001
From: Wietse Venema <wietse@porcupine.org>
Date: Mon, 14 May 2007 00:00:00 -0500
Subject: [PATCH] postfix-2.5-20070514

---
 postfix/HISTORY                   | 10 ++++++++++
 postfix/makedefs                  | 10 +++++-----
 postfix/src/global/mail_version.h |  2 +-
 postfix/src/local/mailbox.c       |  2 +-
 postfix/src/xsasl/README          | 12 ++++++++----
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/postfix/HISTORY b/postfix/HISTORY
index ed883f525..bce6a9d99 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -13537,6 +13537,16 @@ Apologies for any names omitted.
 	case insensitive. File: src/cleanup/cleanup_message.c.
 
 
+20070514
+
+	Bugfix: the makedefs EPOLL workaround broke any attempt to
+	build on a 2.6 kernel. And that two weeks after the workaround
+	had been posted to the mailing list. File: makedefs.
+
+	Bugfix: mailbox_transport nixed the recipient file offset
+	for both local(8) and the delegated transport, instead of
+	just nixing it only for local(8). File: local/mailbox.c.
+
 Wish list:
 
 	Would there be a problem adding $smtpd_mumble_restrictions
diff --git a/postfix/makedefs b/postfix/makedefs
index befbbd600..7018bc0e8 100644
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -285,8 +285,8 @@ case "$SYSTEM.$RELEASE" in
 		# Workaround for retarded libc 
 		case "$RELEASE" in
 		2.6.*)
-		trap 'rm -f makedefs.tmp makedefs.tmp.o makedefs.tmp.c' 1 2 3 15
-		cat >makedefs.tmp.c <<EOF
+		trap 'rm -f makedefs.test makedefs.test.o makedefs.test.c' 1 2 3 15
+		cat >makedefs.test.c <<EOF
 #include <sys/types.h>
 #include <sys/epoll.h>
 #include <errno.h>
@@ -304,9 +304,9 @@ int     main(int argc, char **argv)
     exit(0);
 }
 EOF
-		${CC-gcc} -o makedefs.tmp makedefs.tmp.c || exit 1
-		./makedefs.tmp 2>/dev/null || CCARGS="$CCARGS -DNO_EPOLL"
-		rm -f makedefs.tmp makedefs.tmp.o makedefs.tmp.c;;
+		${CC-gcc} -o makedefs.test makedefs.test.c || exit 1
+		./makedefs.test 2>/dev/null || CCARGS="$CCARGS -DNO_EPOLL"
+		rm -f makedefs.test makedefs.test.o makedefs.test.c;;
 		esac
 		;;
      GNU.0*|GNU/kFreeBSD.[56]*)
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index b54eb5879..be376737a 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	"20070511"
+#define MAIL_RELEASE_DATE	"20070514"
 #define MAIL_VERSION_NUMBER	"2.5"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/local/mailbox.c b/postfix/src/local/mailbox.c
index 04cead1b9..d29591fef 100644
--- a/postfix/src/local/mailbox.c
+++ b/postfix/src/local/mailbox.c
@@ -280,9 +280,9 @@ int     deliver_mailbox(LOCAL_STATE state, USER_ATTR usr_attr, int *statusp)
 	return (YES);
     }
     if (*var_mailbox_transport) {
-	state.msg_attr.rcpt.offset = -1L;
 	*statusp = deliver_pass(MAIL_CLASS_PRIVATE, var_mailbox_transport,
 				state.request, &state.msg_attr.rcpt);
+	state.msg_attr.rcpt.offset = -1L;
 	return (YES);
     }
 
diff --git a/postfix/src/xsasl/README b/postfix/src/xsasl/README
index 7962ded1b..d1b2f5a04 100644
--- a/postfix/src/xsasl/README
+++ b/postfix/src/xsasl/README
@@ -24,10 +24,14 @@ information from main.cf into the plug_in:
     smtp_sasl_path, smtp_sasl_security_options
     lmtp_sasl_path, lmtp_sasl_security_options
 
-The parameter values are passed to the plug-in without any
-interpretation. The following restrictions are imposed by the main.cf
-file parser: parameter values never contain newlines, and they never
-start or end with whitespace characters.
+As usual, newline characters are removed from multi-line parameter
+values, and $name is expanded recursively.  The parameter values
+are passed to the plug-in without any further processing. The
+following restrictions are imposed by the main.cf file parser:
+
+- parameter values never contain newlines,
+
+- parameter values never start or end with whitespace characters.
 
 The _path parameter value is passed only once during process
 initialization (i.e. it is a class variable). The path typically