svn commit: r460628 - branches/2018Q1/mail/postfix

[Olli Hauer]

Author: ohauer
Date: Thu Feb  1 20:26:03 2018
New Revision: 460628
URL: https://svnweb.freebsd.org/changeset/ports/460628

Log:
  MFH: r460435 r460438
  
  - update to 3.2.5
  - license is now dual (see Changelog 20180127)
  - make EAI optional but on by default [1]
  
  Changelog:
  20171116
    Bugfix (introduced: Postfix 2.1): don't log warnings
    that some restriction returns OK, when the access map
    DISCARD feature is in effect. File: smtpd/smtpd_check.c.
  
  20171215
    Bugfix (introduced: 20170611): the DB_CONFIG bugfix broke
    Berkeley DB configurations with a relative pathname.  File:
    util/dict_db.c.
  
  20171218
    Workaround: reportedly, some res_query(3) implementation
    can return -1 with h_errno==0. Instead of terminating with
    a panic, the Postfix DNS client now logs a warning and sets
    h_errno to TRY_AGAIN. File: dns/dns_lookup.c.
  
  20171226
    Documentation patches by Sven Neuhaus. Files:
    proto/FORWARD_SECRECY_README.html, proto/MILTER_README.html,
    proto/SMTPD_ACCESS_README.html.
  
  20180106
    Cleanup: missing mailbox seek-to-end error check in the
    local(8) delivery agent. File: local/mailbox.c.
  
    Cleanup: incorrect mailbox seek-to-end error message in the
    virtual(8) delivery agent. File: virtual/mailbox.c.
  
  20180127
    Licence: in addition to the historical IBM Public License
    1.0, this software is now also distributed with the more
    recent Eclipse Public License 2.0. Recipients can choose
    to take the software under the license of their choice.
    Those who are more comfortable with the IPL can continue
    with that license. File: LICENSE.
  
  - fix licence error after last commit
  
  Reported by:	Yasuhiro KIMURA
  
  PR:		ports/221619 [1]
  Submitted by:	Kubilay Kocak (koobs@)
  
  Approved by:	ports-secteam (swills@)

Modified:
  branches/2018Q1/mail/postfix/Makefile
  branches/2018Q1/mail/postfix/distinfo
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/mail/postfix/Makefile
==============================================================================
--- branches/2018Q1/mail/postfix/Makefile	Thu Feb  1 20:19:27 2018	(r460627)
+++ branches/2018Q1/mail/postfix/Makefile	Thu Feb  1 20:26:03 2018	(r460628)
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	postfix
-PORTVERSION=	3.2.4
+PORTVERSION=	3.2.5
+PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/ \
@@ -17,13 +18,12 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	ohauer at FreeBSD.org
 COMMENT=	Secure alternative to widely-used Sendmail
 
-LICENSE=	IPL10
-LICENSE_NAME=	IBM PUBLIC LICENSE VERSION 1.0
+LICENSE=	IPL10 EPL
+LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_NAME_IPL10=	IBM PUBLIC LICENSE VERSION 1.0
+LICENSE_PERMS_IPL10=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libicuuc.so:devel/icu
-
 PORTSCOUT=	limit:^3\.2\.
 
 CONFLICTS_INSTALL?=	courier-0.* opensmtpd-[0-9]* \
@@ -40,15 +40,16 @@ USE_SUBMAKE=	yes
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	BDB CDB DOCS INST_BASE LDAP LDAP_SASL LMDB MYSQL \
+OPTIONS_DEFINE=	BDB CDB DOCS EAI INST_BASE LDAP LDAP_SASL LMDB MYSQL \
 		NIS PCRE PGSQL SASL SQLITE TEST TLS
 
 OPTIONS_RADIO=		RG1
 OPTIONS_RADIO_RG1=	SASLKRB5 SASLKMIT
-OPTIONS_DEFAULT=	PCRE TLS
+OPTIONS_DEFAULT=	EAI PCRE TLS
 
 BDB_USES=		bdb
 CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
+EAI_LIB_DEPENDS=	libicuuc.so:devel/icu
 LDAP_USE=		OPENLDAP=yes
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 MYSQL_USE=		MYSQL=yes
@@ -60,6 +61,7 @@ SQLITE_USES=		sqlite
 TLS_USES=		ssl
 
 CDB_DESC=	CDB maps lookups
+EAI_DESC=	Email Address Internationalization (SMTPUTF8) support
 INST_BASE_DESC=	Install into /usr and /etc/postfix
 LDAP_DESC=	LDAP maps (uses WITH_OPENLDAP_VER)
 LDAP_SASL_DESC=	LDAP client-to-server SASL auth
@@ -150,9 +152,12 @@ _REQUIRE=		LOGIN cleanvar dovecot
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH
 
 # Email Address Internationalization (EAI, RFC 6531..6533)
-# This is now mandantory!
+.if ${PORT_OPTIONS:MEAI}
 POSTFIX_CCARGS+=	-DHAS_EAI -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -licuuc
+.else
+POSTFIX_CCARGS+=	-DNO_EAI
+.endif
 
 .if ${PORT_OPTIONS:MPCRE}
 DYN_EXT+=		pcre

Modified: branches/2018Q1/mail/postfix/distinfo
==============================================================================
--- branches/2018Q1/mail/postfix/distinfo	Thu Feb  1 20:19:27 2018	(r460627)
+++ branches/2018Q1/mail/postfix/distinfo	Thu Feb  1 20:26:03 2018	(r460628)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1511368835
-SHA256 (postfix/postfix-3.2.4.tar.gz) = ec55ebaa2aa464792af8d5ee103eb68b27a42dc2b36a02fee42dafbf9740c7f6
-SIZE (postfix/postfix-3.2.4.tar.gz) = 4390376
+TIMESTAMP = 1517107020
+SHA256 (postfix/postfix-3.2.5.tar.gz) = 7d0b841d3a46e7c64f392fcc4de5dd3f4bdcfd0b9e48fc235bdff6a208f0f376
+SIZE (postfix/postfix-3.2.5.tar.gz) = 4394765