Accepting request 878317 from server:mail

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/878317
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dovecot23?expand=0&rev=38

dovecot-2.3-pigeonhole-0.5.13.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:911fe566da5b638eab1b11105314300bc9049cc3832d4bd2aed44c265013bf17
-size 1908839

dovecot-2.3-pigeonhole-0.5.13.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJLBAABCAA1FiEEK+dKqz7nVN+5yA0zGKNIru1AnaEFAl/yu38XHGRvdmVjb3Qt
-Y2VAZG92ZWNvdC5vcmcACgkQGKNIru1AnaE8qw//b7fp+mFRsFnqtVB+VDgFB2e8
-oB6f1EaeCkzCkYDFxdYcuHiXAgXOHDezBAhJmQTI+h4NkPdodiz0bx/bKQoOrRGW
-fS0pY1cT6n/6oDZsLTZGLDt5HOLrFtg8PTIcOQ3MIO5nOdy1Jo3bkRslNvL/87N1
-cQGJENuVv71jS6gNdPfjcseCYPr3UudGBmFlSAYXKJX+xgoJezQA+T+4VGmvj/RM
-3Ib7lFs8ZrWAhnOvRp4Q9H4j2efuIUGt8o1IdcFLIml7t1ahGsEwr93ZPoTrSkAc
-o9swm1FIfUaa2L8V05jDEj/s4raWJkhcZt2ViIGMC1UrXk08f1Qi0h4570p8Pxsa
-qPui1iv9KbCKz1i1vC+Uk3d4FFt6/n9YmabGDZLEDmYx/I+RGd+o2YtaJvaOe3oU
-9WYFRXnor1d2cyJsvNO5wuRIMlm+HAkhZhP6amwukbiZ+YQ3ZoJot4PuvrmO5yqQ
-sOTjm2qFYUckZaCbzAPUypNMms/lujbFf1/LS2/E9+Pe33cJ2eHopmmcvA/9duxo
-YFCs0GJEDdMifVRRdcO0jlX13SISlIIJMs1LhAOom8T6IFtD5k/Ddaodf7Ov4AxX
-AWVFhSheQp8aBgDbULjqYSW9CJ7nLIkn4FVRfBUzIcG2MYuZdyr0dw9uQLi8stRH
-pVMTu+Omdf9sbleogp4=
-=OJTQ
------END PGP SIGNATURE-----

dovecot-2.3-pigeonhole-0.5.14.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:68ca0f78a3caa6b090a469f45c395c44cf16da8fcb3345755b1ca436c9ffb2d2
+size 1910607

dovecot-2.3-pigeonhole-0.5.14.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJLBAABCAA1FiEEK+dKqz7nVN+5yA0zGKNIru1AnaEFAmBAssQXHGRvdmVjb3Qt
+Y2VAZG92ZWNvdC5vcmcACgkQGKNIru1AnaFA8Q//RhJpoX8nwT7m5B78Vvy/a1rW
+56++CQosLUxpjnwlzJ+4/G/x29nmI7qgt0cwVX1bPy5jrmTD4826M3MWCcn329R/
+YDQRk5BlU26f9MshNQC+MRA72YGUQyoLkW4aaGUXQdcTYzwOgTDDbu+uZbFOMwDV
+EWqAIXi/7faaVwxZiE2mMwXKDT9+6jyudsIRL9jKIJmbZSG0oiJN+5pIjZ4EQrt4
+mYyR3YQP+QlAMEqmY23vsrCtq7DiR+0hEnQUVCYtyGsZWbMjyMzwmRtx8v25s3HP
+M6A1+S/aBddKMPGNydk+VQz8Y7kSSdSEjoag5DRF6s/4+lSrIpDt7PzC9//A2At0
+BdW52i4AH6uw4Ggwicg0xJ95argFC8rNVxk2pl/zzH6MlQa5Hl0VnHuxc5HyGjuN
+uZqdPHN+ak3Mg/7zzN2w3nyjSuc6FmuWjdGX0PKkCgMPtDWE8yr5+jHX4blMvAgR
+Pc0FkdmOpjfVUhMTT/GZxR3pkk9oKyoJV/9UbjuBAL8oSLAznlj+gFoYmTW1vCNm
+ApJobM2Idn6tRnUi/88eI2E2JFEx8np0oiQY0uhAjdhw51eyHpws9sD4LF1NE4CH
+WFNR7zzO4ENG+NFV/eiSXc3v/6QacTcGNJkxm2SvhrSO/i7588Sni5tReWjq4woM
+pZ9IOPOWGeveyC40ppQ=
+=onpa
+-----END PGP SIGNATURE-----

