diff --git a/mail/postfix/snapshot/Makefile b/mail/postfix/snapshot/Makefile index ddc24f9c01f..830601847a0 100644 --- a/mail/postfix/snapshot/Makefile +++ b/mail/postfix/snapshot/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.246 2012/09/05 23:18:11 sthen Exp $ +# $OpenBSD: Makefile,v 1.247 2012/10/04 08:39:04 brad Exp $ -VERSION= 2.10-20120902 +VERSION= 2.10-20120924 MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/} diff --git a/mail/postfix/snapshot/distinfo b/mail/postfix/snapshot/distinfo index af4845b1493..fd1a0aef92f 100644 --- a/mail/postfix/snapshot/distinfo +++ b/mail/postfix/snapshot/distinfo @@ -1,2 +1,2 @@ -SHA256 (postfix/postfix-2.10-20120902.tar.gz) = mti0bOlkiPLmGSpUDr1MaSKdgKTMyGqR5651VCvftak= -SIZE (postfix/postfix-2.10-20120902.tar.gz) = 3785733 +SHA256 (postfix/postfix-2.10-20120924.tar.gz) = 358lxW/WqgycxotXxpUYe+UXRsfuiXoW+adAjCgaptI= +SIZE (postfix/postfix-2.10-20120924.tar.gz) = 3789252 diff --git a/mail/postfix/snapshot/patches/patch-conf_master_cf b/mail/postfix/snapshot/patches/patch-conf_master_cf index c6909daf58a..429674e01bc 100644 --- a/mail/postfix/snapshot/patches/patch-conf_master_cf +++ b/mail/postfix/snapshot/patches/patch-conf_master_cf @@ -1,6 +1,6 @@ -$OpenBSD: patch-conf_master_cf,v 1.4 2012/04/10 22:24:29 sthen Exp $ ---- conf/master.cf.orig Tue Mar 13 19:50:43 2012 -+++ conf/master.cf Tue Apr 10 17:06:14 2012 +$OpenBSD: patch-conf_master_cf,v 1.5 2012/10/04 08:39:04 brad Exp $ +--- conf/master.cf.orig Mon Sep 24 20:10:16 2012 ++++ conf/master.cf Wed Oct 3 21:32:18 2012 @@ -8,12 +8,12 @@ # service type private unpriv chroot wakeup maxproc command + args # (yes) (yes) (yes) (never) (100) @@ -34,10 +34,10 @@ $OpenBSD: patch-conf_master_cf,v 1.4 2012/04/10 22:24:29 sthen Exp $ # -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject # -o milter_macro_daemon_name=ORIGINATING -#628 inet n - n - - qmqpd --pickup fifo n - n 60 1 pickup +-pickup unix n - n 60 1 pickup -cleanup unix n - n - 0 cleanup --qmgr fifo n - n 300 1 qmgr --#qmgr fifo n - n 300 1 oqmgr +-qmgr unix n - n 300 1 qmgr +-#qmgr unix n - n 300 1 oqmgr -tlsmgr unix - - n 1000? 1 tlsmgr -rewrite unix - - n - - trivial-rewrite -bounce unix - - n - 0 bounce @@ -46,10 +46,10 @@ $OpenBSD: patch-conf_master_cf,v 1.4 2012/04/10 22:24:29 sthen Exp $ -verify unix - - n - 1 verify -flush unix n - n 1000? 0 flush +#628 inet n - - - - qmqpd -+pickup fifo n - - 60 1 pickup ++pickup unix n - - 60 1 pickup +cleanup unix n - - - 0 cleanup -+qmgr fifo n - - 300 1 qmgr -+#qmgr fifo n - - 300 1 oqmgr ++qmgr unix n - - 300 1 qmgr ++#qmgr unix n - - 300 1 oqmgr +tlsmgr unix - - - 1000? 1 tlsmgr +rewrite unix - - - - - trivial-rewrite +bounce unix - - - - 0 bounce