Date: Thu, 21 Apr 2016 15:52:23 +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: r413740 - in head/mail: exim exim-doc-html exim/files Message-ID: <201604211552.u3LFqN8B032628@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vsevolod Date: Thu Apr 21 15:52:23 2016 New Revision: 413740 URL: https://svnweb.freebsd.org/changeset/ports/413740 Log: - Update to 4.87 - Enable recommended default options - Rename no longer experimental options - Add rspamd shutdown patch Exim 4.87 announce link: https://lists.exim.org/lurker/message/20160406.181048.292a54e9.en.html Added: head/mail/exim/files/patch-rspamd-shutdown (contents, props changed) Deleted: head/mail/exim/files/patch-post-transport-crash head/mail/exim/files/patch-src__auths__call_radius.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 Thu Apr 21 15:41:24 2016 (r413739) +++ head/mail/exim-doc-html/Makefile Thu Apr 21 15:52:23 2016 (r413740) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= exim -PORTVERSION= 4.86.2 +PORTVERSION= 4.87 CATEGORIES= mail MASTER_SITES= EXIM/exim4/:exim PKGNAMESUFFIX= -doc-${DOCFORMAT} Modified: head/mail/exim-doc-html/distinfo ============================================================================== --- head/mail/exim-doc-html/distinfo Thu Apr 21 15:41:24 2016 (r413739) +++ head/mail/exim-doc-html/distinfo Thu Apr 21 15:52:23 2016 (r413740) @@ -1,6 +1,6 @@ -SHA256 (exim/exim-html-4.86.2.tar.bz2) = 1c97a6efd0a7aaf4b9960ce70fed4df37725f676397ce744efea1503ec1f5914 -SIZE (exim/exim-html-4.86.2.tar.bz2) = 466139 -SHA256 (exim/exim-pdf-4.86.2.tar.bz2) = 4e0f960d94f10d52d6f72d55bb28f7abbf7643ce6287ee66356dd3c1ec5d9491 -SIZE (exim/exim-pdf-4.86.2.tar.bz2) = 1886776 -SHA256 (exim/exim-postscript-4.86.2.tar.bz2) = 34ae3882d4b1126e6c3034c217212e18f02c16c17a6a9452404c749a8788ce98 -SIZE (exim/exim-postscript-4.86.2.tar.bz2) = 1037469 +SHA256 (exim/exim-html-4.87.tar.bz2) = 8f87876d4a392f59d1009ba64ac461862951a3f4eed9c0b14a49be7bcbdc1f12 +SIZE (exim/exim-html-4.87.tar.bz2) = 478953 +SHA256 (exim/exim-pdf-4.87.tar.bz2) = 52c6205ec31fe8162a7068ba86dfd1ac6e370c76a5377bdc7bd29555f8d6ca0c +SIZE (exim/exim-pdf-4.87.tar.bz2) = 1917123 +SHA256 (exim/exim-postscript-4.87.tar.bz2) = 7241b80d724d473cb9e47823eaa219d89bf2a56d6e80e710b850bbd90f271b49 +SIZE (exim/exim-postscript-4.87.tar.bz2) = 1052132 Modified: head/mail/exim/Makefile ============================================================================== --- head/mail/exim/Makefile Thu Apr 21 15:41:24 2016 (r413739) +++ head/mail/exim/Makefile Thu Apr 21 15:52:23 2016 (r413740) @@ -3,7 +3,6 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= EXIM/exim4/:exim DISTNAME= ${PORTNAME}-${EXIM_VERSION} @@ -96,7 +95,7 @@ MASTER_SITES+= http://marc.merlins.org/l DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim .endif -EXIM_VERSION= 4.86.2 +EXIM_VERSION= 4.87 SA_EXIM_VERSION=4.2 EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink" @@ -200,7 +199,7 @@ SEDLIST+= -e 's,^\# (EXPERIMENTAL_DCC=), .endif .if ${PORT_OPTIONS:MPROXY} -SEDLIST+= -e 's,^\# (EXPERIMENTAL_PROXY=),\1,' +SEDLIST+= -e 's,^\# (SUPPORT_PROXY=),\1,' .endif .if ${PORT_OPTIONS:MCERTNAMES} @@ -215,19 +214,19 @@ SEDLIST+= -e 's,^\# (EXPERIMENTAL_DSN=), SEDLIST+= -e 's,^\# (EXPERIMENTAL_DANE=),\1,' .endif -.if ${PORT_OPTIONS:MEVENT} -SEDLIST+= -e 's,^\# (EXPERIMENTAL_EVENT=),\1,' +.if !${PORT_OPTIONS:MEVENT} +SEDLIST+= -e 's,^\# (DISABLE_EVENT=),\1,' .endif .if ${PORT_OPTIONS:MINTERNATIONAL} -SEDLIST+= -e 's,^\# (EXPERIMENTAL_INTERNATIONAL=),\1,' \ +SEDLIST+= -e 's,^\# (SUPPORT_I18N=),\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,' +SEDLIST+= -e 's,^\# (SUPPORT_SOCKS=),\1,' .endif .if !${PORT_OPTIONS:MPRDR} @@ -438,7 +437,7 @@ SEDLIST+= -e 's,XX_SQLITE_LIBS_XX,,' \ .if ${PORT_OPTIONS:MREDIS} SEDLIST+= -e 's,XX_REDIS_LIBS_XX,-L${LOCALBASE}/lib -lhiredis,' \ -e 's,^\# (LOOKUP_REDIS=),\1,' \ - -e 's,^\# (EXPERIMENTAL_REDIS=),\1,' + -e 's,^\# (REDIS=),\1,' .else SEDLIST+= -e 's,XX_REDIS_LIBS_XX,,' .endif Modified: head/mail/exim/distinfo ============================================================================== --- head/mail/exim/distinfo Thu Apr 21 15:41:24 2016 (r413739) +++ head/mail/exim/distinfo Thu Apr 21 15:52:23 2016 (r413740) @@ -1,4 +1,4 @@ -SHA256 (exim/exim-4.86.2.tar.bz2) = 7756deafd0583776e091f2efcba9b36203e668cf420d8876f314980803636eb3 -SIZE (exim/exim-4.86.2.tar.bz2) = 1799316 +SHA256 (exim/exim-4.87.tar.bz2) = 74691e0dff4d1b5d387e9c33c86f96a8f6d2adbc781c0dec9d2061a847b07dc9 +SIZE (exim/exim-4.87.tar.bz2) = 1801422 SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a SIZE (exim/sa-exim-4.2.tar.gz) = 66575 Added: head/mail/exim/files/patch-rspamd-shutdown ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/exim/files/patch-rspamd-shutdown Thu Apr 21 15:52:23 2016 (r413740) @@ -0,0 +1,13 @@ +--- src/spam.c.orig 2016-04-02 20:24:15.000000000 +0100 ++++ src/spam.c 2016-04-21 16:42:49.297221000 +0100 +@@ -494,7 +494,9 @@ + (void)fclose(mbox_file); + + /* we're done sending, close socket for writing */ +-shutdown(spamd_sock,SHUT_WR); ++if (!sd->is_rspamd) { ++ shutdown(spamd_sock,SHUT_WR); ++} + + /* read spamd response using what's left of the timeout. */ + memset(spamd_buffer, 0, sizeof(spamd_buffer)); Modified: head/mail/exim/options ============================================================================== --- head/mail/exim/options Thu Apr 21 15:41:24 2016 (r413739) +++ head/mail/exim/options Thu Apr 21 15:52:23 2016 (r413740) @@ -18,7 +18,11 @@ OPTIONS_DEFINE+= ALT_CONFIG_PREFIX \ READLINE \ SUID \ TCP_WRAPPERS \ - WISHLIST + WISHLIST \ + EVENT \ + PROXY \ + SOCKS \ + INTERNATIONAL OPTIONS_DEFAULT+= AUTH_CRAM_MD5 \ AUTH_DOVECOT \ @@ -32,7 +36,9 @@ OPTIONS_DEFAULT+= AUTH_CRAM_MD5 \ DNSSEC \ DSEARCH \ EMBEDDED_PERL \ + EVENT \ ICONV \ + INTERNATIONAL \ LMTP \ LSEARCH \ MAILDIR \ @@ -60,7 +66,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 INTERNATIONAL PROXY SOCKS SPF +OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN SPF EXPERIMENTAL_DESC= Experimental options OPTIONS_GROUP= AUTH LOOKUP STORAGE EXPERIMENTAL @@ -107,7 +113,7 @@ PGSQL_DESC= Enable postgresql lookups PRDR_DESC= Enable Per-Recipient-Data-Response support PROXY_DESC= Enable Experimental Proxy Protocol READLINE_DESC= Enable readline(3) library -REDIS_DESC= Enable redis lookups (experimental) +REDIS_DESC= Enable redis lookups 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604211552.u3LFqN8B032628>