Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/ibm-public/postfix/dist Import Postfix 2.8.2. Chang...
details: https://anonhg.NetBSD.org/src/rev/222f84b7e87e
branches: trunk
changeset: 763530:222f84b7e87e
user: tron <tron%NetBSD.org@localhost>
date: Wed Mar 23 19:06:45 2011 +0000
description:
Import Postfix 2.8.2. Changes since version 2.8.1:
- Bugfix: postscreen DNSBL scoring error. When a client disconnected
and then reconnected before all DNSBL results for the earlier
session arrived, DNSBL results for the earlier session would be
added to the score for the later session. This is very unlikely
to have affected any legitimate mail.
- Workaround: the SMTP client did not support mail to [ipv6:ipv6addr].
diffstat:
external/ibm-public/postfix/dist/HISTORY | 31 +++++++
external/ibm-public/postfix/dist/README_FILES/RELEASE_NOTES | 10 ++
external/ibm-public/postfix/dist/RELEASE_NOTES | 10 ++
external/ibm-public/postfix/dist/html/dnsblog.8.html | 39 +++++----
external/ibm-public/postfix/dist/man/man8/dnsblog.8 | 13 +-
external/ibm-public/postfix/dist/src/dnsblog/dnsblog.c | 18 ++-
external/ibm-public/postfix/dist/src/global/mail_version.h | 6 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen_dnsbl.c | 13 ++-
external/ibm-public/postfix/dist/src/util/host_port.c | 23 +++++-
external/ibm-public/postfix/dist/src/util/sys_defs.h | 7 +-
10 files changed, 127 insertions(+), 43 deletions(-)
diffs (truncated from 414 to 300 lines):
diff -r ab39f7b6cdf1 -r 222f84b7e87e external/ibm-public/postfix/dist/HISTORY
--- a/external/ibm-public/postfix/dist/HISTORY Wed Mar 23 18:10:25 2011 +0000
+++ b/external/ibm-public/postfix/dist/HISTORY Wed Mar 23 19:06:45 2011 +0000
@@ -16538,3 +16538,34 @@
Cleanup: don't log a "connection reset by peer" warning
when postscreen(8) tries to send a server response. File:
postscreen/postscreen_send.c.
+
+20110225
+
+ Workaround (problem introduced with IPv6 support in Postfix
+ 2.2): the SMTP client did not support mail to [ipv6:ipv6addr].
+ Fix based on a patch by Gurusamy Sarathy (Sophos). File:
+ util/host_port.c and regression test files.
+
+20110227
+
+ Portability: FreeBSD closefrom() support time window. Sahil
+ Tandon. File: util/sys_defs.h.
+
+20110313
+
+ Bugfix (introduced Postfix 2.8): postscreen DNSBL scoring
+ error. When a client disconnected and then reconnected
+ before all DNSBL results for the earlier session arrived,
+ DNSBL results for the earlier session would be added to the
+ score for the later session. Problem report by Larry Vaden.
+ Files: dnsblog/dnsblog.c, postscreen/postscreen_dnsbl.c.
+
+ Cleanup: protocol description in dnsblog(8) manpage. File:
+ dnsblog/dnsblog.c.
+
+20110314
+
+ Portability: the SUN compiler had trouble with a pointer
+ expression of the form ``("text1" "text2") + constant'' so
+ we don't try to be so clever. Fix by Victor Duchovni. File:
+ global/mail_params.h.
diff -r ab39f7b6cdf1 -r 222f84b7e87e external/ibm-public/postfix/dist/README_FILES/RELEASE_NOTES
--- a/external/ibm-public/postfix/dist/README_FILES/RELEASE_NOTES Wed Mar 23 18:10:25 2011 +0000
+++ b/external/ibm-public/postfix/dist/README_FILES/RELEASE_NOTES Wed Mar 23 19:06:45 2011 +0000
@@ -11,6 +11,16 @@
The mail_release_date configuration parameter (format: yyyymmdd)
specifies the release date of a stable release or snapshot release.
+Incompatible changes with Postfix 2.8.2
+---------------------------------------
+
+Use "postfix reload" after "make upgrade" on a running Postfix
+system. This is needed because the protocol between postscreen(8)
+and dnsblog(8) has changed.
+
+Postfix 2.8.0 release notes
+---------------------------
+
If you upgrade from Postfix 2.6 or earlier, read RELEASE_NOTES-2.7
before proceeding.
diff -r ab39f7b6cdf1 -r 222f84b7e87e external/ibm-public/postfix/dist/RELEASE_NOTES
--- a/external/ibm-public/postfix/dist/RELEASE_NOTES Wed Mar 23 18:10:25 2011 +0000
+++ b/external/ibm-public/postfix/dist/RELEASE_NOTES Wed Mar 23 19:06:45 2011 +0000
@@ -11,6 +11,16 @@
The mail_release_date configuration parameter (format: yyyymmdd)
specifies the release date of a stable release or snapshot release.
+Incompatible changes with Postfix 2.8.2
+---------------------------------------
+
+Use "postfix reload" after "make upgrade" on a running Postfix
+system. This is needed because the protocol between postscreen(8)
+and dnsblog(8) has changed.
+
+Postfix 2.8.0 release notes
+---------------------------
+
If you upgrade from Postfix 2.6 or earlier, read RELEASE_NOTES-2.7
before proceeding.
diff -r ab39f7b6cdf1 -r 222f84b7e87e external/ibm-public/postfix/dist/html/dnsblog.8.html
--- a/external/ibm-public/postfix/dist/html/dnsblog.8.html Wed Mar 23 18:10:25 2011 +0000
+++ b/external/ibm-public/postfix/dist/html/dnsblog.8.html Wed Mar 23 19:06:45 2011 +0000
@@ -20,35 +20,36 @@
<b>PROTOCOL</b>
With each connection, the <a href="dnsblog.8.html"><b>dnsblog</b>(8)</a> server receives a DNS
- white/blacklist domain name and an IP address. If the
- address is listed under the DNS white/blacklist, the <b>dns-</b>
- <b>blog</b>(8) server logs the match and replies with the query
- arguments plus a non-zero status. Otherwise it replies
- with the query arguments plus a zero status. Finally, The
- <a href="dnsblog.8.html"><b>dnsblog</b>(8)</a> server closes the connection.
+ white/blacklist domain name, IP address, and an ID. If
+ the address is listed under the DNS white/blacklist, the
+ <a href="dnsblog.8.html"><b>dnsblog</b>(8)</a> server logs the match and replies with the
+ query arguments plus an address list with the resulting IP
+ addresses separated by whitespace. Otherwise it replies
+ with the query arguments plus an empty address list.
+ Finally, The <a href="dnsblog.8.html"><b>dnsblog</b>(8)</a> server closes the connection.
<b>DIAGNOSTICS</b>
Problems and transactions are logged to <b>syslogd</b>(8).
<b>CONFIGURATION PARAMETERS</b>
- Changes to <a href="postconf.5.html"><b>main.cf</b></a> are picked up automatically, as <b>dns-</b>
- <b>blog</b>(8) processes run for only a limited amount of time.
+ Changes to <a href="postconf.5.html"><b>main.cf</b></a> are picked up automatically, as <b>dns-</b>
+ <b>blog</b>(8) processes run for only a limited amount of time.
Use the command "<b>postfix reload</b>" to speed up a change.
- The text below provides only a parameter summary. See
+ The text below provides only a parameter summary. See
<a href="postconf.5.html"><b>postconf</b>(5)</a> for more details including examples.
<b><a href="postconf.5.html#config_directory">config_directory</a> (see 'postconf -d' output)</b>
- The default location of the Postfix <a href="postconf.5.html">main.cf</a> and
+ The default location of the Postfix <a href="postconf.5.html">main.cf</a> and
<a href="master.5.html">master.cf</a> configuration files.
<b><a href="postconf.5.html#daemon_timeout">daemon_timeout</a> (18000s)</b>
- How much time a Postfix daemon process may take to
- handle a request before it is terminated by a
+ How much time a Postfix daemon process may take to
+ handle a request before it is terminated by a
built-in watchdog timer.
<b><a href="postconf.5.html#postscreen_dnsbl_sites">postscreen_dnsbl_sites</a> (empty)</b>
- Optional list of DNS white/blacklist domains, fil-
+ Optional list of DNS white/blacklist domains, fil-
ters and weight factors.
<b><a href="postconf.5.html#ipc_timeout">ipc_timeout</a> (3600s)</b>
@@ -56,23 +57,23 @@
over an internal communication channel.
<b><a href="postconf.5.html#process_id">process_id</a> (read-only)</b>
- The process ID of a Postfix command or daemon
+ The process ID of a Postfix command or daemon
process.
<b><a href="postconf.5.html#process_name">process_name</a> (read-only)</b>
- The process name of a Postfix command or daemon
+ The process name of a Postfix command or daemon
process.
<b><a href="postconf.5.html#queue_directory">queue_directory</a> (see 'postconf -d' output)</b>
- The location of the Postfix top-level queue direc-
+ The location of the Postfix top-level queue direc-
tory.
<b><a href="postconf.5.html#syslog_facility">syslog_facility</a> (mail)</b>
The syslog facility of Postfix logging.
<b><a href="postconf.5.html#syslog_name">syslog_name</a> (see 'postconf -d' output)</b>
- The mail system name that is prepended to the
- process name in syslog records, so that "smtpd"
+ The mail system name that is prepended to the
+ process name in syslog records, so that "smtpd"
becomes, for example, "postfix/smtpd".
<b>SEE ALSO</b>
@@ -81,7 +82,7 @@
syslogd(5), system logging
<b>LICENSE</b>
- The Secure Mailer license must be distributed with this
+ The Secure Mailer license must be distributed with this
software.
<b>HISTORY</b>
diff -r ab39f7b6cdf1 -r 222f84b7e87e external/ibm-public/postfix/dist/man/man8/dnsblog.8
--- a/external/ibm-public/postfix/dist/man/man8/dnsblog.8 Wed Mar 23 18:10:25 2011 +0000
+++ b/external/ibm-public/postfix/dist/man/man8/dnsblog.8 Wed Mar 23 19:06:45 2011 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: dnsblog.8,v 1.1.1.1 2011/03/02 19:31:54 tron Exp $
+.\" $NetBSD: dnsblog.8,v 1.1.1.2 2011/03/23 19:07:17 tron Exp $
.\"
.TH DNSBLOG 8
.ad
@@ -24,12 +24,13 @@
.ad
.fi
With each connection, the \fBdnsblog\fR(8) server receives
-a DNS white/blacklist domain name and an IP address. If the
-address is listed under the DNS white/blacklist, the
+a DNS white/blacklist domain name, IP address, and an ID.
+If the address is listed under the DNS white/blacklist, the
\fBdnsblog\fR(8) server logs the match and replies with the
-query arguments plus a non-zero status. Otherwise it replies
-with the query arguments plus a zero status. Finally, The
-\fBdnsblog\fR(8) server closes the connection.
+query arguments plus an address list with the resulting IP
+addresses separated by whitespace. Otherwise it replies
+with the query arguments plus an empty address list. Finally,
+The \fBdnsblog\fR(8) server closes the connection.
.SH DIAGNOSTICS
.ad
.fi
diff -r ab39f7b6cdf1 -r 222f84b7e87e external/ibm-public/postfix/dist/src/dnsblog/dnsblog.c
--- a/external/ibm-public/postfix/dist/src/dnsblog/dnsblog.c Wed Mar 23 18:10:25 2011 +0000
+++ b/external/ibm-public/postfix/dist/src/dnsblog/dnsblog.c Wed Mar 23 19:06:45 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dnsblog.c,v 1.1.1.1 2011/03/02 19:32:10 tron Exp $ */
+/* $NetBSD: dnsblog.c,v 1.1.1.2 2011/03/23 19:07:34 tron Exp $ */
/*++
/* NAME
@@ -16,12 +16,13 @@
/* .ad
/* .fi
/* With each connection, the \fBdnsblog\fR(8) server receives
-/* a DNS white/blacklist domain name and an IP address. If the
-/* address is listed under the DNS white/blacklist, the
+/* a DNS white/blacklist domain name, IP address, and an ID.
+/* If the address is listed under the DNS white/blacklist, the
/* \fBdnsblog\fR(8) server logs the match and replies with the
-/* query arguments plus a non-zero status. Otherwise it replies
-/* with the query arguments plus a zero status. Finally, The
-/* \fBdnsblog\fR(8) server closes the connection.
+/* query arguments plus an address list with the resulting IP
+/* addresses separated by whitespace. Otherwise it replies
+/* with the query arguments plus an empty address list. Finally,
+/* The \fBdnsblog\fR(8) server closes the connection.
/* DIAGNOSTICS
/* Problems and transactions are logged to \fBsyslogd\fR(8).
/* CONFIGURATION PARAMETERS
@@ -217,6 +218,7 @@
static void dnsblog_service(VSTREAM *client_stream, char *unused_service,
char **argv)
{
+ int request_id;
/*
* Sanity check. This service takes no command-line arguments.
@@ -233,13 +235,15 @@
ATTR_FLAG_MORE | ATTR_FLAG_STRICT,
ATTR_TYPE_STR, MAIL_ATTR_RBL_DOMAIN, rbl_domain,
ATTR_TYPE_STR, MAIL_ATTR_ACT_CLIENT_ADDR, addr,
- ATTR_TYPE_END) == 2) {
+ ATTR_TYPE_INT, MAIL_ATTR_LABEL, &request_id,
+ ATTR_TYPE_END) == 3) {
(void) dnsblog_query(result, STR(rbl_domain), STR(addr));
if (var_dnsblog_delay > 0)
sleep(var_dnsblog_delay);
attr_print(client_stream, ATTR_FLAG_NONE,
ATTR_TYPE_STR, MAIL_ATTR_RBL_DOMAIN, STR(rbl_domain),
ATTR_TYPE_STR, MAIL_ATTR_ACT_CLIENT_ADDR, STR(addr),
+ ATTR_TYPE_INT, MAIL_ATTR_LABEL, request_id,
ATTR_TYPE_STR, MAIL_ATTR_RBL_ADDR, STR(result),
ATTR_TYPE_END);
vstream_fflush(client_stream);
diff -r ab39f7b6cdf1 -r 222f84b7e87e external/ibm-public/postfix/dist/src/global/mail_version.h
--- a/external/ibm-public/postfix/dist/src/global/mail_version.h Wed Mar 23 18:10:25 2011 +0000
+++ b/external/ibm-public/postfix/dist/src/global/mail_version.h Wed Mar 23 19:06:45 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mail_version.h,v 1.1.1.6 2011/03/02 19:32:16 tron Exp $ */
+/* $NetBSD: mail_version.h,v 1.1.1.7 2011/03/23 19:07:40 tron 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 "20110222"
-#define MAIL_VERSION_NUMBER "2.8.1"
+#define MAIL_RELEASE_DATE "20110321"
+#define MAIL_VERSION_NUMBER "2.8.2"
#ifdef SNAPSHOT
# define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE
diff -r ab39f7b6cdf1 -r 222f84b7e87e external/ibm-public/postfix/dist/src/postscreen/postscreen_dnsbl.c
--- a/external/ibm-public/postfix/dist/src/postscreen/postscreen_dnsbl.c Wed Mar 23 18:10:25 2011 +0000
+++ b/external/ibm-public/postfix/dist/src/postscreen/postscreen_dnsbl.c Wed Mar 23 19:06:45 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: postscreen_dnsbl.c,v 1.1.1.1 2011/03/02 19:32:26 tron Exp $ */
+/* $NetBSD: postscreen_dnsbl.c,v 1.1.1.2 2011/03/23 19:07:49 tron Exp $ */
/*++
/* NAME
@@ -145,6 +145,7 @@
int total; /* combined blocklist score */
int refcount; /* score reference count */
int pending_lookups; /* nr of DNS requests in flight */
+ int request_id; /* duplicate suppression */
/* Call-back table support. */
int index; /* next table index */
int limit; /* last valid index */
@@ -346,6 +347,7 @@
PSC_DNSBL_HEAD *head;
PSC_DNSBL_SITE *site;
ARGV *reply_argv;
+ int request_id;
PSC_CLEAR_EVENT_REQUEST(vstream_fileno(stream), psc_dnsbl_receive, context);
@@ -369,10 +371,12 @@
ATTR_FLAG_STRICT,
ATTR_TYPE_STR, MAIL_ATTR_RBL_DOMAIN, reply_dnsbl,
ATTR_TYPE_STR, MAIL_ATTR_ACT_CLIENT_ADDR, reply_client,
+ ATTR_TYPE_INT, MAIL_ATTR_LABEL, &request_id,
Home |
Main Index |
Thread Index |
Old Index