diff options
| author | Vsevolod Stakhov <vsevolod@FreeBSD.org> | 2020-02-17 13:58:43 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@FreeBSD.org> | 2020-02-17 13:58:43 +0000 |
| commit | 477c24b2bf6d5f75f8c918a9441ae5ef52e275b0 (patch) | |
| tree | 2bb9cff4b02b3d1dd71cd654cf6bc036744d60d2 /mail/exim | |
| parent | e23ba3405312eafbe5ee692c9e5c275dba52d82f (diff) | |
| download | ports-477c24b2bf6d5f75f8c918a9441ae5ef52e275b0.tar.gz ports-477c24b2bf6d5f75f8c918a9441ae5ef52e275b0.zip | |
- Update to 4.93
Notes
Notes:
svn path=/head/; revision=526373
Diffstat (limited to 'mail/exim')
| -rw-r--r-- | mail/exim/Makefile | 8 | ||||
| -rw-r--r-- | mail/exim/distinfo | 6 | ||||
| -rw-r--r-- | mail/exim/files/patch-src__EDITME | 9 | ||||
| -rw-r--r-- | mail/exim/files/patch-src_deliver.c | 11 |
4 files changed, 8 insertions, 26 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 7ea1cfa6905b..7f7ab93a95b3 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -98,7 +98,7 @@ MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \ 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} diff --git a/mail/exim/distinfo b/mail/exim/distinfo index 5bf1261258dd..8499ba292159 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -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 diff --git a/mail/exim/files/patch-src__EDITME b/mail/exim/files/patch-src__EDITME index fa7689084cd3..cdbc576fda1d 100644 --- a/mail/exim/files/patch-src__EDITME +++ b/mail/exim/files/patch-src__EDITME @@ -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 @@ diff --git a/mail/exim/files/patch-src_deliver.c b/mail/exim/files/patch-src_deliver.c deleted file mode 100644 index 476eaf7f6c34..000000000000 --- a/mail/exim/files/patch-src_deliver.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/deliver.c.orig 2019-03-11 16:20:17 UTC -+++ src/deliver.c -@@ -763,7 +763,7 @@ if (LOGGING(incoming_interface) && LOGGING(outgoing_in - { - g = string_fmt_append(g, " I=[%s]", sending_ip_address); - if (LOGGING(outgoing_port)) -- g = string_fmt_append(g, "%d", sending_port); -+ g = string_fmt_append(g, ":%d", sending_port); - } - return g; - } |