- updated to 2.11.5, updated VDA patch

diff --git a/format-security.patch b/format-security.patch
index 274ff1da2ebbfc63f10d2d3f44f27a26dfc58776..d5ffaf9e052fa4240d7498a1c6a1a18ae6678e6f 100644 (file)
--- a/format-security.patch
+++ b/format-security.patch
@@ -1,26 +1,26 @@
---- postfix-2.9.4/src/virtual/maildir.c.orig   2012-12-07 08:38:15.031182187 +0100
-+++ postfix-2.9.4/src/virtual/maildir.c        2012-12-07 08:39:11.291180202 +0100
-@@ -972,19 +972,19 @@
+--- postfix-2.11.5/src/virtual/maildir.c.orig  2015-06-08 08:05:21.064261014 +0000
++++ postfix-2.11.5/src/virtual/maildir.c       2015-06-08 08:07:40.918261014 +0000
+@@ -972,19 +972,19 @@ int deliver_maildir(LOCAL_STATE state, U
          if (*var_virt_maildir_limit_message_maps != 0 && (limit_message = mail_addr_find(virtual_maildir_limit_message_maps, state.msg_attr.user, (char **) NULL)) != 0) {
              errno = errnored;
              if (errno == EFBIG) {
--                dsb_simple(why, "5.2.2", limit_message);
-+                dsb_simple(why, "5.2.2", "%s", limit_message);
+-                dsb_simple(why, "5.2.2", limit_message, NULL);
++                dsb_simple(why, "5.2.2", "%s", limit_message, NULL);
              }
              if (errno == EDQUOT) {
--                dsb_simple(why, "4.2.2", limit_message);
-+                dsb_simple(why, "4.2.2", "%s", limit_message);
+-                dsb_simple(why, "4.2.2", limit_message, NULL);
++                dsb_simple(why, "4.2.2", "%s", limit_message, NULL);
              }
          }
          else {
              errno = errnored;
              if (errno == EFBIG) {
--                dsb_simple(why, "5.2.2", var_virt_maildir_limit_message);
-+                dsb_simple(why, "5.2.2", "%s", var_virt_maildir_limit_message);
+-                dsb_simple(why, "5.2.2", var_virt_maildir_limit_message, NULL);
++                dsb_simple(why, "5.2.2", "%s", var_virt_maildir_limit_message, NULL);
              }
              if (errno == EDQUOT) {
--                dsb_simple(why, "4.2.2", var_virt_maildir_limit_message);
-+                dsb_simple(why, "4.2.2", "%s", var_virt_maildir_limit_message);
+-                dsb_simple(why, "4.2.2", var_virt_maildir_limit_message, NULL);
++                dsb_simple(why, "4.2.2", "%s", var_virt_maildir_limit_message, NULL);
              }
          }
  

diff --git a/postfix.spec b/postfix.spec
index a0dba3fe708f8cb12b84c2d9454e176ee533c691..933468cb0f7aa9c01e0cb02986ffe2fbc6a21bac 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -12,7 +12,7 @@
 %bcond_with    tcp     # with unofficial tcp: lookup table
 %bcond_without epoll   # disable epoll for 2.4 kernels
 
-%define                vda_ver v11-2.9.1
+%define                vda_ver v13-2.10.0
 Summary:       Postfix Mail Transport Agent
 Summary(cs.UTF-8):     Postfix - program pro přepravu pošty (MTA)
 Summary(es.UTF-8):     Postfix - Un MTA (Mail Transport Agent) de alto desempeño
@@ -21,13 +21,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:       2.11.4
+Version:       2.11.5
 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: 7f1f67b205992f3e8acc98d597a4deef
+# Source0-md5: 8523f6d1de6f522313207524d794ee9c
 Source1:       %{name}.aliases
 Source2:       %{name}.cron
 Source3:       %{name}.init
@@ -35,7 +35,7 @@ Source4:      %{name}.sysconfig
 Source5:       %{name}.sasl
 Source6:       %{name}.pamd
 Source7:       http://vda.sourceforge.net/VDA/%{name}-vda-%{vda_ver}.patch
-# Source7-md5: a54a21428de5eeae91b4bb670976e37a
+# Source7-md5: 01e1b031d79b85f3cb67d98ceddd775d
 Source8:       %{name}-bounce.cf.pl
 # http://postfix.state-of-mind.de/bounce-templates/bounce.de-DE.cf
 Source9:       %{name}-bounce.cf.de