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 merge conflicts
details: https://anonhg.NetBSD.org/src/rev/d3d6633835d0
branches: trunk
changeset: 933510:d3d6633835d0
user: christos <christos%NetBSD.org@localhost>
date: Mon May 25 23:47:13 2020 +0000
description:
merge conflicts
diffstat:
external/ibm-public/postfix/dist/html/postconf.5.html | 2 +-
external/ibm-public/postfix/dist/makedefs | 15 ++++++-
external/ibm-public/postfix/dist/man/man1/postfix.1 | 4 +-
external/ibm-public/postfix/dist/man/man5/postconf.5 | 4 +-
external/ibm-public/postfix/dist/proto/postconf.proto | 2 +-
external/ibm-public/postfix/dist/src/dns/dns.h | 6 ++-
external/ibm-public/postfix/dist/src/dns/dns_lookup.c | 9 ++-
external/ibm-public/postfix/dist/src/global/mail_params.c | 4 +-
external/ibm-public/postfix/dist/src/global/mail_params.h | 4 +-
external/ibm-public/postfix/dist/src/global/mail_version.h | 6 +-
external/ibm-public/postfix/dist/src/milter/milter.c | 12 ++--
external/ibm-public/postfix/dist/src/postfix/postfix.c | 4 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_check.c | 18 +++---
external/ibm-public/postfix/dist/src/tls/tls_session.c | 4 +-
external/ibm-public/postfix/dist/src/tlsproxy/tlsproxy.c | 32 +++++++++++--
external/ibm-public/postfix/dist/src/util/midna_domain.c | 28 +++++++++++-
external/ibm-public/postfix/dist/src/util/midna_domain.h | 3 +-
17 files changed, 114 insertions(+), 43 deletions(-)
diffs (truncated from 499 to 300 lines):
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/html/postconf.5.html
--- a/external/ibm-public/postfix/dist/html/postconf.5.html Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/html/postconf.5.html Mon May 25 23:47:13 2020 +0000
@@ -6329,7 +6329,7 @@
</DD>
<DT><b><a name="maillog_file_rotate_suffix">maillog_file_rotate_suffix</a>
-(default: %Y%M%d-%H%M%S)</b></DT><DD>
+(default: %Y%m%d-%H%M%S)</b></DT><DD>
<p> The format of the suffix to append to $<a href="postconf.5.html#maillog_file">maillog_file</a> while rotating
the file with "postfix logrotate". See strftime(3) for syntax. The
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/makedefs
--- a/external/ibm-public/postfix/dist/makedefs Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/makedefs Mon May 25 23:47:13 2020 +0000
@@ -228,6 +228,19 @@
*) echo usage: $0 [system release] 1>&2; exit 1;;
esac
+case "$SYSTEM" in
+ Linux)
+ case "`PATH=/bin:/usr/bin ldd /bin/sh`" in
+ *-musl-*)
+ case "$CCARGS" in
+ *-DNO_DNSSEC*) ;;
+ *) echo Warning: libc-musl breaks DANE/TLSA security. 1>&2
+ echo This build will not support DANE/TLSA. 1>&2
+ CCARGS="$CCARGS -DNO_DNSSEC";;
+ esac;;
+ esac;;
+esac
+
case "$SYSTEM.$RELEASE" in
SCO_SV.3.2) SYSTYPE=SCO5
# Use the native compiler by default
@@ -1136,7 +1149,7 @@
: ${CC=gcc} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk} \
${WARN='-Wall -Wno-comment -Wformat -Wimplicit -Wmissing-prototypes \
-Wparentheses -Wstrict-prototypes -Wswitch -Wuninitialized \
- -Wunused -Wno-missing-braces'}
+ -Wunused -Wno-missing-braces -fcommon'}
# Extract map type names from -DHAS_XXX compiler options. We avoid
# problems with tr(1) range syntax by using enumerations instead,
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/man/man1/postfix.1
--- a/external/ibm-public/postfix/dist/man/man1/postfix.1 Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/man/man1/postfix.1 Mon May 25 23:47:13 2020 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: postfix.1,v 1.3 2020/03/18 19:05:14 christos Exp $
+.\" $NetBSD: postfix.1,v 1.4 2020/05/25 23:47:13 christos Exp $
.\"
.TH POSTFIX 1
.ad
@@ -254,7 +254,7 @@
logrotate".
.IP "\fBmaillog_file_prefixes (/var, /dev/stdout)\fR"
A list of allowed prefixes for a maillog_file value.
-.IP "\fBmaillog_file_rotate_suffix (%Y%M%d\-%H%M%S)\fR"
+.IP "\fBmaillog_file_rotate_suffix (%Y%m%d\-%H%M%S)\fR"
The format of the suffix to append to $maillog_file while rotating
the file with "postfix logrotate".
.IP "\fBpostlog_service_name (postlog)\fR"
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/man/man5/postconf.5
--- a/external/ibm-public/postfix/dist/man/man5/postconf.5 Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/man/man5/postconf.5 Mon May 25 23:47:13 2020 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: postconf.5,v 1.16 2020/03/18 19:05:14 christos Exp $
+.\" $NetBSD: postconf.5,v 1.17 2020/05/25 23:47:13 christos Exp $
.\"
.TH POSTCONF 5
.SH NAME
@@ -3824,7 +3824,7 @@
whitespace.
.PP
This feature is available in Postfix 3.4 and later.
-.SH maillog_file_rotate_suffix (default: %Y%M%d\-%H%M%S)
+.SH maillog_file_rotate_suffix (default: %Y%m%d\-%H%M%S)
The format of the suffix to append to $maillog_file while rotating
the file with "postfix logrotate". See \fBstrftime\fR(3) for syntax. The
default suffix, YYYYMMDD\-HHMMSS, allows logs to be rotated frequently.
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/proto/postconf.proto
--- a/external/ibm-public/postfix/dist/proto/postconf.proto Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/proto/postconf.proto Mon May 25 23:47:13 2020 +0000
@@ -17651,7 +17651,7 @@
<p> This feature is available in Postfix 3.4 and later. </p>
-%PARAM maillog_file_rotate_suffix %Y%M%d-%H%M%S
+%PARAM maillog_file_rotate_suffix %Y%m%d-%H%M%S
<p> The format of the suffix to append to $maillog_file while rotating
the file with "postfix logrotate". See strftime(3) for syntax. The
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/src/dns/dns.h
--- a/external/ibm-public/postfix/dist/src/dns/dns.h Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/src/dns/dns.h Mon May 25 23:47:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dns.h,v 1.3 2020/03/18 19:05:15 christos Exp $ */
+/* $NetBSD: dns.h,v 1.4 2020/05/25 23:47:13 christos Exp $ */
#ifndef _DNS_H_INCLUDED_
#define _DNS_H_INCLUDED_
@@ -61,6 +61,7 @@
*/
#ifdef NO_DNSSEC
#undef RES_USE_DNSSEC
+#undef RES_TRUSTAD
#endif
/*
@@ -72,6 +73,9 @@
#ifndef RES_USE_EDNS0
#define RES_USE_EDNS0 0
#endif
+#ifndef RES_TRUSTAD
+#define RES_TRUSTAD 0
+#endif
/*-
* TLSA: https://tools.ietf.org/html/rfc6698#section-7.1
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/src/dns/dns_lookup.c
--- a/external/ibm-public/postfix/dist/src/dns/dns_lookup.c Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/src/dns/dns_lookup.c Mon May 25 23:47:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dns_lookup.c,v 1.5 2020/03/18 19:05:15 christos Exp $ */
+/* $NetBSD: dns_lookup.c,v 1.6 2020/05/25 23:47:13 christos Exp $ */
/*++
/* NAME
@@ -118,6 +118,9 @@
/* Request DNSSEC validation. This flag is silently ignored
/* when the system stub resolver API, resolver(3), does not
/* implement DNSSEC.
+/* Automatically turns on the RES_TRUSTAD flag on systems that
+/* support this flag (this behavior will be more configurable
+/* in a later release).
/* .RE
/* .IP lflags
/* Flags that control the operation of the dns_lookup*()
@@ -487,10 +490,10 @@
/*
* Set extra options that aren't exposed to the application.
*/
-#define XTRA_FLAGS (RES_USE_EDNS0)
+#define XTRA_FLAGS (RES_USE_EDNS0 | RES_TRUSTAD)
if (flags & RES_USE_DNSSEC)
- flags |= RES_USE_EDNS0;
+ flags |= (RES_USE_EDNS0 | RES_TRUSTAD);
/*
* Can't append domains: we need the right SOA TTL.
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/src/global/mail_params.c
--- a/external/ibm-public/postfix/dist/src/global/mail_params.c Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/src/global/mail_params.c Mon May 25 23:47:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mail_params.c,v 1.3 2020/03/18 19:05:16 christos Exp $ */
+/* $NetBSD: mail_params.c,v 1.4 2020/05/25 23:47:14 christos Exp $ */
/*++
/* NAME
@@ -873,6 +873,8 @@
var_smtputf8_enable = 0;
#else
midna_domain_transitional = var_idna2003_compat;
+ if (var_smtputf8_enable)
+ midna_domain_pre_chroot();
#endif
util_utf8_enable = var_smtputf8_enable;
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/src/global/mail_params.h
--- a/external/ibm-public/postfix/dist/src/global/mail_params.h Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/src/global/mail_params.h Mon May 25 23:47:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mail_params.h,v 1.16 2020/03/18 19:05:16 christos Exp $ */
+/* $NetBSD: mail_params.h,v 1.17 2020/05/25 23:47:14 christos Exp $ */
#ifndef _MAIL_PARAMS_H_INCLUDED_
#define _MAIL_PARAMS_H_INCLUDED_
@@ -4183,7 +4183,7 @@
extern char *var_maillog_file_comp;
#define VAR_MAILLOG_FILE_STAMP "maillog_file_rotate_suffix"
-#define DEF_MAILLOG_FILE_STAMP "%Y%M%d-%H%M%S"
+#define DEF_MAILLOG_FILE_STAMP "%Y%m%d-%H%M%S"
extern char *var_maillog_file_stamp;
#define VAR_POSTLOG_SERVICE "postlog_service_name"
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/src/global/mail_version.h
--- a/external/ibm-public/postfix/dist/src/global/mail_version.h Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/src/global/mail_version.h Mon May 25 23:47:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mail_version.h,v 1.3 2020/03/18 19:05:16 christos Exp $ */
+/* $NetBSD: mail_version.h,v 1.4 2020/05/25 23:47:14 christos 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 "20200316"
-#define MAIL_VERSION_NUMBER "3.5.0"
+#define MAIL_RELEASE_DATE "20200516"
+#define MAIL_VERSION_NUMBER "3.5.2"
#ifdef SNAPSHOT
#define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/src/milter/milter.c
--- a/external/ibm-public/postfix/dist/src/milter/milter.c Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/src/milter/milter.c Mon May 25 23:47:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: milter.c,v 1.3 2020/03/18 19:05:17 christos Exp $ */
+/* $NetBSD: milter.c,v 1.4 2020/05/25 23:47:14 christos Exp $ */
/*++
/* NAME
@@ -622,14 +622,14 @@
* names by skipping the redundant "milter_" prefix.
*/
static ATTR_OVER_TIME time_table[] = {
- 7 + VAR_MILT_CONN_TIME, DEF_MILT_CONN_TIME, 0, 1, 0,
- 7 + VAR_MILT_CMD_TIME, DEF_MILT_CMD_TIME, 0, 1, 0,
- 7 + VAR_MILT_MSG_TIME, DEF_MILT_MSG_TIME, 0, 1, 0,
+ 7 + (const char *) VAR_MILT_CONN_TIME, DEF_MILT_CONN_TIME, 0, 1, 0,
+ 7 + (const char *) VAR_MILT_CMD_TIME, DEF_MILT_CMD_TIME, 0, 1, 0,
+ 7 + (const char *) VAR_MILT_MSG_TIME, DEF_MILT_MSG_TIME, 0, 1, 0,
0,
};
static ATTR_OVER_STR str_table[] = {
- 7 + VAR_MILT_PROTOCOL, 0, 1, 0,
- 7 + VAR_MILT_DEF_ACTION, 0, 1, 0,
+ 7 + (const char *) VAR_MILT_PROTOCOL, 0, 1, 0,
+ 7 + (const char *) VAR_MILT_DEF_ACTION, 0, 1, 0,
0,
};
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/src/postfix/postfix.c
--- a/external/ibm-public/postfix/dist/src/postfix/postfix.c Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/src/postfix/postfix.c Mon May 25 23:47:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: postfix.c,v 1.3 2020/03/18 19:05:18 christos Exp $ */
+/* $NetBSD: postfix.c,v 1.4 2020/05/25 23:47:14 christos Exp $ */
/*++
/* NAME
@@ -244,7 +244,7 @@
/* logrotate".
/* .IP "\fBmaillog_file_prefixes (/var, /dev/stdout)\fR"
/* A list of allowed prefixes for a maillog_file value.
-/* .IP "\fBmaillog_file_rotate_suffix (%Y%M%d-%H%M%S)\fR"
+/* .IP "\fBmaillog_file_rotate_suffix (%Y%m%d-%H%M%S)\fR"
/* The format of the suffix to append to $maillog_file while rotating
/* the file with "postfix logrotate".
/* .IP "\fBpostlog_service_name (postlog)\fR"
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/src/smtpd/smtpd_check.c
--- a/external/ibm-public/postfix/dist/src/smtpd/smtpd_check.c Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/src/smtpd/smtpd_check.c Mon May 25 23:47:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: smtpd_check.c,v 1.3 2020/03/18 19:05:20 christos Exp $ */
+/* $NetBSD: smtpd_check.c,v 1.4 2020/05/25 23:47:14 christos Exp $ */
/*++
/* NAME
@@ -488,20 +488,20 @@
* parameter names by skipping the redundant "smtpd_policy_service_" prefix.
*/
static ATTR_OVER_TIME time_table[] = {
- 21 + VAR_SMTPD_POLICY_TMOUT, DEF_SMTPD_POLICY_TMOUT, 0, 1, 0,
- 21 + VAR_SMTPD_POLICY_IDLE, DEF_SMTPD_POLICY_IDLE, 0, 1, 0,
- 21 + VAR_SMTPD_POLICY_TTL, DEF_SMTPD_POLICY_TTL, 0, 1, 0,
- 21 + VAR_SMTPD_POLICY_TRY_DELAY, DEF_SMTPD_POLICY_TRY_DELAY, 0, 1, 0,
+ 21 + (const char *) VAR_SMTPD_POLICY_TMOUT, DEF_SMTPD_POLICY_TMOUT, 0, 1, 0,
+ 21 + (const char *) VAR_SMTPD_POLICY_IDLE, DEF_SMTPD_POLICY_IDLE, 0, 1, 0,
+ 21 + (const char *) VAR_SMTPD_POLICY_TTL, DEF_SMTPD_POLICY_TTL, 0, 1, 0,
+ 21 + (const char *) VAR_SMTPD_POLICY_TRY_DELAY, DEF_SMTPD_POLICY_TRY_DELAY, 0, 1, 0,
0,
};
static ATTR_OVER_INT int_table[] = {
- 21 + VAR_SMTPD_POLICY_REQ_LIMIT, 0, 0, 0,
- 21 + VAR_SMTPD_POLICY_TRY_LIMIT, 0, 1, 0,
+ 21 + (const char *) VAR_SMTPD_POLICY_REQ_LIMIT, 0, 0, 0,
+ 21 + (const char *) VAR_SMTPD_POLICY_TRY_LIMIT, 0, 1, 0,
0,
};
static ATTR_OVER_STR str_table[] = {
- 21 + VAR_SMTPD_POLICY_DEF_ACTION, 0, 1, 0,
- 21 + VAR_SMTPD_POLICY_CONTEXT, 0, 1, 0,
+ 21 + (const char *) VAR_SMTPD_POLICY_DEF_ACTION, 0, 1, 0,
+ 21 + (const char *) VAR_SMTPD_POLICY_CONTEXT, 0, 1, 0,
0,
};
diff -r 6c2a0fa129e7 -r d3d6633835d0 external/ibm-public/postfix/dist/src/tls/tls_session.c
--- a/external/ibm-public/postfix/dist/src/tls/tls_session.c Mon May 25 23:40:25 2020 +0000
+++ b/external/ibm-public/postfix/dist/src/tls/tls_session.c Mon May 25 23:47:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tls_session.c,v 1.2 2020/03/18 19:05:21 christos Exp $ */
+/* $NetBSD: tls_session.c,v 1.3 2020/05/25 23:47:14 christos Exp $ */
/*++
Home |
Main Index |
Thread Index |
Old Index