From a10976dc9bc9ffc7c96e66e49d3c5f76dcc0c282 Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Wed, 28 Dec 2022 00:00:00 -0500 Subject: [PATCH] postfix-3.8-20221228 --- postfix/HISTORY | 13 +++++++++++++ postfix/INSTALL | 8 ++++---- postfix/README_FILES/BASIC_CONFIGURATION_README | 2 +- postfix/README_FILES/DEBUG_README | 2 +- postfix/README_FILES/INSTALL | 8 ++++---- postfix/README_FILES/QSHAPE_README | 8 ++++---- postfix/README_FILES/TLS_README | 4 ++-- postfix/RELEASE_NOTES | 8 ++++++++ postfix/auxiliary/fix-grep/fix-grep.sh | 11 +++++++++++ postfix/conf/postfix-script | 2 +- postfix/conf/postfix-tls-script | 10 ++++------ postfix/html/BASIC_CONFIGURATION_README.html | 2 +- postfix/html/DEBUG_README.html | 2 +- postfix/html/INSTALL.html | 8 ++++---- postfix/html/QSHAPE_README.html | 8 ++++---- postfix/html/TLS_README.html | 4 ++-- postfix/html/postfix-tls.1.html | 5 +---- postfix/makedefs | 4 ++++ postfix/man/man1/postfix-tls.1 | 4 +--- postfix/mantools/check-double-cc | 2 +- postfix/mantools/check-double-history | 2 +- postfix/mantools/check-double-install-proto-text | 2 +- postfix/mantools/check-double-proto-html | 2 +- postfix/mantools/check-postfix-files | 2 +- postfix/mantools/check-postlink | 2 +- postfix/mantools/check-spell-cc | 2 +- postfix/mantools/check-spell-history | 6 +++--- postfix/mantools/check-spell-install-proto-text | 2 +- postfix/mantools/check-spell-proto-html | 2 +- postfix/mantools/manlint | 4 ++-- postfix/mantools/manspell | 2 +- postfix/mantools/spell | 2 +- postfix/proto/BASIC_CONFIGURATION_README.html | 2 +- postfix/proto/DEBUG_README.html | 2 +- postfix/proto/INSTALL.html | 8 ++++---- postfix/proto/QSHAPE_README.html | 8 ++++---- postfix/proto/TLS_README.html | 4 ++-- postfix/proto/stop | 4 +++- postfix/src/global/mail_version.h | 2 +- postfix/src/postconf/Makefile.in | 2 +- postfix/src/smtp/Makefile.in | 2 +- postfix/src/tls/Makefile.in | 2 +- 42 files changed, 106 insertions(+), 75 deletions(-) create mode 100755 postfix/auxiliary/fix-grep/fix-grep.sh diff --git a/postfix/HISTORY b/postfix/HISTORY index a08e80121..b11f5f305 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -26721,3 +26721,16 @@ Apologies for any names omitted. proto/pgsql_table, proto/ldap_table. Typofixes for changes made 20221207. File: tls/tls_fprint.c. + +20221228 + + Long ago, a committee decided that "grep -E" and "grep -F" + are better than "egrep" and "fgrep". This could not be an + optimization for ease of use: the new command syntax requires + mixed case for common usage, and the new command is longer. + To make things better, some implementation now warns when + the "obsolete" syntax is used. To address this, all Postfix + code and documentation has been converted; a script + auxiliary/fix-grep/fix-grep.sh can revert the syntax if you + want to build Postfix on an older platform. Files: too many + to mention here. diff --git a/postfix/INSTALL b/postfix/INSTALL index 17a8cf744..f66b6d6c3 100644 --- a/postfix/INSTALL +++ b/postfix/INSTALL @@ -829,7 +829,7 @@ and watch your maillog file for any error messages. The pathname is /var/log/ maillog, /var/log/mail, /var/log/syslog, or something else. Typically, the pathname is defined in the /etc/syslog.conf file. - $ egrep '(reject|warning|error|fatal|panic):' /some/log/file + $ grep -E '(reject|warning|error|fatal|panic):' /some/log/file Note: the most important error message is logged first. Later messages are not as useful. @@ -879,7 +879,7 @@ and watch your maillog file for any error messages. The pathname is /var/log/ maillog, /var/log/mail, /var/log/syslog, or something else. Typically, the pathname is defined in the /etc/syslog.conf file. - $ egrep '(reject|warning|error|fatal|panic):' /some/log/file + $ grep -E '(reject|warning|error|fatal|panic):' /some/log/file Note: the most important error message is logged first. Later messages are not as useful. @@ -919,7 +919,7 @@ and watch your maillog file for any error messages. The pathname is /var/log/ maillog, /var/log/mail, /var/log/syslog, or something else. Typically, the pathname is defined in the /etc/syslog.conf file. - $ egrep '(reject|warning|error|fatal|panic):' /some/log/file + $ grep -E '(reject|warning|error|fatal|panic):' /some/log/file Note: the most important error message is logged first. Later messages are not as useful. @@ -1151,7 +1151,7 @@ Hopefully, the number of problems will be small, but it is a good idea to run every night before the syslog files are rotated: # postfix check - # egrep '(reject|warning|error|fatal|panic):' /some/log/file + # grep -E '(reject|warning|error|fatal|panic):' /some/log/file * The first line (postfix check) causes Postfix to report file permission/ ownership discrepancies. diff --git a/postfix/README_FILES/BASIC_CONFIGURATION_README b/postfix/README_FILES/BASIC_CONFIGURATION_README index 4bc4d845d..6f3606df6 100644 --- a/postfix/README_FILES/BASIC_CONFIGURATION_README +++ b/postfix/README_FILES/BASIC_CONFIGURATION_README @@ -369,7 +369,7 @@ Hopefully, the number of problems will be small, but it is a good idea to run every night before the syslog files are rotated: # postfix check - # egrep '(reject|warning|error|fatal|panic):' /some/log/file + # grep -E '(reject|warning|error|fatal|panic):' /some/log/file * The first line (postfix check) causes Postfix to report file permission/ ownership discrepancies. diff --git a/postfix/README_FILES/DEBUG_README b/postfix/README_FILES/DEBUG_README index 3a895c743..7221572a2 100644 --- a/postfix/README_FILES/DEBUG_README +++ b/postfix/README_FILES/DEBUG_README @@ -46,7 +46,7 @@ Postfix logs all failed and successful deliveries to a logfile. When Postfix does not receive or deliver mail, the first order of business is to look for errors that prevent Postfix from working properly: - % eeggrreepp ''((wwaarrnniinngg||eerrrroorr||ffaattaall||ppaanniicc))::'' //ssoommee//lloogg//ffiillee || mmoorree + % ggrreepp --EE ''((wwaarrnniinngg||eerrrroorr||ffaattaall||ppaanniicc))::'' //ssoommee//lloogg//ffiillee || mmoorree Note: the most important message is near the BEGINNING of the output. Error messages that come later are less useful. diff --git a/postfix/README_FILES/INSTALL b/postfix/README_FILES/INSTALL index e97c95c2d..7a4a4f862 100644 --- a/postfix/README_FILES/INSTALL +++ b/postfix/README_FILES/INSTALL @@ -829,7 +829,7 @@ and watch your maillog file for any error messages. The pathname is /var/log/ maillog, /var/log/mail, /var/log/syslog, or something else. Typically, the pathname is defined in the /etc/syslog.conf file. - $ egrep '(reject|warning|error|fatal|panic):' /some/log/file + $ grep -E '(reject|warning|error|fatal|panic):' /some/log/file Note: the most important error message is logged first. Later messages are not as useful. @@ -879,7 +879,7 @@ and watch your maillog file for any error messages. The pathname is /var/log/ maillog, /var/log/mail, /var/log/syslog, or something else. Typically, the pathname is defined in the /etc/syslog.conf file. - $ egrep '(reject|warning|error|fatal|panic):' /some/log/file + $ grep -E '(reject|warning|error|fatal|panic):' /some/log/file Note: the most important error message is logged first. Later messages are not as useful. @@ -919,7 +919,7 @@ and watch your maillog file for any error messages. The pathname is /var/log/ maillog, /var/log/mail, /var/log/syslog, or something else. Typically, the pathname is defined in the /etc/syslog.conf file. - $ egrep '(reject|warning|error|fatal|panic):' /some/log/file + $ grep -E '(reject|warning|error|fatal|panic):' /some/log/file Note: the most important error message is logged first. Later messages are not as useful. @@ -1151,7 +1151,7 @@ Hopefully, the number of problems will be small, but it is a good idea to run every night before the syslog files are rotated: # postfix check - # egrep '(reject|warning|error|fatal|panic):' /some/log/file + # grep -E '(reject|warning|error|fatal|panic):' /some/log/file * The first line (postfix check) causes Postfix to report file permission/ ownership discrepancies. diff --git a/postfix/README_FILES/QSHAPE_README b/postfix/README_FILES/QSHAPE_README index eba722e13..28c2386fc 100644 --- a/postfix/README_FILES/QSHAPE_README +++ b/postfix/README_FILES/QSHAPE_README @@ -117,25 +117,25 @@ recent messages pertaining to the domains in question. # Find deliveries to example.com # $ tail -10000 /var/log/maillog | - egrep -i ': to=<.*@example\.com>,' | + grep -E -i ': to=<.*@example\.com>,' | less # Find messages from example.com # $ tail -10000 /var/log/maillog | - egrep -i ': from=<.*@example\.com>,' | + grep -E -i ': from=<.*@example\.com>,' | less You may want to drill in on some specific queue ids: # Find all messages for a specific queue id. # - $ tail -10000 /var/log/maillog | egrep ': 2B2173FF68: ' + $ tail -10000 /var/log/maillog | grep -E ': 2B2173FF68: ' Also look for queue manager warning messages in the log. These warnings can suggest strategies to reduce congestion. - $ egrep 'qmgr.*(panic|fatal|error|warning):' /var/log/maillog + $ grep -E 'qmgr.*(panic|fatal|error|warning):' /var/log/maillog When all else fails try the Postfix mailing list for help, but please don't forget to include the top 10 or 20 lines of qshape(1) output. diff --git a/postfix/README_FILES/TLS_README b/postfix/README_FILES/TLS_README index 12ef62f37..e7fd25910 100644 --- a/postfix/README_FILES/TLS_README +++ b/postfix/README_FILES/TLS_README @@ -2227,7 +2227,7 @@ If you're willing to revert your settings to the defaults and switch to a "stock" opportunistic TLS configuration, then you can: erase all the SMTP client TLS settings and then enable client TLS: - # postconf -X `postconf -nH | egrep '^smtp(_|_enforce_|_use_)tls'` + # postconf -X `postconf -nH | grep -E '^smtp(_|_enforce_|_use_)tls'` # postfix tls enable-client # postfix reload @@ -2251,7 +2251,7 @@ If you're willing to revert your settings to the defaults and switch to a "stock" server TLS configuration, then you can: erase all the SMTP server TLS settings and then enable server TLS: - # postconf -X `postconf -nH | egrep '^smtpd(_|_enforce_|_use_)tls'` + # postconf -X `postconf -nH | grep -E '^smtpd(_|_enforce_|_use_)tls'` # postfix tls enable-server # postfix reload diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index 00876604d..3bc391d8b 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -44,6 +44,14 @@ Please see https://www.postfix.org/announcements/postfix-3.7.3 for instructions to identify falsely flagged messages in the Postfix queue, and what actions may be taken. +Incompatible changes with snapshot 20221228 +=========================================== + +Postfix documentation and code have been converted to use "grep -E" +and "grep -F" instead of the historical forms egrep and fgrep. To +build Postfix on a system that supports only the historical forms, +run the script auxiliary/fix-grep/fix-grep.sh to revert this change. + Incompatible changes with snapshot 20220507 =========================================== diff --git a/postfix/auxiliary/fix-grep/fix-grep.sh b/postfix/auxiliary/fix-grep/fix-grep.sh new file mode 100755 index 000000000..4faf3443e --- /dev/null +++ b/postfix/auxiliary/fix-grep/fix-grep.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +# Fix grep -[EF] for systems that require the historical forms egrep +# and fgrep. Run this script in the top-level Postfix directory as +# sh auxiliary/fix-grep/fix-grep.sh + +# Use only historical grep syntax. +find * -type f | xargs grep -l 'grep -[EF]' | xargs perl -pi -e ' + s/grep -E/egrep/g; + s/grep -F/fgrep/g; +' diff --git a/postfix/conf/postfix-script b/postfix/conf/postfix-script index 93d8a1fbc..da98375ea 100755 --- a/postfix/conf/postfix-script +++ b/postfix/conf/postfix-script @@ -328,7 +328,7 @@ check-warn) # Check Postfix mail_owner-owned directory tree owner. find `ls -d $queue_directory/* | \ - egrep '/(saved|incoming|active|defer|deferred|bounce|hold|trace|corrupt|public|private|flush)$'` \ + grep -E '/(saved|incoming|active|defer|deferred|bounce|hold|trace|corrupt|public|private|flush)$'` \ ! \( -type p -o -type s \) ! -user $mail_owner \ -exec $WARN not owned by $mail_owner: {} \; diff --git a/postfix/conf/postfix-tls-script b/postfix/conf/postfix-tls-script index 1a364b7fc..997e9c52e 100644 --- a/postfix/conf/postfix-tls-script +++ b/postfix/conf/postfix-tls-script @@ -178,9 +178,7 @@ # .IP "\fBsmtp_tls_loglevel (0)\fR" # Enable additional Postfix SMTP client logging of TLS activity. # .IP "\fBsmtp_tls_security_level (empty)\fR" -# The default SMTP TLS security level for the Postfix SMTP client; -# when a non-empty value is specified, this overrides the obsolete -# parameters smtp_use_tls, smtp_enforce_tls, and smtp_tls_enforce_peername. +# The default SMTP TLS security level for the Postfix SMTP client. # .IP "\fBsmtp_tls_session_cache_database (empty)\fR" # Name of the file containing the optional Postfix SMTP client # TLS session cache. @@ -333,7 +331,7 @@ $postconf -T compile-version | grep . >/dev/null || { } rsa= ecdsa= -for _algo in `$postconf -T public-key-algorithms | egrep '^(rsa|ecdsa)$'` +for _algo in `$postconf -T public-key-algorithms | grep -E '^(rsa|ecdsa)$'` do eval $_algo=$_algo done @@ -415,7 +413,7 @@ pubkey_dgst() { for cmd in ec rsa; do $openssl $cmd -passin "pass:umask 077" -in "$1" -pubout | $openssl $cmd -pubin -outform DER | - hex_sha256 | egrep -v "${null256}" && return 0 + hex_sha256 | grep -E -v "${null256}" && return 0 done 2>/dev/null return 1 } @@ -429,7 +427,7 @@ cert_pubkey_dgst() { for cmd in ec rsa; do $openssl x509 -pubkey -noout -in "$1" | $openssl $cmd -pubin -outform DER | - hex_sha256 | egrep -v "${null256}" && return 0 + hex_sha256 | grep -E -v "${null256}" && return 0 done 2>/dev/null return 1 } diff --git a/postfix/html/BASIC_CONFIGURATION_README.html b/postfix/html/BASIC_CONFIGURATION_README.html index ccede706f..cf49188f4 100644 --- a/postfix/html/BASIC_CONFIGURATION_README.html +++ b/postfix/html/BASIC_CONFIGURATION_README.html @@ -523,7 +523,7 @@ idea to run every night before the syslog files are rotated: 

 # postfix check
