From b91909e268b3b8f9812611177dc4d4251019f4a4 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Fri, 26 Feb 2010 12:17:52 +0000
Subject: [PATCH] - update to 2.7.0

---
 .cvsignore                                    |  2 +-
 ...config.patch => postfix-2.7.0-config.patch | 31 +++++++++----------
 postfix.spec                                  |  9 ++++--
 sources                                       |  2 +-
 4 files changed, 23 insertions(+), 21 deletions(-)
 rename postfix-2.6.1-config.patch => postfix-2.7.0-config.patch (87%)

diff --git a/.cvsignore b/.cvsignore
index 8960e92..67b1105 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-postfix-2.6.5.tar.gz
 pflogsumm-1.1.2.tar.gz
+postfix-2.7.0.tar.gz
diff --git a/postfix-2.6.1-config.patch b/postfix-2.7.0-config.patch
similarity index 87%
rename from postfix-2.6.1-config.patch
rename to postfix-2.7.0-config.patch
index 6bffcc9..ea8caf8 100644
--- a/postfix-2.6.1-config.patch
+++ b/postfix-2.7.0-config.patch
@@ -1,6 +1,6 @@
-diff -up postfix-2.6.1/conf/main.cf.config postfix-2.6.1/conf/main.cf
---- postfix-2.6.1/conf/main.cf.config	2007-12-18 14:50:25.000000000 +0100
-+++ postfix-2.6.1/conf/main.cf	2009-05-22 17:04:40.000000000 +0200
+diff -up postfix-2.7.0/conf/main.cf.config postfix-2.7.0/conf/main.cf
+--- postfix-2.7.0/conf/main.cf.config	2007-12-18 14:50:25.000000000 +0100
++++ postfix-2.7.0/conf/main.cf	2010-02-26 12:28:14.000000000 +0100
 @@ -113,6 +113,10 @@ mail_owner = postfix
  #inet_interfaces = all
  #inet_interfaces = $myhostname
@@ -80,19 +80,10 @@ diff -up postfix-2.6.1/conf/main.cf.config postfix-2.6.1/conf/main.cf
  #fallback_transport =
  
  # The luser_relay parameter specifies an optional destination address
-diff -up postfix-2.6.1/conf/master.cf.config postfix-2.6.1/conf/master.cf
---- postfix-2.6.1/conf/master.cf.config	2008-01-30 12:57:57.000000000 +0100
-+++ postfix-2.6.1/conf/master.cf	2009-05-22 16:38:30.000000000 +0200
-@@ -68,7 +68,7 @@ scache    unix  -       -       n       
- # The Cyrus deliver program has changed incompatibly, multiple times.
- #
- #old-cyrus unix  -       n       n       -       -       pipe
--#  flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
-+#  flags=R user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -m ${extension} ${user}
- #
- # ====================================================================
- #
-@@ -76,7 +76,7 @@ scache    unix  -       -       n       
+diff -up postfix-2.7.0/conf/master.cf.config postfix-2.7.0/conf/master.cf
+--- postfix-2.7.0/conf/master.cf.config	2010-02-03 22:01:27.000000000 +0100
++++ postfix-2.7.0/conf/master.cf	2010-02-26 12:31:55.000000000 +0100
+@@ -80,14 +80,14 @@ scache    unix  -       -       n       
  # Also specify in main.cf: cyrus_destination_recipient_limit=1
  #
  #cyrus     unix  -       n       n       -       -       pipe
@@ -101,3 +92,11 @@ diff -up postfix-2.6.1/conf/master.cf.config postfix-2.6.1/conf/master.cf
  #
  # ====================================================================
  #
+ # Old example of delivery via Cyrus.
+ #
+ #old-cyrus unix  -       n       n       -       -       pipe
+-#  flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
++#  flags=R user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -m ${extension} ${user}
+ #
+ # ====================================================================
+ #
diff --git a/postfix.spec b/postfix.spec
index ad9a55f..201e09e 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -39,8 +39,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.6.5
-Release: 3%{?dist}
+Version: 2.7.0
+Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -74,7 +74,7 @@ Source101: postfix-pam.conf
 
 # Patches
 
-Patch1: postfix-2.6.1-config.patch
+Patch1: postfix-2.7.0-config.patch
 Patch2: postfix-2.6.1-files.patch
 Patch3: postfix-alternatives.patch
 Patch8: postfix-large-fs.patch
@@ -499,6 +499,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Feb 26 2010 Miroslav Lichvar <mlichvar@redhat.com> 2:2.7.0-1
+- update to 2.7.0
+
 * Fri Jan 29 2010 Miroslav Lichvar <mlichvar@redhat.com> 2:2.6.5-3
 - fix init script LSB compliance (#528151)
 - update pflogsumm to 1.1.2
diff --git a/sources b/sources
index 7eaf4c7..9ceba8a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6b954cfb3eb6141dac1e773281211717  postfix-2.6.5.tar.gz
 c6bb433444a83564101aa30259cc849b  pflogsumm-1.1.2.tar.gz
+df648f59421604e895cce56325f00bae  postfix-2.7.0.tar.gz