- up to 3.5.0

diff --git a/80_glibc2.30-ftbfs.diff b/80_glibc2.30-ftbfs.diff
deleted file mode 100644 (file)
index c36baf0..0000000
--- a/80_glibc2.30-ftbfs.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: fix build with glibc 2.30
- glibc 2.30 release notes at
- https://savannah.gnu.org/forum/forum.php?forum_id=9515 states:
- """
- Support for the "inet6" option in /etc/resolv.conf and the RES_USE_INET6
- resolver flag (deprecated in glibc 2.25) have been removed.
- ...
- The obsolete RES_INSECURE1 and RES_INSECURE2 option flags for the DNS stub
- resolver have been removed from <resolv.h>.
- """
- And RES_AAONLY and RES_PRIMARY are already flagged as deprecated and are
- being guarded with the same fix.
-Origin: upstream, https://github.com/vdukhovni/postfix/commit/3274c3cea9d739f86e84b65664aabb692e37e83f#diff-777bfb681a1cd539ddc8e1e606959ffa
-Bug: http://postfix.1071664.n5.nabble.com/build-failure-with-glibc-2-30-td102511.html
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1842923
-Last-Update: 2019-09-05
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/postfix/src/dns/dns_str_resflags.c b/postfix/src/dns/dns_str_resflags.c
-index 5f2cce5e..472394c3 100644
---- a/src/dns/dns_str_resflags.c
-+++ b/src/dns/dns_str_resflags.c
-@@ -52,18 +52,28 @@
- static const LONG_NAME_MASK resflag_table[] = {
-     "RES_INIT", RES_INIT,
-     "RES_DEBUG", RES_DEBUG,
-+#ifdef RES_AAONLY
-     "RES_AAONLY", RES_AAONLY,
-+#endif
-     "RES_USEVC", RES_USEVC,
-+#ifdef RES_PRIMARY
-     "RES_PRIMARY", RES_PRIMARY,
-+#endif
-     "RES_IGNTC", RES_IGNTC,
-     "RES_RECURSE", RES_RECURSE,
-     "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 28db6efe693d89277dc7190fed4163c5e60fd4e5..cd922867f09b56339eee85cd5f33359e931ecc48 100644 (file)
--- a/postfix-conf.patch
+++ b/postfix-conf.patch
@@ -1,11 +1,11 @@
 --- postfix-2.3.0/conf/master.cf~      2006-07-25 13:36:17.245609587 +0300
 +++ postfix-2.3.0/conf/master.cf       2006-07-25 13:37:53.847756797 +0300
-@@ -55,7 +55,7 @@
+@@ -79,7 +79,7 @@ postlog   unix-dgram n  -       n
  # 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}
  #
  # ====================================================================
  #

diff --git a/postfix-master.cf_cyrus.patch b/postfix-master.cf_cyrus.patch
index 1947926ecfc2da396a04a562c06758590082867e..cd5e80b7a2603aef5456c26908fea3615639aeaf 100644 (file)
--- a/postfix-master.cf_cyrus.patch
+++ b/postfix-master.cf_cyrus.patch
@@ -1,11 +1,11 @@
 --- postfix-2.2.2/conf/master.cf.orig  2005-01-24 20:12:46.000000000 +0100
 +++ postfix-2.2.2/conf/master.cf       2005-04-26 11:46:51.000000000 +0200
-@@ -60,14 +60,14 @@
+@@ -98,14 +98,14 @@ postlog   unix-dgram n  -       n
  # 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}
  #
  # ====================================================================
  #
@@ -17,3 +17,4 @@
  #
  # ====================================================================
  #
+

diff --git a/postfix.spec b/postfix.spec
index f02c352f37987278db941debf9837f284efd2632..2efbd0e66dbc531b1772f8f39e0677264d488ea6 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.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
@@ -55,7 +55,6 @@ Source11:     %{name}-vda-bigquota.patch
 # -ource11-md5:        d46103195b43ec5784ea2c166b238f71
 Source12:      %{name}.service
 Patch0:                %{name}-config.patch
-Patch1:                80_glibc2.30-ftbfs.diff
 
 Patch3:                %{name}-master.cf_cyrus.patch
 # from http://akson.sgh.waw.pl/~chopin/unix/postfix-2.1.5-header_if_reject.diff
@@ -302,7 +301,6 @@ 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}