Date: Mon, 27 Jul 2015 19:42:14 +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: r393028 - in head/mail: exim exim-doc-html exim/files Message-ID: <201507271942.t6RJgED5042795@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vsevolod Date: Mon Jul 27 19:42:14 2015 New Revision: 393028 URL: https://svnweb.freebsd.org/changeset/ports/393028 Log: - Update to 4.86 [1] - Add experimental INTERNATIONAL option - Add experimental SOCKS option - Removed rspamd extra patch (included by default now) - Removed xclient patch (broken and not used) Relnotes: ftp://ftp.exim.org/pub/exim/exim4/NewStuff [1] Deleted: head/mail/exim/files/extra-patch-rspamd head/mail/exim/files/extra-patch-xclient Modified: head/mail/exim-doc-html/Makefile head/mail/exim-doc-html/distinfo head/mail/exim/Makefile head/mail/exim/distinfo head/mail/exim/files/patch-src__EDITME head/mail/exim/options Modified: head/mail/exim-doc-html/Makefile ============================================================================== --- head/mail/exim-doc-html/Makefile Mon Jul 27 19:32:06 2015 (r393027) +++ head/mail/exim-doc-html/Makefile Mon Jul 27 19:42:14 2015 (r393028) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= exim -PORTVERSION= 4.85 +PORTVERSION= 4.86 CATEGORIES= mail MASTER_SITES= EXIM/exim4/:exim PKGNAMESUFFIX= -doc-${DOCFORMAT} Modified: head/mail/exim-doc-html/distinfo ============================================================================== --- head/mail/exim-doc-html/distinfo Mon Jul 27 19:32:06 2015 (r393027) +++ head/mail/exim-doc-html/distinfo Mon Jul 27 19:42:14 2015 (r393028) @@ -1,6 +1,6 @@ -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 +SHA256 (exim/exim-postscript-4.86.tar.bz2) = eb12f301d3d137ba6ab0e2ca3533fa6a9b3e1271164dcf3a27a8ae94e4767c3a +SIZE (exim/exim-postscript-4.86.tar.bz2) = 1036410 +SHA256 (exim/exim-html-4.86.tar.bz2) = 02226a9fbb6d5aaa9d35f3e2a3bd9077e2307463de6baf6e3e2e938c1fe39146 +SIZE (exim/exim-html-4.86.tar.bz2) = 471159 +SHA256 (exim/exim-pdf-4.86.tar.bz2) = 0a3be846b743a8bae2a9a9835613b2de2273c67e9c3f2bdd0079a83b51dbcaa8 +SIZE (exim/exim-pdf-4.86.tar.bz2) = 1887704 Modified: head/mail/exim/Makefile ============================================================================== --- head/mail/exim/Makefile Mon Jul 27 19:32:06 2015 (r393027) +++ head/mail/exim/Makefile Mon Jul 27 19:42:14 2015 (r393028) @@ -3,7 +3,6 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION?= 2 CATEGORIES= mail ipv6 MASTER_SITES= EXIM/exim4/:exim DISTNAME= ${PORTNAME}-${EXIM_VERSION} @@ -48,6 +47,7 @@ EMBEDDED_PERL_USE= perl5=run,build EXIMON_USE= xorg=x11,xaw,xt GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls ICONV_USES= iconv:lib,build +INTERNATIONAL_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn MYSQL_USE= mysql=yes OPENLDAP_USE= openldap=yes PGSQL_USES= pgsql @@ -57,8 +57,6 @@ SA_EXIM_RUN_DEPENDS= ${LOCALBASE}/bin/sp SPF_LIB_DEPENDS= libspf2.so:${PORTSDIR}/mail/libspf2 SQLITE_USE= sqlite=yes SQLITE_USES= pkgconfig -XCLIENT_EXTRA_PATCHES= ${FILESDIR}/extra-patch-xclient -RSPAMD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-rspamd .include <bsd.port.options.mk> @@ -97,7 +95,7 @@ MASTER_SITES+= http://marc.merlins.org/l DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim .endif -EXIM_VERSION= 4.85 +EXIM_VERSION= 4.86 SA_EXIM_VERSION=4.2 EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink" @@ -220,6 +218,17 @@ SEDLIST+= -e 's,^\# (EXPERIMENTAL_DANE=) SEDLIST+= -e 's,^\# (EXPERIMENTAL_EVENT=),\1,' .endif +.if ${PORT_OPTIONS:MINTERNATIONAL} +SEDLIST+= -e 's,^\# (EXPERIMENTAL_INTERNATIONAL=),\1,' \ + -e 's,XX_IDN_LIBS_XX,-L${LOCALBASE}/lib -lidn,' +.else +SEDLIST+= -e 's,XX_IDN_LIBS_XX,,' +.endif + +.if ${PORT_OPTIONS:MSOCKS} +SEDLIST+= -e 's,^\# (EXPERIMENTAL_SOCKS=),\1,' +.endif + .if !${PORT_OPTIONS:MPRDR} SEDLIST+= -e 's,^\# (DISABLE_PRDR=),\1,' .endif Modified: head/mail/exim/distinfo ============================================================================== --- head/mail/exim/distinfo Mon Jul 27 19:32:06 2015 (r393027) +++ head/mail/exim/distinfo Mon Jul 27 19:42:14 2015 (r393028) @@ -1,4 +1,4 @@ -SHA256 (exim/exim-4.85.tar.bz2) = 13211f2bbc5400d095a9b4be075eb1347e0d98676fdfe4be8a3b4d56281daaa4 -SIZE (exim/exim-4.85.tar.bz2) = 1784150 +SHA256 (exim/exim-4.86.tar.bz2) = f1ccf2ce2ea51b7fbbf160e7e0e41d24ca401cf44a185128ad99ea04635fc456 +SIZE (exim/exim-4.86.tar.bz2) = 1804807 SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a SIZE (exim/sa-exim-4.2.tar.gz) = 66575 Modified: head/mail/exim/files/patch-src__EDITME ============================================================================== --- head/mail/exim/files/patch-src__EDITME Mon Jul 27 19:32:06 2015 (r393027) +++ head/mail/exim/files/patch-src__EDITME Mon Jul 27 19:42:14 2015 (r393028) @@ -123,7 +123,7 @@ # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. +CFLAGS=XX_CFLAGS_XX XX_SPF_FLAGS_XX XX_SRS_FLAGS_XX XX_SQLITE_FLAGS_XX -+EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_ICONV_LIBS_XX XX_SPF_LIBS_XX XX_SRS_LIBS_XX XX_RADIUS_LIBS_XX XX_SQLITE_LIBS_XX XX_DMARC_LIBS_XX XX_REDIS_LIBS_XX XX_DYNAMIC_LDFLAGS_XX ++EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_ICONV_LIBS_XX XX_SPF_LIBS_XX XX_SRS_LIBS_XX XX_RADIUS_LIBS_XX XX_SQLITE_LIBS_XX XX_DMARC_LIBS_XX XX_REDIS_LIBS_XX XX_DYNAMIC_LDFLAGS_XX XX_IDN_LIBS_XX # # To use a name other than exim in the tcpwrappers config file, # e.g. if you're running multiple daemons with different access lists, Modified: head/mail/exim/options ============================================================================== --- head/mail/exim/options Mon Jul 27 19:32:06 2015 (r393027) +++ head/mail/exim/options Mon Jul 27 19:42:14 2015 (r393028) @@ -18,8 +18,7 @@ OPTIONS_DEFINE+= ALT_CONFIG_PREFIX \ READLINE \ SUID \ TCP_WRAPPERS \ - WISHLIST \ - XCLIENT + WISHLIST OPTIONS_DEFAULT+= AUTH_CRAM_MD5 \ AUTH_DOVECOT \ @@ -61,7 +60,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 DANE DCC DMARC DSN EVENT PROXY SPF RSPAMD +OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN EVENT INTERNATIONAL PROXY SOCKS SPF EXPERIMENTAL_DESC= Experimental options OPTIONS_GROUP= AUTH LOOKUP STORAGE EXPERIMENTAL @@ -90,6 +89,7 @@ EMBEDDED_PERL_DESC= Enable embedded Perl EVENT_DESC= Messages events support (TPDA namely) EXIMON_DESC= Build eximon monitor (requires X libraries) ICONV_DESC= Enable header charset conversion +INTERNATIONAL_DESC= Enable support for the transmission of UTF-8 envelope addresses LISTMATCH_RHS_DESC= Enable pre-4.77 behaviour for match_* LMTP_DESC= RFC2033 SMTP over command pipe transport LSEARCH_DESC= Enable wildcarded-file lookups @@ -110,12 +110,11 @@ READLINE_DESC= Enable readline(3) libra REDIS_DESC= Enable redis lookups (experimental) SASLAUTHD_DESC= Enable use of Cyrus SASL auth daemon SA_EXIM_DESC= Build with Spamassassin local scan +SOCKS_DESC= Enable smtp transport via socks5 proxies SPF_DESC= Enable Sender Policy Framework checking -RSPAMD_DESC= Build with Rspamd support SQLITE_DESC= Enable SQLite lookups SRS_DESC= Enable 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 WISHLIST_DESC= Include the unsupported patches -XCLIENT_DESC= Enable XCLIENT command in exim
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507271942.t6RJgED5042795>