dovecot-2.3.13.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4
-size 7456073

dovecot-2.3.13.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJLBAABCAA1FiEEK+dKqz7nVN+5yA0zGKNIru1AnaEFAl/yu3IXHGRvdmVjb3Qt
-Y2VAZG92ZWNvdC5vcmcACgkQGKNIru1AnaFxwg/9HOfizq4fLMPRI9AHgouZis5/
-GaQI2u1cI6eGr/+rtuArP1u067KBIyST1cxQq5c3FmYZHWILj3nAKAYpQaRM57mT
-/fshtKNBRWJxYLzkbAQqfji2Pkzso8a8hBjj+cpD3ipcjXzBQGPzLaMmSWqNTvj/
-AURY5q5eMN+cqnV27S+GDenId9wXHx15R0dxbLUsDY4P+kbiopEIQcQG3WoGJtiW
-p1aolB2LCcKEtRSZkIWC1+A4CwMfFC8+/KgT4tsNWsCr9oTSSqYrDgQH6UOFL1O6
-dmiekdCpaoAIYxhvD/mKXV0YH8wn0HCP6YOxf/6g4GQNZLBqsyxiy988li5VnUVm
-Lq26RsYeXOuuq5YsNI2deyaJbeGKeJQSQLfH1n/z2nXP+iTE7BItqUe3yQS1Xsbl
-Oxuj8jfxaE0RGq3X5iICxyd36KzbDq1tL1nuKlwI9CoiBCxDURMMGtdi6vme/p3q
-itWyiwYRuB3PkXDSRL4ZFz/MBBT2NglGqjvStXO4Q9C9afV070E5ZnufNp62+SAr
-pTLRb75ILBy2XagVm63w0nVNWGDPsIDS7WjsMJq7GMoshMoC/WLQsq3hS+4ZWnf3
-oK2C4EiMW7pzLK4vm8rM/OQtCxWxJRdHdjuSuRGsH2LfxSRRxRWFHLKcAZpUwIP5
-xSd8abhsc676L2zgCbo=
-=TFqL
------END PGP SIGNATURE-----

dovecot-2.3.14.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8b3d7f3af1e558a3ff0f970309d4013a4d3ce136f8c02a53a3b05f345b9a34a
+size 7483769

dovecot-2.3.14.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJLBAABCAA1FiEEK+dKqz7nVN+5yA0zGKNIru1AnaEFAmBAspYXHGRvdmVjb3Qt
+Y2VAZG92ZWNvdC5vcmcACgkQGKNIru1AnaG80BAA0Q4KznyBEGAUOnsTV5YFGuP7
+T+ROvjCPK2RYCUN+/hFV1TIrEnTWtu9rC+G2UPEwWAHYQTnsOjR/XT+973/8bv8C
+5DSAAUFoO7SWmxuqTzEirworfYTNnuwTYcb0YAAC9mXfD2y0LrbRcSJmrNg2wbFg
+IIhlfHY1wSYSnXJvXktzJHBUKXlOLwJL4cokjtWHcJlY3PNmbTISZ6H7HfthBxaY
+k6BsqQ96n3MMkUV7Bg1WEnkwS0VGiPcj0wLdfJvpquwFTkxuNuh1DEK3yyttrtTx
+K1POSoE78JqWv++mdoHxdtm8A1le5PipqOIhoC+gpZv6TFE0+yztLNzPd8fKDfzK
+IxisA9/kWi5/4jwOXQ7R7H3pMZ3ikJiL0IIwCKoLX+NuKbD28zZkZDH0maXmDnOB
+27+hBztrT0h8gRXuC8cReOH/MpK4XVX/VhsLbMuF9n2qhR9r+atoMw4d3x17KgKK
+/jd+n4BuuXzKjWRsI7B9wVvPpHWBHYTGR1lLpC3xxhSlRV71ZJ4DStP6cgNke/Hh
+AkW/7rE8oZbxp7NhjICIb4aHmhKdpp4iSUWdm6kgtPCwJfF26oNiuXL3O7ugha8V
+sLniTTuiceU7hl9Zkt89eqERjMa1/NKf3c+g4BlKO7sN9rhmWie5zqc4oQ1VXfO9
+jSbLcfs57L7odF3s1SY=
+=B32T
+-----END PGP SIGNATURE-----

