- updated to 3.8.1, dropped duplicate trigger, rediffed patch 1

diff --git a/postfix-conf_msg.patch b/postfix-conf_msg.patch
index 7bf98f509d29047f8385233b26065f789e5fbd2c..aecd61f90741b84c6ca1a54c44d917c501998127 100644 (file)
--- a/postfix-conf_msg.patch
+++ b/postfix-conf_msg.patch
@@ -1,6 +1,6 @@
-diff -urNp -x '*.orig' postfix-3.7.0.org/src/global/mail_params.c postfix-3.7.0/src/global/mail_params.c
---- postfix-3.7.0.org/src/global/mail_params.c 2021-10-22 20:47:31.000000000 +0200
-+++ postfix-3.7.0/src/global/mail_params.c     2022-04-04 19:57:20.999351108 +0200
+diff -urNp -x '*.orig' postfix-3.8.1.org/src/global/mail_params.c postfix-3.8.1/src/global/mail_params.c
+--- postfix-3.8.1.org/src/global/mail_params.c 2021-10-22 20:47:31.000000000 +0200
++++ postfix-3.8.1/src/global/mail_params.c     2023-07-09 22:19:21.172026512 +0200
 @@ -83,6 +83,7 @@
  /*    char    *var_debug_peer_list;
  /*    int     var_debug_peer_level;
@@ -25,12 +25,12 @@ diff -urNp -x '*.orig' postfix-3.7.0.org/src/global/mail_params.c postfix-3.7.0/
        0,
      };
      static const CONFIG_STR_FN_TABLE function_str_defaults_2[] = {
-diff -urNp -x '*.orig' postfix-3.7.0.org/src/global/mail_params.h postfix-3.7.0/src/global/mail_params.h
---- postfix-3.7.0.org/src/global/mail_params.h 2022-04-04 19:57:20.803350655 +0200
-+++ postfix-3.7.0/src/global/mail_params.h     2022-04-04 19:57:21.000351111 +0200
-@@ -4322,6 +4322,13 @@ extern char *var_dnssec_probe;
-               "lmtp=24, smtp=25, smtps=submissions=465, submission=587"
- extern char *var_known_tcp_ports;
+diff -urNp -x '*.orig' postfix-3.8.1.org/src/global/mail_params.h postfix-3.8.1/src/global/mail_params.h
+--- postfix-3.8.1.org/src/global/mail_params.h 2023-07-09 22:19:21.003024104 +0200
++++ postfix-3.8.1/src/global/mail_params.h     2023-07-09 22:19:21.172026512 +0200
+@@ -4411,6 +4411,13 @@ extern bool var_ign_srv_lookup_err;
+ #define DEF_ALLOW_SRV_FALLBACK        0
+ extern bool var_allow_srv_fallback;
  
 + /*
 +  * SMTPD messages
@@ -42,10 +42,10 @@ diff -urNp -x '*.orig' postfix-3.7.0.org/src/global/mail_params.h postfix-3.7.0/
  /* LICENSE
  /* .ad
  /* .fi
-diff -urNp -x '*.orig' postfix-3.7.0.org/src/smtpd/smtpd.c postfix-3.7.0/src/smtpd/smtpd.c
---- postfix-3.7.0.org/src/smtpd/smtpd.c        2021-10-02 16:46:46.000000000 +0200
-+++ postfix-3.7.0/src/smtpd/smtpd.c    2022-04-04 19:57:21.001351113 +0200
-@@ -6577,6 +6577,7 @@ int     main(int argc, char **argv)
+diff -urNp -x '*.orig' postfix-3.8.1.org/src/smtpd/smtpd.c postfix-3.8.1/src/smtpd/smtpd.c
+--- postfix-3.8.1.org/src/smtpd/smtpd.c        2023-06-05 21:06:51.000000000 +0200
++++ postfix-3.8.1/src/smtpd/smtpd.c    2023-07-09 22:19:21.173026526 +0200
+@@ -6645,6 +6645,7 @@ int     main(int argc, char **argv)
        VAR_MILT_MACRO_DEFLTS, DEF_MILT_MACRO_DEFLTS, &var_milt_macro_deflts, 0, 0,
        VAR_SMTPD_MILTER_MAPS, DEF_SMTPD_MILTER_MAPS, &var_smtpd_milter_maps, 0, 0,
        VAR_STRESS, DEF_STRESS, &var_stress, 0, 0,

diff --git a/postfix.spec b/postfix.spec
index 0fafa1008f4cbd606c2f1c171fa29bcb7e5090cd..cfdb4e9876294adece76893f7b550e201bc2992a 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -18,13 +18,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.8.0
-Release:       2
+Version:       3.8.1
+Release:       1
 Epoch:         2
 License:       distributable
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
-# Source0-md5: 73cce85d78a6bf0d5a0c326c23361ed1
+# Source0-md5: 956d0baca1259189c80a9311ef4daaa1
 Source1:       %{name}.aliases
 Source2:       %{name}.cron
 Source3:       %{name}.init
@@ -391,43 +391,12 @@ if [ $1 -le 1 ]; then
 fi
 [ -f "/etc/postfix/main.cf" ] && sed -i -e 's,^daemon_directory = .*,daemon_directory = %{_libdir}/postfix/sbin,' /etc/postfix/main.cf 2>/dev/null || :
 
-%triggerun -- %{name} < 2:3.4.6-2
-if [ $1 -le 1 ]; then
-        exit 0
-fi
-[ -d /etc/postfix ] || mkdir /etc/postfix 2>/dev/null || :
-for f in /etc/mail/{access,aliases,body_checks,bounce.cf.*,canonical,dynamicmaps.cf,generic,header_checks,main.cf,master.cf,postfix-files,relocated,transport,virtual}; do
-       f=${f##*/}
-       [ -f "/etc/mail/$f" ] && mv "/etc/mail/$f" "/etc/postfix/$f" 2>/dev/null || :
-done
-find /etc/postfix -type f 2>/dev/null | xargs sed -i -e 's|/etc/mail|/etc/postfix|g' 2>/dev/null
-for f in /etc/mail/*.db; do
-       f=${f##*/}
-       [ "$f" = "*.db" ] && break
-       [ -f "/etc/mail/$f" ] && rm "/etc/mail/$f" 2>/dev/null || :
-       f=${f%%.db}
-       [ -f "/etc/mail/$f" ] && mv "/etc/mail/$f" /etc/postfix 2>/dev/null || :
-       if [ "$f" = "aliases" ]; then
-               /usr/sbin/postalias "/etc/postfix/aliases" 2>/dev/null || :
-       else
-               /usr/sbin/postmap "/etc/postfix/$f" 2>/dev/null || :
-       fi
-done
-[ -n "$(find /etc/mail -type d -empty 2>/dev/null)" ] && rmdir /etc/mail 2>/dev/null || :
-
 %triggerpostun -- %{name} < 2:3.8.0-1
 echo
 echo "Warning! Option daemon_directory in file /etc/postfix/main.cf was set to"
 echo "path %{_libdir}/postfix/sbin."
 echo
 
-%triggerpostun -- %{name} < 2:3.4.6-2
-echo
-echo "Warning! Configuration has been migrated to /etc/postfix."
-echo "It may be required to move some files manually from /etc/mail"
-echo "to /etc/postfix and/or run postmap on some files in /etc/postfix."
-echo
-
 %files
 %defattr(644,root,root,755)
 %doc html COMPATIBILITY HISTORY LICENSE RELEASE_NOTES* TLS_*