diff --git a/mail/postfix/stable/Makefile b/mail/postfix/stable/Makefile index 23672b5fefd..536f5d265e9 100644 --- a/mail/postfix/stable/Makefile +++ b/mail/postfix/stable/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.151 2012/02/02 06:57:39 jakob Exp $ +# $OpenBSD: Makefile,v 1.152 2012/02/20 09:55:48 sthen Exp $ -VERSION= 2.8.8 +VERSION= 2.9.0 MASTER_SITES= ${MASTER_SITE_POSTFIX:=official/} diff --git a/mail/postfix/stable/distinfo b/mail/postfix/stable/distinfo index 71f96591bfc..6eb3853021d 100644 --- a/mail/postfix/stable/distinfo +++ b/mail/postfix/stable/distinfo @@ -1,5 +1,5 @@ -MD5 (postfix/postfix-2.8.8.tar.gz) = /w1OZSTAdgEVSzrL5YJ5Fw== -RMD160 (postfix/postfix-2.8.8.tar.gz) = 63G1Qq8qANpfEiIJRnMVYP8gN30= -SHA1 (postfix/postfix-2.8.8.tar.gz) = txKyWhBcEytAtjrvSSaOoRe4bwM= -SHA256 (postfix/postfix-2.8.8.tar.gz) = d9yY4h2kiQHTJumPkY6lDWytZu5YEgM7Wqs0LJV4Mow= -SIZE (postfix/postfix-2.8.8.tar.gz) = 3648317 +MD5 (postfix/postfix-2.9.0.tar.gz) = Q6XqLW+zkYWmC0Y14BaWfg== +RMD160 (postfix/postfix-2.9.0.tar.gz) = BFTc4ugu2xH35h+AOBVMMqR7xgU= +SHA1 (postfix/postfix-2.9.0.tar.gz) = oEpyqLlDYnmjC30bYhl75jEkoTI= +SHA256 (postfix/postfix-2.9.0.tar.gz) = rtmzYOt09Gv9bG7+TrckzgE8uMbUrUOIjdlAqi0z5uw= +SIZE (postfix/postfix-2.9.0.tar.gz) = 3768091 diff --git a/mail/postfix/stable/patches/patch-conf_main_cf b/mail/postfix/stable/patches/patch-conf_main_cf index da50ecd5d06..bab6931743e 100644 --- a/mail/postfix/stable/patches/patch-conf_main_cf +++ b/mail/postfix/stable/patches/patch-conf_main_cf @@ -1,6 +1,6 @@ -$OpenBSD: patch-conf_main_cf,v 1.3 2012/02/02 06:57:39 jakob Exp $ +$OpenBSD: patch-conf_main_cf,v 1.4 2012/02/20 09:55:49 sthen Exp $ --- conf/main.cf.orig Tue Dec 18 13:50:25 2007 -+++ conf/main.cf Wed Mar 9 10:46:11 2011 ++++ conf/main.cf Wed Mar 9 10:45:45 2011 @@ -114,6 +114,9 @@ mail_owner = postfix #inet_interfaces = $myhostname #inet_interfaces = $myhostname, localhost diff --git a/mail/postfix/stable/patches/patch-conf_master_cf b/mail/postfix/stable/patches/patch-conf_master_cf index 4acb402d534..e0c0f15f842 100644 --- a/mail/postfix/stable/patches/patch-conf_master_cf +++ b/mail/postfix/stable/patches/patch-conf_master_cf @@ -1,6 +1,6 @@ -$OpenBSD: patch-conf_master_cf,v 1.3 2012/02/02 06:57:39 jakob Exp $ ---- conf/master.cf.orig Fri Dec 31 14:14:51 2010 -+++ conf/master.cf Wed Mar 9 10:46:11 2011 +$OpenBSD: patch-conf_master_cf,v 1.4 2012/02/20 09:55:49 sthen Exp $ +--- conf/master.cf.orig Wed Dec 14 12:44:24 2011 ++++ conf/master.cf Sat Dec 17 20:20:15 2011 @@ -8,49 +8,49 @@ # service type private unpriv chroot wakeup maxproc command + args # (yes) (yes) (yes) (never) (100) @@ -17,12 +17,14 @@ $OpenBSD: patch-conf_master_cf,v 1.3 2012/02/02 06:57:39 jakob Exp $ +#dnsblog unix - - - - 0 dnsblog +#tlsproxy unix - - - - 0 tlsproxy +#submission inet n - - - - smtpd + # -o syslog_name=postfix/submission # -o smtpd_tls_security_level=encrypt # -o smtpd_sasl_auth_enable=yes # -o smtpd_client_restrictions=permit_sasl_authenticated,reject # -o milter_macro_daemon_name=ORIGINATING -#smtps inet n - n - - smtpd +#smtps inet n - - - - smtpd + # -o syslog_name=postfix/smtps # -o smtpd_tls_wrappermode=yes # -o smtpd_sasl_auth_enable=yes # -o smtpd_client_restrictions=permit_sasl_authenticated,reject @@ -54,11 +56,9 @@ $OpenBSD: patch-conf_master_cf,v 1.3 2012/02/02 06:57:39 jakob 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 diff --git a/mail/postfix/stable/pkg/DESCR b/mail/postfix/stable/pkg/DESCR index 353b40ad001..2241a5787e7 100644 --- a/mail/postfix/stable/pkg/DESCR +++ b/mail/postfix/stable/pkg/DESCR @@ -11,4 +11,4 @@ Extra features always included: Optional features included using flavors: - authenticated SMTP using Cyrus SASL v2 -- table lookups using LDAP, MySQL, PostgreSQL, BerkeleyDB +- table lookups using LDAP, MySQL, PostgreSQL, BerkeleyDB, SQLite diff --git a/mail/postfix/stable/pkg/PLIST b/mail/postfix/stable/pkg/PLIST index c059c878a96..a91c3595256 100644 --- a/mail/postfix/stable/pkg/PLIST +++ b/mail/postfix/stable/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.30 2012/02/02 06:57:39 jakob Exp $ +@comment $OpenBSD: PLIST,v 1.31 2012/02/20 09:55:49 sthen Exp $ @conflict postfix-* @newgroup _postfix:507 @newgroup _postdrop:508 @@ -70,6 +70,7 @@ libexec/postfix/postmulti-script @man man/man5/header_checks.5 @man man/man5/ldap_table.5 @man man/man5/master.5 +@man man/man5/memcache_table.5 @man man/man5/mysql_table.5 @man man/man5/nisplus_table.5 @man man/man5/pcre_table.5 @@ -119,8 +120,8 @@ sbin/newaliases @mode 2755 @group _postdrop @bin sbin/postdrop -@group @mode +@group @bin sbin/postfix sbin/postfix-disable sbin/postfix-enable @@ -133,8 +134,8 @@ sbin/postfix-install @mode 2755 @group _postdrop @bin sbin/postqueue -@group @mode +@group @bin sbin/postsuper sbin/qshape @bin sbin/sendmail @@ -210,6 +211,7 @@ share/doc/postfix/html/local.8.html share/doc/postfix/html/mailq.1.html share/doc/postfix/html/master.5.html share/doc/postfix/html/master.8.html +share/doc/postfix/html/memcache_table.5.html share/doc/postfix/html/mysql_table.5.html share/doc/postfix/html/newaliases.1.html share/doc/postfix/html/nisplus_table.5.html @@ -282,6 +284,7 @@ share/doc/postfix/readme/LDAP_README share/doc/postfix/readme/LINUX_README share/doc/postfix/readme/LOCAL_RECIPIENT_README share/doc/postfix/readme/MAILDROP_README +share/doc/postfix/readme/MEMCACHE_README share/doc/postfix/readme/MILTER_README share/doc/postfix/readme/MULTI_INSTANCE_README share/doc/postfix/readme/MYSQL_README