- updated to 3.5.0

diff --git a/glibc-2.30.patch b/glibc-2.30.patch
deleted file mode 100644 (file)
index 8a92780..0000000
--- a/glibc-2.30.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur postfix-3.4.6.orig/src/dns/dns_str_resflags.c postfix-3.4.6/src/dns/dns_str_resflags.c
---- postfix-3.4.6.orig/src/dns/dns_str_resflags.c      2016-05-15 17:20:14.000000000 +0200
-+++ postfix-3.4.6/src/dns/dns_str_resflags.c   2019-09-05 22:01:00.522000000 +0200
-@@ -60,10 +60,16 @@
-     "RES_DEFNAMES", RES_DEFNAMES,
-     "RES_STAYOPEN", RES_STAYOPEN,
-     "RES_DNSRCH", RES_DNSRCH,
-+#ifdef RES_INSECURE1
-     "RES_INSECURE1", RES_INSECURE1,
-+#endif
-+#ifdef RES_INSECURE2
-     "RES_INSECURE2", RES_INSECURE2,
-+#endif
-     "RES_NOALIASES", RES_NOALIASES,
-+#ifdef RES_USE_INET6
-     "RES_USE_INET6", RES_USE_INET6,
-+#endif
- #ifdef RES_ROTATE
-     "RES_ROTATE", RES_ROTATE,
- #endif

diff --git a/postfix-conf.patch b/postfix-conf.patch
index 0bc4ce9359c7566a5017f19632613192aaad3c93..f5989457b84791661fecfa09233400f1a3cd8364 100644 (file)
--- a/postfix-conf.patch
+++ b/postfix-conf.patch
@@ -1,16 +1,16 @@
 diff -ur postfix-3.0.2.orig/conf/master.cf postfix-3.0.2/conf/master.cf
 --- postfix-3.0.2.orig/conf/master.cf  2015-07-25 18:23:32.000000000 +0000
 +++ postfix-3.0.2/conf/master.cf       2015-07-25 18:24:44.966826277 +0000
-@@ -76,7 +76,7 @@
+@@ -79,7 +79,7 @@
  # Also specify in main.cf: maildrop_destination_recipient_limit=1
  #
  #maildrop  unix  -       n       n       -       -       pipe
--#  flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}
-+#  flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}
+-#  flags=DRXhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}
++#  flags=DRXhu user=vmail argv=/usr/bin/maildrop -d ${recipient}
  #
  # ====================================================================
  #
-@@ -119,7 +119,7 @@
+@@ -122,7 +122,7 @@
  #  flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
  #
  #bsmtp     unix  -       n       n       -       -       pipe

diff --git a/postfix-conf_msg.patch b/postfix-conf_msg.patch
index 0515c0474f69f56045810b3f0c5976df4a6d4324..55f0247e9bd8d0cc25cb6313551dc32bfcda40e9 100644 (file)
--- a/postfix-conf_msg.patch
+++ b/postfix-conf_msg.patch
@@ -1,7 +1,7 @@
 diff -ur postfix-3.0.2.orig/src/global/mail_params.c postfix-3.0.2/src/global/mail_params.c
 --- postfix-3.0.2.orig/src/global/mail_params.c        2015-01-27 19:27:44.000000000 +0000
 +++ postfix-3.0.2/src/global/mail_params.c     2015-07-25 15:55:35.700514288 +0000
-@@ -82,6 +82,7 @@
+@@ -83,6 +83,7 @@
  /*    char    *var_debug_peer_list;
  /*    int     var_debug_peer_level;
  /*    int     var_in_flow_delay;
@@ -9,7 +9,7 @@ diff -ur postfix-3.0.2.orig/src/global/mail_params.c postfix-3.0.2/src/global/ma
  /*    int     var_fault_inj_code;
  /*    char   *var_bounce_service;
  /*    char   *var_cleanup_service;
-@@ -286,6 +287,7 @@
+@@ -304,6 +305,7 @@
  char   *var_export_environ;
  char   *var_debug_peer_list;
  int     var_debug_peer_level;
@@ -17,10 +17,10 @@ diff -ur postfix-3.0.2.orig/src/global/mail_params.c postfix-3.0.2/src/global/ma
  int     var_fault_inj_code;
  char   *var_bounce_service;
  char   *var_cleanup_service;
-@@ -695,6 +697,7 @@
-       VAR_DSN_FILTER, DEF_DSN_FILTER, &var_dsn_filter, 0, 0,
+@@ -762,6 +764,7 @@
        VAR_SMTPUTF8_AUTOCLASS, DEF_SMTPUTF8_AUTOCLASS, &var_smtputf8_autoclass, 1, 0,
        VAR_DROP_HDRS, DEF_DROP_HDRS, &var_drop_hdrs, 0, 0,
+       VAR_INFO_LOG_ADDR_FORM, DEF_INFO_LOG_ADDR_FORM, &var_info_log_addr_form, 1, 0,
 +      VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
        0,
      };

diff --git a/postfix-master.cf_cyrus.patch b/postfix-master.cf_cyrus.patch
index 9d59e84802ac803395fa8e0db7d9adde06217d4a..7db764e456d88869a14efd8a4e570784a9d73019 100644 (file)
--- a/postfix-master.cf_cyrus.patch
+++ b/postfix-master.cf_cyrus.patch
@@ -1,12 +1,12 @@
 diff -ur postfix-3.0.2.orig/conf/master.cf postfix-3.0.2/conf/master.cf
 --- postfix-3.0.2.orig/conf/master.cf  2015-01-31 22:54:26.000000000 +0000
 +++ postfix-3.0.2/conf/master.cf       2015-07-25 18:23:32.695826277 +0000
-@@ -95,14 +95,14 @@
+@@ -98,14 +98,14 @@
  # Also specify in main.cf: cyrus_destination_recipient_limit=1
  #
  #cyrus     unix  -       n       n       -       -       pipe
--#  user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
-+#  user=cyrus argv=/usr/lib/cyrus/deliver -e -r ${sender} -m ${extension} ${user}
+-#  flags=DRX user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
++#  flags=DRX user=cyrus argv=/usr/lib/cyrus/deliver -e -r ${sender} -m ${extension} ${user}
  #
  # ====================================================================
  #

diff --git a/postfix.spec b/postfix.spec
index dc12bce17238b20662e85b75ce462a349183a580..e14f7fe4cd2ad1e71fb33ce5c0edd8d426b656d7 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -17,13 +17,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.4.9
+Version:       3.5.0
 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: 5dbe5f07b98903716f969dcff88c0775
+# Source0-md5: f6a48f369cf8d693d7b0f8ab51f0fc9b
 Source1:       %{name}.aliases
 Source2:       %{name}.cron
 Source3:       %{name}.init
@@ -41,7 +41,6 @@ Patch2:               %{name}-master.cf_cyrus.patch
 Patch3:                %{name}-conf.patch
 Patch4:                %{name}-link.patch
 Patch5:                %{name}-scache_clnt.patch
-Patch6:                glibc-2.30.patch
 URL:           http://www.postfix.org/
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel}
 BuildRequires: db-devel
@@ -250,7 +249,6 @@ sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %{__make} -f Makefile.init makefiles