.github/ISSUE_TEMPLATE/Bug_report.md

@@ -31,15 +31,3 @@ about: A report of an error in a recent systemd version
 
 **Steps to reproduce the problem**
  > …
-
-**Additional program output to the terminal or log subsystem illustrating the issue**
-
-<!-- Please paste relevant program terminal or journal output here, ideally
-     when generated in debug mode (try setting the SYSTEMD_LOG_LEVEL=debug
-     environment variable). For very long copy/pasted data consider using a
-     service like https://gist.github.com/. Where copy/paste is not possible
-     (for example early boot or late shutdown), a photo of the screen might do
-     too, but text is always much preferred. -->
-```text
-…
-```

src/analyze/analyze-security.c

@@ -1545,7 +1545,7 @@ static int assess(const struct security_info *info, Table *overview_table, Analy
 
                 if (a->default_dependencies_only && !info->default_dependencies) {
                         badness = UINT64_MAX;
-                        d = strdup("Service runs in special boot phase, option is not appropriate");
+                        d = strdup("Service runs in special boot phase, option does not apply");
                         if (!d)
                                 return log_oom();
                 } else {

src/shared/clock-util.c

@@ -96,7 +96,8 @@ int clock_is_localtime(const char* adjtime_path) {
         return false;
 }
 
-int clock_set_timezone(int *ret_minutesdelta) {
+int clock_set_timezone(int *min) {
+        const struct timeval *tv_null = NULL;
         struct timespec ts;
         struct tm tm;
         int minutesdelta;
@@ -106,32 +107,36 @@ int clock_set_timezone(int *ret_minutesdelta) {
         assert_se(localtime_r(&ts.tv_sec, &tm));
         minutesdelta = tm.tm_gmtoff / 60;
 
-        tz = (struct timezone) {
-                .tz_minuteswest = -minutesdelta,
-                .tz_dsttime = 0, /* DST_NONE */
-        };
+        tz.tz_minuteswest = -minutesdelta;
+        tz.tz_dsttime = 0; /* DST_NONE */
 
-        /* If the RTC does not run in UTC but in local time, the very first call to settimeofday() will set
-         * the kernel's timezone and will warp the system clock, so that it runs in UTC instead of the local
-         * time we have read from the RTC. */
-        if (settimeofday(NULL, &tz) < 0)
-                return -errno;
-
-        if (ret_minutesdelta)
-                *ret_minutesdelta = minutesdelta;
+        /*
+         * If the RTC does not run in UTC but in local time, the very first
+         * call to settimeofday() will set the kernel's timezone and will warp the
+         * system clock, so that it runs in UTC instead of the local time we
+         * have read from the RTC.
+         */
+        if (settimeofday(tv_null, &tz) < 0)
+                return negative_errno();
 
+        if (min)
+                *min = minutesdelta;
         return 0;
 }
 
 int clock_reset_timewarp(void) {
-        static const struct timezone tz = {
-                .tz_minuteswest = 0,
-                .tz_dsttime = 0, /* DST_NONE */
-        };
+        const struct timeval *tv_null = NULL;
+        struct timezone tz;
 
-        /* The very first call to settimeofday() does time warp magic. Do a dummy call here, so the time
-         * warping is sealed and all later calls behave as expected. */
-        if (settimeofday(NULL, &tz) < 0)
+        tz.tz_minuteswest = 0;
+        tz.tz_dsttime = 0; /* DST_NONE */
+
+        /*
+         * The very first call to settimeofday() does time warp magic. Do a
+         * dummy call here, so the time warping is sealed and all later calls
+         * behave as expected.
+         */
+        if (settimeofday(tv_null, &tz) < 0)
                 return -errno;
 
         return 0;

src/test/test-string-util.c

@@ -917,7 +917,7 @@ static void test_strverscmp_improved(void) {
                 "123-3.1",
                 "123^patch1",
                 "123^1",
-                "123.a-1",
+                "123.a-1"
                 "123.1-1",
                 "123a-1",
                 "124",