Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Feb 2020 13:58:43 +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: r526373 - in head/mail/exim: . files
Message-ID:  <202002171358.01HDwhK3037324@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vsevolod
Date: Mon Feb 17 13:58:43 2020
New Revision: 526373
URL: https://svnweb.freebsd.org/changeset/ports/526373

Log:
  - Update to 4.93
  
  Announce link: https://lists.exim.org/lurker/message/20191208.213349.3407a963.en.html

Deleted:
  head/mail/exim/files/patch-src_deliver.c
Modified:
  head/mail/exim/Makefile
  head/mail/exim/distinfo
  head/mail/exim/files/patch-src__EDITME

Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile	Mon Feb 17 13:52:08 2020	(r526372)
+++ head/mail/exim/Makefile	Mon Feb 17 13:58:43 2020	(r526373)
@@ -98,7 +98,7 @@ MASTER_SITES+=	http://marc.merlins.org/linux/exim/file
 DISTFILES+=	sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
 .endif
 
-EXIM_VERSION=	4.92.3
+EXIM_VERSION=	4.93
 SA_EXIM_VERSION=4.2
 EXIM_INSTALL_ARG+=	"-no_chown" "-no_symlink"
 
@@ -250,7 +250,7 @@ SEDLIST+=	-e 's,^\# (DISABLE_DNSSEC=),\1,'
 
 .if ${PORT_OPTIONS:MDMARC}
 SEDLIST+= -e 's,XX_DMARC_LIBS_XX,-L${LOCALBASE}/lib -lopendmarc,' \
-		-e 's,^\# (EXPERIMENTAL_DMARC=),\1,'
+		-e 's,^\# (SUPPORT_DMARC=),\1,'
 .else
 SEDLIST+= -e 's,XX_DMARC_LIBS_XX,,'
 .endif
@@ -268,14 +268,16 @@ SEDLIST+=	-e 's,^\# (EXIM_MONITOR=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MTLS}
-SEDLIST+=	-e 's,^\# (SUPPORT_TLS=),\1,'
 .if ! ${PORT_OPTIONS:MGNUTLS}
 USES+=		ssl
+SEDLIST+=	-e 's,^\# (USE_OPENSSL=),\1,'
 SEDLIST+=	-e 's,^\# (TLS_LIBS=.*-lssl[[:space:]]),\1,'
 .else
 SEDLIST+=	-e 's,^\# (USE_GNUTLS=),\1,'
 SEDLIST+=	-e 's,^\# (TLS_LIBS=.*-lgnutls[[:space:]]),\1,'
 .endif
+.else # TLS support
+SEDLIST+=	-e 's,^\# (DISABLE_TLS=),\1,'
 .endif
 
 .if ${PORT_OPTIONS:MEMBEDDED_PERL}

Modified: head/mail/exim/distinfo
==============================================================================
--- head/mail/exim/distinfo	Mon Feb 17 13:52:08 2020	(r526372)
+++ head/mail/exim/distinfo	Mon Feb 17 13:58:43 2020	(r526373)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1569739841
-SHA256 (exim/exim-4.92.3.tar.bz2) = 29966aab50523cd7b7f90a0788c79a16b75181513115a61302ce0f7a93041034
-SIZE (exim/exim-4.92.3.tar.bz2) = 1933605
+TIMESTAMP = 1581947251
+SHA256 (exim/exim-4.93.tar.bz2) = 22c432c0585ef605c52bc796042c4823e961f58a7e6ad1486252e203bf4c9276
+SIZE (exim/exim-4.93.tar.bz2) = 1972841
 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 Feb 17 13:52:08 2020	(r526372)
+++ head/mail/exim/files/patch-src__EDITME	Mon Feb 17 13:58:43 2020	(r526373)
@@ -57,15 +57,6 @@
  
  
  #------------------------------------------------------------------------------
-@@ -373,7 +376,7 @@
- # files are defaulted in the OS/Makefile-Default file, but can be overridden in
- # local OS-specific make files.
- 
--EXIM_MONITOR=eximon.bin
-+# EXIM_MONITOR=eximon.bin
- 
- 
- #------------------------------------------------------------------------------
 @@ -454,6 +457,7 @@
  
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002171358.01HDwhK3037324>