postfix-3.11-20251117

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 71b5b6358e388c11ff668bd2f1c403ee294796c4..15c184b4ff9b05e0555f82e561ac3f91a0409a24 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -30041,3 +30041,6 @@ Apologies for any names omitted.
 
        Testing: add 'update' to global library test targets. File:
        global/Makefile.in.
+
+       Bugfix: garbage in the postconf.5 text. Perl numbers () regexp
+       patterns in unexpected ways. File: mantools/postconf2man.

diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index aad40767b3be85e334c6885e3b1fe39ec6cf9e35..06c4e8bcc81b239b961ae877681dbf92baf87d35 100644 (file)
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -7897,46 +7897,46 @@ connection failed before or in the TLS handshake.
 Examples for REQUIRETLS policies (set with smtp_requiretls_policy),
 where "\fIxxx\fR" is a TLS security level:
 .IP "tls=xxx/requiretls"
-\&ddEnforce' policy compliant.
+\&'Enforce' policy compliant.
 After a successful TLS handshake that required a certificate match,
 the remote server announced REQUIRETLS support, and the client sent
 REQUIRETLS.
 .IP "tls=xxx/!requiretls:nocertmatch"
-\&ddEnforce' policy
+\&'Enforce' policy
 violation. The connection was not used because the remote server
 certificate did not match as required by the TLS security policy,
 or no connection was made because the TLS security policy disabled
 server certificate matching.
 .br
 .IP "tls=xxx/requiretls:nocertmatch"
-\&ddOpportunistic+starttls'
+\&'Opportunistic+starttls'
 or 'opportunistic' policy compliant. After a successful TLS handshake
 that did not require a server certificate match, the remote server
 announced REQUIRETLS support, and the client sent REQUIRETLS.
 .br
 .IP "tls=xxx/!requiretls:nostarttls"
-\&ddEnforce' or
+\&'Enforce' or
 \&'opportunistic+starttls' policy violation. The connection was not
 used because the remote server did not support STARTTLS.
 .br
 .IP "tls=xxx/!requiretls:noencryption"
-\&ddEnforce' or
+\&'Enforce' or
 \&'opportunistic+starttls' policy violation. No connection was made
 used because the TLS security policy disabled encryption.
 .br
 .IP "tls=xxx/!requiretls:none"
-\&ddEnforce' policy violation.
+\&'Enforce' policy violation.
 After a successful TLS handshake, the connection was not used because
 the remote server did not support REQUIRETLS.
 .br
 .IP "tls=xxx/requiretls:none"
-\&ddOpportunistic+starttls'
+\&'Opportunistic+starttls'
 policy compliant. After a successful TLS handshake, the remote
 server did not announce REQUIRETLS support, and the connection was
 used without sending REQUIRETLS.
 .br
 .IP "tls=xxx/requiretls:none"
-\&ddOpportunistic' policy
+\&'Opportunistic' policy
 compliant. The remote server did not announce support for STARTTLS
 or REQUIRETLS, and the connection was used without sending REQUIRETLS.
 .br

diff --git a/postfix/mantools/postconf2man b/postfix/mantools/postconf2man
index 601547460509c40991855bf71295a397c12a1a57..189e84e859ca07341a343e00ec1d6282d24c6709 100755 (executable)
--- a/postfix/mantools/postconf2man
+++ b/postfix/mantools/postconf2man
@@ -39,7 +39,8 @@ while(<>) {
     #$block =~ s/\n\./\n\\\&./g;
     $block =~ s/\n\./\n\134\&./g;
     $block =~ s/\n'/\n\134\&'/g;
-    $block =~ s/(<(p|dd|br)+>\s*)(['.])/$1\134\&$2/g;
+    $block =~ s/(<(p|dd|br)+>\s*)'/$1\134\&'/g;
+    $block =~ s/(<(p|dd|br)+>\s*)\./$1\134\&./g;
     if ($block =~ /<H2>/) {
        $block =~ s/<H2><a[^>]+>([^<]+)<\/a><\/H2>/\n.SH \1\n/g;
        $block =~ tr/a-z/A-Z/;

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index a2a56d994f3bd3d5e4e6b82c08a93c46005f0b05..6fd5d9510a83f67c2f94f8eb7226acc5429ded04 100644 (file)
--- 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      "20251116"
+#define MAIL_RELEASE_DATE      "20251117"
 #define MAIL_VERSION_NUMBER    "3.11"
 
 #ifdef SNAPSHOT