From nobody Sun Sep 01 18:06:18 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wxfvt3qp0z5Mj9h; Sun, 01 Sep 2024 18:06:18 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wxfvt3FYJz4t90; Sun, 1 Sep 2024 18:06:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725213978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e0qwRSvo41N9IeaNHykv8VPTF/IDPSQlhkrwJoFI/zE=; b=Q76nK7dkGglgbUZcRpfGsd17O4F2ifndYTWVOKzQBbopnq6qErq2XiX+U1XC4A0GmzKpVT gj9CnpdxzNu7kN7lN98fTrRgzBx7IXzjD7zaQmyEG9hVpseJgSphSmNu5U7ifvKpHhY5dT /fgfdqB6TkqgiRGncdSiyqxZyvKRg73uqqS5nZVNUAW+DhJAd+KJbpUthUal8Rl8QaKGWH j3gaEVRyqTrQQvwkyl8sWF6QyFNiH9RVdKEnccZ+NZsbWWFRTJkE1Y3VfIZ3714AsOFBu8 62IBFw7dJBTirjddwCoWM3L9yNKd6M2GEUtxecAx5ZNJ4tNaqIp2m5Yr2Z52iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725213978; a=rsa-sha256; cv=none; b=aEGHWshcU3SjUM4unD075f7LBiJhdoAmdtwYxkxDt9wwCl+iUGvxbZg7aT5Apye05jCilk 0XNvQn/TgNNgsB3J5MUdyVYGtFgej6DoA5FV1WbAIUBMTbdeqNOftZwZZ3s6j5NUAdVr0l HiMWkUjbCGF7WMD4zou6ePoglukz/FL/qyy0ajzYGjHUiFShNLAhT4uvsHOZm5fPaM+frr 8u6PYk4Gob9mfz01KfovHyB3TPqy3eu9yZAg9H/dkWa3ARck+GVuXTg+/PasoZhVHjFbyv zMhtxcDbXWcXEdNmuqELF/gV0DbOPl7rGVDYG4Knl0NAhYx9CkBxhhPmXIClhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725213978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e0qwRSvo41N9IeaNHykv8VPTF/IDPSQlhkrwJoFI/zE=; b=V7KzenxMcmUxw4le9r4x6PYvI4TTAEbYT6xsXoYAHsykHBCic213PHzlBx2UrfE+IDdPaM o51tb0npjz/poUIhPShcC5UKs61ytKbdpdK8EG2eQdOFDfVtMuW1aH9ePIPJCplnoFdneI 9zBKryXjI241ckZEKLQ1OzbLAx12/x1cP1kxk3B6uSc7V+sgYGJfJwkDFVrox5bE3BbhBV gqMPPXppFUjjKmljevJDcCn3LTI8kQKnkCFW1ig8OJIPOTSeavBrUDFxgS1IDGMB0zwg0y Xl0hSaEtPrFQ4eQKIclxNw4xmXz4mNFPCKTXoNL1lTU5/6rDhaLOATh1Q39kQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wxfvt2kc9zf6Y; Sun, 1 Sep 2024 18:06:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 481I6Ipt009236; Sun, 1 Sep 2024 18:06:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 481I6IoG009233; Sun, 1 Sep 2024 18:06:18 GMT (envelope-from git) Date: Sun, 1 Sep 2024 18:06:18 GMT Message-Id: <202409011806.481I6IoG009233@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Larry Rosenman Subject: git: eae4d9b6062a - main - mail/dovecot: add patch from upstream to silence "time moved forwards" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ler X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eae4d9b6062a7f15a533a00c173d7b66f91ec675 Auto-Submitted: auto-generated The branch main has been updated by ler: URL: https://cgit.FreeBSD.org/ports/commit/?id=eae4d9b6062a7f15a533a00c173d7b66f91ec675 commit eae4d9b6062a7f15a533a00c173d7b66f91ec675 Author: Larry Rosenman AuthorDate: 2024-09-01 18:04:00 +0000 Commit: Larry Rosenman CommitDate: 2024-09-01 18:06:13 +0000 mail/dovecot: add patch from upstream to silence "time moved forwards" Patch from Timo Sirainen (via dovecot list) PR: 280929 Reported by: trashcan@ellael.org --- mail/dovecot/Makefile | 1 + mail/dovecot/files/patch-src-lib-ioloop.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 712066e165bd..4fc43b254226 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -10,6 +10,7 @@ PORTNAME= dovecot DISTVERSION= 2.3.21.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= https://dovecot.org/releases/2.3/ diff --git a/mail/dovecot/files/patch-src-lib-ioloop.c b/mail/dovecot/files/patch-src-lib-ioloop.c new file mode 100644 index 000000000000..e2606e515d96 --- /dev/null +++ b/mail/dovecot/files/patch-src-lib-ioloop.c @@ -0,0 +1,25 @@ +--- src/lib/ioloop.c.orig 2024-08-31 16:00:42.168389000 +0200 ++++ src/lib/ioloop.c 2024-08-31 16:04:14.978513000 +0200 +@@ -18,6 +18,7 @@ + Dovecot generally doesn't have very important short timeouts, so to avoid + logging many warnings about this, use a rather high value. */ + #define IOLOOP_TIME_MOVED_FORWARDS_MIN_USECS (100000) ++#define IOLOOP_TIME_MOVED_FORWARDS_MIN_USECS_LARGE (1000000) + + time_t ioloop_time = 0; + struct timeval ioloop_timeval; +@@ -654,9 +655,13 @@ + /* the callback may have slept, so check the time again. */ + i_gettimeofday(&ioloop_timeval); + } else { ++ int max_diff = diff_usecs < IOLOOP_TIME_MOVED_FORWARDS_MIN_USECS_LARGE ? ++ IOLOOP_TIME_MOVED_FORWARDS_MIN_USECS : ++ IOLOOP_TIME_MOVED_FORWARDS_MIN_USECS_LARGE; ++ + diff_usecs = timeval_diff_usecs(&ioloop->next_max_time, + &ioloop_timeval); +- if (unlikely(-diff_usecs >= IOLOOP_TIME_MOVED_FORWARDS_MIN_USECS)) { ++ if (unlikely(-diff_usecs >= max_diff)) { + io_loops_timeouts_update(-diff_usecs); + /* time moved forwards */ + ioloop->time_moved_callback(&ioloop->next_max_time,