-# egrep '(reject|warning|error|fatal|panic):' /some/log/file
+# grep -E '(reject|warning|error|fatal|panic):' /some/log/file
diff --git a/postfix/html/DEBUG_README.html b/postfix/html/DEBUG_README.html index a2cec547b..be2fb4e52 100644 --- a/postfix/html/DEBUG_README.html +++ b/postfix/html/DEBUG_README.html @@ -92,7 +92,7 @@ properly: 

-% egrep '(warning|error|fatal|panic):' /some/log/file | more
+% grep -E '(warning|error|fatal|panic):' /some/log/file | more
diff --git a/postfix/html/INSTALL.html b/postfix/html/INSTALL.html index acf7b5572..f7386fdca 100644 --- a/postfix/html/INSTALL.html +++ b/postfix/html/INSTALL.html @@ -1185,7 +1185,7 @@ file. 

-$ egrep '(reject|warning|error|fatal|panic):' /some/log/file
+$ grep -E '(reject|warning|error|fatal|panic):' /some/log/file
@@ -1266,7 +1266,7 @@ file. 

-$ egrep '(reject|warning|error|fatal|panic):' /some/log/file
+$ grep -E '(reject|warning|error|fatal|panic):' /some/log/file
@@ -1331,7 +1331,7 @@ file. 

