Version 257.1
- A bunch of post-release fixes, incl. for systemd-resolved, tpm2 support, systemd-networkd, systemd-logind, journalct. - Should fix rhbz#2325780.
This commit is contained in:
parent
35e6814ef4
commit
62abb21906
3 changed files with 2 additions and 63 deletions
|
|
@ -1,58 +0,0 @@
|
|||
From 3f1d499964abb6a4c0141d7ea8f852829880adff Mon Sep 17 00:00:00 2001
|
||||
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||||
Date: Sat, 14 Dec 2024 16:49:54 +0900
|
||||
Subject: [PATCH] test-time-util: fix truncation of usec to sec
|
||||
|
||||
Also
|
||||
- use ASSERT_XYZ() macros,
|
||||
- log tzname[] on failure.
|
||||
---
|
||||
src/test/test-time-util.c | 18 +++++++++++-------
|
||||
1 file changed, 11 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c
|
||||
index d761261e24..d717ca94d2 100644
|
||||
--- a/src/test/test-time-util.c
|
||||
+++ b/src/test/test-time-util.c
|
||||
@@ -393,27 +393,31 @@ TEST(format_timestamp) {
|
||||
static void test_format_timestamp_impl(usec_t x) {
|
||||
bool success, override;
|
||||
const char *xx, *yy;
|
||||
- usec_t y;
|
||||
+ usec_t y, x_sec, y_sec;
|
||||
|
||||
xx = FORMAT_TIMESTAMP(x);
|
||||
- assert_se(xx);
|
||||
- assert_se(parse_timestamp(xx, &y) >= 0);
|
||||
+ ASSERT_NOT_NULL(xx);
|
||||
+ ASSERT_OK(parse_timestamp(xx, &y));
|
||||
yy = FORMAT_TIMESTAMP(y);
|
||||
- assert_se(yy);
|
||||
+ ASSERT_NOT_NULL(yy);
|
||||
|
||||
- success = (x / USEC_PER_SEC == y / USEC_PER_SEC) && streq(xx, yy);
|
||||
+ x_sec = x / USEC_PER_SEC;
|
||||
+ y_sec = y / USEC_PER_SEC;
|
||||
+ success = (x_sec == y_sec) && streq(xx, yy);
|
||||
/* Workaround for https://github.com/systemd/systemd/issues/28472
|
||||
* and https://github.com/systemd/systemd/pull/35471. */
|
||||
override = !success &&
|
||||
(STRPTR_IN_SET(tzname[0], "CAT", "EAT", "WET") ||
|
||||
STRPTR_IN_SET(tzname[1], "CAT", "EAT", "WET")) &&
|
||||
- DIV_ROUND_UP(x > y ? x - y : y - x, USEC_PER_SEC) == 3600; /* 1 hour, ignore fractional second */
|
||||
+ (x_sec > y_sec ? x_sec - y_sec : y_sec - x_sec) == 3600; /* 1 hour, ignore fractional second */
|
||||
log_full(success ? LOG_DEBUG : override ? LOG_WARNING : LOG_ERR,
|
||||
"@" USEC_FMT " → %s → @" USEC_FMT " → %s%s",
|
||||
x, xx, y, yy,
|
||||
override ? ", ignoring." : "");
|
||||
if (!override) {
|
||||
- assert_se(x / USEC_PER_SEC == y / USEC_PER_SEC);
|
||||
+ if (!success)
|
||||
+ log_warning("tzname[0]=\"%s\", tzname[1]=\"%s\"", tzname[0], tzname[1]);
|
||||
+ ASSERT_EQ(x_sec, y_sec);
|
||||
ASSERT_STREQ(xx, yy);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.47.1
|
||||
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (systemd-257.tar.gz) = 5f95367e004e44c6a7448d2c0a04d0c4ad90f0e5052b84b362a8886e3d761ef1d5bf9db98408598a75303d18d041beaa0a9bc312c7451ab957b8d1ae7b88678c
|
||||
SHA512 (systemd-257.1.tar.gz) = dded7555077f85d0f8106b72cc46604fbe4249452be6b2d55800770b6deb2a3a122697c5a5f23b22dab416e8c050e53fc30d59dfd3bfd7c9fbbdab3162e8ebe5
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ Name: systemd
|
|||
Url: https://systemd.io
|
||||
# Allow users to specify the version and release when building the rpm by
|
||||
# setting the %%version_override and %%release_override macros.
|
||||
Version: %{?version_override}%{!?version_override:257}
|
||||
Version: %{?version_override}%{!?version_override:257.1}
|
||||
Release: %autorelease
|
||||
|
||||
%global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?)
|
||||
|
|
@ -121,9 +121,6 @@ Patch0491: https://github.com/systemd/systemd/pull/30846.patch
|
|||
# Soft-disable tmpfiles --purge until a good use case comes up.
|
||||
Patch0492: 0001-tmpfiles-make-purge-hard-to-mis-use.patch
|
||||
|
||||
# https://github.com/systemd/systemd/pull/35615
|
||||
Patch0493: 0002-test-time-util-fix-truncation-of-usec-to-sec.patch
|
||||
|
||||
%ifarch %{ix86} x86_64 aarch64 riscv64
|
||||
%global want_bootloader 1
|
||||
%endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue