From 3e160e27e4686620d16477a9ea9cf00141e52ce7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 13 Apr 2024 10:41:51 +0200 Subject: Adding upstream version 3.9.0. Signed-off-by: Daniel Baumann --- mantools/check-see-postconf-d-output | 6 ++++++ mantools/check-snapshot-nonprod | 13 +++++++++++++ mantools/dehtml | 6 +++--- mantools/postlink | 12 ++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100755 mantools/check-see-postconf-d-output create mode 100755 mantools/check-snapshot-nonprod (limited to 'mantools') diff --git a/mantools/check-see-postconf-d-output b/mantools/check-see-postconf-d-output new file mode 100755 index 0000000..d74c4f1 --- /dev/null +++ b/mantools/check-see-postconf-d-output @@ -0,0 +1,6 @@ +#!/bin/sh + +# check-see-postconf-d-output - find missing is misplaced quotes + +grep -r "see *'*postconf -d'* *output'*" proto html man | + grep -v "see 'postconf -d' output" diff --git a/mantools/check-snapshot-nonprod b/mantools/check-snapshot-nonprod new file mode 100755 index 0000000..e18f6aa --- /dev/null +++ b/mantools/check-snapshot-nonprod @@ -0,0 +1,13 @@ +#!/bin/sh + +version=$(basename $(env - pwd)) || exit 1 +case "$version" in +postfix-[0-9]*.[0-9]*.[0-9]*) + test -f conf/makedefs.out || { + echo "Error: no conf/makedefs.out" 1>&2; exit 1; } + grep 'CCARGS.*-DSNAPSHOT' conf/makedefs.out && { + echo "Error: stable release builds with -DSNAPSHOT" 1>&2, exit 1; } + grep 'CCARGS.*-DNONPROD' conf/makedefs.out && { + echo "Error: stable release builds with -DNONPROD" 1>&2, exit 1; } + ;; +esac diff --git a/mantools/dehtml b/mantools/dehtml index cc120de..9a3be6f 100755 --- a/mantools/dehtml +++ b/mantools/dehtml @@ -3,7 +3,7 @@ for i do case $i in - /*) lynx -dump file://localhost$i;; - *) lynx -dump file://localhost`pwd`/$i;; + /*) lynx -width=256 -dump file://localhost$i;; + *) lynx -width=256 -dump file://localhost`pwd`/$i;; esac -done +done | grep -v 'file://localhost/' diff --git a/mantools/postlink b/mantools/postlink index 89b0fa4..6ca24c6 100755 --- a/mantools/postlink +++ b/mantools/postlink @@ -169,6 +169,7 @@ while (<>) { s;\bdisable_dns_lookups\b;$&;g; s;\bdisable_mime_input_processing\b;$&;g; s;\bdisable_mime_output_conversion\b;$&;g; + s;\bforce_mime_input_conversion\b;$&;g; s;\bdisable_verp_bounces\b;$&;g; s;\bdisable_vrfy_command\b;$&;g; s;\bdont_remove\b;$&;g; @@ -231,6 +232,8 @@ while (<>) { s;\blmtp_min_data_rate\b;$&;g; s;\blmtp_reply_filter\b;$&;g; s;\blmtp_sasl_password_maps\b;$&;g; + s;\bsmtp_sasl_password_result_delimiter\b;$&;g; + s;\blmtp_sasl_password_result_delimiter\b;$&;g; s;\blmtp_send_dummy_mail_auth\b;$&;g; s;\blmtp_balance_inet_protocols\b;$&;g; s;\blmtp_sender_dependent_authentication\b;$&;g; @@ -273,6 +276,7 @@ while (<>) { s;\blmtp_tls_loglevel\b;$&;g; s;\blmtp_tls_session_cache_database\b;$&;g; s;\blmtp_tls_session_cache_timeout\b;$&;g; + s;\blmtp_tls_enable_rpk\b;$&;g; s;\blmtp_tls_wrappermode\b;$&;g; s;\blmtp_generic_maps\b;$&;g; s;\blmtp_pix_workaround_threshold_time\b;$&;g; @@ -699,6 +703,7 @@ while (<>) { s;\bsmtp_tls_block_early_mail_reply\b;$&;g; s;\bsmtp_tls_dane_insecure_mx_policy\b;$&;g; s;\bsmtp_tls_force_insecure_host_tlsa_lookup\b;$&;g; + s;\bsmtp_tls_enable_rpk\b;$&;g; s;\bsmtp_tls_wrappermode\b;$&;g; s;\bsmtp_use_tls\b;$&;g; s;\bsmtp_header_checks\b;$&;g; @@ -752,6 +757,7 @@ while (<>) { s;\bsmtpd_tls_ses[-]*\n*[ ]*sion_cache_database\b;$&;g; s;\bsmtpd_tls_ses[-]*\n*[ ]*sion_cache_timeout\b;$&;g; s;\bsmtpd_tls_always_issue_ses[-]*\n*[ ]*sion_ids\b;$&;g; + s;\bsmtpd_tls_enable_rpk\b;$&;g; s;\bsmtpd_tls_wrappermode\b;$&;g; s;\bsmtpd_use_tls\b;$&;g; s;\bsmtpd_reject_footer\b;$&;g; @@ -889,6 +895,7 @@ while (<>) { s/[]*lmdb[<\/bBiI>]*_[<\/iIbB>]*ta[-<\/bB>]*\n*[ ]*ble[<\/bB>]*\(5\)/$&<\/a>/g; s/[]*mas[-<\/bB>]*\n* *[]*ter[<\/bB>]*\(5\)/$&<\/a>/g; s/[]*mem[-<\/bB>]*\n* *[]*cache[<\/bBiI>]*_[<\/iIbB>]*ta[-<\/bB>]*\n*[ ]*ble[<\/bB>]*\(5\)/$&<\/a>/g; + s/[]*mongodb[<\/bBiI>]*_[<\/iIbB>]*ta[-<\/bB>]*\n*[ ]*ble[<\/bB>]*\(5\)/$&<\/a>/g; s/[]*mysql[<\/bBiI>]*_[<\/iIbB>]*ta[-<\/bB>]*\n*[ ]*ble[<\/bB>]*\(5\)/$&<\/a>/g; s/[]*nisplus[<\/bBiI>]*_[<\/iIbB>]*ta[-<\/bB>]*\n*[ ]*ble[<\/bB>]*\(5\)/$&<\/a>/g; s/[]*pcre[<\/bBiI>]*_[<\/iIbB>]*ta[-<\/bB>]*\n*[ ]*ble[<\/bB>]*\(5\)/$&<\/a>/g; @@ -1124,6 +1131,7 @@ while (<>) { s;\btlsproxy_tls_protocols\b;$&;g; s;\btlsproxy_tls_req_ccert\b;$&;g; s;\btlsproxy_tls_security_level\b;$&;g; + s;\btlsproxy_tls_enable_rpk\b;$&;g; s;\btlsproxy_use_tls\b;$&;g; s;\btlsproxy_client_CAfile\b;$&;g; @@ -1160,6 +1168,7 @@ while (<>) { s;\bmail[-]*\n*[ ]*log_file_compressor\b;$&;g; s;\bmail[-]*\n*[ ]*log_file_prefixes\b;$&;g; s;\bmail[-]*\n*[ ]*log_file_rotate_suffix\b;$&;g; + s;\bmail[-]*\n*[ ]*log_file_permissions\b;$&;g; s;\bpostlog_service_name\b;$&;g; s;\bpostlogd_watchdog_timeout\b;$&;g; @@ -1228,6 +1237,8 @@ while (<>) { s/\b"*hold"* *queues*\b/$&<\/a>/g; s/\b("*hold"*),/$1<\/a>,/g; s/\b(postfix *tls)\b/$1<\/a>/g; + s/\b(local\s*aliasing)\b/$1<\/a>/g; + s/\b(virtual\s*aliasing)\b/$1<\/a>/g; # Hyperlink map types. @@ -1242,6 +1253,7 @@ while (<>) { s/\b(ldap[is]?):/$1<\/a>:/g; s/\b(lmdb):/$1<\/a>:/g; s/\b(memcache):/$1<\/a>:/g; + s/\b(mongodb):/$1<\/a>:/g; s/\b(mysql):/$1<\/a>:/g; s/\b(nisplus):/$1<\/a>:/g; s/\b(pcre):/$1<\/a>:/g; -- cgit v1.2.3