Date: Sun, 2 Nov 2014 21:09:26 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372089 - in head/mail/postfix-current: . files Message-ID: <201411022109.sA2L9QCr035821@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sun Nov 2 21:09:26 2014 New Revision: 372089 URL: https://svnweb.freebsd.org/changeset/ports/372089 QAT: https://qat.redports.org/buildarchive/r372089/ Log: - update to 2.12-20141020 - use PORTDOCS macro - remove check for OSVERSION >= 800037 - fix OPENLDAP_VER usage - always call set-permissions in post-install to set correct spool/postfix/* permissions this is required with pkg to support non interrupted upgrade Approved by: sahil (explicit) Modified: head/mail/postfix-current/Makefile head/mail/postfix-current/distinfo head/mail/postfix-current/files/pkg-install.in head/mail/postfix-current/files/pkg-message.in head/mail/postfix-current/pkg-plist Modified: head/mail/postfix-current/Makefile ============================================================================== --- head/mail/postfix-current/Makefile Sun Nov 2 20:49:59 2014 (r372088) +++ head/mail/postfix-current/Makefile Sun Nov 2 21:09:26 2014 (r372089) @@ -2,8 +2,7 @@ # $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/ \ @@ -33,9 +32,6 @@ 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}" @@ -107,6 +103,7 @@ PLIST_SUB+= BASE="@comment " BMAN="" PLIST_SUB+= PFETC=${ETCDIR} .if ${PORT_OPTIONS:MDOCS} +PORTDOCS= * READMEDIR= ${DOCSDIR} .else READMEDIR= no @@ -134,7 +131,7 @@ POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ -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 @@ -161,10 +158,7 @@ _REQUIRE+= dovecot .endif .if ${PORT_OPTIONS:MSASLKRB5} -.if ${OSVERSION} >= 800037 -KRB5_EXTR= -lhx509 -.endif -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} @@ -220,7 +214,7 @@ POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -ls .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 Modified: head/mail/postfix-current/distinfo ============================================================================== --- head/mail/postfix-current/distinfo Sun Nov 2 20:49:59 2014 (r372088) +++ head/mail/postfix-current/distinfo Sun Nov 2 21:09:26 2014 (r372089) @@ -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 Modified: head/mail/postfix-current/files/pkg-install.in ============================================================================== --- head/mail/postfix-current/files/pkg-install.in Sun Nov 2 20:49:59 2014 (r372088) +++ head/mail/postfix-current/files/pkg-install.in Sun Nov 2 21:09:26 2014 (r372089) @@ -66,7 +66,6 @@ if [ "$2" = "POST-INSTALL" ]; then 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 \ @@ -74,7 +73,7 @@ if [ "$2" = "POST-INSTALL" ]; then 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 Modified: head/mail/postfix-current/files/pkg-message.in ============================================================================== --- head/mail/postfix-current/files/pkg-message.in Sun Nov 2 20:49:59 2014 (r372088) +++ head/mail/postfix-current/files/pkg-message.in Sun Nov 2 21:09:26 2014 (r372089) @@ -23,5 +23,6 @@ the sasldb file. This is accomplished b 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 Modified: head/mail/postfix-current/pkg-plist ============================================================================== --- head/mail/postfix-current/pkg-plist Sun Nov 2 20:49:59 2014 (r372088) +++ head/mail/postfix-current/pkg-plist Sun Nov 2 21:09:26 2014 (r372089) @@ -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 -%%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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411022109.sA2L9QCr035821>