Date: Tue, 17 Feb 2015 05:35:36 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379143 - branches/2015Q1/mail/postfix Message-ID: <201502170535.t1H5ZawL091044@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Tue Feb 17 05:35:35 2015 New Revision: 379143 URL: https://svnweb.freebsd.org/changeset/ports/379143 QAT: https://qat.redports.org/buildarchive/r379143/ Log: MFH: r378221 - update conflicts for new postfix-current - use OPTIONS_SUB - enable TLS as default [1] - use USE_OPENSSL instead including Mk/openssl.mk - use new install instruction - use new notation for @mode in pkg-plist - bump PORTREVISON [1] Users using packages should have the ability to use TLS from the default package, (this makes the the postfix-tls port obsolete) MFH: r378967 - remove dead mirrors from MASTER_SITES (a good overview can be taken by viewving the source of http://www.postfix.org/download.html) - remove MASTER_SITE_SUBDIR, it should be used only for sites defined in bsd.site.mk MFH: r378980 - update to 2.11.4 Changes: 20141025 Bugfix (introduced: Postfix 2.11): core dump when smtp_policy_maps specifies an invalid TLS level. Viktor Dukhovni. File: smtp/smtp_tls_policy.c. 20150106 Robustness: don't segfault due to excessive recursion after a faulty configuration runs into the virtual_alias_recursion_limit. File: global/tok822_tree.c. 20150115 Safety: stop aliasing loops that exponentially increase the address length with each iteration. Back-ported from Postfix 3.0. File: cleanup/cleanup_map1n.c. 20150117 Cleanup: missing " in \%s\" in postconf(1) fatal error messages. Iain Hibbert. File: postconf/postconf_master.c. Approved by: portmgr (erwin) Modified: branches/2015Q1/mail/postfix/Makefile branches/2015Q1/mail/postfix/distinfo branches/2015Q1/mail/postfix/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/mail/postfix/Makefile ============================================================================== --- branches/2015Q1/mail/postfix/Makefile Tue Feb 17 05:17:09 2015 (r379142) +++ branches/2015Q1/mail/postfix/Makefile Tue Feb 17 05:35:35 2015 (r379143) @@ -2,16 +2,16 @@ # $FreeBSD$ PORTNAME= postfix -PORTVERSION= 2.11.3 -PORTREVISION= 3 +PORTVERSION= 2.11.4 PORTEPOCH= 1 CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ - ftp://ftp.tux.org/pub/net/postfix/official/ \ - ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ - ftp://ftp.samurai.com/pub/postfix/official/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} -MASTER_SITE_SUBDIR= . old related/postfix +MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ + http://de.postfix.org/ftpmirror/ \ + http://cdn.postfix.johnriley.me/mirrors/postfix-release/ \ + http://www.artfiles.org/postfix.org/postfix-release/ \ + http://mirror.lhsolutions.nl/postfix-release/ \ + ftp://postfix.mirrors.pair.com/ +MASTER_SITES:= ${MASTER_SITES:S|$|official/|} DIST_SUBDIR= ${PORTNAME} MAINTAINER= sahil@FreeBSD.org @@ -25,9 +25,10 @@ LICENSE_PERMS= dist-mirror dist-sell pkg 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-* \ - sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]* +CONFLICTS_INSTALL?= courier-0.* opensmtpd-[0-9]* \ + postfix2?-* postfix21?-* postfix-tls-* \ + postfix-current-[23].* postfix-current-base-[23].* \ + sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* USERS= postfix GROUPS= mail maildrop postfix @@ -39,13 +40,14 @@ USE_SUBMAKE= yes USE_PERL5= build SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" +OPTIONS_SUB= yes OPTIONS_DEFINE= BDB CDB DOCS INST_BASE LDAP_SASL LMDB MYSQL NIS \ OPENLDAP PCRE PGSQL SASL2 SPF SQLITE TEST TLS VDA OPTIONS_RADIO= RG1 RG2 OPTIONS_RADIO_RG1= DOVECOT DOVECOT2 OPTIONS_RADIO_RG2= SASLKRB5 SASLKMIT -OPTIONS_DEFAULT= PCRE +OPTIONS_DEFAULT= PCRE TLS PCRE_DESC= Perl Compatible Regular Expressions SASL2_DESC= Cyrus SASLv2 (Simple Auth. and Sec. Layer) @@ -97,10 +99,10 @@ PKGNAMESUFFIX= -base PREFIX= /usr ETCDIR= /etc/postfix USE_RCORDER= postfix -PLIST_SUB+= BASE="" BMAN="share/" +PLIST_SUB+= BMAN="share/" .else USE_RC_SUBR= postfix -PLIST_SUB+= BASE="@comment " BMAN="" +PLIST_SUB+= BMAN="" .endif PLIST_SUB+= PFETC=${ETCDIR} @@ -114,7 +116,8 @@ READMEDIR= no DAEMONDIR= ${PREFIX}/libexec/postfix -SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" DAEMONDIR="${DAEMONDIR}" +SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" \ + DAEMONDIR="${DAEMONDIR}" SUB_FILES+= pkg-install pkg-message POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \ @@ -169,9 +172,11 @@ POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HO .endif .if ${PORT_OPTIONS:MTLS} -.include "${PORTSDIR}/Mk/bsd.openssl.mk" +USE_OPENSSL= yes POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC} POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto +.else +POSTFIX_CCARGS+= -DNO_TLS .endif .if ${PORT_OPTIONS:MSPF} @@ -182,9 +187,6 @@ PATCHFILES+= postfix-2.8.0-libspf2-1.2. 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} @@ -216,18 +218,18 @@ POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -ls .if ${PORT_OPTIONS:MOPENLDAP} USE_OPENLDAP= yes -.if defined(WITH_OPENLDAP_VER) +. if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} -.endif +. 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} +. if ${PORT_OPTIONS:MLDAP_SASL} +. if ! ${PORT_OPTIONS:MSASL2} LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 -.endif +. endif POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL -.endif +. endif .endif .if ${PORT_OPTIONS:MCDB} @@ -245,17 +247,11 @@ _REQUIRE+= ypserv PATCH_SITES+= http://vda.sourceforge.net/VDA/:vda PATCHFILES+= postfix-vda-v13-${VDAVERSION}.patch:vda PATCH_DIST_STRIP= -p1 -PLIST_SUB+= VDA="" -.else -PLIST_SUB+= VDA="@comment " .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} @@ -327,8 +323,9 @@ post-patch: >> ${WRKSRC}/conf/postfix-files do-configure: - (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ - CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ + (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles \ + ${MAKEFILEFLAGS} CCARGS="${POSTFIX_CCARGS}" \ + AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-install: @@ -337,7 +334,8 @@ pre-install: .endif do-install: - @(cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=${STAGEDIR} tempdir=${WRKDIR} \ + @(cd ${WRKSRC} && ${MAKE} non-interactive-package \ + install_root=${STAGEDIR} tempdir=${WRKDIR} \ config_directory=${ETCDIR} \ command_directory=${PREFIX}/sbin \ daemon_directory=${DAEMONDIR} \ Modified: branches/2015Q1/mail/postfix/distinfo ============================================================================== --- branches/2015Q1/mail/postfix/distinfo Tue Feb 17 05:17:09 2015 (r379142) +++ branches/2015Q1/mail/postfix/distinfo Tue Feb 17 05:35:35 2015 (r379143) @@ -1,5 +1,5 @@ -SHA256 (postfix/postfix-2.11.3.tar.gz) = 04e5146e6e56261baae9f63c590348a4b12ce22d3d46260e26e97233f40802c3 -SIZE (postfix/postfix-2.11.3.tar.gz) = 4039705 +SHA256 (postfix/postfix-2.11.4.tar.gz) = f4154c1db58c0300897d4c430bd90714ac7855249df59cc8828910fd5ccb031e +SIZE (postfix/postfix-2.11.4.tar.gz) = 4040104 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 Modified: branches/2015Q1/mail/postfix/pkg-plist ============================================================================== --- branches/2015Q1/mail/postfix/pkg-plist Tue Feb 17 05:17:09 2015 (r379142) +++ branches/2015Q1/mail/postfix/pkg-plist Tue Feb 17 05:35:35 2015 (r379143) @@ -8,7 +8,7 @@ bin/qshape bin/rmail %%TEST%%bin/smtp-sink %%TEST%%bin/smtp-source -%%BASE%%@cwd / +%%INST_BASE%%@cwd / etc/postfix/LICENSE etc/postfix/TLS_LICENSE etc/postfix/bounce.cf.default @@ -128,21 +128,18 @@ libexec/postfix/virtual sbin/postalias sbin/postcat sbin/postconf +@(,maildrop,2755) sbin/postdrop sbin/postfix sbin/postkick sbin/postlock sbin/postlog sbin/postmap sbin/postmulti -@group maildrop -@mode 2755 -sbin/postdrop -sbin/postqueue -@group -@mode +@(,maildrop,2755) sbin/postqueue sbin/postsuper sbin/posttls-finger sbin/sendmail +@dir %%PFETC%% @dir /var/db/postfix @dir(postfix,,700) /var/spool/postfix/active @dir(postfix,,700) /var/spool/postfix/bounce @@ -159,6 +156,3 @@ sbin/sendmail @dir(postfix,,700) /var/spool/postfix/saved @dir(postfix,,700) /var/spool/postfix/trace @dir(,,755) /var/spool/postfix -%%BASE%%@cwd / -@dir etc/postfix -@cwd %%RESETPREFIX%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502170535.t1H5ZawL091044>