- up to 3.6.15

diff --git a/postfix-egrep.patch b/postfix-egrep.patch
new file mode 100644 (file)
index 0000000..d6818c8
--- /dev/null
+++ b/postfix-egrep.patch
@@ -0,0 +1,42 @@
+diff -urN postfix-3.6.11.org/conf/postfix-script postfix-3.6.11/conf/postfix-script
+--- postfix-3.6.11.org/conf/postfix-script     2019-02-02 17:17:50.000000000 +0100
++++ postfix-3.6.11/conf/postfix-script 2023-09-05 10:22:52.909999216 +0200
+@@ -328,7 +328,7 @@
+       # 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 -urN postfix-3.6.11.org/conf/postfix-tls-script postfix-3.6.11/conf/postfix-tls-script
+--- postfix-3.6.11.org/conf/postfix-tls-script 2020-05-30 16:37:04.000000000 +0200
++++ postfix-3.6.11/conf/postfix-tls-script     2023-09-05 10:22:41.113332549 +0200
+@@ -333,7 +333,7 @@
+ }
+ 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 +415,7 @@
+     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 +429,7 @@
+     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.spec b/postfix.spec
index fd7eb85aecefa233a8b2a69c89815e00ecd97695..997f1de2574ca5bba8f565b34570c16fce4abee0 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -30,13 +30,13 @@ Summary(pl.UTF-8):  Serwer SMTP Postfix
 Summary(pt_BR.UTF-8):  Postfix - Um MTA (Mail Transport Agent) de alto desempenho
 Summary(sk.UTF-8):     Agent prenosu pošty Postfix
 Name:          postfix
-Version:       3.6.6
+Version:       3.6.15
 Release:       1
 Epoch:         2
 License:       IBM Public License or Eclipse Public License v2.0
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
-# Source0-md5: 891ea3d4e2d7a9a82c0363ce9de2abda
+# Source0-md5: 88471ed95d8f779d16e5c77c000367d5
 Source1:       %{name}.aliases
 Source2:       %{name}.cron
 Source3:       %{name}.init
@@ -55,6 +55,7 @@ Source11:     %{name}-vda-bigquota.patch
 # -ource11-md5:        d46103195b43ec5784ea2c166b238f71
 Source12:      %{name}.service
 Patch0:                %{name}-config.patch
+Patch1:         %{name}-egrep.patch
 
 Patch3:                %{name}-master.cf_cyrus.patch
 # from http://akson.sgh.waw.pl/~chopin/unix/postfix-2.1.5-header_if_reject.diff
@@ -304,6 +305,7 @@ cat %{SOURCE11} | %{__patch} -p1 -s
 find -type f | xargs %{__sed} -i -e 's|/etc/postfix|/etc/mail|g'
 
 %patch0 -p1
+%patch1 -p1
 
 %patch3 -p1
 %{?with_hir:%patch4 -p0}