From d430aec8af65179bbb58434cbe7c09e82a8dfccc Mon Sep 17 00:00:00 2001 From: sthen Date: Thu, 10 Nov 2011 17:27:09 +0000 Subject: [PATCH] update to postfix 20111109 snapshot, from Brad --- mail/postfix/snapshot/Makefile | 5 ++--- mail/postfix/snapshot/distinfo | 10 +++++----- mail/postfix/snapshot/patches/patch-conf_master_cf | 14 ++++++-------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/mail/postfix/snapshot/Makefile b/mail/postfix/snapshot/Makefile index d1592bcda5b..cc82951005d 100644 --- a/mail/postfix/snapshot/Makefile +++ b/mail/postfix/snapshot/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.225 2011/11/07 12:31:22 sthen Exp $ +# $OpenBSD: Makefile,v 1.226 2011/11/10 17:27:09 sthen Exp $ -VERSION= 2.9-20111025 -REVISION= 0 +VERSION= 2.9-20111109 MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/} diff --git a/mail/postfix/snapshot/distinfo b/mail/postfix/snapshot/distinfo index 0fd699d1ce3..62d98a2992f 100644 --- a/mail/postfix/snapshot/distinfo +++ b/mail/postfix/snapshot/distinfo @@ -1,5 +1,5 @@ -MD5 (postfix/postfix-2.9-20111025.tar.gz) = gGUHkrG70eMaQnXOlJDqLA== -RMD160 (postfix/postfix-2.9-20111025.tar.gz) = o5U+60tciyWNIu1A9uMa+WyS4KY= -SHA1 (postfix/postfix-2.9-20111025.tar.gz) = aJOwD/sSmLuSs4cwNPVnJrTgTmU= -SHA256 (postfix/postfix-2.9-20111025.tar.gz) = 2Vt3OYufpS0M3Gx4fcBm6kSRKCBftpsl395xLNwadmg= -SIZE (postfix/postfix-2.9-20111025.tar.gz) = 3676422 +MD5 (postfix/postfix-2.9-20111109.tar.gz) = 4pNSHU40vAwjDTvczjSloQ== +RMD160 (postfix/postfix-2.9-20111109.tar.gz) = MsHoqBOJDaD51QyxQkBsQk6Vp4I= +SHA1 (postfix/postfix-2.9-20111109.tar.gz) = xs0LIO/VRLhHebRvbAwRobMFrQM= +SHA256 (postfix/postfix-2.9-20111109.tar.gz) = diiahiHBKUwQU5RsQ+f2+zs8WSDR8MEz+XQP9ha5RBM= +SIZE (postfix/postfix-2.9-20111109.tar.gz) = 3681747 diff --git a/mail/postfix/snapshot/patches/patch-conf_master_cf b/mail/postfix/snapshot/patches/patch-conf_master_cf index 7d9563c71e2..b5810ede382 100644 --- a/mail/postfix/snapshot/patches/patch-conf_master_cf +++ b/mail/postfix/snapshot/patches/patch-conf_master_cf @@ -1,7 +1,7 @@ -$OpenBSD: patch-conf_master_cf,v 1.1 2011/03/09 10:47:31 sthen Exp $ ---- conf/master.cf.orig Fri Dec 31 14:14:51 2010 -+++ conf/master.cf Wed Mar 9 10:45:45 2011 -@@ -8,49 +8,49 @@ +$OpenBSD: patch-conf_master_cf,v 1.2 2011/11/10 17:27:09 sthen Exp $ +--- conf/master.cf.orig Tue Nov 8 19:33:52 2011 ++++ conf/master.cf Thu Nov 10 10:14:21 2011 +@@ -8,47 +8,47 @@ # service type private unpriv chroot wakeup maxproc command + args # (yes) (yes) (yes) (never) (100) # ========================================================================== @@ -54,11 +54,9 @@ $OpenBSD: patch-conf_master_cf,v 1.1 2011/03/09 10:47:31 sthen Exp $ proxymap unix - - n - - proxymap proxywrite unix - - n - 1 proxymap -smtp unix - - n - - smtp -+smtp unix - - - - - smtp - # When relaying mail as backup MX, disable fallback_relay to avoid MX loops -relay unix - - n - - smtp ++smtp unix - - - - - smtp +relay unix - - - - - smtp - -o smtp_fallback_relay= # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 -showq unix n - n - - showq -error unix - - n - - error @@ -79,7 +77,7 @@ $OpenBSD: patch-conf_master_cf,v 1.1 2011/03/09 10:47:31 sthen Exp $ # # ==================================================================== # Interfaces to non-Postfix software. Be sure to examine the manual -@@ -84,14 +84,14 @@ scache unix - - n - 1 +@@ -82,14 +82,14 @@ scache unix - - n - 1 # Also specify in main.cf: cyrus_destination_recipient_limit=1 # #cyrus unix - n n - - pipe