[src/trunk]: src/external/ibm-public/postfix/dist Resolve conflicts from last...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cdca44deae1d
branches:  trunk
changeset: 335811:cdca44deae1d
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jan 24 18:10:52 2015 +0000

description:
Resolve conflicts from last import.

diffstat:

 external/ibm-public/postfix/dist/makedefs              |  4 ++--
 external/ibm-public/postfix/dist/src/cleanup/cleanup.h |  3 ++-
 external/ibm-public/postfix/dist/src/smtpd/smtpd.c     |  5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diffs (58 lines):

diff -r 39e4d17be933 -r cdca44deae1d external/ibm-public/postfix/dist/makedefs
--- a/external/ibm-public/postfix/dist/makedefs Sat Jan 24 18:08:05 2015 +0000
+++ b/external/ibm-public/postfix/dist/makedefs Sat Jan 24 18:10:52 2015 +0000
@@ -491,9 +491,9 @@
                     ?.*) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_NAMESER8_COMPAT_H";;
                       *) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_ARPA_NAMESER_COMPAT_H";;
                esac
-               # Darwin 12.x (MacOS X 10.8.x), maybe earlier, needs libresolv.
+               # Darwin 11.x (MacOS X 10.7.x), maybe earlier, needs libresolv.
                case $RELEASE in
-           ?.*|1[0-1].*) ;;
+               ?.*|10.*) ;;
                       *) SYSLIBS="$SYSLIBS -lresolv";;
                esac
                # kqueue and/or poll are broken in MacOS X 10.5 (Darwin 9).
diff -r 39e4d17be933 -r cdca44deae1d external/ibm-public/postfix/dist/src/cleanup/cleanup.h
--- a/external/ibm-public/postfix/dist/src/cleanup/cleanup.h    Sat Jan 24 18:08:05 2015 +0000
+++ b/external/ibm-public/postfix/dist/src/cleanup/cleanup.h    Sat Jan 24 18:10:52 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cleanup.h,v 1.6 2014/07/06 19:45:50 tron Exp $ */
+/*     $NetBSD: cleanup.h,v 1.7 2015/01/24 18:10:52 tron Exp $ */
 
 /*++
 /* NAME
@@ -63,6 +63,7 @@
     char   *orig_rcpt;                 /* original recipient address */
     char   *return_receipt;            /* return-receipt address */
     char   *errors_to;                 /* errors-to address */
+    ARGV   *auto_hdrs;                 /* MTA's own header(s) */
     int     flags;                     /* processing options, status flags */
     int     qmgr_opts;                 /* qmgr processing options */
     int     errs;                      /* any badness experienced */
diff -r 39e4d17be933 -r cdca44deae1d external/ibm-public/postfix/dist/src/smtpd/smtpd.c
--- a/external/ibm-public/postfix/dist/src/smtpd/smtpd.c        Sat Jan 24 18:08:05 2015 +0000
+++ b/external/ibm-public/postfix/dist/src/smtpd/smtpd.c        Sat Jan 24 18:10:52 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smtpd.c,v 1.11 2014/07/06 19:45:50 tron Exp $  */
+/*     $NetBSD: smtpd.c,v 1.12 2015/01/24 18:10:52 tron Exp $  */
 
 /*++
 /* NAME
@@ -2987,7 +2987,7 @@
     }
 
     /*
-     * PREPEND message headers.
+     * PREPEND message headers above our own Received: header.
      */
     if (state->prepend)
        for (cpp = state->prepend->argv; *cpp; cpp++)
@@ -3082,6 +3082,7 @@
                    "\t(envelope-from %s)", STR(state->buffer));
 #endif
     }
+
     smtpd_chat_reply(state, "354 End data with <CR><LF>.<CR><LF>");
     state->where = SMTPD_AFTER_DATA;