-$ egrep '(reject|warning|error|fatal|panic):' /some/log/file
+$ grep -E '(reject|warning|error|fatal|panic):' /some/log/file
@@ -1650,7 +1650,7 @@ idea to run every night before the syslog files are rotated: 

 # postfix check
-# egrep '(reject|warning|error|fatal|panic):' /some/log/file
+# grep -E '(reject|warning|error|fatal|panic):' /some/log/file
diff --git a/postfix/html/QSHAPE_README.html b/postfix/html/QSHAPE_README.html index 6b763969f..6cc745053 100644 --- a/postfix/html/QSHAPE_README.html +++ b/postfix/html/QSHAPE_README.html @@ -187,13 +187,13 @@ question.

# Find deliveries to example.com # $ tail -10000 /var/log/maillog | - egrep -i ': to=<.*@example\.com>,' | + grep -E -i ': to=<.*@example\.com>,' | less # Find messages from example.com # $ tail -10000 /var/log/maillog | - egrep -i ': from=<.*@example\.com>,' | + grep -E -i ': from=<.*@example\.com>,' | less @@ -204,7 +204,7 @@ $ tail -10000 /var/log/maillog | 
 # Find all messages for a specific queue id.
 #
-$ tail -10000 /var/log/maillog | egrep ': 2B2173FF68: '
+$ tail -10000 /var/log/maillog | grep -E ': 2B2173FF68: '
@@ -213,7 +213,7 @@ warnings can suggest strategies to reduce congestion. 

