Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src Pullup the following, requested by tron in ticket #459:
details: https://anonhg.NetBSD.org/src/rev/47eed1f2029a
branches: netbsd-7
changeset: 798907:47eed1f2029a
user: martin <martin%NetBSD.org@localhost>
date: Tue Jan 27 08:14:03 2015 +0000
description:
Pullup the following, requested by tron in ticket #459:
doc/3RDPARTY 1.1195
external/ibm-public/postfix/dist/HISTORY patch
external/ibm-public/postfix/dist/makedefs patch
external/ibm-public/postfix/dist/src/cleanup/cleanup.h patch
external/ibm-public/postfix/dist/src/cleanup/cleanup_message.c patch
external/ibm-public/postfix/dist/src/cleanup/cleanup_milter.c patch
external/ibm-public/postfix/dist/src/cleanup/cleanup_state.c patch
external/ibm-public/postfix/dist/src/global/mail_version.h patch
external/ibm-public/postfix/dist/src/milter/milter.c patch
external/ibm-public/postfix/dist/src/milter/milter.h patch
external/ibm-public/postfix/dist/src/milter/milter8.c patch
external/ibm-public/postfix/dist/src/qmqpd/qmqpd.c patch
external/ibm-public/postfix/dist/src/smtpd/smtpd.c patch
external/ibm-public/postfix/dist/src/smtpd/smtpd_check.c patch
Import Postfix 2.11.3. Changes since version 2.11.1:
- Fix for DMARC implementations based on SPF policy plus DKIM Milter.
The PREPEND access/policy action added headers ABOVE Postfix's own
Received: header, exposing Postfix's own Received: header to Milters
(protocol violation) and hiding the PREPENDed header from Milters.
PREPENDed headers are now added BELOW Postfix's own Received: header
and remain visible to Milters.
- The Postfix SMTP server logged an incorrect client name in reject
messages for check_reverse_client_hostname_access and
check_reverse_client_hostname_{mx,ns}_access. They replied with the
verified client name, instead of the name that was rejected.
- The TLS client logged that an anonymous TLS connection was
"Untrusted", instead of "Anonymous".
- Fix for configurations that prepend message headers with Postfix
access maps, policy servers or Milter applications. Postfix now hides
its own Received: header from Milters and exposes prepended headers
to Milters, regardless of the mechanism used to prepend a header.
This fix reverts a partial solution that was released on October 13,
2014, and replaces it with a complete solution.
diffstat:
doc/3RDPARTY | 6 +-
external/ibm-public/postfix/dist/HISTORY | 44 ++++++++++
external/ibm-public/postfix/dist/makedefs | 4 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup.h | 3 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_message.c | 14 ++-
external/ibm-public/postfix/dist/src/cleanup/cleanup_milter.c | 4 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_state.c | 4 +-
external/ibm-public/postfix/dist/src/global/mail_version.h | 6 +-
external/ibm-public/postfix/dist/src/milter/milter.c | 11 +-
external/ibm-public/postfix/dist/src/milter/milter.h | 6 +-
external/ibm-public/postfix/dist/src/milter/milter8.c | 20 +++-
external/ibm-public/postfix/dist/src/qmqpd/qmqpd.c | 5 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd.c | 5 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_check.c | 8 +-
14 files changed, 104 insertions(+), 36 deletions(-)
diffs (truncated from 413 to 300 lines):
diff -r 9af467b507c4 -r 47eed1f2029a doc/3RDPARTY
--- a/doc/3RDPARTY Tue Jan 27 07:49:48 2015 +0000
+++ b/doc/3RDPARTY Tue Jan 27 08:14:03 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1145.2.6 2015/01/25 09:11:02 martin Exp $
+# $NetBSD: 3RDPARTY,v 1.1145.2.7 2015/01/27 08:14:03 martin Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -1102,8 +1102,8 @@
now to do a new import.
Package: Postfix
-Version: 2.11.1
-Current Vers: 2.11.1
+Version: 2.11.3
+Current Vers: 2.11.3
Maintainer: Wietse Venema <wietse%porcupine.org@localhost>
Archive Site: ftp://postfix.cloud9.net/official/
Home Page: http://www.postfix.org/
diff -r 9af467b507c4 -r 47eed1f2029a external/ibm-public/postfix/dist/HISTORY
--- a/external/ibm-public/postfix/dist/HISTORY Tue Jan 27 07:49:48 2015 +0000
+++ b/external/ibm-public/postfix/dist/HISTORY Tue Jan 27 08:14:03 2015 +0000
@@ -19574,3 +19574,47 @@
reported by Sahil Tandon, predicate error found by Viktor,
redundant connection restore request eliminated by Wietse.
File: smtp/smtp_connect.c.
+
+20140619
+
+ Bugfix (introduced: 2001): qmqpd null pointer bug when it
+ logs a lost connection while not in a mail transaction.
+ Reported by Michal Adamek. File: qmqpd/qmqpd.c.
+
+20140920
+
+ Bugfix (introduced: 20080212): incorrect client name in
+ reject messages from check_reverse_client_hostname_access
+ and check_reverse_client_hostname_{mx,ns}_access. They
+ replied with the verified client name, instead of the name
+ that was rejected. Problem reported by Reindl Harald. File:
+ smtpd/smtpd_check.c.
+
+20141012
+
+ Bugfix (introduced: Postfix 2.3): the PREPEND access/policy
+ action added headers ABOVE Postfix's own Received: header,
+ exposing Postfix's own Received: header to Milters (protocol
+ violation) and hiding the PREPENDed header from Milters.
+ The latter caused problems for DMARC implementations with
+ SPF policy plus DKIM Milter. PREPENDed headers are now
+ added BELOW Postfix's own Received: header and remain visible
+ to Milters. File: smtpd/smtpd.c.
+
+20141014
+
+ Portability: Darwin 11.x needs to link with -lresolv. Viktor
+ Dukhovni. File: makedefs.
+
+20141018
+
+ Bugfix (introduced: Postfix 2.3): when a Milter inserted a
+ header ABOVE Postfix's own Received: header, Postfix would
+ expose its own Received: header to Milters (violating
+ protocol) and hide the Milter-inserted header from Milters
+ (wtf). Files: cleanup/cleanup.h, cleanup/cleanup_message.c,
+ cleanup/cleanup_state.c, milter/milter.[hc], milter/milter8.c.
+
+ Cleanup: revert the workaround that places headers inserted
+ with PREPEND actions or policy requests BELOW Postfix's own
+ Received: message header. File: smtpd/smtpd.c.
diff -r 9af467b507c4 -r 47eed1f2029a external/ibm-public/postfix/dist/makedefs
--- a/external/ibm-public/postfix/dist/makedefs Tue Jan 27 07:49:48 2015 +0000
+++ b/external/ibm-public/postfix/dist/makedefs Tue Jan 27 08:14:03 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 9af467b507c4 -r 47eed1f2029a external/ibm-public/postfix/dist/src/cleanup/cleanup.h
--- a/external/ibm-public/postfix/dist/src/cleanup/cleanup.h Tue Jan 27 07:49:48 2015 +0000
+++ b/external/ibm-public/postfix/dist/src/cleanup/cleanup.h Tue Jan 27 08:14:03 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.6.2.1 2015/01/27 08:14:03 martin 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 9af467b507c4 -r 47eed1f2029a external/ibm-public/postfix/dist/src/cleanup/cleanup_message.c
--- a/external/ibm-public/postfix/dist/src/cleanup/cleanup_message.c Tue Jan 27 07:49:48 2015 +0000
+++ b/external/ibm-public/postfix/dist/src/cleanup/cleanup_message.c Tue Jan 27 08:14:03 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cleanup_message.c,v 1.1.1.4 2014/07/06 19:27:50 tron Exp $ */
+/* $NetBSD: cleanup_message.c,v 1.1.1.4.2.1 2015/01/27 08:14:03 martin Exp $ */
/*++
/* NAME
@@ -481,6 +481,10 @@
if (hdr_opts && (hdr_opts->flags & HDR_OPT_MIME))
header_class = MIME_HDR_MULTIPART;
+ /* Update the Received: header count before maybe dropping headers below. */
+ if (hdr_opts && hdr_opts->type == HDR_RECEIVED)
+ state->hop_count += 1;
+
if ((state->flags & CLEANUP_FLAG_FILTER)
&& (CHECK(MIME_HDR_PRIMARY, cleanup_header_checks, VAR_HEADER_CHECKS)
|| CHECK(MIME_HDR_MULTIPART, cleanup_mimehdr_checks, VAR_MIMEHDR_CHECKS)
@@ -581,9 +585,13 @@
msg_info("%s: message-id=%s", state->queue_id, hdrval);
if (hdr_opts->type == HDR_RESENT_MESSAGE_ID)
msg_info("%s: resent-message-id=%s", state->queue_id, hdrval);
- if (hdr_opts->type == HDR_RECEIVED)
- if (++state->hop_count >= var_hopcount_limit)
+ if (hdr_opts->type == HDR_RECEIVED) {
+ if (state->hop_count >= var_hopcount_limit)
state->errs |= CLEANUP_STAT_HOPS;
+ /* Save our Received: header after maybe updating headers above. */
+ if (state->hop_count == 1)
+ argv_add(state->auto_hdrs, vstring_str(header_buf), ARGV_END);
+ }
if (CLEANUP_OUT_OK(state)) {
if (hdr_opts->flags & HDR_OPT_RR)
state->resent = "Resent-";
diff -r 9af467b507c4 -r 47eed1f2029a external/ibm-public/postfix/dist/src/cleanup/cleanup_milter.c
--- a/external/ibm-public/postfix/dist/src/cleanup/cleanup_milter.c Tue Jan 27 07:49:48 2015 +0000
+++ b/external/ibm-public/postfix/dist/src/cleanup/cleanup_milter.c Tue Jan 27 08:14:03 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cleanup_milter.c,v 1.1.1.8 2014/07/06 19:27:50 tron Exp $ */
+/* $NetBSD: cleanup_milter.c,v 1.1.1.8.2.1 2015/01/27 08:14:03 martin Exp $ */
/*++
/* NAME
@@ -2022,7 +2022,7 @@
* filter library.
*/
if ((resp = milter_message(milters, state->handle->stream,
- state->data_offset)) != 0)
+ state->data_offset, state->auto_hdrs)) != 0)
cleanup_milter_apply(state, "END-OF-MESSAGE", resp);
/*
diff -r 9af467b507c4 -r 47eed1f2029a external/ibm-public/postfix/dist/src/cleanup/cleanup_state.c
--- a/external/ibm-public/postfix/dist/src/cleanup/cleanup_state.c Tue Jan 27 07:49:48 2015 +0000
+++ b/external/ibm-public/postfix/dist/src/cleanup/cleanup_state.c Tue Jan 27 08:14:03 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cleanup_state.c,v 1.1.1.3 2014/07/06 19:27:50 tron Exp $ */
+/* $NetBSD: cleanup_state.c,v 1.1.1.3.2.1 2015/01/27 08:14:03 martin Exp $ */
/*++
/* NAME
@@ -80,6 +80,7 @@
state->orig_rcpt = 0;
state->return_receipt = 0;
state->errors_to = 0;
+ state->auto_hdrs = argv_alloc(1);
state->flags = 0;
state->qmgr_opts = 0;
state->errs = 0;
@@ -153,6 +154,7 @@
myfree(state->return_receipt);
if (state->errors_to)
myfree(state->errors_to);
+ argv_free(state->auto_hdrs);
if (state->queue_name)
myfree(state->queue_name);
if (state->queue_id)
diff -r 9af467b507c4 -r 47eed1f2029a external/ibm-public/postfix/dist/src/global/mail_version.h
--- a/external/ibm-public/postfix/dist/src/global/mail_version.h Tue Jan 27 07:49:48 2015 +0000
+++ b/external/ibm-public/postfix/dist/src/global/mail_version.h Tue Jan 27 08:14:03 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mail_version.h,v 1.1.1.21 2014/07/06 19:27:51 tron Exp $ */
+/* $NetBSD: mail_version.h,v 1.1.1.21.2.1 2015/01/27 08:14:03 martin Exp $ */
#ifndef _MAIL_VERSION_H_INCLUDED_
#define _MAIL_VERSION_H_INCLUDED_
@@ -22,8 +22,8 @@
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
-#define MAIL_RELEASE_DATE "20140507"
-#define MAIL_VERSION_NUMBER "2.11.1"
+#define MAIL_RELEASE_DATE "20141019"
+#define MAIL_VERSION_NUMBER "2.11.3"
#ifdef SNAPSHOT
#define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE
diff -r 9af467b507c4 -r 47eed1f2029a external/ibm-public/postfix/dist/src/milter/milter.c
--- a/external/ibm-public/postfix/dist/src/milter/milter.c Tue Jan 27 07:49:48 2015 +0000
+++ b/external/ibm-public/postfix/dist/src/milter/milter.c Tue Jan 27 08:14:03 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: milter.c,v 1.1.1.3 2013/01/02 18:59:01 tron Exp $ */
+/* $NetBSD: milter.c,v 1.1.1.3.8.1 2015/01/27 08:14:03 martin Exp $ */
/*++
/* NAME
@@ -87,10 +87,11 @@
/* const char *milter_other_event(milters)
/* MILTERS *milters;
/*
-/* const char *milter_message(milters, qfile, data_offset)
+/* const char *milter_message(milters, qfile, data_offset, auto_hdrs)
/* MILTERS *milters;
/* VSTREAM *qfile;
/* off_t data_offset;
+/* ARGV *auto_hdrs;
/*
/* const char *milter_abort(milters)
/* MILTERS *milters;
@@ -483,7 +484,8 @@
/* milter_message - inspect message content */
-const char *milter_message(MILTERS *milters, VSTREAM *fp, off_t data_offset)
+const char *milter_message(MILTERS *milters, VSTREAM *fp, off_t data_offset,
+ ARGV *auto_hdrs)
{
const char *resp;
MILTER *m;
@@ -497,7 +499,8 @@
for (resp = 0, m = milters->milter_list; resp == 0 && m != 0; m = m->next) {
any_eoh_macros = MILTER_MACRO_EVAL(global_eoh_macros, m, milters, eoh_macros);
any_eod_macros = MILTER_MACRO_EVAL(global_eod_macros, m, milters, eod_macros);
- resp = m->message(m, fp, data_offset, any_eoh_macros, any_eod_macros);
+ resp = m->message(m, fp, data_offset, any_eoh_macros, any_eod_macros,
+ auto_hdrs);
if (any_eoh_macros != global_eoh_macros)
argv_free(any_eoh_macros);
if (any_eod_macros != global_eod_macros)
diff -r 9af467b507c4 -r 47eed1f2029a external/ibm-public/postfix/dist/src/milter/milter.h
--- a/external/ibm-public/postfix/dist/src/milter/milter.h Tue Jan 27 07:49:48 2015 +0000
+++ b/external/ibm-public/postfix/dist/src/milter/milter.h Tue Jan 27 08:14:03 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: milter.h,v 1.1.1.1 2009/06/23 10:08:49 tron Exp $ */
+/* $NetBSD: milter.h,v 1.1.1.1.28.1 2015/01/27 08:14:03 martin Exp $ */
#ifndef _MILTER_H_INCLUDED_
#define _MILTER_H_INCLUDED_
@@ -42,7 +42,7 @@
const char *(*mail_event) (struct MILTER *, const char **, ARGV *);
const char *(*rcpt_event) (struct MILTER *, const char **, ARGV *);
const char *(*data_event) (struct MILTER *, ARGV *);
- const char *(*message) (struct MILTER *, VSTREAM *, off_t, ARGV *, ARGV *);
+ const char *(*message) (struct MILTER *, VSTREAM *, off_t, ARGV *, ARGV *, ARGV *);
const char *(*unknown_event) (struct MILTER *, const char *, ARGV *);
const char *(*other_event) (struct MILTER *);
void (*abort) (struct MILTER *);
@@ -138,7 +138,7 @@
extern const char *milter_mail_event(MILTERS *, const char **);
extern const char *milter_rcpt_event(MILTERS *, int, const char **);
extern const char *milter_data_event(MILTERS *);
-extern const char *milter_message(MILTERS *, VSTREAM *, off_t);
+extern const char *milter_message(MILTERS *, VSTREAM *, off_t, ARGV *);
extern const char *milter_unknown_event(MILTERS *, const char *);
extern const char *milter_other_event(MILTERS *);
extern void milter_abort(MILTERS *);
diff -r 9af467b507c4 -r 47eed1f2029a external/ibm-public/postfix/dist/src/milter/milter8.c
--- a/external/ibm-public/postfix/dist/src/milter/milter8.c Tue Jan 27 07:49:48 2015 +0000
+++ b/external/ibm-public/postfix/dist/src/milter/milter8.c Tue Jan 27 08:14:03 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: milter8.c,v 1.1.1.7 2014/07/06 19:27:52 tron Exp $ */
+/* $NetBSD: milter8.c,v 1.1.1.7.2.1 2015/01/27 08:14:03 martin Exp $ */
/*++
/* NAME
@@ -2287,6 +2287,8 @@
MILTER8 *milter; /* milter client */
ARGV *eoh_macros; /* end-of-header macros */
ARGV *eod_macros; /* end-of-body macros */
+ ARGV *auto_hdrs; /* auto-generated headers */
+ int auto_done; /* good enough for now */
int first_header; /* first header */
int first_body; /* first body line */
const char *resp; /* milter application response */
@@ -2303,6 +2305,8 @@
MILTER8 *milter = msg_ctx->milter;
char *cp;
int skip_reply;
+ char **cpp;
+ unsigned done;
/*
* XXX Workaround: mime_state_update() may invoke multiple call-backs
@@ -2331,10 +2335,11 @@
* XXX Sendmail compatibility. It eats the first space (not tab) after the
Home |
Main Index |
Thread Index |
Old Index