dovecot23.changes

@@ -1,3 +1,113 @@
+-------------------------------------------------------------------
+Thu Mar  4 10:28:11 UTC 2021 - Michael Ströder <michael@stroeder.com>
+
+- update to 2.3.14 and pigeonhole to 0.5.14
+  * removed obsolete fix-timeval_cmp_margin-for-32bit-systems.patch
+
+  Dovecot 2.3.14
+  * Added new aliases for some variables. Usage of the old ones is possible,
+    but discouraged. (These were partially added already to v2.3.13.)
+    See https://doc.dovecot.org/configuration_manual/config_file/config_variables/
+    for more information.
+  * Optimize imap/pop3/submission/managesieve proxies to use less CPU at
+    the cost of extra memory usage.
+  * Remove autocreate, expire, snarf and mail-filter plugins.
+  * Remove cydir storage driver.
+  * Remove XZ/LZMA write support. Read support will be removed in future release.
+  * doveadm -D: Add timestamps to debug output even when LOG_STDERR_TIMESTAMP
+    environment variable is not set. Timestamp format is taken from
+    log_timestamp setting.
+  * If BROKENCHAR or listescape plugin is used, the escaped folder names
+    may be slightly different from before in some situations. This is
+    unlikely to cause issues, although caching clients may redownload the
+    folders.
+  * imapc: It now enables BROKENCHAR=~ by default to escape remote folder
+    names if necessary. This also means that if there are any '~'
+    characters in the remote folder names, they will be visible as "~7e".
+  * imapc: When using local index files folder names were escaped on
+    filesystem a bit differently. This affects only if there are folder
+    names that actually require escaping, which isn't so common. The old
+    style folders will be automatically deleted from filesystem.
+  * stats: Update exported metrics to be compliant with OpenMetrics standard.
+  + doveadm: Add an optional '-p' parameter to metadata list command. If
+    enabled, "/private", and "/shared" metadata prefixes will be prepended
+    to the keys in the list output.
+  + doveconf: Support environment variables in config files. See
+    https://doc.dovecot.org/configuration_manual/config_file/config_file_syntax/#environment-variables
+    for more details.
+  + indexer-worker: Change indexer to disconnect from indexer-worker
+    after each request. This allows service indexer-worker's service_count &
+    idle_kill settings to work. These can be used to restart indexer-worker
+    processes once in a while to reduce their memory usage.
+  - auth: "nodelay" with various authentication mechanisms such as apop
+    and digest-md5 crashed AUTH process if authentication failed.
+  - auth: Auth lua script generating an error triggered an assertion
+    failure: Panic: file db-lua.c: line 630 (auth_lua_call_password_verify):
+    assertion failed: (lua_gettop(script->L) == 0).
+  - configure: Fix libunwind detection to work on other than x86_64 systems.
+  - doveadm-server: Process could crash if logging was done outside command
+    handling. For example http-client could have done debug logging
+    afterwards, resulting in either segfault or Panic:
+    file http-client.c: line 642 (http_client_context_close):
+    assertion failed: (cctx->clients_list == NULL).
+  - dsync: Folder name escaping with BROKENCHAR didn't work completely
+    correctly. This especially caused problems with dsync-migrations using
+    imapc where some of the remote folder names may not have been accessible.
+  - dsync: doveadm sync + imapc doesn't always sync all mails when doing
+    an incremental sync (-1), which could lead to mail loss when it's used
+    for migration. This happens only when GUIDs aren't used (i.e.
+    imapc without imapc_features=guid-forced).
+  - fts-tika: When tika server returns error, some mails cause Panic:
+    file message-parser.c: line 802 (message_parser_deinit_from_parts):
+    assertion failed: (ctx->nested_parts_count == 0 || i_stream_have_bytes_left(ctx->input))
+  - lib-imap: imapc parsing illegal BODYSTRUCTUREs with NILs could have
+    resulted in crashes. This exposed that Dovecot was wrongly accepting
+    atoms in "nstring" handling. Changed the IMAP parsing to be more
+    strict about this now.
+  - lib-index: If dovecot.index.cache has corrupted message size, fetching
+    BODY/BODYSTRUCTURE may cause assert-crash:
+    Panic: file index-mail.c: line 1140 (index_mail_parse_body_finish):
+    assertion failed: (mail->data.parts != NULL).
+  - lib-index: Minor error handling and race condition fixes related to
+    rotating dovecot.index.log. These didn't usually cause problems,
+    unless the log files were rotated rapidly.
+  - lib-lua: Lua scripts using coroutines or lua libraries using coroutines
+    (e.g., cqueues) panicked.
+  - Message PREVIEW handled whitespace wrong so first space would get
+    eaten from between words.
+  - FTS and message PREVIEW (snippet) parsed HTML &entities case-sensitively.
+  - lib-mail: When max nested MIME parts were reached, IMAP BODYSTRUCTURE
+    was written in a way that may have caused confusion for IMAP clients
+    and also Dovecot itself when parsing it. The truncated part is now
+    written out using application/octet-stream MIME type.
+  - lib-oauth2: HS512 and HS384 JWT token algorithms crash when you try to
+    use them: Panic: file hmac.c: line 26 (hmac_init): assertion failed:
+    (meth->context_size <= MAC_MAX_CONTEXT_SIZE).
+  - event filters: NOT keyword did not have the correct associativity.
+    NOT a AND b were getting parsed as NOT (a AND b) instead of
+    (NOT a) AND b.
+  - Ignore ECONNRESET when closing socket. This avoids logging useless
+    errors on systems like FreeBSD.
+  - event filters: event filter syntax error may lead to Panic:
+    file event-filter.c: line 137 (event_filter_parse): assertion failed:
+    (state.output == NULL)
+  - lib: timeval_cmp_margin() was broken on 32-bit systems. This could
+    potentially have caused HTTP timeouts to be handled incorrectly.
+  - log: instance_name wasn't used as syslog ident by the log process.
+  - master: After a service reached process_limit and client_limit, it
+    could have taken up to 1 second to realize that more client connections
+    became available. During this time client connections could have been
+    unnecessarily rejected and a warning logged:
+    Warning: service(...): process_limit (...) reached, client connections are being dropped
+  - stats: Crash would occur when generating openmetrics data for metrics
+    using aggregating functions.
+  - stats: Event filters comparing against empty strings crash the stats
+    process.
+
+  Pigeonhole 0.5.14
+  * IMAP FILTER command: cmd-filter-sieve - Do not allow NIL as
+    script name argument.
+  
 -------------------------------------------------------------------
 Thu Feb  4 07:06:00 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
 