-$ egrep 'qmgr.*(panic|fatal|error|warning):' /var/log/maillog
+$ grep -E 'qmgr.*(panic|fatal|error|warning):' /var/log/maillog
diff --git a/postfix/html/TLS_README.html b/postfix/html/TLS_README.html index 7f950aba3..eae84b730 100644 --- a/postfix/html/TLS_README.html +++ b/postfix/html/TLS_README.html @@ -2908,7 +2908,7 @@ erase all the SMTP client TLS settings and then enable client TLS: 

-# postconf -X `postconf -nH | egrep '^smtp(_|_enforce_|_use_)tls'`
+# postconf -X `postconf -nH | grep -E '^smtp(_|_enforce_|_use_)tls'`
 # postfix tls enable-client
 # postfix reload
@@ -2941,7 +2941,7 @@ all the SMTP server TLS settings and then enable server TLS: 

-# postconf -X `postconf -nH | egrep '^smtpd(_|_enforce_|_use_)tls'`
+# postconf -X `postconf -nH | grep -E '^smtpd(_|_enforce_|_use_)tls'`
 # postfix tls enable-server
 # postfix reload
diff --git a/postfix/html/postfix-tls.1.html b/postfix/html/postfix-tls.1.html index 348ba8575..c87deb296 100644 --- a/postfix/html/postfix-tls.1.html +++ b/postfix/html/postfix-tls.1.html @@ -182,10 +182,7 @@ POSTFIX-TLS(1) POSTFIX-TLS(1) Enable additional Postfix SMTP client logging of TLS activity. smtp_tls_security_level (empty) - The default SMTP TLS security level for the Postfix SMTP client; - when a non-empty value is specified, this overrides the obsolete - parameters smtp_use_tls, smtp_enforce_tls, and - smtp_tls_enforce_peername. + The default SMTP TLS security level for the Postfix SMTP client. smtp_tls_session_cache_database (empty) Name of the file containing the optional Postfix SMTP client TLS diff --git a/postfix/makedefs b/postfix/makedefs index 9e061b379..8b0875387 100644 --- a/postfix/makedefs +++ b/postfix/makedefs @@ -206,6 +206,10 @@ do esac done || exit 1 +# Suggest a fix for systems without grep -E or -F flags. +(echo foo | grep -E foo 2>/dev/null | grep -F foo >/dev/null 2>/dev/null) || + error "No grep -[EF] support. See auxiliary/fix-grep for a conversion tool." + # Emit system-dependent Makefile macro definitions to standard output. echo "#----------------------------------------------------------------" diff --git a/postfix/man/man1/postfix-tls.1 b/postfix/man/man1/postfix-tls.1 index 1c96799d0..4e8cb9279 100644 --- a/postfix/man/man1/postfix-tls.1 +++ b/postfix/man/man1/postfix-tls.1 @@ -186,9 +186,7 @@ The location of the OpenSSL command line program \fBopenssl\fR(1). .IP "\fBsmtp_tls_loglevel (0)\fR" Enable additional Postfix SMTP client logging of TLS activity. .IP "\fBsmtp_tls_security_level (empty)\fR" -The default SMTP TLS security level for the Postfix SMTP client; -when a non\-empty value is specified, this overrides the obsolete -parameters smtp_use_tls, smtp_enforce_tls, and smtp_tls_enforce_peername. +The default SMTP TLS security level for the Postfix SMTP client. .IP "\fBsmtp_tls_session_cache_database (empty)\fR" Name of the file containing the optional Postfix SMTP client TLS session cache. diff --git a/postfix/mantools/check-double-cc b/postfix/mantools/check-double-cc index 61ffc5b66..bf7878063 100755 --- a/postfix/mantools/check-double-cc +++ b/postfix/mantools/check-double-cc @@ -5,4 +5,4 @@ LANG=C; export LANG -find src -name '*.[hc]' | xargs cat | comment | mantools/deroff | mantools/find-double | fgrep -vxf proto/stop.double-cc +find src -name '*.[hc]' | xargs cat | comment | mantools/deroff | mantools/find-double | grep -F -vxf proto/stop.double-cc diff --git a/postfix/mantools/check-double-history b/postfix/mantools/check-double-history index 26e85c09c..f65eae0de 100755 --- a/postfix/mantools/check-double-history +++ b/postfix/mantools/check-double-history @@ -4,4 +4,4 @@ LANG=C; export LANG -sed '1,/^2022/d' HISTORY | mantools/find-double | fgrep -vxf proto/stop.double-history +sed '1,/^2022/d' HISTORY | mantools/find-double | grep -F -vxf proto/stop.double-history diff --git a/postfix/mantools/check-double-install-proto-text b/postfix/mantools/check-double-install-proto-text index bab88bc6d..24b73f489 100755 --- a/postfix/mantools/check-double-install-proto-text +++ b/postfix/mantools/check-double-install-proto-text @@ -4,4 +4,4 @@ LANG=C; export LANG -(ls *install* proto/* | egrep -v 'stop|Makefile|html|\.proto' | xargs mantools/deroff; cat RELEASE_NOTES) | mantools/find-double | fgrep -vxf proto/stop.double-install-proto-text +(ls *install* proto/* | grep -E -v 'stop|Makefile|html|\.proto' | xargs mantools/deroff; cat RELEASE_NOTES) | mantools/find-double | grep -F -vxf proto/stop.double-install-proto-text diff --git a/postfix/mantools/check-double-proto-html b/postfix/mantools/check-double-proto-html index 234a7743d..df5618434 100755 --- a/postfix/mantools/check-double-proto-html +++ b/postfix/mantools/check-double-proto-html @@ -4,4 +4,4 @@ LANG=C; export LANG -ls proto/*.html proto/*.proto | xargs mantools/dehtml | mantools/find-double | fgrep -vxf proto/stop.double-proto-html +ls proto/*.html proto/*.proto | xargs mantools/dehtml | mantools/find-double | grep -F -vxf proto/stop.double-proto-html diff --git a/postfix/mantools/check-postfix-files b/postfix/mantools/check-postfix-files index ea85d4058..478d22b96 100755 --- a/postfix/mantools/check-postfix-files +++ b/postfix/mantools/check-postfix-files @@ -18,7 +18,7 @@ awk -F: ' # Create a list of expected names, excluding files that aren't installed. -(ls man/man?/* html/*.html |sed 's/.*\///' | egrep -v '^makedefs.1 +(ls man/man?/* html/*.html |sed 's/.*\///' | grep -E -v '^makedefs.1 ^posttls-finger.1 ^qmqp-sink.1 ^qmqp-source.1 diff --git a/postfix/mantools/check-postlink b/postfix/mantools/check-postlink index 21472d64e..fd9687040 100755 --- a/postfix/mantools/check-postlink +++ b/postfix/mantools/check-postlink @@ -54,4 +54,4 @@ EOF # Report names from postconf that have no rule in mantools/postlink. -comm -23 postconf.tmp postlink.tmp | fgrep -vx -f stoplist.tmp +comm -23 postconf.tmp postlink.tmp | grep -F -vx -f stoplist.tmp diff --git a/postfix/mantools/check-spell-cc b/postfix/mantools/check-spell-cc index ab2247019..f82a4a34e 100755 --- a/postfix/mantools/check-spell-cc +++ b/postfix/mantools/check-spell-cc @@ -5,4 +5,4 @@ LANG=C; export LANG -find . -name *.[hc] | xargs cat | comment | mantools/deroff | spell | fgrep -vxf proto/stop | fgrep -vxf proto/stop.spell-cc +find . -name *.[hc] | xargs cat | comment | mantools/deroff | spell | grep -F -vxf proto/stop | grep -F -vxf proto/stop.spell-cc diff --git a/postfix/mantools/check-spell-history b/postfix/mantools/check-spell-history index 242130c24..3119be8c2 100755 --- a/postfix/mantools/check-spell-history +++ b/postfix/mantools/check-spell-history @@ -4,6 +4,6 @@ LANG=C; export LANG -sed '1,/^2022/d' HISTORY | spell | fgrep -vxf proto/stop | \ - fgrep -vxf proto/stop.spell-cc | \ - fgrep -vxf proto/stop.spell-history +sed '1,/^2022/d' HISTORY | spell | grep -F -vxf proto/stop | \ + grep -F -vxf proto/stop.spell-cc | \ + grep -F -vxf proto/stop.spell-history diff --git a/postfix/mantools/check-spell-install-proto-text b/postfix/mantools/check-spell-install-proto-text index 19b8140a0..ca6b211ea 100755 --- a/postfix/mantools/check-spell-install-proto-text +++ b/postfix/mantools/check-spell-install-proto-text @@ -4,4 +4,4 @@ LANG=C; export LANG -(ls *install* proto/* | egrep -v 'stop|Makefile|html|\.proto' | mantools/deroff; cat RELEASE_NOTES) | spell | fgrep -vxf proto/stop +(ls *install* proto/* | grep -E -v 'stop|Makefile|html|\.proto' | mantools/deroff; cat RELEASE_NOTES) | spell | grep -F -vxf proto/stop diff --git a/postfix/mantools/check-spell-proto-html b/postfix/mantools/check-spell-proto-html index 3d05d6676..b81ce1f97 100755 --- a/postfix/mantools/check-spell-proto-html +++ b/postfix/mantools/check-spell-proto-html @@ -4,4 +4,4 @@ LANG=C; export LANG -mantools/dehtml proto/*html proto/*.proto | spell | fgrep -vxf proto/stop | fgrep -vxf proto/stop.spell-proto-html +mantools/dehtml proto/*html proto/*.proto | spell | grep -F -vxf proto/stop | grep -F -vxf proto/stop.spell-proto-html diff --git a/postfix/mantools/manlint b/postfix/mantools/manlint index 8927d897c..7aecad812 100755 --- a/postfix/mantools/manlint +++ b/postfix/mantools/manlint @@ -161,5 +161,5 @@ grep -n . "$@" | sed -n ' p d } -' | egrep -v ':[a-z][_a-z0-9-]*\([0-9]\),' | - fgrep -vf mantools/manlint.stop +' | grep -E -v ':[a-z][_a-z0-9-]*\([0-9]\),' | + grep -F -vf mantools/manlint.stop diff --git a/postfix/mantools/manspell b/postfix/mantools/manspell index 107873d9c..f11721fef 100644 --- a/postfix/mantools/manspell +++ b/postfix/mantools/manspell @@ -3,5 +3,5 @@ for file do echo ==== $file ==== - deroff $file | spell | fgrep -vf proto/stop + deroff $file | spell | grep -F -vf proto/stop done diff --git a/postfix/mantools/spell b/postfix/mantools/spell index f4138ed62..c694e153f 100755 --- a/postfix/mantools/spell +++ b/postfix/mantools/spell @@ -6,5 +6,5 @@ export LC_ALL for i in $* do echo === $i === - mantools/html2readme $i | col -b | spell | fgrep -vxf proto/stop + mantools/html2readme $i | col -b | spell | grep -F -vxf proto/stop done diff --git a/postfix/proto/BASIC_CONFIGURATION_README.html b/postfix/proto/BASIC_CONFIGURATION_README.html index 531dbf9d8..1b1079329 100644 --- a/postfix/proto/BASIC_CONFIGURATION_README.html +++ b/postfix/proto/BASIC_CONFIGURATION_README.html @@ -523,7 +523,7 @@ idea to run every night before the syslog files are rotated: 

 # postfix check
