Date: Tue, 13 Jan 2015 13:45:51 +0000 (UTC) From: Vsevolod Stakhov <vsevolod@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376931 - in head/mail: exim exim-doc-html exim/files Message-ID: <201501131345.t0DDjpfe009703@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vsevolod Date: Tue Jan 13 13:45:51 2015 New Revision: 376931 URL: https://svnweb.freebsd.org/changeset/ports/376931 QAT: https://qat.redports.org/buildarchive/r376931/ Log: - Update to 4.85 - Add DANE experimental support - Add EVENT experimental support - Drop SRS_ALT option as exim cannot work with libsrs2 so srs_alt is the only option now - Polish IGNORE messages - Remove already included patch - Update documentation slave ports The ChangeLog/NewStuff/README.UPDATING can be reviewed at: http://git.exim.org/exim.git/blob/exim-4_85:/doc/doc-txt/ChangeLog http://git.exim.org/exim.git/blob/exim-4_85:/doc/doc-txt/NewStuff http://git.exim.org/exim.git/blob/exim-4_85:/src/README.UPDATING Deleted: head/mail/exim/files/patch-src__mime.c Modified: head/mail/exim-doc-html/Makefile head/mail/exim-doc-html/distinfo head/mail/exim/Makefile head/mail/exim/distinfo head/mail/exim/options Modified: head/mail/exim-doc-html/Makefile ============================================================================== --- head/mail/exim-doc-html/Makefile Tue Jan 13 13:25:13 2015 (r376930) +++ head/mail/exim-doc-html/Makefile Tue Jan 13 13:45:51 2015 (r376931) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= exim -PORTVERSION= 4.84 +PORTVERSION= 4.85 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/} MASTER_SITE_SUBDIR= exim4/:exim Modified: head/mail/exim-doc-html/distinfo ============================================================================== --- head/mail/exim-doc-html/distinfo Tue Jan 13 13:25:13 2015 (r376930) +++ head/mail/exim-doc-html/distinfo Tue Jan 13 13:45:51 2015 (r376931) @@ -1,6 +1,6 @@ -SHA256 (exim/exim-html-4.84.tar.bz2) = 7ee7e9015b853915604b7806be93d56e9ba1fb915b63f0d6828c47f2228fd45b -SIZE (exim/exim-html-4.84.tar.bz2) = 465281 -SHA256 (exim/exim-pdf-4.84.tar.bz2) = 019c43bbcb794de6e2bbcfa71379de2f2fd9f09858935abdc21b37254ec2365a -SIZE (exim/exim-pdf-4.84.tar.bz2) = 1857579 -SHA256 (exim/exim-postscript-4.84.tar.bz2) = 31c1198058788a40f058b0f351d03e5d80ae7868bf30ab428d77274d2877d83c -SIZE (exim/exim-postscript-4.84.tar.bz2) = 1020664 +SHA256 (exim/exim-html-4.85.tar.bz2) = fd91946369626e74842a0799b93d0d9e4a201fe640af84e1b5349fe6ff204167 +SIZE (exim/exim-html-4.85.tar.bz2) = 467069 +SHA256 (exim/exim-pdf-4.85.tar.bz2) = f9614c74178da50f071bde5f65f25d0fdf1c197cc556d861b601d61a4a9452d9 +SIZE (exim/exim-pdf-4.85.tar.bz2) = 1865904 +SHA256 (exim/exim-postscript-4.85.tar.bz2) = 9fdceeac5810791a936c95866a2f5871db4d0b48fc3f109d35eb6a6d53df97e9 +SIZE (exim/exim-postscript-4.85.tar.bz2) = 1025295 Modified: head/mail/exim/Makefile ============================================================================== --- head/mail/exim/Makefile Tue Jan 13 13:25:13 2015 (r376930) +++ head/mail/exim/Makefile Tue Jan 13 13:45:51 2015 (r376931) @@ -3,7 +3,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION?= 2 +PORTREVISION?= 0 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/} MASTER_SITE_SUBDIR= exim4/:exim @@ -65,16 +65,23 @@ XCLIENT_EXTRA_PATCHES= ${FILESDIR}/extra # OCSP is supported for openssl only .if ${PORT_OPTIONS:MOCSP} .if ! ${PORT_OPTIONS:MTLS} -IGNORE= You cannot enable OCSP stapling without TLS support +IGNORE= you cannot enable OCSP stapling without TLS support .elif ${PORT_OPTIONS:MGNUTLS} -IGNORE= You cannot enable OCSP stapling with gnutls +IGNORE= you cannot enable OCSP stapling with gnutls .endif .endif # DMARC implies SPF .if ${PORT_OPTIONS:MDMARC} .if ! ${PORT_OPTIONS:MSPF} || ! ${PORT_OPTIONS:MDKIM} -IGNORE= You cannot enable DMARC without SPF and DKIM support +IGNORE= you cannot enable DMARC without SPF and DKIM support +.endif +.endif + +# DANE implies DNSSEC +.if ${PORT_OPTIONS:MDANE} +.if ! ${PORT_OPTIONS:MDNSSEC} +IGNORE= you cannot enable DANE without DNSSEC support .endif .endif @@ -85,7 +92,7 @@ MASTER_SITE_SUBDIR+= sa-exim/:sa_exim DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim .endif -EXIM_VERSION= 4.84 +EXIM_VERSION= 4.85 SA_EXIM_VERSION=4.2 EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink" @@ -201,6 +208,14 @@ SEDLIST+= -e 's,^\# (EXPERIMENTAL_CERTNA SEDLIST+= -e 's,^\# (EXPERIMENTAL_DSN=),\1,' .endif +.if ${PORT_OPTIONS:MDANE} +SEDLIST+= -e 's,^\# (EXPERIMENTAL_DANE=),\1,' +.endif + +.if ${PORT_OPTIONS:MEVENT} +SEDLIST+= -e 's,^\# (EXPERIMENTAL_EVENT=),\1,' +.endif + .if !${PORT_OPTIONS:MPRDR} SEDLIST+= -e 's,^\# (DISABLE_PRDR=),\1,' .endif @@ -433,10 +448,6 @@ SEDLIST+= -e 's,XX_SPF_FLAGS_XX,,' \ .endif .if ${PORT_OPTIONS:MSRS} -LIB_DEPENDS+= libsrs2.so:${PORTSDIR}/mail/libsrs2 -SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DSRS,' \ - -e 's,XX_SRS_LIBS_XX,-L${LOCALBASE}/lib -lsrs2,' -.elif ${PORT_OPTIONS:MSRS_ALT} LIB_DEPENDS+= libsrs_alt.so:${PORTSDIR}/mail/libsrs_alt SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DEXPERIMENTAL_SRS,' \ -e 's,XX_SRS_LIBS_XX,-L${LOCALBASE}/lib -lsrs_alt,' Modified: head/mail/exim/distinfo ============================================================================== --- head/mail/exim/distinfo Tue Jan 13 13:25:13 2015 (r376930) +++ head/mail/exim/distinfo Tue Jan 13 13:45:51 2015 (r376931) @@ -1,4 +1,4 @@ -SHA256 (exim/exim-4.84.tar.bz2) = 78ea22be87fb6df880e7fd482f3bec9ef6ceca0c9dedd50f8a26cae0b38b9e9c -SIZE (exim/exim-4.84.tar.bz2) = 1761790 +SHA256 (exim/exim-4.85.tar.bz2) = 13211f2bbc5400d095a9b4be075eb1347e0d98676fdfe4be8a3b4d56281daaa4 +SIZE (exim/exim-4.85.tar.bz2) = 1784150 SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a SIZE (exim/sa-exim-4.2.tar.gz) = 66575 Modified: head/mail/exim/options ============================================================================== --- head/mail/exim/options Tue Jan 13 13:25:13 2015 (r376930) +++ head/mail/exim/options Tue Jan 13 13:45:51 2015 (r376931) @@ -52,7 +52,7 @@ OPTIONS_RADIO_TLS= TLS GNUTLS TLS_DESC= TLS support OPTIONS_RADIO_LS= SA_EXIM LS_DESC= Local scan patch -OPTIONS_RADIO_SRSR= SRS SRS_ALT +OPTIONS_RADIO_SRSR= SRS SRSR_DESC= Sender Rewriting Scheme OPTIONS_RADIO= TLS LS SRSR @@ -62,7 +62,7 @@ OPTIONS_GROUP_LOOKUP= CDB BDB DNSDB DSEA LOOKUP_DESC= Lookup support OPTIONS_GROUP_STORAGE= MAILDIR MAILSTORE MBX STORAGE_DESC= Supported storage formats -OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DCC DMARC DSN PROXY SPF +OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN EVENT PROXY SPF EXPERIMENTAL_DESC= Experimental options OPTIONS_GROUP= AUTH LOOKUP STORAGE EXPERIMENTAL @@ -74,11 +74,11 @@ AUTH_RADIUS_DESC= Enable radius (RFC 286 AUTH_SASL_DESC= Enable use of Cyrus SASL auth library AUTH_SPA_DESC= Enable Secure Password Authentication CERTNAMES_DESC= Check certiticates ownership -DSN_DESC= Enable Delivery Status Notifications BDB_DESC= Enable Berkeley DB lookups CDB_DESC= Enable CDB-style lookups CONTENT_SCAN_DESC= Enable exiscan email content scanner DAEMON_DESC= Install scripts to run as a daemon +DANE_DESC= Enable experimental DANE support DCC_DESC= Enable DCC at ACL support via dccifd DISABLE_D_OPT_DESC= Disable macros overrides using option -D DKIM_DESC= Enable support for DKIM @@ -86,7 +86,9 @@ DMARC_DESC= Enable DMARC support DNSDB_DESC= Enable DNS-style lookups DNSSEC_DESC= Enable DNSSEC validation DSEARCH_DESC= Enable directory-list lookups +DSN_DESC= Enable Delivery Status Notifications EMBEDDED_PERL_DESC= Enable embedded Perl interpreter +EVENT_DESC= Messages events support (TPDA namely) EXIMON_DESC= Build eximon monitor (requires X libraries) ICONV_DESC= Enable header charset conversion LISTMATCH_RHS_DESC= Enable pre-4.77 behaviour for match_* @@ -112,7 +114,6 @@ SA_EXIM_DESC= Build with Spamassassin l SPF_DESC= Enable Sender Policy Framework checking SQLITE_DESC= Enable SQLite lookups SRS_DESC= Enable Sender Rewriting Scheme -SRS_ALT_DESC= Enable alternative Sender Rewriting Scheme SUID_DESC= Install the exim binary suid root TCP_WRAPPERS_DESC= Enable /etc/hosts.allow access control GNUTLS_DESC= Use GnuTLS instead of OpenSSL for TLS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501131345.t0DDjpfe009703>