dovecot23.spec

@@ -19,11 +19,11 @@
 %global _lto_cflags %{nil}
 
 Name:           dovecot23
-Version:        2.3.13
+Version:        2.3.14
 Release:        0
 %define pkg_name dovecot
-%define dovecot_version 2.3.13
+%define dovecot_version 2.3.14
-%define dovecot_pigeonhole_version 0.5.13
+%define dovecot_pigeonhole_version 0.5.14
 %define dovecot_branch  2.3
 %define dovecot_pigeonhole_source_dir %{pkg_name}-%{dovecot_branch}-pigeonhole-%{dovecot_pigeonhole_version}
 %define dovecot_pigeonhole_docdir     %{_docdir}/%{pkg_name}/dovecot-pigeonhole
@@ -132,9 +132,9 @@ Recommends:     %{name}-backend-sqlite = %{version}
 %endif
 Recommends:     %{name}-fts = %{version}
 Recommends:     %{name}-fts-squat = %{version}
-URL:            http://www.dovecot.org
+URL:            https://www.dovecot.org
-Source:         http://www.dovecot.org/releases/%{dovecot_branch}/%{pkg_name}-%{dovecot_version}.tar.gz
+Source:         https://www.dovecot.org/releases/%{dovecot_branch}/%{pkg_name}-%{dovecot_version}.tar.gz
-Source1:        http://pigeonhole.dovecot.org/releases/%{dovecot_branch}/%{dovecot_pigeonhole_source_dir}.tar.gz
+Source1:        https://pigeonhole.dovecot.org/releases/%{dovecot_branch}/%{dovecot_pigeonhole_source_dir}.tar.gz
 Source2:        dovecot-rpmlintrc
 Source3:        dovecot-2.0.configfiles
 Source4:        dovecot-2.1.configfiles