-# egrep '(reject|warning|error|fatal|panic):' /some/log/file
+# grep -E '(reject|warning|error|fatal|panic):' /some/log/file
diff --git a/postfix/proto/DEBUG_README.html b/postfix/proto/DEBUG_README.html index ea62cdc48..3a606bbd3 100644 --- a/postfix/proto/DEBUG_README.html +++ b/postfix/proto/DEBUG_README.html @@ -92,7 +92,7 @@ properly: 

-% egrep '(warning|error|fatal|panic):' /some/log/file | more
+% grep -E '(warning|error|fatal|panic):' /some/log/file | more
diff --git a/postfix/proto/INSTALL.html b/postfix/proto/INSTALL.html index 756012ede..36b7a05ee 100644 --- a/postfix/proto/INSTALL.html +++ b/postfix/proto/INSTALL.html @@ -1185,7 +1185,7 @@ file. 

-$ egrep '(reject|warning|error|fatal|panic):' /some/log/file
+$ grep -E '(reject|warning|error|fatal|panic):' /some/log/file
@@ -1266,7 +1266,7 @@ file. 

-$ egrep '(reject|warning|error|fatal|panic):' /some/log/file
+$ grep -E '(reject|warning|error|fatal|panic):' /some/log/file
@@ -1331,7 +1331,7 @@ file. 

