Update to Postfix 2.12-20141013.
There have been some default settings changes so everyone upgrading will have to look at merging some potential config changes. The backwards compat mode will ensure existing configs work as is but users should look at updating their configs and especially keep master.cf in mind due to the default chroot setting. http://www.postfix.org/COMPATIBILITY_README.html ok sthen@
This commit is contained in:
brad
parent
9575c25843
commit
e4fba4c1a9
@ -1,7 +1,6 @@
|
||||
# $OpenBSD: Makefile,v 1.274 2014/09/13 18:09:21 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.275 2014/10/16 18:27:28 brad Exp $
|
||||
|
||||
VERSION= 2.12-20140801
|
||||
REVISION= 0
|
||||
VERSION= 2.12-20141013
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/}
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (postfix/postfix-2.12-20140801.tar.gz) = caoXg+D4xPorPvgdYsENOW8vM5XLtAUA0cFROW0pnaU=
|
||||
SIZE (postfix/postfix-2.12-20140801.tar.gz) = 4142466
|
||||
SHA256 (postfix/postfix-2.12-20141013.tar.gz) = roFmuYyjNInALEAdu/+vW23lXIb4YviR/x2s8KCDdHQ=
|
||||
SIZE (postfix/postfix-2.12-20141013.tar.gz) = 4185611
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-conf_main_cf,v 1.2 2013/04/30 11:28:02 sthen Exp $
|
||||
--- conf/main.cf.orig Thu Nov 17 18:23:48 2011
|
||||
+++ conf/main.cf Mon Apr 29 16:14:02 2013
|
||||
@@ -114,6 +114,9 @@ mail_owner = postfix
|
||||
$OpenBSD: patch-conf_main_cf,v 1.3 2014/10/16 18:27:28 brad Exp $
|
||||
--- conf/main.cf.orig Wed Oct 1 17:36:20 2014
|
||||
+++ conf/main.cf Sun Oct 5 03:50:16 2014
|
||||
@@ -133,6 +133,9 @@ mail_owner = postfix
|
||||
#inet_interfaces = $myhostname
|
||||
#inet_interfaces = $myhostname, localhost
|
||||
|
||||
@ -11,7 +11,7 @@ $OpenBSD: patch-conf_main_cf,v 1.2 2013/04/30 11:28:02 sthen Exp $
|
||||
# The proxy_interfaces parameter specifies the network interface
|
||||
# addresses that this mail system receives mail on by way of a
|
||||
# proxy or network address translation unit. This setting extends
|
||||
@@ -654,4 +657,3 @@ sample_directory =
|
||||
@@ -673,4 +676,3 @@ sample_directory =
|
||||
# readme_directory: The location of the Postfix README files.
|
||||
#
|
||||
readme_directory =
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-conf_master_cf,v 1.7 2014/01/17 03:01:41 brad Exp $
|
||||
--- conf/master.cf.orig Tue Dec 24 09:58:27 2013
|
||||
+++ conf/master.cf Wed Jan 8 20:47:21 2014
|
||||
$OpenBSD: patch-conf_master_cf,v 1.8 2014/10/16 18:27:28 brad Exp $
|
||||
--- conf/master.cf.orig Wed Oct 1 17:47:03 2014
|
||||
+++ conf/master.cf Thu Oct 16 13:38:42 2014
|
||||
@@ -9,12 +9,12 @@
|
||||
# service type private unpriv chroot wakeup maxproc command + args
|
||||
# (yes) (yes) (yes) (never) (100)
|
||||
# (yes) (yes) (no) (never) (100)
|
||||
# ==========================================================================
|
||||
-smtp inet n - n - - smtpd
|
||||
-#smtp inet n - n - 1 postscreen
|
||||
@ -11,12 +11,12 @@ $OpenBSD: patch-conf_master_cf,v 1.7 2014/01/17 03:01:41 brad Exp $
|
||||
-#dnsblog unix - - n - 0 dnsblog
|
||||
-#tlsproxy unix - - n - 0 tlsproxy
|
||||
-#submission inet n - n - - smtpd
|
||||
+smtp inet n - - - - smtpd
|
||||
+#smtp inet n - - - 1 postscreen
|
||||
+#smtpd pass - - - - - smtpd
|
||||
+#dnsblog unix - - - - 0 dnsblog
|
||||
+#tlsproxy unix - - - - 0 tlsproxy
|
||||
+#submission inet n - - - - smtpd
|
||||
+smtp inet n - y - - smtpd
|
||||
+#smtp inet n - y - 1 postscreen
|
||||
+#smtpd pass - - y - - smtpd
|
||||
+#dnsblog unix - - y - 0 dnsblog
|
||||
+#tlsproxy unix - - y - 0 tlsproxy
|
||||
+#submission inet n - y - - smtpd
|
||||
# -o syslog_name=postfix/submission
|
||||
# -o smtpd_tls_security_level=encrypt
|
||||
# -o smtpd_sasl_auth_enable=yes
|
||||
@ -25,7 +25,7 @@ $OpenBSD: patch-conf_master_cf,v 1.7 2014/01/17 03:01:41 brad Exp $
|
||||
# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
|
||||
# -o milter_macro_daemon_name=ORIGINATING
|
||||
-#smtps inet n - n - - smtpd
|
||||
+#smtps inet n - - - - smtpd
|
||||
+#smtps inet n - y - - smtpd
|
||||
# -o syslog_name=postfix/smtps
|
||||
# -o smtpd_tls_wrappermode=yes
|
||||
# -o smtpd_sasl_auth_enable=yes
|
||||
@ -45,41 +45,41 @@ $OpenBSD: patch-conf_master_cf,v 1.7 2014/01/17 03:01:41 brad Exp $
|
||||
-trace unix - - n - 0 bounce
|
||||
-verify unix - - n - 1 verify
|
||||
-flush unix n - n 1000? 0 flush
|
||||
+#628 inet n - - - - qmqpd
|
||||
+pickup unix n - - 60 1 pickup
|
||||
+cleanup unix n - - - 0 cleanup
|
||||
+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
|
||||
+defer unix - - - - 0 bounce
|
||||
+trace unix - - - - 0 bounce
|
||||
+verify unix - - - - 1 verify
|
||||
+flush unix n - - 1000? 0 flush
|
||||
+#628 inet n - y - - qmqpd
|
||||
+pickup unix n - y 60 1 pickup
|
||||
+cleanup unix n - y - 0 cleanup
|
||||
+qmgr unix n - y 300 1 qmgr
|
||||
+#qmgr unix n - y 300 1 oqmgr
|
||||
+tlsmgr unix - - y 1000? 1 tlsmgr
|
||||
+rewrite unix - - y - - trivial-rewrite
|
||||
+bounce unix - - y - 0 bounce
|
||||
+defer unix - - y - 0 bounce
|
||||
+trace unix - - y - 0 bounce
|
||||
+verify unix - - y - 1 verify
|
||||
+flush unix n - y 1000? 0 flush
|
||||
proxymap unix - - n - - proxymap
|
||||
proxywrite unix - - n - 1 proxymap
|
||||
-smtp unix - - n - - smtp
|
||||
-relay unix - - n - - smtp
|
||||
+smtp unix - - - - - smtp
|
||||
+relay unix - - - - - smtp
|
||||
+smtp unix - - y - - smtp
|
||||
+relay unix - - y - - smtp
|
||||
# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
|
||||
-showq unix n - n - - showq
|
||||
-error unix - - n - - error
|
||||
-retry unix - - n - - error
|
||||
-discard unix - - n - - discard
|
||||
+showq unix n - - - - showq
|
||||
+error unix - - - - - error
|
||||
+retry unix - - - - - error
|
||||
+discard unix - - - - - discard
|
||||
+showq unix n - y - - showq
|
||||
+error unix - - y - - error
|
||||
+retry unix - - y - - error
|
||||
+discard unix - - y - - discard
|
||||
local unix - n n - - local
|
||||
virtual unix - n n - - virtual
|
||||
-lmtp unix - - n - - lmtp
|
||||
-anvil unix - - n - 1 anvil
|
||||
-scache unix - - n - 1 scache
|
||||
+lmtp unix - - - - - lmtp
|
||||
+anvil unix - - - - 1 anvil
|
||||
+scache unix - - - - 1 scache
|
||||
+lmtp unix - - y - - lmtp
|
||||
+anvil unix - - y - 1 anvil
|
||||
+scache unix - - y - 1 scache
|
||||
#
|
||||
# ====================================================================
|
||||
# Interfaces to non-Postfix software. Be sure to examine the manual
|
||||
@ -88,7 +88,7 @@ $OpenBSD: patch-conf_master_cf,v 1.7 2014/01/17 03:01:41 brad Exp $
|
||||
#
|
||||
#cyrus unix - n n - - pipe
|
||||
-# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
|
||||
+# user=_cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
|
||||
+# user=_cyrus argv=/usr/local/libexec/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user}
|
||||
#
|
||||
# ====================================================================
|
||||
#
|
||||
@ -96,7 +96,7 @@ $OpenBSD: patch-conf_master_cf,v 1.7 2014/01/17 03:01:41 brad Exp $
|
||||
#
|
||||
#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}
|
||||
+# flags=R user=_cyrus argv=/usr/local/libexec/cyrus-imapd/deliver -e -m ${extension} ${user}
|
||||
#
|
||||
# ====================================================================
|
||||
#
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user