From 955d5b2d5493f95be7c288a8381680e80869294e Mon Sep 17 00:00:00 2001
From: rpaulo <rpaulo@NetBSD.org>
Date: Sun, 27 Aug 2006 00:47:08 +0000
Subject: [PATCH] fix conflicts

---
 gnu/dist/postfix/README_FILES/RELEASE_NOTES | 7 +++++++
 gnu/dist/postfix/conf/post-install          | 3 ++-
 gnu/dist/postfix/makedefs                   | 2 ++
 gnu/dist/postfix/man/man5/postconf.5        | 9 +++++++--
 gnu/dist/postfix/src/smtpd/smtpd.c          | 8 +++++---
 gnu/dist/postfix/src/util/sys_defs.h        | 4 ++--
 6 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/gnu/dist/postfix/README_FILES/RELEASE_NOTES b/gnu/dist/postfix/README_FILES/RELEASE_NOTES
index a1ac8c0405f6..7fb822a0aeca 100644
--- a/gnu/dist/postfix/README_FILES/RELEASE_NOTES
+++ b/gnu/dist/postfix/README_FILES/RELEASE_NOTES
@@ -11,6 +11,13 @@ instead, a new snapshot is released.
 The mail_release_date configuration parameter (format: yyyymmdd)
 specifies the release date of a stable release or snapshot release.
 
+Incompatible changes with Postfix 2.3.3
+---------------------------------------
+
+Postfix no longer announces its name in delivery status notifications.
+Users believe that Wietse provides a free help desk service that
+solves all their email problems.
+
 Critical notes
 --------------
 
diff --git a/gnu/dist/postfix/conf/post-install b/gnu/dist/postfix/conf/post-install
index f03527df813a..a071d398f7b1 100644
--- a/gnu/dist/postfix/conf/post-install
+++ b/gnu/dist/postfix/conf/post-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: post-install,v 1.9 2006/07/19 01:35:39 rpaulo Exp $
+#	$NetBSD: post-install,v 1.10 2006/08/27 00:47:08 rpaulo Exp $
 #
 
 # To view the formatted manual page of this file, type:
@@ -645,6 +645,7 @@ EOF
 	    ed $config_directory/master.cf <<EOF || exit 1
 /^tlsmgr[ 	]*fifo[ 	]/
 s/fifo/unix/
+s/[0-9][0-9]*/&?/
 p
 w
 q
diff --git a/gnu/dist/postfix/makedefs b/gnu/dist/postfix/makedefs
index 02db2f623b4c..db9852b84e6b 100644
--- a/gnu/dist/postfix/makedefs
+++ b/gnu/dist/postfix/makedefs
@@ -122,6 +122,8 @@ case "$SYSTEM.$RELEASE" in
 		;;
   OpenBSD.3*)	SYSTYPE=OPENBSD3
 		;;
+  OpenBSD.4*)	SYSTYPE=OPENBSD4
+		;;
   ekkoBSD.1*)	SYSTYPE=EKKOBSD1
 		;;
    NetBSD.1*)	SYSTYPE=NETBSD1
diff --git a/gnu/dist/postfix/man/man5/postconf.5 b/gnu/dist/postfix/man/man5/postconf.5
index 8d6fbf721ddd..17f68043898c 100644
--- a/gnu/dist/postfix/man/man5/postconf.5
+++ b/gnu/dist/postfix/man/man5/postconf.5
@@ -1,4 +1,4 @@
-.\"	$NetBSD: postconf.5,v 1.8 2006/08/01 00:12:42 rpaulo Exp $
+.\"	$NetBSD: postconf.5,v 1.9 2006/08/27 00:47:08 rpaulo Exp $
 .\"
 .TH POSTCONF 5 
 .SH NAME
@@ -3021,6 +3021,10 @@ default is to report only the most serious problems. The paranoid
 may wish to turn on the policy (UCE and mail relaying) and protocol
 error (broken mail software) reports.
 .PP
+NOTE: postmaster notifications may contain confidential information
+such as SASL passwords or message content.  It is the system
+administrator's responsibility to treat such information with care.
+.PP
 The error classes are:
 .IP "\fBbounce\fR (also implies \fB2bounce\fR)"
 Send the postmaster copies of the headers of bounced mail, and
@@ -7166,7 +7170,8 @@ message contains no To: or Cc: message header.
 .SH unknown_address_reject_code (default: 450)
 The numerical Postfix SMTP server response code when a sender or
 recipient address is rejected by the reject_unknown_sender_domain
-or reject_unknown_recipient_domain restriction.
+or reject_unknown_recipient_domain restriction.  The response is
+always 450 in case of a temporary DNS error.
 .PP
 Do not change this unless you have a complete understanding of RFC 821.
 .SH unknown_client_reject_code (default: 450)
diff --git a/gnu/dist/postfix/src/smtpd/smtpd.c b/gnu/dist/postfix/src/smtpd/smtpd.c
index 3a2517e05e7f..c8859b56828a 100644
--- a/gnu/dist/postfix/src/smtpd/smtpd.c
+++ b/gnu/dist/postfix/src/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smtpd.c,v 1.16 2006/08/01 00:12:42 rpaulo Exp $	*/
+/*	$NetBSD: smtpd.c,v 1.17 2006/08/27 00:47:09 rpaulo Exp $	*/
 
 /*++
 /* NAME
@@ -2645,9 +2645,11 @@ static int data_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *unused_argv)
 	    && (state->proxy == 0 ? (++start, --len) == 0 : len == 1))
 	    break;
 	if (state->err == CLEANUP_STAT_OK) {
-	    if (var_message_limit > 0 && var_message_limit - state->act_size < len + 2)
+	    if (var_message_limit > 0 && var_message_limit - state->act_size < len + 2) {
 		state->err = CLEANUP_STAT_SIZE;
-	    else {
+		msg_warn("%s: queue file size limit exceeded",
+			 state->queue_id ? state->queue_id : "NOQUEUE");
+	    } else {
 		state->act_size += len + 2;
 		if (out_record(out_stream, curr_rec_type, start, len) < 0)
 		    state->err = out_error;
diff --git a/gnu/dist/postfix/src/util/sys_defs.h b/gnu/dist/postfix/src/util/sys_defs.h
index e51ef08638b2..088ce0c58964 100644
--- a/gnu/dist/postfix/src/util/sys_defs.h
+++ b/gnu/dist/postfix/src/util/sys_defs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_defs.h,v 1.19 2006/07/19 01:35:40 rpaulo Exp $	*/
+/*	$NetBSD: sys_defs.h,v 1.20 2006/08/27 00:47:09 rpaulo Exp $	*/
 
 #ifndef _SYS_DEFS_H_INCLUDED_
 #define _SYS_DEFS_H_INCLUDED_
@@ -28,7 +28,7 @@
 #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
     || defined(FREEBSD5) || defined(FREEBSD6) \
     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-    || defined(OPENBSD2) || defined(OPENBSD3) \
+    || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
     || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
     || defined(EKKOBSD1)
 #define SUPPORTED