-$ egrep '(reject|warning|error|fatal|panic):' /some/log/file
+$ grep -E '(reject|warning|error|fatal|panic):' /some/log/file
@@ -1650,7 +1650,7 @@ idea to run every night before the syslog files are rotated: 

 # postfix check
-# egrep '(reject|warning|error|fatal|panic):' /some/log/file
+# grep -E '(reject|warning|error|fatal|panic):' /some/log/file
diff --git a/postfix/proto/QSHAPE_README.html b/postfix/proto/QSHAPE_README.html index 6956b46c7..d69671755 100644 --- a/postfix/proto/QSHAPE_README.html +++ b/postfix/proto/QSHAPE_README.html @@ -187,13 +187,13 @@ question.

# Find deliveries to example.com # $ tail -10000 /var/log/maillog | - egrep -i ': to=<.*@example\.com>,' | + grep -E -i ': to=<.*@example\.com>,' | less # Find messages from example.com # $ tail -10000 /var/log/maillog | - egrep -i ': from=<.*@example\.com>,' | + grep -E -i ': from=<.*@example\.com>,' | less
@@ -204,7 +204,7 @@ $ tail -10000 /var/log/maillog | 
 # Find all messages for a specific queue id.
 #
-$ tail -10000 /var/log/maillog | egrep ': 2B2173FF68: '
+$ tail -10000 /var/log/maillog | grep -E ': 2B2173FF68: '
@@ -213,7 +213,7 @@ warnings can suggest strategies to reduce congestion. 