@@ -143,15 +143,13 @@ Source6:        dovecot-2.3.configfiles
 Source7:        dovecot-2.1-pigeonhole.configfiles
 Source8:        dovecot-2.2-pigeonhole.configfiles
 Source9:        dovecot-2.3-pigeonhole.configfiles
-Source10:       http://www.dovecot.org/releases/%{dovecot_branch}/%{pkg_name}-%{dovecot_version}.tar.gz.sig
+Source10:       https://www.dovecot.org/releases/%{dovecot_branch}/%{pkg_name}-%{dovecot_version}.tar.gz.sig
-Source11:       http://pigeonhole.dovecot.org/releases/%{dovecot_branch}/%{dovecot_pigeonhole_source_dir}.tar.gz.sig
+Source11:       https://pigeonhole.dovecot.org/releases/%{dovecot_branch}/%{dovecot_pigeonhole_source_dir}.tar.gz.sig
 Source12:       dovecot23.keyring
 Patch:          dovecot-2.3.0-dont_use_etc_ssl_certs.patch
 Patch1:         dovecot-2.3.0-better_ssl_defaults.patch
 #               https://github.com/dovecot/core/pull/126
 Patch2:         allow-tls1.3-only.patch
-#               https://github.com/dovecot/core/pull/149
-Patch3:         fix-timeval_cmp_margin-for-32bit-systems.patch
 Summary:        IMAP and POP3 Server Written Primarily with Security in Mind
 License:        BSD-3-Clause AND LGPL-2.1-or-later AND MIT
 Group:          Productivity/Networking/Email/Servers
@@ -332,7 +330,6 @@ dovecot tree.
 %patch -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 gzip -9v ChangeLog
 # Fix plugins dir.
 sed -i 's|#mail_plugin_dir = /usr/lib/dovecot|mail_plugin_dir = %{_libdir}/dovecot/modules|' doc/example-config/conf.d/10-mail.conf
@@ -592,9 +589,11 @@ fi
 %{_libdir}/%{pkg_name}/libdovecot-lda.so.*
 %{_libdir}/%{pkg_name}/libdovecot-ldap.so.*
 %{_libdir}/%{pkg_name}/libdovecot-login.so.*
+%{_libdir}/%{pkg_name}/libdovecot-lua.so.*
 %{_libdir}/%{pkg_name}/libdovecot-sieve.so.*
 %{_libdir}/%{pkg_name}/libdovecot-sql.so.*
 %{_libdir}/%{pkg_name}/libdovecot-storage.so.*
+%{_libdir}/%{pkg_name}/libdovecot-storage-lua.so.*
 %if %{with dcrypt_openssl}
 %{_libdir}/%{pkg_name}/libdcrypt_openssl.so
 %endif
@@ -606,11 +605,9 @@ fi
 %{_libdir}/%{pkg_name}/modules/lib02_lazy_expunge_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib05_mail_crypt_acl_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib05_pop3_migration_plugin.so
-%{_libdir}/%{pkg_name}/modules/lib05_snarf_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib10_last_login_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib01_mail_lua_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib10_mail_crypt_plugin.so
-%{_libdir}/%{pkg_name}/modules/lib10_mail_filter_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib10_quota_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib11_trash_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib15_notify_plugin.so
@@ -618,11 +615,9 @@ fi
 %{_libdir}/%{pkg_name}/modules/lib20_mailbox_alias_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib20_notify_status_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib20_charset_alias_plugin.so
-%{_libdir}/%{pkg_name}/modules/lib20_expire_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib20_var_expand_crypt.so
 %{_libdir}/%{pkg_name}/modules/lib20_zlib_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib20_push_notification_plugin.so
