From owner-svn-ports-all@freebsd.org Wed Mar 8 16:46:08 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A00DD03CD5; Wed, 8 Mar 2017 16:46:08 +0000 (UTC) (envelope-from vsevolod@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1C8C4FB4; Wed, 8 Mar 2017 16:46:08 +0000 (UTC) (envelope-from vsevolod@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v28Gk72k042534; Wed, 8 Mar 2017 16:46:07 GMT (envelope-from vsevolod@FreeBSD.org) Received: (from vsevolod@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v28Gk6Dv042531; Wed, 8 Mar 2017 16:46:06 GMT (envelope-from vsevolod@FreeBSD.org) Message-Id: <201703081646.v28Gk6Dv042531@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vsevolod set sender to vsevolod@FreeBSD.org using -f From: Vsevolod Stakhov Date: Wed, 8 Mar 2017 16:46:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435696 - in head/mail/exim: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2017 16:46:08 -0000 Author: vsevolod Date: Wed Mar 8 16:46:06 2017 New Revision: 435696 URL: https://svnweb.freebsd.org/changeset/ports/435696 Log: - Update to 4.89 Modified: head/mail/exim/Makefile head/mail/exim/distinfo head/mail/exim/files/patch-pass-fd-to-tcpwrappers Modified: head/mail/exim/Makefile ============================================================================== --- head/mail/exim/Makefile Wed Mar 8 16:14:49 2017 (r435695) +++ head/mail/exim/Makefile Wed Mar 8 16:46:06 2017 (r435696) @@ -3,7 +3,6 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION= 2 CATEGORIES= mail ipv6 MASTER_SITES= EXIM:exim MASTER_SITE_SUBDIR= /exim4/:exim \ @@ -92,7 +91,7 @@ MASTER_SITES+= http://marc.merlins.org/l DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim .endif -EXIM_VERSION= 4.88 +EXIM_VERSION= 4.89 SA_EXIM_VERSION=4.2 EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink" Modified: head/mail/exim/distinfo ============================================================================== --- head/mail/exim/distinfo Wed Mar 8 16:14:49 2017 (r435695) +++ head/mail/exim/distinfo Wed Mar 8 16:46:06 2017 (r435696) @@ -1,5 +1,5 @@ -TIMESTAMP = 1483356878 -SHA256 (exim/exim-4.88.tar.bz2) = 119d5fd7e31fc224e84dfa458fe182f200856bae7adf852a8287c242161f8a2d -SIZE (exim/exim-4.88.tar.bz2) = 1824610 +TIMESTAMP = 1488990705 +SHA256 (exim/exim-4.89.tar.bz2) = 912f2ee03c8dba06a3a4c0ee40522d367e1b65dc59e38dfcc1f5d9eecff51ab0 +SIZE (exim/exim-4.89.tar.bz2) = 1844430 SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a SIZE (exim/sa-exim-4.2.tar.gz) = 66575 Modified: head/mail/exim/files/patch-pass-fd-to-tcpwrappers ============================================================================== --- head/mail/exim/files/patch-pass-fd-to-tcpwrappers Wed Mar 8 16:14:49 2017 (r435695) +++ head/mail/exim/files/patch-pass-fd-to-tcpwrappers Wed Mar 8 16:46:06 2017 (r435696) @@ -1,37 +1,32 @@ -This patch passes output filedescriptor argument (stdout in the -case of SMTP sessions) to the tcp_wrappers code in order to allow -statements like 'twist' (that output anything instead of the daemon) -to work. Bare hosts_ctl() is too dumb to handle such usage of tcp -wrappers. - ---- src/smtp_in.c.orig 2012-06-28 19:52:46.000000000 +0400 -+++ src/smtp_in.c 2012-06-28 20:08:00.000000000 +0400 -@@ -1357,6 +1357,9 @@ - uschar *user_msg, *log_msg; - uschar *code, *esc; - uschar *p, *s, *ss; +--- src/smtp_in.c.orig 2017-03-08 16:31:57.587957000 +0000 ++++ src/smtp_in.c 2017-03-08 16:43:44.934346000 +0000 +@@ -2246,6 +2246,9 @@ + #ifdef USE_TCP_WRAPPERS + struct request_info tcpwrap_ri; + #endif +#ifdef USE_TCP_WRAPPERS +struct request_info tcpwrap_ri; +#endif smtp_connection_start = time(NULL); for (smtp_ch_index = 0; smtp_ch_index < SMTP_HBUFF_SIZE; smtp_ch_index++) -@@ -1706,10 +1709,14 @@ +@@ -2602,11 +2605,14 @@ + log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Expansion of \"%s\" " "(tcp_wrappers_name) failed: %s", string_printing(tcp_wrappers_name), expand_string_message); - } +- - if (!hosts_ctl(tcp_wrappers_name, -- (sender_host_name == NULL)? STRING_UNKNOWN : CS sender_host_name, -- (sender_host_address == NULL)? STRING_UNKNOWN : CS sender_host_address, -- (sender_ident == NULL)? STRING_UNKNOWN : CS sender_ident)) -+ request_init(&tcpwrap_ri, +- sender_host_name ? CS sender_host_name : STRING_UNKNOWN, +- sender_host_address ? CS sender_host_address : STRING_UNKNOWN, +- sender_ident ? CS sender_ident : STRING_UNKNOWN)) ++ request_init(&tcpwrap_ri, + RQ_DAEMON, tcp_wrappers_name, + RQ_FILE, fileno(smtp_out), + RQ_CLIENT_NAME, (sender_host_name == NULL)? STRING_UNKNOWN : CS sender_host_name, + RQ_CLIENT_ADDR, (sender_host_address == NULL)? STRING_UNKNOWN : CS sender_host_address, + RQ_USER, (sender_ident == NULL)? STRING_UNKNOWN : CS sender_ident, + 0); -+ if (!hosts_access(&tcpwrap_ri)) ++ if (!hosts_access(&tcpwrap_ri)) { if (errno == 0 || errno == ENOENT) {