-$ egrep 'qmgr.*(panic|fatal|error|warning):' /var/log/maillog
+$ grep -E 'qmgr.*(panic|fatal|error|warning):' /var/log/maillog
diff --git a/postfix/proto/TLS_README.html b/postfix/proto/TLS_README.html index b53e71bd3..6753b5c8d 100644 --- a/postfix/proto/TLS_README.html +++ b/postfix/proto/TLS_README.html @@ -2908,7 +2908,7 @@ erase all the SMTP client TLS settings and then enable client TLS: 

-# postconf -X `postconf -nH | egrep '^smtp(_|_enforce_|_use_)tls'`
+# postconf -X `postconf -nH | grep -E '^smtp(_|_enforce_|_use_)tls'`
 # postfix tls enable-client
 # postfix reload
@@ -2941,7 +2941,7 @@ all the SMTP server TLS settings and then enable server TLS: 

-# postconf -X `postconf -nH | egrep '^smtpd(_|_enforce_|_use_)tls'`
+# postconf -X `postconf -nH | grep -E '^smtpd(_|_enforce_|_use_)tls'`
 # postfix tls enable-server
 # postfix reload
diff --git a/postfix/proto/stop b/postfix/proto/stop index 16a29cf21..d663ad9c0 100644 --- a/postfix/proto/stop +++ b/postfix/proto/stop @@ -241,7 +241,7 @@ cd chmod config defs -egrep +grep -E ifdef init libexec @@ -1568,3 +1568,5 @@ mkmap Brendel Bugfix https +egrep +fgrep diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 34a251eb6..f103ea05d 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 "20221227" +#define MAIL_RELEASE_DATE "20221228" #define MAIL_VERSION_NUMBER "3.8" #ifdef SNAPSHOT diff --git a/postfix/src/postconf/Makefile.in b/postfix/src/postconf/Makefile.in index 4f6536fd3..665f36e8a 100644 --- a/postfix/src/postconf/Makefile.in +++ b/postfix/src/postconf/Makefile.in @@ -40,7 +40,7 @@ $(PROG): $(OBJS) $(LIBS) (echo "# DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE"; \ echo "# TEXT HERE JUST SHOWS DEFAULT SETTINGS BUILT INTO POSTFIX."; \ echo "#"; $(SHLIB_ENV) $(VALGRIND) ./$(PROG) -d -c ../../conf) | \ - egrep -v '^(myhostname|mydomain|mynetworks|process_name|process_id) ' >$@ + grep -E -v '^(myhostname|mydomain|mynetworks|process_name|process_id) ' >$@ $(OBJS): ../../conf/makedefs.out diff --git a/postfix/src/smtp/Makefile.in b/postfix/src/smtp/Makefile.in index 6412e0e36..0f7ee2210 100644 --- a/postfix/src/smtp/Makefile.in +++ b/postfix/src/smtp/Makefile.in @@ -45,7 +45,7 @@ update: ../../libexec/$(PROG) smtp.o: smtp.c smtp_params.c lmtp_params.c lmtp_params.c: smtp_params.c - egrep -v -f smtp-only smtp_params.c | \ + grep -E -v -f smtp-only smtp_params.c | \ sed 's/SMTP/LMTP/g; s/smtp_\([a-z]*_table\)/lmtp_\1/' >$@ printfck: $(OBJS) $(PROG) diff --git a/postfix/src/tls/Makefile.in b/postfix/src/tls/Makefile.in index 948afab9f..ce77151cf 100644 --- a/postfix/src/tls/Makefile.in +++ b/postfix/src/tls/Makefile.in @@ -71,7 +71,7 @@ tls_certkey_tests: test done; \ for pem in bad-*.pem; do \ $(SHLIB_ENV) $(VALGRIND) ./tls_certkey $$pem > $$pem.out 2>&1 && exit 1 || : ok; \ - egrep -v 'TLS library problem' $$pem.out | diff $$pem.ref - || \ + grep -E -v 'TLS library problem' $$pem.out | diff $$pem.ref - || \ exit 1; \ echo " $$pem: OK"; \ done