-%{_libdir}/%{pkg_name}/modules/lib20_autocreate_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib20_listescape_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib20_quota_clone_plugin.so
 %{_libdir}/%{pkg_name}/modules/lib20_replication_plugin.so
@@ -656,7 +651,6 @@ fi
 %dir %{_libdir}/%{pkg_name}/modules/doveadm
 %{_libdir}/%{pkg_name}/modules/doveadm/libdoveadm_mail_crypt_plugin.so
 %{_libdir}/%{pkg_name}/modules/doveadm/lib10_doveadm_acl_plugin.so
-%{_libdir}/%{pkg_name}/modules/doveadm/lib10_doveadm_expire_plugin.so
 %{_libdir}/%{pkg_name}/modules/doveadm/lib10_doveadm_quota_plugin.so*
 %{_libdir}/%{pkg_name}/modules/doveadm/lib10_doveadm_sieve_plugin.so
 #
@@ -759,8 +753,10 @@ fi
 %{_libdir}/%{pkg_name}/libdovecot-lda.so
 %{_libdir}/%{pkg_name}/libdovecot-ldap.so
 %{_libdir}/%{pkg_name}/libdovecot-login.so
+%{_libdir}/%{pkg_name}/libdovecot-lua.so
 %{_libdir}/%{pkg_name}/libdovecot-sieve.so
 %{_libdir}/%{pkg_name}/libdovecot-sql.so
 %{_libdir}/%{pkg_name}/libdovecot-storage.so
+%{_libdir}/%{pkg_name}/libdovecot-storage-lua.so
 
 %changelog

fix-timeval_cmp_margin-for-32bit-systems.patch

@@ -1,49 +0,0 @@
-From 2cc1feca9087651902a5ea3cda021c8a0b3217ce Mon Sep 17 00:00:00 2001
-From: Paul Howarth <paul@city-fan.org>
-Date: Mon, 4 Jan 2021 16:31:03 +0000
-Subject: [PATCH] lib: Fix timeval_cmp_margin for 32-bit systems
-
-The test suite compares times with seconds values of -INT_MAX and
-INT_MAX. The result of this comparison does not fit in a value of
-type int and so the test suite fails on 32-bit systems where time_t
-is an int. To fix this, calculations on seconds values are done
-using long long integers.
-
-Broken by 16ab5542
----
- src/lib/time-util.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/lib/time-util.c b/src/lib/time-util.c
-index 294bb02310..3f4cd01c9e 100644
---- a/src/lib/time-util.c
-+++ b/src/lib/time-util.c
-@@ -38,21 +38,23 @@ int timeval_cmp(const struct timeval *tv1, const struct timeval *tv2)
- int timeval_cmp_margin(const struct timeval *tv1, const struct timeval *tv2,
- 	unsigned int usec_margin)
- {
--	long long usecs_diff;
-+	long long secs_diff, usecs_diff;
- 	int sec_margin, ret;
- 
- 	if (tv1->tv_sec < tv2->tv_sec) {
- 		sec_margin = ((int)usec_margin / 1000000) + 1;
--		if ((tv2->tv_sec - tv1->tv_sec) > sec_margin)
-+		secs_diff = (long long)tv2->tv_sec - (long long)tv1->tv_sec;
-+		if (secs_diff > sec_margin)
- 			return -1;
--		usecs_diff = (tv2->tv_sec - tv1->tv_sec) * 1000000LL +
-+		usecs_diff = secs_diff * 1000000LL +
- 			(tv2->tv_usec - tv1->tv_usec);
- 		ret = -1;
- 	} else if (tv1->tv_sec > tv2->tv_sec) {
- 		sec_margin = ((int)usec_margin / 1000000) + 1;
--		if ((tv1->tv_sec - tv2->tv_sec) > sec_margin)
-+		secs_diff = (long long)tv1->tv_sec - (long long)tv2->tv_sec;
-+		if (secs_diff > sec_margin)
- 			return 1;
--		usecs_diff = (tv1->tv_sec - tv2->tv_sec) * 1000000LL +
-+		usecs_diff = secs_diff * 1000000LL +
- 			(tv1->tv_usec - tv2->tv_usec);
- 		ret = 1;
- 	} else if (tv1->tv_usec < tv2->tv_usec) {