1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00

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
This commit is contained in:
Larry Rosenman 2024-09-01 13:04:00 -05:00
parent 5fe832b4e7
commit eae4d9b606
No known key found for this signature in database
GPG Key ID: 697C99B1AB48A77D
2 changed files with 26 additions and 0 deletions

View File

@ -10,6 +10,7 @@
PORTNAME= dovecot
DISTVERSION= 2.3.21.1
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://dovecot.org/releases/2.3/

View File

@ -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,