From owner-svn-ports-head@freebsd.org Wed Jul 17 20:19:20 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 99878B5064; Wed, 17 Jul 2019 20:19:20 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7C5C392A05; Wed, 17 Jul 2019 20:19:20 +0000 (UTC) (envelope-from ler@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3E02823C33; Wed, 17 Jul 2019 20:19:20 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6HKJKcL025643; Wed, 17 Jul 2019 20:19:20 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6HKJJjK025641; Wed, 17 Jul 2019 20:19:19 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201907172019.x6HKJJjK025641@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Wed, 17 Jul 2019 20:19:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506824 - in head/mail/dovecot: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ler X-SVN-Commit-Paths: in head/mail/dovecot: . files X-SVN-Commit-Revision: 506824 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7C5C392A05 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2019 20:19:20 -0000 Author: ler Date: Wed Jul 17 20:19:19 2019 New Revision: 506824 URL: https://svnweb.freebsd.org/changeset/ports/506824 Log: mail/dovecot: One should actually TEST their patches. Fix previous commit. Pointy Hat To: ler Modified: head/mail/dovecot/Makefile head/mail/dovecot/files/patch-src_lib_ostream-file.c Modified: head/mail/dovecot/Makefile ============================================================================== --- head/mail/dovecot/Makefile Wed Jul 17 20:08:41 2019 (r506823) +++ head/mail/dovecot/Makefile Wed Jul 17 20:19:19 2019 (r506824) @@ -8,7 +8,7 @@ PORTNAME= dovecot PORTVERSION= 2.3.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail ipv6 MASTER_SITES= https://dovecot.org/releases/2.3/ Modified: head/mail/dovecot/files/patch-src_lib_ostream-file.c ============================================================================== --- head/mail/dovecot/files/patch-src_lib_ostream-file.c Wed Jul 17 20:08:41 2019 (r506823) +++ head/mail/dovecot/files/patch-src_lib_ostream-file.c Wed Jul 17 20:19:19 2019 (r506824) @@ -1,29 +1,29 @@ ---- src/lib/ostream-file.c.orig 2019-07-12 19:19:37 UTC +--- src/lib/ostream-file.c.orig 2019-07-12 10:46:25 UTC +++ src/lib/ostream-file.c @@ -333,17 +333,17 @@ static int buffer_flush(struct file_ostream *fstream) static void o_stream_tcp_flush_via_nodelay(struct file_ostream *fstream) { if (net_set_tcp_nodelay(fstream->fd, TRUE) < 0) { - if (errno != ENOTSUP && errno != ENOTSOCK && -- errno != ENOPROTOOPT && errno != EINVAL) { +- errno != ENOPROTOOPT) { - i_error("file_ostream.net_set_tcp_nodelay(%s, TRUE) failed: %m", - o_stream_get_name(&fstream->ostream.ostream)); - } + /* Don't bother logging errors. There are quite a lot of -+ different errors that need to be ignored, and it differs -+ between OSes. At least: -+ Linux: ENOTSUP, ENOTSOCK, ENOPROTOOPT -+ FreeBSD: EINVAL, ECONNRESET */ ++ different errors that need to be ignored, and it differs ++ between OSes. At least: ++ Linux: ENOTSUP, ENOTSOCK, ENOPROTOOPT ++ FreeBSD: EINVAL, ECONNRESET */ fstream->no_socket_nodelay = TRUE; } else if (net_set_tcp_nodelay(fstream->fd, FALSE) < 0) { - /* We already successfully enabled TCP_NODELAY, so we're really - not expecting any errors here. */ - i_error("file_ostream.net_set_tcp_nodelay(%s, FALSE) failed: %m", - o_stream_get_name(&fstream->ostream.ostream)); -+ /* We already successfully enabled TCP_NODELAY, so there -+ shouldn't really be errors. Except ECONNRESET can possibly -+ still happen between these two calls, so again don't log -+ errors. */ ++ /* We already successfully enabled TCP_NODELAY, so there ++ shouldn't really be errors. Except ECONNRESET can possibly ++ still happen between these two calls, so again don't log ++ errors. */ fstream->no_socket_nodelay = TRUE; } }