1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-11 02:50:24 +00:00

- update to 2.11.3

- add CPE support
- use PORTDOCS macro
- remove check for OSVERSION >= 800037
- fix OPENLDAP_VER usage
- set PORTSCOUD
- always call set-permissions in post-install to set correct spool/postfix/* permissions
  this is required with pkg to support non interrupted upgrade

Changes:
========
20140619
        Bugfix (introduced: 2001): qmqpd null pointer bug when it
        logs a lost connection while not in a mail transaction.
        Reported by Michal Adamek. File: qmqpd/qmqpd.c.

20140920
        Bugfix (introduced: 20080212): incorrect client name in
        reject messages from check_reverse_client_hostname_access
        and check_reverse_client_hostname_{mx,ns}_access.  They
        replied with the verified client name, instead of the name
        that was rejected.  Problem reported by Reindl Harald. File:
        smtpd/smtpd_check.c.

20141012
        Bugfix (introduced: Postfix 2.3): the PREPEND access/policy
        action added headers ABOVE Postfix's own Received: header,
        exposing Postfix's own Received: header to Milters (protocol
        violation) and hiding the PREPENDed header from Milters.
        The latter caused problems for DMARC implementations with
        SPF policy plus DKIM Milter.  PREPENDed headers are now
        added BELOW Postfix's own Received: header and remain visible
        to Milters. File: smtpd/smtpd.c.

20141018
        Bugfix (introduced: Postfix 2.3): when a Milter inserted a
        header ABOVE Postfix's own Received: header, Postfix would
        expose its own Received: header to Milters (violating
        protocol) and hide the Milter-inserted header from Milters
        (wtf).  Files: cleanup/cleanup.h, cleanup/cleanup_message.c,
        cleanup/cleanup_state.c, milter/milter.[hc], milter/milter8.c.

        Cleanup: revert the workaround that places headers inserted
        with PREPEND actions or policy requests BELOW Postfix's own
        Received: message header. File: smtpd/smtpd.c.

PR:		194396
Submitted by:	Yasuhiro KIMURA
Approved by:	sahil (explicit per PM)
This commit is contained in:
Olli Hauer 2014-11-02 20:45:16 +00:00
parent ec713d99b6
commit 6b5df34d8a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=372087
4 changed files with 27 additions and 216 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= postfix
PORTVERSION= 2.11.1
PORTREVISION= 4
PORTVERSION= 2.11.3
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@ -22,6 +21,8 @@ LICENSE_NAME= IBM PUBLIC LICENSE VERSION 1.0
LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
PORTSCOUT= limit:^2\.11\.
VDAVERSION= 2.10.0
CONFLICTS_INSTALL?= courier-0.* postfix-1.* postfix2?-* postfix21?-* \
postfix-current-2.* postfix-current-base-2.* postfix-tls-* \
@ -29,7 +30,7 @@ CONFLICTS_INSTALL?= courier-0.* postfix-1.* postfix2?-* postfix21?-* \
USERS= postfix
GROUPS= mail maildrop postfix
USES= perl5 shebangfix
USES= perl5 shebangfix cpe
SHEBANG_LANG= perl
SHEBANG_FILES= auxiliary/qshape/qshape.pl
@ -84,10 +85,6 @@ IS_INTERACTIVE= yes
.endif
.endif
.if ${OSVERSION} >= 800037
KRB5_EXTR= -lhx509
.endif
.if !defined(DEBUG)
MAKEFILEFLAGS+= DEBUG=
.endif
@ -108,6 +105,7 @@ PLIST_SUB+= BASE="@comment " BMAN=""
PLIST_SUB+= PFETC=${ETCDIR}
.if ${PORT_OPTIONS:MDOCS}
PORTDOCS= *
READMEDIR= ${DOCSDIR}
.else
READMEDIR= no
@ -161,7 +159,7 @@ _REQUIRE+= dovecot
.endif
.if ${PORT_OPTIONS:MSASLKRB5}
POSTFIX_AUXLIBS+= -lkrb5 ${KRB5_EXTR} -lcrypto -lcrypt -lcom_err -lasn1 -lroken
POSTFIX_AUXLIBS+= -lkrb5 -lhx509 -lcrypto -lcrypt -lcom_err -lasn1 -lroken
.endif
.if ${PORT_OPTIONS:MSASLKMIT}
@ -217,7 +215,7 @@ POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsqlite3
.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

View File

@ -1,5 +1,5 @@
SHA256 (postfix/postfix-2.11.1.tar.gz) = 487f98a73b95a5799409caf21ec065efea91c1dcdfb84c038a0e3a265d6489e2
SIZE (postfix/postfix-2.11.1.tar.gz) = 4035026
SHA256 (postfix/postfix-2.11.3.tar.gz) = 04e5146e6e56261baae9f63c590348a4b12ce22d3d46260e26e97233f40802c3
SIZE (postfix/postfix-2.11.3.tar.gz) = 4039705
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-vda-v13-2.10.0.patch) = 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f

View File

@ -66,14 +66,13 @@ if [ "$2" = "POST-INSTALL" ]; then
done
cmp ${DAEMONDIR}/main.cf ${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} \
${POSTARG}
set-permissions ${POSTARG}
fi
if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then

View File

@ -137,208 +137,22 @@ 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
%%VDA%%%%PORTDOCS%%%%DOCSDIR%%/VDA_README
%%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
@dirrm 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%%