From f653a0d1fd5b08366e513297499dbd3384a5a213 Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Sun, 5 Dec 2021 00:00:00 -0500 Subject: [PATCH] postfix-3.7-20211205 --- postfix/HISTORY | 20 ++++++ postfix/conf/main.cf | 4 ++ postfix/html/aliases.5.html | 11 ++- postfix/html/local.8.html | 17 +++-- postfix/html/pipe.8.html | 15 ++--- postfix/html/qmqpd.8.html | 12 ++-- postfix/html/trivial-rewrite.8.html | 67 +++++++++---------- postfix/makedefs | 55 ++++++++++++++- postfix/man/man5/aliases.5 | 5 +- postfix/man/man8/local.8 | 5 +- postfix/man/man8/pipe.8 | 5 +- postfix/man/man8/qmqpd.8 | 11 +-- postfix/man/man8/trivial-rewrite.8 | 5 +- postfix/proto/aliases | 5 +- postfix/src/global/mail_version.h | 2 +- postfix/src/local/local.c | 5 +- postfix/src/pipe/pipe.c | 5 +- postfix/src/qmqpd/qmqpd.c | 11 +-- postfix/src/tls/tls_dh.c | 5 +- postfix/src/trivial-rewrite/trivial-rewrite.c | 5 +- postfix/src/util/sys_defs.h | 8 ++- 21 files changed, 174 insertions(+), 104 deletions(-) diff --git a/postfix/HISTORY b/postfix/HISTORY index 819847677..205e72ad0 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -25936,3 +25936,23 @@ Apologies for any names omitted. library is still supported). See RELEASE_NOTES for details. Files: makedefs, util/dict_open.c, util.dict_pcre.c, proto/pcre_table, proto/PCRE_README.html. + +20211129 + + Portability: defines for FreeBSD <= 14.x, OpenBSD 7.x, NetBSD <= + 10.x. Brad Smith. Files: makedefs, util/sys_defs.h. + +20211202 + + Cleanup: warning messages when a Diffie-Hellman parameter + file cannot be opened or parsed. Viktor Dukhovni. File: + tls/tls_dh.c. + +20211204 + + Cleanup: parameter descriptions in manpages were frozen in the + past. Files: proto/aliases, src/local/local.c, src/pipe/pipe.c, + src/qmqpd/qmqpd.c, src/trivial-rewrite/trivial-rewrite.c. + + Documentation: added a "howto tip" to the stock main.cf + file. File: conf/main.cf diff --git a/postfix/conf/main.cf b/postfix/conf/main.cf index ac199ae70..562e4dfc3 100644 --- a/postfix/conf/main.cf +++ b/postfix/conf/main.cf @@ -2,6 +2,10 @@ # of all parameters. For the syntax, and for a complete parameter # list, see the postconf(5) manual page (command: "man 5 postconf"). # +# TIP: use the command "postconf -n" to view main.cf parameter +# settings, "postconf parametername" to view a specific parameter, +# and "postconf 'parametername=value'" to set a specific parameter. +# # For common configuration examples, see BASIC_CONFIGURATION_README # and STANDARD_CONFIGURATION_README. To find these documents, use # the command "postconf html_directory readme_directory", or go to diff --git a/postfix/html/aliases.5.html b/postfix/html/aliases.5.html index af9e9ec69..e7d5b663b 100644 --- a/postfix/html/aliases.5.html +++ b/postfix/html/aliases.5.html @@ -164,16 +164,15 @@ ALIASES(5) ALIASES(5) set to "-". recipient_delimiter (empty) - The set of characters that can separate a user name from its - extension (example: user+foo), or a .forward file name from its - extension (example: .forward+foo). + The set of characters that can separate an email address local- + part, user name, or a .forward file name from its extension. Available in Postfix version 2.3 and later: frozen_delivered_to (yes) - Update the local(8) delivery agent's idea of the Delivered-To: - address (see prepend_delivered_header) only once, at the start - of a delivery attempt; do not update the Delivered-To: address + Update the local(8) delivery agent's idea of the Delivered-To: + address (see prepend_delivered_header) only once, at the start + of a delivery attempt; do not update the Delivered-To: address while expanding aliases or .forward files. STANDARDS diff --git a/postfix/html/local.8.html b/postfix/html/local.8.html index 888fb31ba..bcc0a032c 100644 --- a/postfix/html/local.8.html +++ b/postfix/html/local.8.html @@ -550,9 +550,8 @@ LOCAL(8) LOCAL(8) The location of the Postfix top-level queue directory. recipient_delimiter (empty) - The set of characters that can separate a user name from its - extension (example: user+foo), or a .forward file name from its - extension (example: .forward+foo). + The set of characters that can separate an email address local- + part, user name, or a .forward file name from its extension. require_home_directory (no) Require that a local(8) recipient's home directory exists before @@ -562,14 +561,14 @@ LOCAL(8) LOCAL(8) The syslog facility of Postfix logging. syslog_name (see 'postconf -d' output) - A prefix that is prepended to the process name in syslog + A prefix that is prepended to the process name in syslog records, so that, for example, "smtpd" becomes "prefix/smtpd". Available in Postfix version 3.3 and later: enable_original_recipient (yes) - Enable support for the original recipient address after an - address is rewritten to a different address (for example with + Enable support for the original recipient address after an + address is rewritten to a different address (for example with aliasing or with canonical mapping). service_name (read-only) @@ -578,7 +577,7 @@ LOCAL(8) LOCAL(8) Available in Postfix 3.5 and later: info_log_address_format (external) - The email address form that will be used in non-debug logging + The email address form that will be used in non-debug logging (info, warning, etc.). FILES @@ -602,10 +601,10 @@ LOCAL(8) LOCAL(8) The Secure Mailer license must be distributed with this software. HISTORY - The Delivered-To: message header appears in the qmail system by Daniel + The Delivered-To: message header appears in the qmail system by Daniel Bernstein. - The maildir structure appears in the qmail system by Daniel Bernstein. + The maildir structure appears in the qmail system by Daniel Bernstein. AUTHOR(S) Wietse Venema diff --git a/postfix/html/pipe.8.html b/postfix/html/pipe.8.html index 46aba353e..ddcccb469 100644 --- a/postfix/html/pipe.8.html +++ b/postfix/html/pipe.8.html @@ -443,29 +443,28 @@ PIPE(8) PIPE(8) The location of the Postfix top-level queue directory. recipient_delimiter (empty) - The set of characters that can separate a user name from its - extension (example: user+foo), or a .forward file name from its - extension (example: .forward+foo). + The set of characters that can separate an email address local- + part, user name, or a .forward file name from its extension. syslog_facility (mail) The syslog facility of Postfix logging. syslog_name (see 'postconf -d' output) - A prefix that is prepended to the process name in syslog + A prefix that is prepended to the process name in syslog records, so that, for example, "smtpd" becomes "prefix/smtpd". Available in Postfix version 3.0 and later: pipe_delivery_status_filter ($default_delivery_status_filter) - Optional filter for the pipe(8) delivery agent to change the + Optional filter for the pipe(8) delivery agent to change the delivery status code or explanatory text of successful or unsuc- cessful deliveries. Available in Postfix version 3.3 and later: enable_original_recipient (yes) - Enable support for the original recipient address after an - address is rewritten to a different address (for example with + Enable support for the original recipient address after an + address is rewritten to a different address (for example with aliasing or with canonical mapping). service_name (read-only) @@ -474,7 +473,7 @@ PIPE(8) PIPE(8) Available in Postfix 3.5 and later: info_log_address_format (external) - The email address form that will be used in non-debug logging + The email address form that will be used in non-debug logging (info, warning, etc.). SEE ALSO diff --git a/postfix/html/qmqpd.8.html b/postfix/html/qmqpd.8.html index bf045f30b..bbabaf714 100644 --- a/postfix/html/qmqpd.8.html +++ b/postfix/html/qmqpd.8.html @@ -92,13 +92,15 @@ QMQPD(8) QMQPD(8) TROUBLE SHOOTING CONTROLS debug_peer_level (2) - The increment in verbose logging level when a remote client or - server matches a pattern in the debug_peer_list parameter. + The increment in verbose logging level when a nexthop destina- + tion, remote client or server name or network address matches a + pattern given with the debug_peer_list parameter. debug_peer_list (empty) - Optional list of remote client or server hostname or network - address patterns that cause the verbose logging level to - increase by the amount specified in $debug_peer_level. + Optional list of nexthop destination, remote client or server + name or network address patterns that, if matched, cause the + verbose logging level to increase by the amount specified in + $debug_peer_level. soft_bounce (no) Safety net to keep mail queued that would otherwise be returned diff --git a/postfix/html/trivial-rewrite.8.html b/postfix/html/trivial-rewrite.8.html index bf166d3f1..54cb125bb 100644 --- a/postfix/html/trivial-rewrite.8.html +++ b/postfix/html/trivial-rewrite.8.html @@ -124,9 +124,8 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) addresses that have no ".domain" information. recipient_delimiter (empty) - The set of characters that can separate a user name from its - extension (example: user+foo), or a .forward file name from its - extension (example: .forward+foo). + The set of characters that can separate an email address local- + part, user name, or a .forward file name from its extension. swap_bangpath (yes) Enable the rewriting of "site!user" into "user@site". @@ -134,24 +133,24 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) Available in Postfix 2.2 and later: remote_header_rewrite_domain (empty) - Don't rewrite message headers from remote clients at all when - this parameter is empty; otherwise, rewrite message headers and + Don't rewrite message headers from remote clients at all when + this parameter is empty; otherwise, rewrite message headers and append the specified domain name to incomplete addresses. ROUTING CONTROLS - The following is applicable to Postfix version 2.0 and later. Earlier - versions do not have support for: virtual_transport, relay_transport, + The following is applicable to Postfix version 2.0 and later. Earlier + versions do not have support for: virtual_transport, relay_transport, virtual_alias_domains, virtual_mailbox_domains or proxy_interfaces. local_transport (local:$myhostname) The default mail delivery transport and next-hop destination for - final delivery to domains listed with mydestination, and for - [ipaddress] destinations that match $inet_interfaces or + final delivery to domains listed with mydestination, and for + [ipaddress] destinations that match $inet_interfaces or $proxy_interfaces. virtual_transport (virtual) The default mail delivery transport and next-hop destination for - final delivery to domains listed with $virtual_mailbox_domains. + final delivery to domains listed with $virtual_mailbox_domains. relay_transport (relay) The default mail delivery transport and next-hop destination for @@ -160,49 +159,49 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) default_transport (smtp) The default mail delivery transport and next-hop destination for destinations that do not match $mydestination, $inet_interfaces, - $proxy_interfaces, $virtual_alias_domains, $virtual_mail- + $proxy_interfaces, $virtual_alias_domains, $virtual_mail- box_domains, or $relay_domains. parent_domain_matches_subdomains (see 'postconf -d' output) - A list of Postfix features where the pattern "example.com" also - matches subdomains of example.com, instead of requiring an + A list of Postfix features where the pattern "example.com" also + matches subdomains of example.com, instead of requiring an explicit ".example.com" pattern. relayhost (empty) - The next-hop destination(s) for non-local mail; overrides + The next-hop destination(s) for non-local mail; overrides non-local domains in recipient addresses. transport_maps (empty) - Optional lookup tables with mappings from recipient address to + Optional lookup tables with mappings from recipient address to (message delivery transport, next-hop destination). Available in Postfix version 2.3 and later: sender_dependent_relayhost_maps (empty) - A sender-dependent override for the global relayhost parameter + A sender-dependent override for the global relayhost parameter setting. Available in Postfix version 2.5 and later: empty_address_relayhost_maps_lookup_key (<>) - The sender_dependent_relayhost_maps search string that will be + The sender_dependent_relayhost_maps search string that will be used instead of the null sender address. Available in Postfix version 2.7 and later: empty_address_default_transport_maps_lookup_key (<>) - The sender_dependent_default_transport_maps search string that + The sender_dependent_default_transport_maps search string that will be used instead of the null sender address. sender_dependent_default_transport_maps (empty) - A sender-dependent override for the global default_transport + A sender-dependent override for the global default_transport parameter setting. ADDRESS VERIFICATION CONTROLS - Postfix version 2.1 introduces sender and recipient address verifica- + Postfix version 2.1 introduces sender and recipient address verifica- tion. This feature is implemented by sending probe email messages that - are not actually delivered. By default, address verification probes - use the same route as regular mail. To override specific aspects of + are not actually delivered. By default, address verification probes + use the same route as regular mail. To override specific aspects of message routing for address verification probes, specify one or more of the following: @@ -211,7 +210,7 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) ification probes. address_verify_virtual_transport ($virtual_transport) - Overrides the virtual_transport parameter setting for address + Overrides the virtual_transport parameter setting for address verification probes. address_verify_relay_transport ($relay_transport) @@ -219,11 +218,11 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) ification probes. address_verify_default_transport ($default_transport) - Overrides the default_transport parameter setting for address + Overrides the default_transport parameter setting for address verification probes. address_verify_relayhost ($relayhost) - Overrides the relayhost parameter setting for address verifica- + Overrides the relayhost parameter setting for address verifica- tion probes. address_verify_transport_maps ($transport_maps) @@ -234,34 +233,34 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) address_verify_sender_dependent_relayhost_maps ($sender_depen- dent_relayhost_maps) - Overrides the sender_dependent_relayhost_maps parameter setting + Overrides the sender_dependent_relayhost_maps parameter setting for address verification probes. Available in Postfix version 2.7 and later: address_verify_sender_dependent_default_transport_maps ($sender_depen- dent_default_transport_maps) - Overrides the sender_dependent_default_transport_maps parameter + Overrides the sender_dependent_default_transport_maps parameter setting for address verification probes. MISCELLANEOUS CONTROLS config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con- + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) - How much time a Postfix daemon process may take to handle a + How much time a Postfix daemon process may take to handle a request before it is terminated by a built-in watchdog timer. empty_address_recipient (MAILER-DAEMON) The recipient of mail addressed to the null address. ipc_timeout (3600s) - The time limit for sending or receiving information over an + The time limit for sending or receiving information over an internal communication channel. max_idle (100s) - The maximum amount of time that an idle Postfix daemon process + The maximum amount of time that an idle Postfix daemon process waits for an incoming connection before terminating voluntarily. max_use (100) @@ -282,20 +281,20 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) The location of the Postfix top-level queue directory. show_user_unknown_table_name (yes) - Display the name of the recipient table in the "User unknown" + Display the name of the recipient table in the "User unknown" responses. syslog_facility (mail) The syslog facility of Postfix logging. syslog_name (see 'postconf -d' output) - A prefix that is prepended to the process name in syslog + A prefix that is prepended to the process name in syslog records, so that, for example, "smtpd" becomes "prefix/smtpd". Available in Postfix version 2.0 and later: helpful_warnings (yes) - Log warnings about problematic configuration settings, and pro- + Log warnings about problematic configuration settings, and pro- vide helpful suggestions. Available in Postfix 3.3 and later: diff --git a/postfix/makedefs b/postfix/makedefs index 0f3977c0a..294454adf 100644 --- a/postfix/makedefs +++ b/postfix/makedefs @@ -309,6 +309,24 @@ case "$SYSTEM.$RELEASE" in : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} : ${PLUGIN_LD="${CC} -shared"} ;; + FreeBSD.13*) SYSTYPE=FREEBSD13 + : ${CC=cc} + : ${SHLIB_SUFFIX=.so} + : ${SHLIB_CFLAGS=-fPIC} + : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'} + : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC} -shared"} + ;; + FreeBSD.14*) SYSTYPE=FREEBSD14 + : ${CC=cc} + : ${SHLIB_SUFFIX=.so} + : ${SHLIB_CFLAGS=-fPIC} + : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'} + : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC} -shared"} + ;; DragonFly.*) SYSTYPE=DRAGONFLY ;; OpenBSD.2*) SYSTYPE=OPENBSD2 @@ -335,6 +353,15 @@ case "$SYSTEM.$RELEASE" in : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} : ${PLUGIN_LD="${CC} -shared"} ;; + OpenBSD.7*) SYSTYPE=OPENBSD7 + : ${CC=cc} + : ${SHLIB_SUFFIX=.so.1.0} + : ${SHLIB_CFLAGS=-fPIC} + : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'} + : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC} -shared"} + ;; ekkoBSD.1*) SYSTYPE=EKKOBSD1 ;; NetBSD.1*) SYSTYPE=NETBSD1 @@ -354,8 +381,32 @@ case "$SYSTEM.$RELEASE" in : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} : ${PLUGIN_LD="${CC-gcc} -shared"} - ;; - NetBSD.7*) SYSTYPE=NETBSD7 + ;; + NetBSD.7*) SYSTYPE=NETBSD7 + : ${SHLIB_SUFFIX=.so} + : ${SHLIB_CFLAGS=-fPIC} + : ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'} + : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC-gcc} -shared"} + ;; + NetBSD.8*) SYSTYPE=NETBSD8 + : ${SHLIB_SUFFIX=.so} + : ${SHLIB_CFLAGS=-fPIC} + : ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'} + : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC-gcc} -shared"} + ;; + NetBSD.9*) SYSTYPE=NETBSD9 + : ${SHLIB_SUFFIX=.so} + : ${SHLIB_CFLAGS=-fPIC} + : ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'} + : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC-gcc} -shared"} + ;; + NetBSD.10*) SYSTYPE=NETBSD10 : ${SHLIB_SUFFIX=.so} : ${SHLIB_CFLAGS=-fPIC} : ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'} diff --git a/postfix/man/man5/aliases.5 b/postfix/man/man5/aliases.5 index 1140d4937..628b5d75d 100644 --- a/postfix/man/man5/aliases.5 +++ b/postfix/man/man5/aliases.5 @@ -180,9 +180,8 @@ Enable special treatment for owner\-\fIlistname\fR entries in the \fIlistname\fR\-request address localparts when the recipient_delimiter is set to "\-". .IP "\fBrecipient_delimiter (empty)\fR" -The set of characters that can separate a user name from its -extension (example: user+foo), or a .forward file name from its -extension (example: .forward+foo). +The set of characters that can separate an email address +localpart, user name, or a .forward file name from its extension. .PP Available in Postfix version 2.3 and later: .IP "\fBfrozen_delivered_to (yes)\fR" diff --git a/postfix/man/man8/local.8 b/postfix/man/man8/local.8 index 91fceb71e..6aeeac7a7 100644 --- a/postfix/man/man8/local.8 +++ b/postfix/man/man8/local.8 @@ -585,9 +585,8 @@ key to the lookup result. .IP "\fBqueue_directory (see 'postconf -d' output)\fR" The location of the Postfix top\-level queue directory. .IP "\fBrecipient_delimiter (empty)\fR" -The set of characters that can separate a user name from its -extension (example: user+foo), or a .forward file name from its -extension (example: .forward+foo). +The set of characters that can separate an email address +localpart, user name, or a .forward file name from its extension. .IP "\fBrequire_home_directory (no)\fR" Require that a \fBlocal\fR(8) recipient's home directory exists before mail delivery is attempted. diff --git a/postfix/man/man8/pipe.8 b/postfix/man/man8/pipe.8 index 777fd952a..59af49f70 100644 --- a/postfix/man/man8/pipe.8 +++ b/postfix/man/man8/pipe.8 @@ -427,9 +427,8 @@ The process name of a Postfix command or daemon process. .IP "\fBqueue_directory (see 'postconf -d' output)\fR" The location of the Postfix top\-level queue directory. .IP "\fBrecipient_delimiter (empty)\fR" -The set of characters that can separate a user name from its -extension (example: user+foo), or a .forward file name from its -extension (example: .forward+foo). +The set of characters that can separate an email address +localpart, user name, or a .forward file name from its extension. .IP "\fBsyslog_facility (mail)\fR" The syslog facility of Postfix logging. .IP "\fBsyslog_name (see 'postconf -d' output)\fR" diff --git a/postfix/man/man8/qmqpd.8 b/postfix/man/man8/qmqpd.8 index c8da141a4..9ee62675f 100644 --- a/postfix/man/man8/qmqpd.8 +++ b/postfix/man/man8/qmqpd.8 @@ -106,12 +106,13 @@ The time limit for sending or receiving information over the network. .ad .fi .IP "\fBdebug_peer_level (2)\fR" -The increment in verbose logging level when a remote client or -server matches a pattern in the debug_peer_list parameter. +The increment in verbose logging level when a nexthop destination, +remote client or server name or network address matches a pattern +given with the debug_peer_list parameter. .IP "\fBdebug_peer_list (empty)\fR" -Optional list of remote client or server hostname or network -address patterns that cause the verbose logging level to increase -by the amount specified in $debug_peer_level. +Optional list of nexthop destination, remote client or server +name or network address patterns that, if matched, cause the verbose +logging level to increase by the amount specified in $debug_peer_level. .IP "\fBsoft_bounce (no)\fR" Safety net to keep mail queued that would otherwise be returned to the sender. diff --git a/postfix/man/man8/trivial-rewrite.8 b/postfix/man/man8/trivial-rewrite.8 index 6bbf7de1f..ccf601b08 100644 --- a/postfix/man/man8/trivial-rewrite.8 +++ b/postfix/man/man8/trivial-rewrite.8 @@ -135,9 +135,8 @@ addresses without domain information. With locally submitted mail, append the string ".$mydomain" to addresses that have no ".domain" information. .IP "\fBrecipient_delimiter (empty)\fR" -The set of characters that can separate a user name from its -extension (example: user+foo), or a .forward file name from its -extension (example: .forward+foo). +The set of characters that can separate an email address +localpart, user name, or a .forward file name from its extension. .IP "\fBswap_bangpath (yes)\fR" Enable the rewriting of "site!user" into "user@site". .PP diff --git a/postfix/proto/aliases b/postfix/proto/aliases index 6442ac1d5..ed01ec0c9 100644 --- a/postfix/proto/aliases +++ b/postfix/proto/aliases @@ -164,9 +164,8 @@ # \fIlistname\fR-request address localparts when the recipient_delimiter # is set to "-". # .IP "\fBrecipient_delimiter (empty)\fR" -# The set of characters that can separate a user name from its -# extension (example: user+foo), or a .forward file name from its -# extension (example: .forward+foo). +# The set of characters that can separate an email address +# localpart, user name, or a .forward file name from its extension. # .PP # Available in Postfix version 2.3 and later: # .IP "\fBfrozen_delivered_to (yes)\fR" diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index ea5fd7d46..5774f1d99 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,7 +20,7 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20211127" +#define MAIL_RELEASE_DATE "20211205" #define MAIL_VERSION_NUMBER "3.7" #ifdef SNAPSHOT diff --git a/postfix/src/local/local.c b/postfix/src/local/local.c index f41e8ac9e..a4133259d 100644 --- a/postfix/src/local/local.c +++ b/postfix/src/local/local.c @@ -541,9 +541,8 @@ /* .IP "\fBqueue_directory (see 'postconf -d' output)\fR" /* The location of the Postfix top-level queue directory. /* .IP "\fBrecipient_delimiter (empty)\fR" -/* The set of characters that can separate a user name from its -/* extension (example: user+foo), or a .forward file name from its -/* extension (example: .forward+foo). +/* The set of characters that can separate an email address +/* localpart, user name, or a .forward file name from its extension. /* .IP "\fBrequire_home_directory (no)\fR" /* Require that a \fBlocal\fR(8) recipient's home directory exists /* before mail delivery is attempted. diff --git a/postfix/src/pipe/pipe.c b/postfix/src/pipe/pipe.c index 38f4be461..8ce59fbea 100644 --- a/postfix/src/pipe/pipe.c +++ b/postfix/src/pipe/pipe.c @@ -405,9 +405,8 @@ /* .IP "\fBqueue_directory (see 'postconf -d' output)\fR" /* The location of the Postfix top-level queue directory. /* .IP "\fBrecipient_delimiter (empty)\fR" -/* The set of characters that can separate a user name from its -/* extension (example: user+foo), or a .forward file name from its -/* extension (example: .forward+foo). +/* The set of characters that can separate an email address +/* localpart, user name, or a .forward file name from its extension. /* .IP "\fBsyslog_facility (mail)\fR" /* The syslog facility of Postfix logging. /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR" diff --git a/postfix/src/qmqpd/qmqpd.c b/postfix/src/qmqpd/qmqpd.c index 2be6d7b8d..d94d33dc7 100644 --- a/postfix/src/qmqpd/qmqpd.c +++ b/postfix/src/qmqpd/qmqpd.c @@ -84,12 +84,13 @@ /* .ad /* .fi /* .IP "\fBdebug_peer_level (2)\fR" -/* The increment in verbose logging level when a remote client or -/* server matches a pattern in the debug_peer_list parameter. +/* The increment in verbose logging level when a nexthop destination, +/* remote client or server name or network address matches a pattern +/* given with the debug_peer_list parameter. /* .IP "\fBdebug_peer_list (empty)\fR" -/* Optional list of remote client or server hostname or network -/* address patterns that cause the verbose logging level to increase -/* by the amount specified in $debug_peer_level. +/* Optional list of nexthop destination, remote client or server +/* name or network address patterns that, if matched, cause the verbose +/* logging level to increase by the amount specified in $debug_peer_level. /* .IP "\fBsoft_bounce (no)\fR" /* Safety net to keep mail queued that would otherwise be returned to /* the sender. diff --git a/postfix/src/tls/tls_dh.c b/postfix/src/tls/tls_dh.c index 2992a591a..9a6bd6733 100644 --- a/postfix/src/tls/tls_dh.c +++ b/postfix/src/tls/tls_dh.c @@ -186,7 +186,7 @@ void tls_set_dh_from_file(const char *path) return; if ((fp = fopen(path, "r")) == 0) { - msg_warn("cannot load DH parameters from file %s: %m" + msg_warn("error opening DH parameter file \"%s\": %m" " -- using compiled-in defaults", path); return; } @@ -194,7 +194,8 @@ void tls_set_dh_from_file(const char *path) OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS, NULL, NULL); if (!d || !OSSL_DECODER_from_fp(d, fp) || !tmp) { - msg_warn("error loading compiled-in DH parameters"); + msg_warn("error decoding DH parameters from file \"%s\"" + " -- using compiled-in defaults", path); tls_print_errors(); } else { dhp = tmp; diff --git a/postfix/src/trivial-rewrite/trivial-rewrite.c b/postfix/src/trivial-rewrite/trivial-rewrite.c index dcc555c6f..d57065456 100644 --- a/postfix/src/trivial-rewrite/trivial-rewrite.c +++ b/postfix/src/trivial-rewrite/trivial-rewrite.c @@ -115,9 +115,8 @@ /* With locally submitted mail, append the string ".$mydomain" to /* addresses that have no ".domain" information. /* .IP "\fBrecipient_delimiter (empty)\fR" -/* The set of characters that can separate a user name from its -/* extension (example: user+foo), or a .forward file name from its -/* extension (example: .forward+foo). +/* The set of characters that can separate an email address +/* localpart, user name, or a .forward file name from its extension. /* .IP "\fBswap_bangpath (yes)\fR" /* Enable the rewriting of "site!user" into "user@site". /* .PP diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h index 886d2a8b9..c9ebc3375 100644 --- a/postfix/src/util/sys_defs.h +++ b/postfix/src/util/sys_defs.h @@ -30,13 +30,15 @@ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \ - || defined(FREEBSD11) || defined(FREEBSD12) \ + || defined(FREEBSD11) || defined(FREEBSD12) || defined(FREEBSD13) \ + || defined(FREEBSD14) \ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ - || defined(OPENBSD5) || defined(OPENBSD6) \ + || defined(OPENBSD5) || defined(OPENBSD6) || defined(OPENBSD7) \ || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ || defined(NETBSD4) || defined(NETBSD5) || defined(NETBSD6) \ - || defined(NETBSD7) \ + || defined(NETBSD7) | defined(NETBSD8) || defined(NETBSD9) \ + || defined(NETBSD10) \ || defined(EKKOBSD1) || defined(DRAGONFLY) #define SUPPORTED #include