diff options
| -rw-r--r-- | UPDATING | 12 | ||||
| -rw-r--r-- | mail/postfix-current/Makefile | 12 | ||||
| -rw-r--r-- | mail/postfix-current/distinfo | 6 | ||||
| -rw-r--r-- | mail/postfix-current/files/pkg-install.in | 7 | ||||
| -rw-r--r-- | mail/postfix-current/pkg-plist | 13 |
5 files changed, 33 insertions, 17 deletions
@@ -6,6 +6,18 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. 20140713: + AFFECTS: users of mail/postfix-current + AUTHOR: sahil@FreeBSD.org + + This is a significant update; so, please carefully review the + RELEASE_NOTES to identify which incompatible changes impact your + environment. Of particular note are changes to the Postfix + build/install procedure. + + Please backup main.cf, master.cf and any other important files + associated with your Postfix setup before updating. + +20140713: AFFECTS: users of www/apache22 AUTHOR: ohauer@FreeBSD.org diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 1afb02ac3397..9f584b3b64f7 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= postfix -DISTVERSION= 2.12-20140507 -PORTREVISION= 1 +DISTVERSION= 2.12-20140709 PORTEPOCH= 4 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ @@ -29,10 +28,13 @@ CONFLICTS_INSTALL= courier-0.* postfix-1.* postfix-2.* postfix-base-2.* postfix2 USERS= postfix GROUPS= mail maildrop postfix -USES= perl5 shebangfix +USES= perl5 shebangfix cpe SHEBANG_LANG= perl SHEBANG_FILES= auxiliary/qshape/qshape.pl +CPE_VENDOR= postfix +CPE_PRODUCT= postfix + USE_SUBMAKE= yes USE_PERL5= build SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" @@ -116,6 +118,7 @@ SUB_FILES+= pkg-install pkg-message POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \ -DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \ + -DDEF_META_DIR=\\\"${DAEMONDIR}\\\" \ -DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \ -DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \ -DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \ @@ -175,6 +178,7 @@ POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto .endif .if ${PORT_OPTIONS:MSPF} +BROKEN= At the moment, SPF support is unavailable for ${PORTNAME}-${DISTVERSION} LIB_DEPENDS+= libspf2.so:${PORTSDIR}/mail/libspf2 PATCH_SITES+= ${MASTER_SITE_LOCAL} PATCH_SITE_SUBDIR= mm @@ -189,7 +193,6 @@ PLIST_SUB+= SPF="@comment " .if ${PORT_OPTIONS:MBDB} USE_BDB= yes -INVALID_BDB_VER= 6 POSTFIX_CCARGS+= -I${BDB_INCLUDE_DIR} POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} .endif @@ -326,6 +329,7 @@ do-install: config_directory=${ETCDIR} \ command_directory=${PREFIX}/sbin \ daemon_directory=${DAEMONDIR} \ + meta_directory=${DAEMONDIR} \ html_directory=${READMEDIR} \ mailq_path=${PREFIX}/bin/mailq \ manpage_directory=${MANPREFIX}/man \ diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index f6aa0739febf..6d201d8fe8ae 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,4 +1,2 @@ -SHA256 (postfix/postfix-2.12-20140507.tar.gz) = 2326b4b470e3e84173f98c39e5475eb17b0733cec7fced737c2b463ea2c640c6 -SIZE (postfix/postfix-2.12-20140507.tar.gz) = 4034688 -SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc -SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191 +SHA256 (postfix/postfix-2.12-20140709.tar.gz) = b0fdebfbf5b49cfa07d19732d1a858739fff762c448592b7566032f60545a67b +SIZE (postfix/postfix-2.12-20140709.tar.gz) = 4132498 diff --git a/mail/postfix-current/files/pkg-install.in b/mail/postfix-current/files/pkg-install.in index 239363f04308..259edce20323 100644 --- a/mail/postfix-current/files/pkg-install.in +++ b/mail/postfix-current/files/pkg-install.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/mail/postfix-current/files/pkg-install.in,v 1.4 2011-12-21 22:45:17 sahil Exp $ +# $FreeBSD$ # # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it @@ -61,11 +61,11 @@ if [ "$2" = "POST-INSTALL" ]; then for file in $SAMPLES do if [ ! -f ${ETCDIR}/$file ]; then - cp ${DAEMONDIR}/$file ${ETCDIR}/ + cp ${DAEMONDIR}/$file.proto ${ETCDIR}/$file fi done - cmp ${DAEMONDIR}/main.cf ${ETCDIR}/main.cf >/dev/null 2>&1 \ + cmp ${DAEMONDIR}/main.cf.proto ${ETCDIR}/main.cf >/dev/null 2>&1 \ && POSTARG="set-permissions" \ || POSTARG="upgrade-package" @@ -73,6 +73,7 @@ if [ "$2" = "POST-INSTALL" ]; then daemon_directory=${DAEMONDIR} \ html_directory=${READMEDIR} \ readme_directory=${READMEDIR} \ + meta_directory=${DAEMONDIR} \ ${POSTARG} fi diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist index 8f4f8b79f117..45f32bc2f68f 100644 --- a/mail/postfix-current/pkg-plist +++ b/mail/postfix-current/pkg-plist @@ -1,5 +1,5 @@ -@unexec if cmp -s %D/libexec/postfix/main.cf %%PFETC%%/main.cf; then rm -f %%PFETC%%/main.cf; fi -@unexec if cmp -s %D/libexec/postfix/master.cf %%PFETC%%/master.cf; then rm -f %%PFETC%%/master.cf; fi +@unexec if cmp -s %D/libexec/postfix/main.cf.proto %%PFETC%%/main.cf; then rm -f %%PFETC%%/main.cf; fi +@unexec if cmp -s %D/libexec/postfix/master.cf.proto %%PFETC%%/master.cf; then rm -f %%PFETC%%/master.cf; fi bin/mailq bin/newaliases %%TEST%%bin/qmqp-sink @@ -13,7 +13,6 @@ etc/postfix/LICENSE etc/postfix/TLS_LICENSE etc/postfix/bounce.cf.default etc/postfix/main.cf.default -etc/postfix/makedefs.out @cwd %%RESETPREFIX%% libexec/postfix/anvil libexec/postfix/bounce @@ -24,9 +23,10 @@ libexec/postfix/error libexec/postfix/flush libexec/postfix/lmtp libexec/postfix/local -libexec/postfix/main.cf +libexec/postfix/main.cf.proto +libexec/postfix/makedefs.out libexec/postfix/master -libexec/postfix/master.cf +libexec/postfix/master.cf.proto libexec/postfix/nqmgr libexec/postfix/oqmgr libexec/postfix/pickup @@ -320,7 +320,8 @@ sbin/sendmail %%PORTDOCS%%%%DOCSDIR%%/verify.8.html %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html -@dirrm libexec/postfix +@dirrmtry libexec/postfix/postfix-files.d +@dirrmtry libexec/postfix %%PORTDOCS%%@dirrm %%DOCSDIR%% @unexec rmdir "/var/db/postfix" >/dev/null 2>&1 || : @unexec rmdir "/var/spool/postfix/active" >/dev/null 2>&1 || : |