From nobody Wed Nov 05 15:29:31 2025 X-Original-To: dev-commits-src-all@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 4d1q4W60pRz6GT38; Wed, 05 Nov 2025 15:29:31 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1q4W3WKCz3CJb; Wed, 05 Nov 2025 15:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762356571; 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=tanQh//eowrELkBUHNYXwSoOQOG7ZxieAj22sygrU+A=; b=LqI0d2Px3ANQEoCqsZuO0QUt2X6O6rDH1Yenz0mqhPSwjlpa4t21Go0WrajL/F7mKBstdy QrXxov6RJ3XfGbmDJuhFV5RdPLHWdTURK6yhrrE2zOuYNq10D+/s3GEfzjo0XtRK0hz1BC XAvqsB9rHdUMqqhWlmQewji9XEOv6JigkaQT0faxiofcEWj2FjqR1qngK3rh6Yje6yWlMO Iq+wXNRNZGuUzsaB7VZJyZizCDsv/6ucvuOFvUQzVYP8L2avT6i8/0VVxeenoHjhz86bO4 enJTlP3wSYOITLBogs8PXhc8PFMm6Ru6V9lnndpOhXUNZiOw8sOrn8rSXqFuzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762356571; 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=tanQh//eowrELkBUHNYXwSoOQOG7ZxieAj22sygrU+A=; b=XJDgShnxtj4xoh7PsUZFjtTEKcjijEYF7Udi0RSc2Lhn2ykxWXLX50BZobaskKjWlZxxyX CeLh61rYVlzgwLcT5fpa5NNipvsVel04azluFuPOKPHufAIKaQcSaFc8uyWZPJLpQT13NU nFsAV76hjFkoZZ9xi3W5Q+f6Chrkz9CT29k1C4BkwNS/RrDC6McCbT8Xb7Dy9FcTGvRjv4 X5hKDKwfghSl0xJGh2UtI6ZWDwlMUzTtqbSy1Dr3jgzC9JJOFwwXm+GPhCzDTvZqolrLhf wtdIBN1gwzfEe3J2ZydZ3KQBAttS8kSxyyqKlqTaYBfJDR4No+ljfPTKo8O1Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762356571; a=rsa-sha256; cv=none; b=U/FoFqpZkd+YqRyI3Mgpza7ZmHiGI2KbzTsmXR3dNoPTn+EwcvD0rtwgCzXDpL29WguWG7 0QCrZP5SUSqZTttQKTa2kVx4DgYKxiqtto9XCjQtOUxEbybtBnJhep9j3BuMYE22yGl4BL hcyNjfCC5MlB+iqVJsCBQBNfs3MBPksn9vDrBziYEXMqRkdEJbTxoCM+fB4i234IYyjOTC iJ90UBg4EeuIF6aimGc17sps2UDE80xnnMvrwFVDLcXOnf2DLAEqkAQpBt99aBAxk1Yo58 pYDdVxCFfTXC34qgSvozUJW6qnBz+47NnfVI5GQ78o8DGr/6nkdnV1qUC43i7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d1q4W2wknzq5T; Wed, 05 Nov 2025 15:29:31 +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 5A5FTVFT014737; Wed, 5 Nov 2025 15:29:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5FTVxp014734; Wed, 5 Nov 2025 15:29:31 GMT (envelope-from git) Date: Wed, 5 Nov 2025 15:29:31 GMT Message-Id: <202511051529.5A5FTVxp014734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f809d3f3ee1c - stable/15 - tzcode: Fix early tz change detection List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f809d3f3ee1cf2d5b2c24283b42fa11871b8b6b8 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f809d3f3ee1cf2d5b2c24283b42fa11871b8b6b8 commit f809d3f3ee1cf2d5b2c24283b42fa11871b8b6b8 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-02 13:51:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-05 13:54:58 +0000 tzcode: Fix early tz change detection Assume tzdata is not fresh if last_checked is zero, as comparing the current time to last_checked less than __tz_change_interval after boot may produce a false negative. While here, invert the return value from tzdata_is_fresh() to better match its new name (it was previously called recheck_tzdata(), so zero for fresh and non-zero for stale made sense, but it doesn't now). PR: 269207 MFC after: 3 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D53502 (cherry picked from commit a38c2f99f81c2fc35c8ca209931c1c46e3e81023) --- contrib/tzcode/localtime.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index 1668475ea646..58099d234e2b 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -1583,15 +1583,15 @@ tzdata_is_fresh(void) struct timespec now; if (clock_gettime(CLOCK_MONOTONIC, &now) < 0) - return 0; + return 1; - if ((now.tv_sec - last_checked >= __tz_change_interval) || - (last_checked > now.tv_sec)) { + if (last_checked == 0 || last_checked > now.tv_sec || + now.tv_sec - last_checked >= __tz_change_interval) { last_checked = now.tv_sec; - return 1; + return 0; } - return 0; + return 1; } #endif /* DETECT_TZ_CHANGES */ @@ -1642,7 +1642,7 @@ tzset_unlocked_name(char const *name) ? lcl_is_set < 0 : 0 < lcl_is_set && strcmp(lcl_TZname, name) == 0) #ifdef DETECT_TZ_CHANGES - if (tzdata_is_fresh() == 0) + if (tzdata_is_fresh()) #endif /* DETECT_TZ_CHANGES */ return; # ifdef ALL_STATE