From bb7c11a7d5e51daadfd47e4e4da1b961ca802be6 Mon Sep 17 00:00:00 2001 From: Olli Hauer Date: Sun, 10 May 2015 15:25:31 +0000 Subject: - update to version 2.11.5 - rename OPTIONS to match default name of most ports - SASL2 -> SASL - OPENLDAP -> LDAP - install main.cf and master.cf with the @sample macro - rework pkg-install - fix wrong permission for /var/db/postfix [1] - sets WANT_OPENLDAP_SASL option for openldap port when postfix LDAP_SASL option is set [2] - make usage of new ${opt}_DEPENDS notation Changelog: 20150324 Bugfix (introduced: Postfix 2.6): sender_dependent_relayhost_maps ignored the relayhost setting in the case of a DUNNO lookup result. It would use the recipient domain instead. Viktor Dukhovni. Wietse took the pieces of code that enforce the precedence of a sender-dependent relayhost, the global relayhost, and the recipient domain, and put that code together in once place so that it is easier to maintain. File: trivial-rewrite/resolve.c. 20150330 Bitrot: prepare for future changes in OpenSSL API. Viktor Dukhovni. File: tls_dane.c. 20150408 Portability: FreeBSD10 support. Files: makedefs, util/sys_defs.h. Incompatibility: specifying "make makefiles" with "CC=command" will no longer override the default WARN setting. PR: 198215 [1] 198857 [2] --- mail/postfix/files/patch-makedefs | 17 ++++++++--------- mail/postfix/files/patch-src__util__sys_defs.h | 10 ++++------ mail/postfix/files/pkg-install.in | 13 +------------ 3 files changed, 13 insertions(+), 27 deletions(-) (limited to 'mail/postfix/files') diff --git a/mail/postfix/files/patch-makedefs b/mail/postfix/files/patch-makedefs index 7fe62c2ee1f1..56b0c3830fb5 100644 --- a/mail/postfix/files/patch-makedefs +++ b/mail/postfix/files/patch-makedefs @@ -1,13 +1,12 @@ ---- makedefs.orig 2013-10-27 02:32:39.000000000 +0000 -+++ makedefs 2013-10-27 02:33:48.000000000 +0000 -@@ -155,6 +155,10 @@ +--- makedefs.orig 2015-04-19 10:19:57 UTC ++++ makedefs +@@ -161,6 +161,9 @@ case "$SYSTEM.$RELEASE" in + FreeBSD.10*) SYSTYPE=FREEBSD10 + : ${CC=cc} ;; - FreeBSD.9*) SYSTYPE=FREEBSD9 - ;; -+ FreeBSD.10*) SYSTYPE=FREEBSD10 -+ ;; + FreeBSD.11*) SYSTYPE=FREEBSD11 ++ : ${CC=cc} + ;; - OpenBSD.2*) SYSTYPE=OPENBSD2 + DragonFly.*) SYSTYPE=DRAGONFLY ;; - OpenBSD.3*) SYSTYPE=OPENBSD3 + OpenBSD.2*) SYSTYPE=OPENBSD2 diff --git a/mail/postfix/files/patch-src__util__sys_defs.h b/mail/postfix/files/patch-src__util__sys_defs.h index a11384454237..d977481d19a1 100644 --- a/mail/postfix/files/patch-src__util__sys_defs.h +++ b/mail/postfix/files/patch-src__util__sys_defs.h @@ -1,11 +1,9 @@ ---- src/util/sys_defs.h.orig 2012-09-24 23:53:56.000000000 +0000 -+++ src/util/sys_defs.h 2013-10-27 01:17:14.000000000 +0000 -@@ -25,7 +25,8 @@ - */ +--- src/util/sys_defs.h.orig 2015-04-19 10:22:40 UTC ++++ src/util/sys_defs.h +@@ -26,6 +26,7 @@ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ -- || defined(FREEBSD8) || defined(FREEBSD9) \ -+ || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \ + || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \ + || defined(FREEBSD11) \ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ diff --git a/mail/postfix/files/pkg-install.in b/mail/postfix/files/pkg-install.in index a8010a38d65c..019057adf920 100644 --- a/mail/postfix/files/pkg-install.in +++ b/mail/postfix/files/pkg-install.in @@ -57,22 +57,11 @@ yesno() { } if [ "$2" = "POST-INSTALL" ]; then - SAMPLES="main.cf master.cf" - for file in $SAMPLES - do - if [ ! -f ${ETCDIR}/$file ]; then - cp ${DAEMONDIR}/$file ${ETCDIR}/ - fi - done - - cmp ${DAEMONDIR}/main.cf ${ETCDIR}/main.cf >/dev/null 2>&1 \ - || POSTARG="upgrade-package" - /bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \ daemon_directory=${DAEMONDIR} \ html_directory=${READMEDIR} \ readme_directory=${READMEDIR} \ - set-permissions ${POSTARG} + upgrade-package fi if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then -- cgit v1.2.3