Index: head/mail/postfix-current/Makefile =================================================================== --- head/mail/postfix-current/Makefile (revision 372088) +++ head/mail/postfix-current/Makefile (revision 372089) @@ -1,357 +1,351 @@ # Created by: Torsten Blum # $FreeBSD$ PORTNAME= postfix -DISTVERSION= 2.12-20140709 -PORTREVISION= 2 +DISTVERSION= 2.12-20141020 PORTEPOCH= 4 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ ftp://postfix.mirrors.pair.com/experimental/ \ ftp://ftp.tux.org/pub/net/postfix/experimental/ \ http://mirrors.rootservices.net/postfix/experimental/ \ ftp://ftp.samurai.com/pub/postfix/experimental/ \ http://ftp.unicamp.br/pub/postfix/experimental/ PKGNAMESUFFIX= -current DIST_SUBDIR= ${PORTNAME} MAINTAINER= sahil@FreeBSD.org COMMENT= Secure alternative to widely-used Sendmail LICENSE= IPL10 LICENSE_NAME= IBM PUBLIC LICENSE VERSION 1.0 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept CONFLICTS_INSTALL= courier-0.* postfix-1.* postfix-2.* postfix-base-2.* postfix2[789]-* \ postfix21?-* sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* \ opensmtpd-[0-9]* postfix-tls-* USERS= postfix GROUPS= mail maildrop postfix 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}" OPTIONS_DEFINE= PCRE SASL2 TLS BDB MYSQL PGSQL SQLITE OPENLDAP LDAP_SASL \ CDB NIS VDA TEST SPF INST_BASE LMDB DOCS OPTIONS_RADIO= RG1 RG2 OPTIONS_RADIO_RG1= DOVECOT DOVECOT2 OPTIONS_RADIO_RG2= SASLKRB5 SASLKMIT OPTIONS_DEFAULT= PCRE PCRE_DESC= Perl Compatible Regular Expressions SASL2_DESC= Cyrus SASLv2 (Simple Auth. and Sec. Layer) DOVECOT_DESC= Dovecot 1.x SASL authentication method DOVECOT2_DESC= Dovecot 2.x SASL authentication method SASLKRB5_DESC= If your SASL req. Kerberos5, select this SASLKMIT_DESC= If your SASL req. MIT Kerberos5, select this TLS_DESC= SSL and TLS support BDB_DESC= Berkeley DB (uses WITH_BDB_VER) MYSQL_DESC= MySQL maps (uses WITH_MYSQL_VER) PGSQL_DESC= PostgreSQL maps (uses DEFAULT_PGSQL_VER) SQLITE_DESC= SQLite maps OPENLDAP_DESC= OpenLDAP maps (uses WITH_OPENLDAP_VER) LDAP_SASL_DESC= OpenLDAP client-to-server SASL auth CDB_DESC= CDB maps lookups NIS_DESC= NIS maps lookups VDA_DESC= VDA (Virtual Delivery Agent 32Bit) TEST_DESC= SMTP/LMTP test server and generator SPF_DESC= SPF support (via libspf2 1.2.x) INST_BASE_DESC= Install into /usr and /etc/postfix LMDB_DESC= LMDB maps RG1_DESC= Dovecot SASL authentication methods RG2_DESC= Kerberos network authentication protocol type .include HTML1= body_checks.5.html bounce.5.html postfix-power.png \ scache.8.html tlsmgr.8.html STRIP_LIBEXEC= anvil bounce cleanup discard dnsblog error flush lmtp local master \ nqmgr oqmgr pickup pipe postscreen proxymap qmgr qmqpd scache showq \ smtp smtpd spawn tlsmgr tlsproxy trivial-rewrite verify virtual .if !defined(BATCH) && !defined(PACKAGE_BUILDING) && exists(/etc/mail/mailer.conf) OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || ${ECHO_CMD} .if !empty(OLD_MAILER) IS_INTERACTIVE= yes .endif .endif .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}" .if ${PORT_OPTIONS:MINST_BASE} PKGNAMESUFFIX= -base PREFIX= /usr ETCDIR= /etc/postfix USE_RCORDER= postfix PLIST_SUB+= BASE="" BMAN="share/" .else USE_RC_SUBR= postfix PLIST_SUB+= BASE="@comment " BMAN="" .endif PLIST_SUB+= PFETC=${ETCDIR} .if ${PORT_OPTIONS:MDOCS} +PORTDOCS= * READMEDIR= ${DOCSDIR} .else READMEDIR= no .endif DAEMONDIR= ${PREFIX}/libexec/postfix SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" DAEMONDIR="${DAEMONDIR}" 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\\\" \ -DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \ -DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \ -DDEF_README_DIR=\\\"${READMEDIR}\\\" \ -DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \ -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \ -DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \ -DDEF_MAIL_OWNER=\\\"postfix\\\" \ -DDEF_SGID_GROUP=\\\"maildrop\\\" \ -Wmissing-prototypes -Wformat -Wno-comment # Default requirement for postfix rc script -_REQUIRE= LOGIN cleanvar +_REQUIRE= LOGIN cleanvar .if ${PORT_OPTIONS:MPCRE} LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .else POSTFIX_CCARGS+= -DNO_PCRE .endif .if ${PORT_OPTIONS:MSASL2} LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt .endif .if ${PORT_OPTIONS:MDOVECOT} || ${PORT_OPTIONS:MDOVECOT2} .if ${PORT_OPTIONS:MDOVECOT} RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot .else RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot2 .endif POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\" _REQUIRE+= dovecot .endif .if ${PORT_OPTIONS:MSASLKRB5} -.if ${OSVERSION} >= 800037 -KRB5_EXTR= -lhx509 +POSTFIX_AUXLIBS+= -lkrb5 -lhx509 -lcrypto -lcrypt -lcom_err -lasn1 -lroken .endif -POSTFIX_AUXLIBS+= -lkrb5 ${KRB5_EXTR} -lcrypto -lcrypt -lcom_err -lasn1 -lroken -.endif .if ${PORT_OPTIONS:MSASLKMIT} LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/krb5 POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err .endif .if ${PORT_OPTIONS:MTLS} .include "${PORTSDIR}/Mk/bsd.openssl.mk" POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC} 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 PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz PATCH_DIST_STRIP= -p1 POSTFIX_CCARGS+= -DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lspf2 PLIST_SUB+= SPF="" .else PLIST_SUB+= SPF="@comment " .endif .if ${PORT_OPTIONS:MBDB} USE_BDB= yes POSTFIX_CCARGS+= -I${BDB_INCLUDE_DIR} POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lcrypt -lm _REQUIRE+= mysql .endif .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes POSTFIX_CCARGS+= -DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt _REQUIRE+= postgresql .endif .if ${PORT_OPTIONS:MSQLITE} USE_SQLITE= yes POSTFIX_CCARGS+= -DHAS_SQLITE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsqlite3 .endif .if ${PORT_OPTIONS:MOPENLDAP} USE_OPENLDAP= yes -.if ${PORT_OPTIONS:MOPENLDAP_VER} +.if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} .endif POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lldap -llber _REQUIRE+= slapd .if ${PORT_OPTIONS:MLDAP_SASL} .if ! ${PORT_OPTIONS:MSASL2} LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 .endif POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL .endif .endif .if ${PORT_OPTIONS:MCDB} LIB_DEPENDS+= libcdb.so:${PORTSDIR}/databases/tinycdb POSTFIX_CCARGS+= -DHAS_CDB -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lcdb .endif .if ${PORT_OPTIONS:MNIS} POSTFIX_CCARGS+= -DHAS_NIS _REQUIRE+= ypserv .endif .if ${PORT_OPTIONS:MVDA} BROKEN= At the moment, VDA support is unavailable for ${PORTNAME}-${DISTVERSION} .endif .if ${PORT_OPTIONS:MTEST} BINTEST= qmqp-sink qmqp-source smtp-sink smtp-source MANTEST= qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1 PLIST_SUB+= TEST="" .else PLIST_SUB+= TEST="@comment " .endif .if ${PORT_OPTIONS:MLMDB} LIB_DEPENDS+= liblmdb.so:${PORTSDIR}/databases/lmdb POSTFIX_CCARGS+= -DHAS_LMDB -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -llmdb .endif # sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\ s!(_directory = )/usr/!\1${PREFIX}/!g;\ s!^(data_directory = /var/)lib/!\1db/!g;\ s!^\#(mynetworks_style = host)!\1!g;\ s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\ s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\ s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\ s!^(setgid_group =)!\1 maildrop!g;\ s!^(manpage_directory =)!\1 ${MANPREFIX}/man!g;\ s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\ \!^\#alias_database = dbm:/etc/mail/aliases$$!d;\ s!(:|= )/etc/postfix!\1$$config_directory!g;\ s!/etc/postfix!${ETCDIR}!g;\ s!^(sample_directory =)!\1 ${ETCDIR}!g;\ s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!; pre-patch: .if ${PORT_OPTIONS:MSASL2} && ! ${PORT_OPTIONS:MMYSQL} && exists(${LOCALBASE}/lib/libsasl2.a) @if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "Your SASL2 library it's compiled with MYSQL"; \ ${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \ ${ECHO_MSG} "select MYSQL OPTION in config menu."; \ ${ECHO_MSG} "# make clean config"; \ ${ECHO_MSG}; \ sleep 5; \ fi .endif @${ECHO} 'See header_checks.5.html' \ > ${WRKSRC}/html/body_checks.5.html @${REINPLACE_CMD} -E -e 's![[:<:]]perl[[:>:]]!${PERL}!' \ ${WRKSRC}/src/bounce/Makefile.in @${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \ ${WRKSRC}/src/global/mail_params.h @${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \ -type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \ ${REINPLACE_CMD} -E -e '${REINPLACE}' post-patch: .for f in ${HTML1} @${ECHO} '$$html_directory/$f:f:root:-:644' \ >> ${WRKSRC}/conf/postfix-files .endfor .if ${PORT_OPTIONS:MSPF} @${ECHO} '$$readme_directory/SPF_README:f:root:-:644' \ >> ${WRKSRC}/conf/postfix-files @${REINPLACE_CMD} -E -e '${REINPLACE}' \ ${WRKSRC}/README_FILES/SPF_README .endif do-configure: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-install: .if ${PORT_OPTIONS:MINST_BASE} ${MKDIR} ${STAGEDIR}/etc/rc.d .endif do-install: @(cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=${STAGEDIR} tempdir=/tmp \ 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 \ newaliases_path=${PREFIX}/bin/newaliases \ readme_directory=${READMEDIR} \ sendmail_path=${PREFIX}/sbin/sendmail ) # == do not overwrite existing config ${RM} ${STAGEDIR}${ETCDIR}/main.cf ${STAGEDIR}${ETCDIR}/master.cf ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${STAGEDIR}${PREFIX}/bin/rmail ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${MANPREFIX}/man/man1 .if ${PORT_OPTIONS:MTEST} ${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${MANPREFIX}/man/man1 .endif post-install: # Fix compressed man pages and strip executables ${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${STAGEDIR}${DAEMONDIR}/postfix-files -@${STRIP_CMD} ${STRIP_LIBEXEC:S|^|${STAGEDIR}${PREFIX}/libexec/postfix/|} -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* .include Index: head/mail/postfix-current/distinfo =================================================================== --- head/mail/postfix-current/distinfo (revision 372088) +++ head/mail/postfix-current/distinfo (revision 372089) @@ -1,2 +1,2 @@ -SHA256 (postfix/postfix-2.12-20140709.tar.gz) = b0fdebfbf5b49cfa07d19732d1a858739fff762c448592b7566032f60545a67b -SIZE (postfix/postfix-2.12-20140709.tar.gz) = 4132498 +SHA256 (postfix/postfix-2.12-20141020.tar.gz) = 3a836863d04fd455032ec35c61eee7881fd6e992e18e8642e02e1fe24b541785 +SIZE (postfix/postfix-2.12-20141020.tar.gz) = 4183161 Index: head/mail/postfix-current/files/pkg-install.in =================================================================== --- head/mail/postfix-current/files/pkg-install.in (revision 372088) +++ head/mail/postfix-current/files/pkg-install.in (revision 372089) @@ -1,101 +1,100 @@ #!/bin/sh # # $FreeBSD$ # # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it # will make the port/package use defaults which make postfix replace # sendmail as much as possible. PREFIX=${PKG_PREFIX:=%%PREFIX%%} ETCDIR=${ETCDIR:=%%ETCDIR%%} DAEMONDIR=${DAEMONDIR:=%%DAEMONDIR%%} READMEDIR=${READMEDIR:=%%READMEDIR%%} BATCH=${BATCH:=no} POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} MC=/etc/mail/mailer.conf if [ "${POSTFIX_DEFAULT_MTA}" = "no" ]; then DEFAULT_REPLACE_MAILERCONF=n else DEFAULT_REPLACE_MAILERCONF=y fi if [ -x /usr/sbin/nologin ]; then NOLOGIN=/usr/sbin/nologin else NOLOGIN=/sbin/nologin fi ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a "${BATCH}" = "no" ]; then read -p "${question} [${default}]? " answer fi if [ -z "${answer}" ]; then answer=${default} fi echo ${answer} } yesno() { local question default answer question=$1 default=$2 while :; do answer=$(ask "${question}" "${default}") case "${answer}" in [Yy]*) return 0;; [Nn]*) return 1;; esac echo "Please answer yes or no." done } if [ "$2" = "POST-INSTALL" ]; then SAMPLES="main.cf master.cf" for file in $SAMPLES do if [ ! -f ${ETCDIR}/$file ]; then cp ${DAEMONDIR}/$file.proto ${ETCDIR}/$file fi done cmp ${DAEMONDIR}/main.cf.proto ${ETCDIR}/main.cf >/dev/null 2>&1 \ - && POSTARG="set-permissions" \ || POSTARG="upgrade-package" /bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \ daemon_directory=${DAEMONDIR} \ html_directory=${READMEDIR} \ readme_directory=${READMEDIR} \ meta_directory=${DAEMONDIR} \ - ${POSTARG} + set-permissions ${POSTARG} fi if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then egrep -q "^sendmail.*${PREFIX}/sbin/sendmail" ${MC} && \ egrep -q "^send-mail.*${PREFIX}/sbin/sendmail" ${MC} && \ egrep -q "^mailq.*${PREFIX}/sbin/sendmail" ${MC} && \ egrep -q "^newaliases.*${PREFIX}/sbin/sendmail" ${MC} ret=$? if [ ${ret} -ne 0 ]; then if yesno "Would you like to activate Postfix in ${MC}" ${DEFAULT_REPLACE_MAILERCONF}; then /bin/mv -f ${MC} ${MC}.old echo "#" > ${MC} echo -n "# Execute the Postfix sendmail program" >> ${MC} echo ", named ${PREFIX}/sbin/sendmail" >> ${MC} echo "#" >> ${MC} echo "sendmail ${PREFIX}/sbin/sendmail" >> ${MC} echo "send-mail ${PREFIX}/sbin/sendmail" >> ${MC} echo "mailq ${PREFIX}/sbin/sendmail" >> ${MC} echo "newaliases ${PREFIX}/sbin/sendmail" >> ${MC} fi else echo "Postfix already activated in ${MC}" fi fi Index: head/mail/postfix-current/files/pkg-message.in =================================================================== --- head/mail/postfix-current/files/pkg-message.in (revision 372088) +++ head/mail/postfix-current/files/pkg-message.in (revision 372089) @@ -1,27 +1,28 @@ To enable postfix startup script please add postfix_enable="YES" in your rc.conf If you not need sendmail anymore, please add in your rc.conf: sendmail_enable="NO" sendmail_submit_enable="NO" sendmail_outbound_enable="NO" sendmail_msp_queue_enable="NO" And you can disable some sendmail specific daily maintenance routines in your /etc/periodic.conf file: daily_clean_hoststat_enable="NO" daily_status_mail_rejects_enable="NO" daily_status_include_submit_mailq="NO" daily_submit_queuerun="NO" If /etc/periodic.conf does not exist please create it and add those values. If you are using SASL, you need to make sure that postfix has access to read the sasldb file. This is accomplished by adding postfix to group mail and making the %%PREFIX%%/etc/sasldb* file(s) readable by group mail (this should be the default for new installs). -If you are upgrading from postfix version prior to 2.0, please see the README -files for recommended changes to your configuration. +If you are upgrading from prior postfix version, please see the README +files for recommended changes to your configuration and additional +http://www.postfix.org/COMPATIBILITY_README.html Index: head/mail/postfix-current/pkg-plist =================================================================== --- head/mail/postfix-current/pkg-plist (revision 372088) +++ head/mail/postfix-current/pkg-plist (revision 372089) @@ -1,344 +1,158 @@ @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 %%TEST%%bin/qmqp-source bin/qshape bin/rmail %%TEST%%bin/smtp-sink %%TEST%%bin/smtp-source %%BASE%%@cwd / etc/postfix/LICENSE etc/postfix/TLS_LICENSE etc/postfix/bounce.cf.default etc/postfix/main.cf.default @cwd %%RESETPREFIX%% libexec/postfix/anvil libexec/postfix/bounce libexec/postfix/cleanup libexec/postfix/discard libexec/postfix/dnsblog libexec/postfix/error libexec/postfix/flush libexec/postfix/lmtp libexec/postfix/local libexec/postfix/main.cf.proto libexec/postfix/makedefs.out libexec/postfix/master libexec/postfix/master.cf.proto libexec/postfix/nqmgr libexec/postfix/oqmgr libexec/postfix/pickup libexec/postfix/pipe libexec/postfix/post-install libexec/postfix/postfix-files libexec/postfix/postfix-script libexec/postfix/postfix-wrapper libexec/postfix/postmulti-script libexec/postfix/postscreen libexec/postfix/proxymap libexec/postfix/qmgr libexec/postfix/qmqpd libexec/postfix/scache libexec/postfix/showq libexec/postfix/smtp libexec/postfix/smtpd libexec/postfix/spawn libexec/postfix/tlsmgr libexec/postfix/tlsproxy libexec/postfix/trivial-rewrite libexec/postfix/verify libexec/postfix/virtual %%BMAN%%man/man1/mailq.1.gz %%BMAN%%man/man1/newaliases.1.gz %%BMAN%%man/man1/postalias.1.gz %%BMAN%%man/man1/postcat.1.gz %%BMAN%%man/man1/postconf.1.gz %%BMAN%%man/man1/postdrop.1.gz %%BMAN%%man/man1/postfix.1.gz %%BMAN%%man/man1/postkick.1.gz %%BMAN%%man/man1/postlock.1.gz %%BMAN%%man/man1/postlog.1.gz %%BMAN%%man/man1/postmap.1.gz %%BMAN%%man/man1/postmulti.1.gz %%BMAN%%man/man1/postqueue.1.gz %%BMAN%%man/man1/postsuper.1.gz %%TEST%%%%BMAN%%man/man1/qmqp-sink.1.gz %%TEST%%%%BMAN%%man/man1/qmqp-source.1.gz %%BMAN%%man/man1/qshape.1.gz %%BMAN%%man/man1/sendmail.1.gz %%TEST%%%%BMAN%%man/man1/smtp-sink.1.gz %%TEST%%%%BMAN%%man/man1/smtp-source.1.gz %%BMAN%%man/man5/access.5.gz %%BMAN%%man/man5/aliases.5.gz %%BMAN%%man/man5/body_checks.5.gz %%BMAN%%man/man5/bounce.5.gz %%BMAN%%man/man5/canonical.5.gz %%BMAN%%man/man5/cidr_table.5.gz %%BMAN%%man/man5/generic.5.gz %%BMAN%%man/man5/header_checks.5.gz %%BMAN%%man/man5/ldap_table.5.gz %%BMAN%%man/man5/lmdb_table.5.gz %%BMAN%%man/man5/master.5.gz %%BMAN%%man/man5/memcache_table.5.gz %%BMAN%%man/man5/mysql_table.5.gz %%BMAN%%man/man5/nisplus_table.5.gz %%BMAN%%man/man5/pcre_table.5.gz %%BMAN%%man/man5/pgsql_table.5.gz %%BMAN%%man/man5/postconf.5.gz %%BMAN%%man/man5/postfix-wrapper.5.gz %%BMAN%%man/man5/regexp_table.5.gz %%BMAN%%man/man5/relocated.5.gz %%BMAN%%man/man5/socketmap_table.5.gz %%BMAN%%man/man5/sqlite_table.5.gz %%BMAN%%man/man5/tcp_table.5.gz %%BMAN%%man/man5/transport.5.gz %%BMAN%%man/man5/virtual.5.gz %%BMAN%%man/man8/anvil.8.gz %%BMAN%%man/man8/bounce.8.gz %%BMAN%%man/man8/cleanup.8.gz %%BMAN%%man/man8/defer.8.gz %%BMAN%%man/man8/discard.8.gz %%BMAN%%man/man8/dnsblog.8.gz %%BMAN%%man/man8/error.8.gz %%BMAN%%man/man8/flush.8.gz %%BMAN%%man/man8/lmtp.8.gz %%BMAN%%man/man8/local.8.gz %%BMAN%%man/man8/master.8.gz %%BMAN%%man/man8/oqmgr.8.gz %%BMAN%%man/man8/pickup.8.gz %%BMAN%%man/man8/pipe.8.gz %%BMAN%%man/man8/postscreen.8.gz %%BMAN%%man/man8/proxymap.8.gz %%BMAN%%man/man8/qmgr.8.gz %%BMAN%%man/man8/qmqpd.8.gz %%BMAN%%man/man8/scache.8.gz %%BMAN%%man/man8/showq.8.gz %%BMAN%%man/man8/smtp.8.gz %%BMAN%%man/man8/smtpd.8.gz %%BMAN%%man/man8/spawn.8.gz %%BMAN%%man/man8/tlsmgr.8.gz %%BMAN%%man/man8/tlsproxy.8.gz %%BMAN%%man/man8/trace.8.gz %%BMAN%%man/man8/trivial-rewrite.8.gz %%BMAN%%man/man8/verify.8.gz %%BMAN%%man/man8/virtual.8.gz sbin/postalias sbin/postcat sbin/postconf sbin/postdrop sbin/postfix sbin/postkick sbin/postlock sbin/postlog sbin/postmap sbin/postmulti sbin/postqueue sbin/postsuper sbin/sendmail -%%PORTDOCS%%%%DOCSDIR%%/AAAREADME -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README -%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html -%%PORTDOCS%%%%DOCSDIR%%/DB_README -%%PORTDOCS%%%%DOCSDIR%%/DB_README.html -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html -%%PORTDOCS%%%%DOCSDIR%%/DSN_README -%%PORTDOCS%%%%DOCSDIR%%/DSN_README.html -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/FORWARD_SECRECY_README -%%PORTDOCS%%%%DOCSDIR%%/FORWARD_SECRECY_README.html -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html -%%PORTDOCS%%%%DOCSDIR%%/LMDB_README -%%PORTDOCS%%%%DOCSDIR%%/LMDB_README.html -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html -%%PORTDOCS%%%%DOCSDIR%%/MEMCACHE_README -%%PORTDOCS%%%%DOCSDIR%%/MILTER_README -%%PORTDOCS%%%%DOCSDIR%%/MILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README -%%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README.html -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/NFS_README -%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/POSTSCREEN_README -%%PORTDOCS%%%%DOCSDIR%%/POSTSCREEN_README.html -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SASL_README -%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html -%%PORTDOCS%%%%DOCSDIR%%/SOHO_README -%%PORTDOCS%%%%DOCSDIR%%/SOHO_README.html -%%SPF%%%%PORTDOCS%%%%DOCSDIR%%/SPF_README -%%PORTDOCS%%%%DOCSDIR%%/SQLITE_README -%%PORTDOCS%%%%DOCSDIR%%/SQLITE_README.html -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/STRESS_README -%%PORTDOCS%%%%DOCSDIR%%/STRESS_README.html -%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README -%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html -%%PORTDOCS%%%%DOCSDIR%%/TLS_README -%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VERP_README -%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html -%%PORTDOCS%%%%DOCSDIR%%/access.5.html -%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html -%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html -%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/bounce.5.html -%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html -%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html -%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html -%%PORTDOCS%%%%DOCSDIR%%/defer.8.html -%%PORTDOCS%%%%DOCSDIR%%/discard.8.html -%%PORTDOCS%%%%DOCSDIR%%/dnsblog.8.html -%%PORTDOCS%%%%DOCSDIR%%/error.8.html -%%PORTDOCS%%%%DOCSDIR%%/flush.8.html -%%PORTDOCS%%%%DOCSDIR%%/generic.5.html -%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/local.8.html -%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html -%%PORTDOCS%%%%DOCSDIR%%/master.5.html -%%PORTDOCS%%%%DOCSDIR%%/master.8.html -%%PORTDOCS%%%%DOCSDIR%%/memcache_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html -%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html -%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html -%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html -%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html -%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg -%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png -%%PORTDOCS%%%%DOCSDIR%%/postfix-wrapper.5.html -%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html -%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html -%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html -%%PORTDOCS%%%%DOCSDIR%%/postmulti.1.html -%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html -%%PORTDOCS%%%%DOCSDIR%%/postscreen.8.html -%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html -%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html -%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html -%%PORTDOCS%%%%DOCSDIR%%/scache.8.html -%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html -%%PORTDOCS%%%%DOCSDIR%%/showq.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html -%%PORTDOCS%%%%DOCSDIR%%/sqlite_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/tcp_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/tlsproxy.8.html -%%PORTDOCS%%%%DOCSDIR%%/trace.8.html -%%PORTDOCS%%%%DOCSDIR%%/transport.5.html -%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html -%%PORTDOCS%%%%DOCSDIR%%/verify.8.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html -@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 || : -@unexec rmdir "/var/spool/postfix/bounce" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/postfix/corrupt" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/postfix/defer" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/postfix/deferred" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/postfix/flush" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/postfix/hold" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/postfix/incoming" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/postfix/maildrop" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/postfix/pid" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/postfix/private" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/postfix/public" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/postfix/saved" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/postfix/trace" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/postfix" >/dev/null 2>&1 || : +@dir /var/db/postfix +@dir /var/spool/postfix/active +@dir /var/spool/postfix/bounce +@dir /var/spool/postfix/corrupt +@dir /var/spool/postfix/defer +@dir /var/spool/postfix/deferred +@dir /var/spool/postfix/flush +@dir /var/spool/postfix/hold +@dir /var/spool/postfix/incoming +@dir /var/spool/postfix/maildrop +@dir /var/spool/postfix/pid +@dir /var/spool/postfix/private +@dir /var/spool/postfix/public +@dir /var/spool/postfix/saved +@dir /var/spool/postfix/trace +@dir /var/spool/postfix %%BASE%%@cwd / -@dirrmtry etc/postfix +@dir etc/postfix @cwd %%RESETPREFIX%%