From d004b5df786ebbd67c24bc33262cc8cf5b80dc37 Mon Sep 17 00:00:00 2001 From: jakob Date: Sat, 14 Nov 2009 07:05:44 +0000 Subject: [PATCH] upgrade to postfix snapshot 20091110; from brad --- mail/postfix/snapshot/Makefile | 4 ++-- mail/postfix/snapshot/distinfo | 10 ++++---- mail/postfix/snapshot/patches/patch-master.cf | 23 +++++++++---------- mail/postfix/snapshot/pkg/PLIST | 8 ++++++- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/mail/postfix/snapshot/Makefile b/mail/postfix/snapshot/Makefile index 4b2b0fea821..c5337ec9f8d 100644 --- a/mail/postfix/snapshot/Makefile +++ b/mail/postfix/snapshot/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.198 2009/08/30 12:25:55 sthen Exp $ +# $OpenBSD: Makefile,v 1.199 2009/11/14 07:05:44 jakob Exp $ -VERSION= 2.7-20090828 +VERSION= 2.7-20091110 MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/} diff --git a/mail/postfix/snapshot/distinfo b/mail/postfix/snapshot/distinfo index c5196c7a42b..902fc687716 100644 --- a/mail/postfix/snapshot/distinfo +++ b/mail/postfix/snapshot/distinfo @@ -1,5 +1,5 @@ -MD5 (postfix/postfix-2.7-20090828.tar.gz) = 4yuyl/pB42xzFg7wmrnwJA== -RMD160 (postfix/postfix-2.7-20090828.tar.gz) = Fj8zx5NpYAJ77lD57sQA2OMdh08= -SHA1 (postfix/postfix-2.7-20090828.tar.gz) = +zEb6jl9W6kvtb7wS/kVPt7ugMk= -SHA256 (postfix/postfix-2.7-20090828.tar.gz) = nnWy8rVjOexiLs9QZ2QI3Ppq9fxo3Xfzowxm0y24XGo= -SIZE (postfix/postfix-2.7-20090828.tar.gz) = 3335807 +MD5 (postfix/postfix-2.7-20091110.tar.gz) = 9LIahXj7GdsFYMAtcTzTdg== +RMD160 (postfix/postfix-2.7-20091110.tar.gz) = DkKk5fzcylZYupDHXIVBZiwaZS8= +SHA1 (postfix/postfix-2.7-20091110.tar.gz) = s6EfV85hbIrakfx78GDDwe8qjI8= +SHA256 (postfix/postfix-2.7-20091110.tar.gz) = uw/+yH0J2FJieKRrGfWsKbis0oyAT0+ZJgQHOGMvmH4= +SIZE (postfix/postfix-2.7-20091110.tar.gz) = 3379976 diff --git a/mail/postfix/snapshot/patches/patch-master.cf b/mail/postfix/snapshot/patches/patch-master.cf index c29322ae9e8..ba710ad72cc 100644 --- a/mail/postfix/snapshot/patches/patch-master.cf +++ b/mail/postfix/snapshot/patches/patch-master.cf @@ -1,5 +1,5 @@ ---- conf/master.cf.orig Wed Jan 30 12:57:57 2008 -+++ conf/master.cf Sun Feb 17 05:17:51 2008 +--- conf/master.cf.orig Wed Oct 21 08:52:32 2009 ++++ conf/master.cf Thu Nov 12 18:59:40 2009 @@ -8,8 +8,8 @@ # service type private unpriv chroot wakeup maxproc command + args # (yes) (yes) (yes) (never) (100) @@ -67,16 +67,7 @@ # # ==================================================================== # Interfaces to non-Postfix software. Be sure to examine the manual -@@ -68,7 +68,7 @@ scache unix - - n - 1 - # 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=/cyrus/bin/deliver -e -m ${extension} ${user} - # - # ==================================================================== - # -@@ -76,7 +76,7 @@ scache unix - - n - 1 +@@ -80,14 +80,14 @@ scache unix - - n - 1 # Also specify in main.cf: cyrus_destination_recipient_limit=1 # #cyrus unix - n n - - pipe @@ -85,3 +76,11 @@ # # ==================================================================== # + # 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=/cyrus/bin/deliver -e -m ${extension} ${user} + # + # ==================================================================== + # diff --git a/mail/postfix/snapshot/pkg/PLIST b/mail/postfix/snapshot/pkg/PLIST index 6ea87786e8e..c7fa4e8d788 100644 --- a/mail/postfix/snapshot/pkg/PLIST +++ b/mail/postfix/snapshot/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.52 2009/04/19 14:14:22 jakob Exp $ +@comment $OpenBSD: PLIST,v 1.53 2009/11/14 07:05:44 jakob Exp $ @conflict postfix-* @newgroup _postfix:507 @newgroup _postdrop:508 @@ -14,6 +14,7 @@ libexec/postfix/ @bin libexec/postfix/bounce @bin libexec/postfix/cleanup @bin libexec/postfix/discard +@bin libexec/postfix/dnsblog @bin libexec/postfix/error @bin libexec/postfix/flush @bin libexec/postfix/lmtp @@ -30,6 +31,7 @@ libexec/postfix/postfix-files libexec/postfix/postfix-script libexec/postfix/postfix-wrapper libexec/postfix/postmulti-script +@bin libexec/postfix/postscreen @bin libexec/postfix/proxymap @bin libexec/postfix/qmgr @bin libexec/postfix/qmqpd @@ -84,6 +86,7 @@ libexec/postfix/postmulti-script @man man/man8/cleanup.8 @man man/man8/defer.8 @man man/man8/discard.8 +@man man/man8/dnsblog.8 @man man/man8/error.8 @man man/man8/flush.8 @man man/man8/lmtp.8 @@ -92,6 +95,7 @@ libexec/postfix/postmulti-script @man man/man8/oqmgr.8 @man man/man8/pickup.8 @man man/man8/pipe.8 +@man man/man8/postscreen.8 @man man/man8/proxymap.8 @man man/man8/qmgr.8 @man man/man8/qmqpd.8 @@ -181,6 +185,7 @@ share/doc/postfix/html/cidr_table.5.html share/doc/postfix/html/cleanup.8.html share/doc/postfix/html/defer.8.html share/doc/postfix/html/discard.8.html +share/doc/postfix/html/dnsblog.8.html share/doc/postfix/html/error.8.html share/doc/postfix/html/flush.8.html share/doc/postfix/html/generic.5.html @@ -215,6 +220,7 @@ share/doc/postfix/html/postlog.1.html share/doc/postfix/html/postmap.1.html share/doc/postfix/html/postmulti.1.html share/doc/postfix/html/postqueue.1.html +share/doc/postfix/html/postscreen.8.html share/doc/postfix/html/postsuper.1.html share/doc/postfix/html/proxymap.8.html share/doc/postfix/html/qmgr.8.html