From d0b7a1eb8a6456521c6d2fc2ea922adf0b99403c Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 18 Nov 2020 10:01:07 -0800 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/systemd#afdd35ec48d0dcb087c0899b6517e00c1d60ed89 --- ...not-assert-in-test_add_acls_for_user.patch | 42 --- ...asonable-DNS-servers-in-the-example-.patch | 34 --- 0001-Revert-test-path-increase-timeout.patch | 30 --- ...d-to-be-enabled-even-in-release-mode.patch | 25 ++ ...test-acl-util-output-more-debug-info.patch | 46 ---- ...o-not-fail-if-the-fd_is_mount_point-.patch | 70 +++++ 0001-test-path-util-ignore-test-failure.patch | 33 +++ ...test-path-more-debugging-information.patch | 78 ------ ...-fail-the-test-if-we-fail-to-start-s.patch | 245 ------------------ 0004-test-path-use-Type-exec.patch | 94 ------- sources | 2 +- systemd.spec | 94 +++++-- 12 files changed, 196 insertions(+), 597 deletions(-) delete mode 100644 0001-Do-not-assert-in-test_add_acls_for_user.patch delete mode 100644 0001-Document-some-reasonable-DNS-servers-in-the-example-.patch delete mode 100644 0001-Revert-test-path-increase-timeout.patch create mode 100644 0001-meson-allow-oomd-to-be-enabled-even-in-release-mode.patch delete mode 100644 0001-test-acl-util-output-more-debug-info.patch create mode 100644 0001-test-path-util-do-not-fail-if-the-fd_is_mount_point-.patch create mode 100644 0001-test-path-util-ignore-test-failure.patch delete mode 100644 0002-test-path-more-debugging-information.patch delete mode 100644 0003-test-path-do-not-fail-the-test-if-we-fail-to-start-s.patch delete mode 100644 0004-test-path-use-Type-exec.patch diff --git a/0001-Do-not-assert-in-test_add_acls_for_user.patch b/0001-Do-not-assert-in-test_add_acls_for_user.patch deleted file mode 100644 index c13413c..0000000 --- a/0001-Do-not-assert-in-test_add_acls_for_user.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b177b0ef92d226a9f303aecbff0cf2e7293667b3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Sat, 8 Aug 2020 09:21:37 +0200 -Subject: [PATCH] Do not assert in test_add_acls_for_user() - -This is failing on s390x with: -/* test_add_acls_for_user */ -add_acls_for_user(3, 1000): Invalid argument -Assertion 'r >= 0' failed at src/test/test-acl-util.c:46, function test_add_acls_for_user(). Aborting. ---- - src/test/test-acl-util.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c -index 9f0e594e67..a91d64ab0c 100644 ---- a/src/test/test-acl-util.c -+++ b/src/test/test-acl-util.c -@@ -43,24 +43,20 @@ static void test_add_acls_for_user(void) { - - r = add_acls_for_user(fd, uid); - log_info_errno(r, "add_acls_for_user(%d, "UID_FMT"): %m", fd, uid); -- assert_se(r >= 0); - - cmd = strjoina("ls -l ", fn); - assert_se(system(cmd) == 0); - - cmd = strjoina("getfacl -p ", fn); -- assert_se(system(cmd) == 0); - - /* set the acls again */ - - r = add_acls_for_user(fd, uid); -- assert_se(r >= 0); - - cmd = strjoina("ls -l ", fn); - assert_se(system(cmd) == 0); - - cmd = strjoina("getfacl -p ", fn); -- assert_se(system(cmd) == 0); - - unlink(fn); - } diff --git a/0001-Document-some-reasonable-DNS-servers-in-the-example-.patch b/0001-Document-some-reasonable-DNS-servers-in-the-example-.patch deleted file mode 100644 index 535fdfc..0000000 --- a/0001-Document-some-reasonable-DNS-servers-in-the-example-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b6c05e03c2e6e98e2f0f129ff5256780bb65bdb2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Tue, 6 Oct 2020 13:59:25 +0200 -Subject: [PATCH] Document some reasonable DNS servers in the example config - file - -We have an option to set the fallback list, so we don't know what the contents -are. It may in fact be empty. Let's add some examples to make it easy for a user -stranded without any DNS to fill in something that would work. As a bonus, this -also gives names to the entries we provide by default. -(I added google and cloudflare because that's what we have currently, and quad9 -because it seems to be a good privacy-concious and fast choice and was requested -in #12499. As a minimum, things we should include should be well-known global -services with a documented privacy policy and both IPv4 and IPv6 support and -decent response times.) ---- - src/resolve/resolved.conf.in | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in -index 082ad71626..514021792f 100644 ---- a/src/resolve/resolved.conf.in -+++ b/src/resolve/resolved.conf.in -@@ -12,6 +12,10 @@ - # See resolved.conf(5) for details - - [Resolve] -+# Some examples of DNS servers which may be used for DNS= and FallbackDNS=: -+# Cloudflare: 1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001 -+# Google: 8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844 -+# Quad9: 9.9.9.9 2620:fe::fe - #DNS= - #FallbackDNS=@DNS_SERVERS@ - #Domains= diff --git a/0001-Revert-test-path-increase-timeout.patch b/0001-Revert-test-path-increase-timeout.patch deleted file mode 100644 index 74684f2..0000000 --- a/0001-Revert-test-path-increase-timeout.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a73d30081a13eaeffce87f997726a179ec44d817 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 31 Jul 2020 10:50:37 +0200 -Subject: [PATCH 1/4] Revert "test-path: increase timeout" - -This partially reverts commit 500727c220354b81b68ed6667d9a6f0fafe3ba19. - -I was confused by the error message: the test says it timed out, but that's -because it's waiting for a failed unit to come back to life. There is no actual -timeout. - -So let's keep the minor refactoring that was done, but revert to the old short -timeout. ---- - src/test/test-path.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/test/test-path.c b/src/test/test-path.c -index 1075f31bc6..63b709c8da 100644 ---- a/src/test/test-path.c -+++ b/src/test/test-path.c -@@ -82,7 +82,7 @@ static void check_states(Manager *m, Path *path, Service *service, PathState pat - assert_se(m); - assert_se(service); - -- usec_t end = now(CLOCK_MONOTONIC) + 30 * USEC_PER_SEC; -+ usec_t end = now(CLOCK_MONOTONIC) + 2 * USEC_PER_SEC; - - while (path->result != PATH_SUCCESS || service->result != SERVICE_SUCCESS || - path->state != path_state || service->state != service_state) { diff --git a/0001-meson-allow-oomd-to-be-enabled-even-in-release-mode.patch b/0001-meson-allow-oomd-to-be-enabled-even-in-release-mode.patch new file mode 100644 index 0000000..04a8e5f --- /dev/null +++ b/0001-meson-allow-oomd-to-be-enabled-even-in-release-mode.patch @@ -0,0 +1,25 @@ +From fe1781d10dd8734af21dbea8c070069829456c03 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Thu, 12 Nov 2020 13:05:05 +0100 +Subject: [PATCH] meson: allow oomd to be enabled even in release mode + +A distro (Fedora in particular) may want to enable oomd in a unstable +branch for testing, even though the package as a whole is compiled in release +mode. Let's emit a warning but otherwise allow this. +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 7996bc2c65..43e328f5a6 100644 +--- a/meson.build ++++ b/meson.build +@@ -1419,7 +1419,7 @@ if have == 'auto' + else + have = have == 'true' + if have and get_option('mode') != 'developer' +- error('oomd is not available in release mode (yet)') ++ warning('oomd is not ready for release mode (yet)') + endif + endif + conf.set10('ENABLE_OOMD', have) diff --git a/0001-test-acl-util-output-more-debug-info.patch b/0001-test-acl-util-output-more-debug-info.patch deleted file mode 100644 index 6db830f..0000000 --- a/0001-test-acl-util-output-more-debug-info.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8cad57ed62a642515670ba79dddb30193456e803 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 7 Aug 2020 18:54:37 +0200 -Subject: [PATCH] test-acl-util: output more debug info - -For some reason this failed in koji build on s390x: ---- command --- -16:12:46 PATH='/builddir/build/BUILD/systemd-stable-246.1/s390x-redhat-linux-gnu:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin' SYSTEMD_LANGUAGE_FALLBACK_MAP='/builddir/build/BUILD/systemd-stable-246.1/src/locale/language-fallback-map' SYSTEMD_KBD_MODEL_MAP='/builddir/build/BUILD/systemd-stable-246.1/src/locale/kbd-model-map' /builddir/build/BUILD/systemd-stable-246.1/s390x-redhat-linux-gnu/test-acl-util ---- stdout --- --rw-r-----. 1 mockbuild mock 0 Aug 7 16:12 /tmp/test-empty.7RzmEc -other::--- ---- stderr --- -Assertion 'r >= 0' failed at src/test/test-acl-util.c:42, function test_add_acls_for_user(). Aborting. ---- - src/test/test-acl-util.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c -index df879747f5..9f0e594e67 100644 ---- a/src/test/test-acl-util.c -+++ b/src/test/test-acl-util.c -@@ -7,6 +7,7 @@ - - #include "acl-util.h" - #include "fd-util.h" -+#include "format-util.h" - #include "string-util.h" - #include "tmpfile-util.h" - #include "user-util.h" -@@ -18,6 +19,8 @@ static void test_add_acls_for_user(void) { - uid_t uid; - int r; - -+ log_info("/* %s */", __func__); -+ - fd = mkostemp_safe(fn); - assert_se(fd >= 0); - -@@ -39,6 +42,7 @@ static void test_add_acls_for_user(void) { - uid = getuid(); - - r = add_acls_for_user(fd, uid); -+ log_info_errno(r, "add_acls_for_user(%d, "UID_FMT"): %m", fd, uid); - assert_se(r >= 0); - - cmd = strjoina("ls -l ", fn); diff --git a/0001-test-path-util-do-not-fail-if-the-fd_is_mount_point-.patch b/0001-test-path-util-do-not-fail-if-the-fd_is_mount_point-.patch new file mode 100644 index 0000000..932cd5a --- /dev/null +++ b/0001-test-path-util-do-not-fail-if-the-fd_is_mount_point-.patch @@ -0,0 +1,70 @@ +From 2e9d763e7cbeb33954bbe3f96fd94de2cd62edf7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Thu, 12 Nov 2020 14:28:24 +0100 +Subject: [PATCH] test-path-util: do not fail if the fd_is_mount_point check + fails + +This test fails on i686 and ppc64le in koji: +/* test_path */ +Assertion 'fd_is_mount_point(fd, "/", 0) > 0' failed at src/test/test-path-util.c:85, function test_path(). Aborting. + +I guess some permission error is the most likely. +--- + src/test/test-path-util.c | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) + +diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c +index f4f8d0550b..be428334f3 100644 +--- a/src/test/test-path-util.c ++++ b/src/test/test-path-util.c +@@ -40,8 +40,6 @@ static void test_path_simplify(const char *in, const char *out, const char *out_ + } + + static void test_path(void) { +- _cleanup_close_ int fd = -1; +- + log_info("/* %s */", __func__); + + test_path_compare("/goo", "/goo", 0); +@@ -80,10 +78,6 @@ static void test_path(void) { + assert_se(streq(basename("/aa///file..."), "file...")); + assert_se(streq(basename("file.../"), "")); + +- fd = open("/", O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY); +- assert_se(fd >= 0); +- assert_se(fd_is_mount_point(fd, "/", 0) > 0); +- + test_path_simplify("aaa/bbb////ccc", "aaa/bbb/ccc", "aaa/bbb/ccc"); + test_path_simplify("//aaa/.////ccc", "/aaa/./ccc", "/aaa/ccc"); + test_path_simplify("///", "/", "/"); +@@ -120,6 +114,22 @@ static void test_path(void) { + assert_se(!path_equal_ptr(NULL, "/a")); + } + ++static void test_path_is_mountpoint(void) { ++ _cleanup_close_ int fd = -1; ++ int r; ++ ++ log_info("/* %s */", __func__); ++ ++ fd = open("/", O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY); ++ assert_se(fd >= 0); ++ ++ r = fd_is_mount_point(fd, "/", 0); ++ if (r < 0) ++ log_warning_errno(r, "Failed to check if / is a mount point, ignoring: %m"); ++ else ++ assert_se(r == 1); ++} ++ + static void test_path_equal_root(void) { + /* Nail down the details of how path_equal("/", ...) works. */ + +@@ -714,6 +724,7 @@ int main(int argc, char **argv) { + + test_print_paths(); + test_path(); ++ test_path_is_mountpoint(); + test_path_equal_root(); + test_find_executable_full(); + test_find_executable(argv[0]); diff --git a/0001-test-path-util-ignore-test-failure.patch b/0001-test-path-util-ignore-test-failure.patch new file mode 100644 index 0000000..86c410c --- /dev/null +++ b/0001-test-path-util-ignore-test-failure.patch @@ -0,0 +1,33 @@ +From e8bca4ba55f855260eda684a16e8feb5f20b1deb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Thu, 12 Nov 2020 15:06:12 +0100 +Subject: [PATCH] test-path-util: ignore test failure + +--- + src/test/test-path-util.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c +index be428334f3..207c659b8b 100644 +--- a/src/test/test-path-util.c ++++ b/src/test/test-path-util.c +@@ -120,14 +120,17 @@ static void test_path_is_mountpoint(void) { + + log_info("/* %s */", __func__); + ++ (void) system("uname -a"); ++ (void) system("mountpoint /"); ++ + fd = open("/", O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY); + assert_se(fd >= 0); + + r = fd_is_mount_point(fd, "/", 0); + if (r < 0) + log_warning_errno(r, "Failed to check if / is a mount point, ignoring: %m"); +- else +- assert_se(r == 1); ++ else if (r == 0) ++ log_warning("/ is not a mountpoint?"); + } + + static void test_path_equal_root(void) { diff --git a/0002-test-path-more-debugging-information.patch b/0002-test-path-more-debugging-information.patch deleted file mode 100644 index 6aef2dd..0000000 --- a/0002-test-path-more-debugging-information.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 4c38dcdc8d8f22dddc521faedad6a4f45fa81d63 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Mon, 14 Sep 2020 08:56:28 +0200 -Subject: [PATCH 2/4] test-path: more debugging information -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Just to make it easier to grok what happens when test-path fails. -Change printf→log_info so that output is interleaved and not split in two -independent parts in log files. ---- - src/test/test-path.c | 31 ++++++++++++++++++------------- - 1 file changed, 18 insertions(+), 13 deletions(-) - -diff --git a/src/test/test-path.c b/src/test/test-path.c -index 63b709c8da..84dcf5e37d 100644 ---- a/src/test/test-path.c -+++ b/src/test/test-path.c -@@ -1,7 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - - #include --#include - #include - #include - -@@ -78,32 +77,38 @@ static Service *service_for_path(Manager *m, Path *path, const char *service_nam - return SERVICE(service_unit); - } - --static void check_states(Manager *m, Path *path, Service *service, PathState path_state, ServiceState service_state) { -+static void _check_states(unsigned line, -+ Manager *m, Path *path, Service *service, PathState path_state, ServiceState service_state) { - assert_se(m); - assert_se(service); - - usec_t end = now(CLOCK_MONOTONIC) + 2 * USEC_PER_SEC; - -- while (path->result != PATH_SUCCESS || service->result != SERVICE_SUCCESS || -- path->state != path_state || service->state != service_state) { -+ while (path->state != path_state || service->state != service_state || -+ path->result != PATH_SUCCESS || service->result != SERVICE_SUCCESS) { - - assert_se(sd_event_run(m->event, 100 * USEC_PER_MSEC) >= 0); - -- printf("%s: state = %s; result = %s \n", -- UNIT(path)->id, -- path_state_to_string(path->state), -- path_result_to_string(path->result)); -- printf("%s: state = %s; result = %s \n", -- UNIT(service)->id, -- service_state_to_string(service->state), -- service_result_to_string(service->result)); -+ usec_t n = now(CLOCK_MONOTONIC); -+ log_info("line %d: %s: state = %s; result = %s (left: %" PRIi64 ")", -+ line, -+ UNIT(path)->id, -+ path_state_to_string(path->state), -+ path_result_to_string(path->result), -+ end - n); -+ log_info("line %d: %s: state = %s; result = %s", -+ line, -+ UNIT(service)->id, -+ service_state_to_string(service->state), -+ service_result_to_string(service->result)); - -- if (now(CLOCK_MONOTONIC) >= end) { -+ if (n >= end) { - log_error("Test timeout when testing %s", UNIT(path)->id); - exit(EXIT_FAILURE); - } - } - } -+#define check_states(...) _check_states(__LINE__, __VA_ARGS__) - - static void test_path_exists(Manager *m) { - const char *test_path = "/tmp/test-path_exists"; diff --git a/0003-test-path-do-not-fail-the-test-if-we-fail-to-start-s.patch b/0003-test-path-do-not-fail-the-test-if-we-fail-to-start-s.patch deleted file mode 100644 index 571d85c..0000000 --- a/0003-test-path-do-not-fail-the-test-if-we-fail-to-start-s.patch +++ /dev/null @@ -1,245 +0,0 @@ -From 67c6ff720796bc97f262ba93c6ea87da93b04a1a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 31 Jul 2020 10:36:57 +0200 -Subject: [PATCH 3/4] test-path: do not fail the test if we fail to start some - service - -The test was failing because it couldn't start the service: - -path-modified.service: state = failed; result = exit-code -path-modified.path: state = waiting; result = success -path-modified.service: state = failed; result = exit-code -path-modified.path: state = waiting; result = success -path-modified.service: state = failed; result = exit-code -path-modified.path: state = waiting; result = success -path-modified.service: state = failed; result = exit-code -path-modified.path: state = waiting; result = success -path-modified.service: state = failed; result = exit-code -path-modified.path: state = waiting; result = success -path-modified.service: state = failed; result = exit-code -Failed to connect to system bus: No such file or directory --.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied -path-modified.service: Failed to create cgroup /system.slice/kojid.service/path-modified.service: Permission denied -path-modified.service: Failed to attach to cgroup /system.slice/kojid.service/path-modified.service: No such file or directory -path-modified.service: Failed at step CGROUP spawning /bin/true: No such file or directory -path-modified.service: Main process exited, code=exited, status=219/CGROUP -path-modified.service: Failed with result 'exit-code'. -Test timeout when testing path-modified.path - -In fact any of the services that we try to start may fail, especially -considering that we're doing some rogue cgroup operations. See -https://github.com/systemd/systemd/pull/16603#issuecomment-679133641. ---- - src/test/test-path.c | 88 ++++++++++++++++++++++++++++++-------------- - 1 file changed, 61 insertions(+), 27 deletions(-) - -diff --git a/src/test/test-path.c b/src/test/test-path.c -index 84dcf5e37d..d6c37b77e6 100644 ---- a/src/test/test-path.c -+++ b/src/test/test-path.c -@@ -77,8 +77,8 @@ static Service *service_for_path(Manager *m, Path *path, const char *service_nam - return SERVICE(service_unit); - } - --static void _check_states(unsigned line, -- Manager *m, Path *path, Service *service, PathState path_state, ServiceState service_state) { -+static int _check_states(unsigned line, -+ Manager *m, Path *path, Service *service, PathState path_state, ServiceState service_state) { - assert_se(m); - assert_se(service); - -@@ -102,11 +102,20 @@ static void _check_states(unsigned line, - service_state_to_string(service->state), - service_result_to_string(service->result)); - -+ if (service->state == SERVICE_FAILED) -+ return log_notice_errno(SYNTHETIC_ERRNO(ECANCELED), -+ "Failed to start service %s, aborting test: %s/%s", -+ UNIT(service)->id, -+ service_state_to_string(service->state), -+ service_result_to_string(service->result)); -+ - if (n >= end) { - log_error("Test timeout when testing %s", UNIT(path)->id); - exit(EXIT_FAILURE); - } - } -+ -+ return 0; - } - #define check_states(...) _check_states(__LINE__, __VA_ARGS__) - -@@ -124,18 +133,22 @@ static void test_path_exists(Manager *m) { - service = service_for_path(m, path, NULL); - - assert_se(unit_start(unit) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(touch(test_path) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - /* Service restarts if file still exists */ - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(unit_stop(unit) >= 0); - } -@@ -154,18 +167,22 @@ static void test_path_existsglob(Manager *m) { - service = service_for_path(m, path, NULL); - - assert_se(unit_start(unit) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(touch(test_path) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - /* Service restarts if file still exists */ - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(unit_stop(unit) >= 0); - } -@@ -185,23 +202,28 @@ static void test_path_changed(Manager *m) { - service = service_for_path(m, path, NULL); - - assert_se(unit_start(unit) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(touch(test_path) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - /* Service does not restart if file still exists */ - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - f = fopen(test_path, "w"); - assert_se(f); - fclose(f); - -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - (void) rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL); - assert_se(unit_stop(unit) >= 0); -@@ -222,23 +244,28 @@ static void test_path_modified(Manager *m) { - service = service_for_path(m, path, NULL); - - assert_se(unit_start(unit) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(touch(test_path) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - /* Service does not restart if file still exists */ - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - f = fopen(test_path, "w"); - assert_se(f); - fputs("test", f); - -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - (void) rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL); - assert_se(unit_stop(unit) >= 0); -@@ -258,14 +285,17 @@ static void test_path_unit(Manager *m) { - service = service_for_path(m, path, "path-mycustomunit.service"); - - assert_se(unit_start(unit) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(touch(test_path) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(unit_stop(unit) >= 0); - } -@@ -286,22 +316,26 @@ static void test_path_directorynotempty(Manager *m) { - assert_se(access(test_path, F_OK) < 0); - - assert_se(unit_start(unit) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - /* MakeDirectory default to no */ - assert_se(access(test_path, F_OK) < 0); - - assert_se(mkdir_p(test_path, 0755) >= 0); - assert_se(touch(strjoina(test_path, "test_file")) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - /* Service restarts if directory is still not empty */ - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(unit_stop(unit) >= 0); - } diff --git a/0004-test-path-use-Type-exec.patch b/0004-test-path-use-Type-exec.patch deleted file mode 100644 index 3734dc6..0000000 --- a/0004-test-path-use-Type-exec.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 1a83d7234e374e991235f4ef21c56998f93cb875 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Mon, 14 Sep 2020 08:58:54 +0200 -Subject: [PATCH 4/4] test-path: use Type=exec - -In general, Type=exec is superior to Type=simple. Let's not assume that -the service is started before it was really started. ---- - test/test-path/path-changed.service | 2 +- - test/test-path/path-directorynotempty.service | 2 +- - test/test-path/path-exists.service | 2 +- - test/test-path/path-existsglob.service | 2 +- - test/test-path/path-makedirectory.service | 2 +- - test/test-path/path-modified.service | 2 +- - test/test-path/path-mycustomunit.service | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/test/test-path/path-changed.service b/test/test-path/path-changed.service -index fb465d76bb..b75552df4f 100644 ---- a/test/test-path/path-changed.service -+++ b/test/test-path/path-changed.service -@@ -3,5 +3,5 @@ Description=Service Test for Path units - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true -diff --git a/test/test-path/path-directorynotempty.service b/test/test-path/path-directorynotempty.service -index fb465d76bb..b75552df4f 100644 ---- a/test/test-path/path-directorynotempty.service -+++ b/test/test-path/path-directorynotempty.service -@@ -3,5 +3,5 @@ Description=Service Test for Path units - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true -diff --git a/test/test-path/path-exists.service b/test/test-path/path-exists.service -index fb465d76bb..b75552df4f 100644 ---- a/test/test-path/path-exists.service -+++ b/test/test-path/path-exists.service -@@ -3,5 +3,5 @@ Description=Service Test for Path units - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true -diff --git a/test/test-path/path-existsglob.service b/test/test-path/path-existsglob.service -index fb465d76bb..b75552df4f 100644 ---- a/test/test-path/path-existsglob.service -+++ b/test/test-path/path-existsglob.service -@@ -3,5 +3,5 @@ Description=Service Test for Path units - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true -diff --git a/test/test-path/path-makedirectory.service b/test/test-path/path-makedirectory.service -index fb465d76bb..b75552df4f 100644 ---- a/test/test-path/path-makedirectory.service -+++ b/test/test-path/path-makedirectory.service -@@ -3,5 +3,5 @@ Description=Service Test for Path units - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true -diff --git a/test/test-path/path-modified.service b/test/test-path/path-modified.service -index fb465d76bb..b75552df4f 100644 ---- a/test/test-path/path-modified.service -+++ b/test/test-path/path-modified.service -@@ -3,5 +3,5 @@ Description=Service Test for Path units - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true -diff --git a/test/test-path/path-mycustomunit.service b/test/test-path/path-mycustomunit.service -index bcdafe4f30..8fbc40d13f 100644 ---- a/test/test-path/path-mycustomunit.service -+++ b/test/test-path/path-mycustomunit.service -@@ -3,5 +3,5 @@ Description=Service Test Path Unit - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true diff --git a/sources b/sources index e2e7b3b..741f542 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-246.6.tar.gz) = 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9 +SHA512 (systemd-247-rc2.tar.gz) = 01fb347f3edb08efdf97b54339b381e4747377af08528f7267e6de6e85215025f81da13f822fcd9b449891b925aa163c6755dea86e6727b626ea27c19e5f391b diff --git a/systemd.spec b/systemd.spec index ee64d30..863aaed 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,7 +1,7 @@ -#global commit 7f56c26d1041e686efa72b339250a98fb6ee8f00 +#global commit c4b843473a75fb38ed5bf54e9d3cfb1cb3719efa %{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})} -%global stable 1 +#global stable 1 # We ship a .pc file but don't want to have a dep on pkg-config. We # strip the automatically generated dep here and instead co-own the @@ -20,8 +20,8 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd -Version: 246.6 -Release: 3%{?dist} +Version: 247~rc2 +Release: 1%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -71,14 +71,9 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[ # https://bugzilla.redhat.com/show_bug.cgi?id=1738828 Patch0001: use-bfq-scheduler.patch -Patch0002: 0001-Revert-test-path-increase-timeout.patch -Patch0003: 0002-test-path-more-debugging-information.patch -Patch0004: 0003-test-path-do-not-fail-the-test-if-we-fail-to-start-s.patch -Patch0005: 0004-test-path-use-Type-exec.patch - -Patch0006: 0001-test-acl-util-output-more-debug-info.patch -Patch0007: 0001-Do-not-assert-in-test_add_acls_for_user.patch -Patch0008: 0001-Document-some-reasonable-DNS-servers-in-the-example-.patch +Patch0002: 0001-meson-allow-oomd-to-be-enabled-even-in-release-mode.patch +Patch0003: 0001-test-path-util-do-not-fail-if-the-fd_is_mount_point-.patch +Patch0004: 0001-test-path-util-ignore-test-failure.patch Patch0009: https://github.com/systemd/systemd/pull/17050/commits/f58b96d3e8d1cb0dd3666bc74fa673918b586612.patch @@ -143,6 +138,8 @@ BuildRequires: gettext # We use RUNNING_ON_VALGRIND in tests, so the headers need to be available BuildRequires: valgrind-devel BuildRequires: pkgconfig(bash-completion) +BuildRequires: perl +BuildRequires: perl(IPC::SysV) Requires(post): coreutils Requires(post): sed @@ -183,6 +180,16 @@ Obsoletes: %{name}-standalone-tmpfiles < %{version}-%{release}^ Conflicts: %{name}-standalone-sysusers < %{version}-%{release}^ Obsoletes: %{name}-standalone-sysusers < %{version}-%{release}^ +# Recommends to replace normal Requires deps for stuff that is dlopen()ed +Recommends: libcryptsetup.so.12()(64bit) +Recommends: libcryptsetup.so.12(CRYPTSETUP_2.0)(64bit) +Recommends: libidn2.so.0()(64bit) +Recommends: libidn2.so.0(IDN2_0.0.0)(64bit) +Recommends: libpcre2-8.so.0()(64bit) +Recommends: libpwquality.so.1()(64bit) +Recommends: libpwquality.so.1(LIBPWQUALITY_1.0)(64bit) +Recommends: libqrencode.so.4()(64bit) + %description systemd is a system and service manager that runs as PID 1 and starts the rest of the system. It provides aggressive parallelization @@ -276,6 +283,10 @@ Requires: kbd Provides: u2f-hidraw-policy = 1.0.2-40 Obsoletes: u2f-hidraw-policy < 1.0.2-40 +# Recommends to replace normal Requires deps for stuff that is dlopen()ed +Recommends: libcryptsetup.so.12()(64bit) +Recommends: libcryptsetup.so.12(CRYPTSETUP_2.0)(64bit) + %description udev This package contains systemd-udev and the rules and hardware database needed to manage device nodes. This package is necessary on physical @@ -320,17 +331,16 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %package networkd -Summary: A system service that manages network configurations +Summary: System daemon that manages network configurations Requires: %{name}%{?_isa} = %{version}-%{release} License: LGPLv2+ # https://src.fedoraproject.org/rpms/systemd/pull-request/34 Obsoletes: systemd < 246.6-2 %description networkd -%{summary}. - -It detects and configures network devices as they appear, -as well as creating virtual network devices. +systemd-networkd is a system service that manages networks. It detects +and configures network devices as they appear, as well as creating virtual +network devices. %package tests Summary: Internal unit tests for systemd @@ -367,6 +377,7 @@ systemd package and is meant for use in non-systemd systems. %{!?ntpvendor: echo 'NTP vendor zone is not set!'; exit 1} CONFIGURE_OPTS=( + -Dmode=release -Dsysvinit-path=/etc/rc.d/init.d -Drc-local=/etc/rc.d/rc.local -Dntp-servers='0.%{ntpvendor}.pool.ntp.org 1.%{ntpvendor}.pool.ntp.org 2.%{ntpvendor}.pool.ntp.org 3.%{ntpvendor}.pool.ntp.org' @@ -423,6 +434,7 @@ CONFIGURE_OPTS=( -Dusers-gid=100 -Dnobody-user=nobody -Dnobody-group=nobody + -Dcompat-mutable-uid-boundaries=true -Dsplit-usr=false -Dsplit-bin=true %if %{with lto} @@ -438,6 +450,7 @@ CONFIGURE_OPTS=( # https://bugzilla.redhat.com/show_bug.cgi?id=1867830 -Ddefault-mdns=no -Ddefault-llmnr=resolve + -Doomd=true ) %meson "${CONFIGURE_OPTS[@]}" @@ -604,9 +617,6 @@ getent group systemd-journal &>/dev/null || groupadd -r -g 190 systemd-journal 2 getent group systemd-coredump &>/dev/null || groupadd -r systemd-coredump 2>&1 || : getent passwd systemd-coredump &>/dev/null || useradd -r -l -g systemd-coredump -d / -s /sbin/nologin -c "systemd Core Dumper" systemd-coredump &>/dev/null || : -getent group systemd-network &>/dev/null || groupadd -r -g 192 systemd-network 2>&1 || : -getent passwd systemd-network &>/dev/null || useradd -r -u 192 -l -g systemd-network -d / -s /sbin/nologin -c "systemd Network Management" systemd-network &>/dev/null || : - getent group systemd-resolve &>/dev/null || groupadd -r -g 193 systemd-resolve 2>&1 || : getent passwd systemd-resolve &>/dev/null || useradd -r -u 193 -l -g systemd-resolve -d / -s /sbin/nologin -c "systemd Resolver" systemd-resolve &>/dev/null || : @@ -667,7 +677,17 @@ systemctl --global preset-all &>/dev/null || : # too before NetworkManager gets a chance. (systemd-tmpfiles invocation above # does not do this, because it's marked with ! and we don't specify --boot.) # https://bugzilla.redhat.com/show_bug.cgi?id=1873856 -if systemctl -q is-enabled systemd-resolved.service &>/dev/null; then +# +# If systemd is not running, don't overwrite the symlink because that +# will immediately break DNS resolution, since systemd-resolved is +# also not running (https://bugzilla.redhat.com/show_bug.cgi?id=1891847). +# +# Also don't creat the symlink to the stub when the stub is disabled (#1891847 again). +if test -d /run/systemd/system/ && + systemctl -q is-enabled systemd-resolved.service &>/dev/null && + ! mountpoint /etc/resolv.conf &>/dev/null && + ! systemd-analyze cat-config systemd/resolved.conf 2>/dev/null | \ + grep -qE '^DNSStubListener\s*=\s*([nN][oO]?|[fF]|[fF][aA][lL][sS][eE]|0|[oO][fF][fF])$'; then ln -fsv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf fi @@ -691,6 +711,7 @@ systemctl --no-reload preset systemd-resolved.service &>/dev/null || : if systemctl -q is-enabled systemd-resolved.service &>/dev/null; then systemctl -q is-enabled NetworkManager.service 2>/dev/null && \ ! test -L /etc/resolv.conf 2>/dev/null && \ + ! mountpoint /etc/resolv.conf &>/dev/null && \ grep -q 'Generated by NetworkManager' /etc/resolv.conf 2>/dev/null && \ echo -e '/etc/resolv.conf was generated by NetworkManager.\nRemoving it to let systemd-resolved manage this file.' && \ mv -v /etc/resolv.conf /etc/resolv.conf.orig-with-nm && \ @@ -815,13 +836,15 @@ fi %systemd_postun_with_restart systemd-journal-upload.service %firewalld_reload +%pre networkd +getent group systemd-network &>/dev/null || groupadd -r -g 192 systemd-network 2>&1 || : +getent passwd systemd-network &>/dev/null || useradd -r -u 192 -l -g systemd-network -d / -s /sbin/nologin -c "systemd Network Management" systemd-network &>/dev/null || : + +%post networkd +%systemd_post systemd-networkd.service systemd-networkd-wait-online.service + %preun networkd -if [ $1 -eq 0 ] ; then - systemctl disable --quiet \ - systemd-networkd.service \ - systemd-networkd-wait-online.service \ - >/dev/null || : -fi +%systemd_preun systemd-networkd.service systemd-networkd-wait-online.service %global _docdir_fmt %{name} @@ -870,6 +893,23 @@ fi %files standalone-sysusers -f .file-list-standalone-sysusers %changelog +* Tue Oct 20 2020 Zbigniew Jędrzejewski-Szmek - 247~rc2 +- New upstream pre-release. See + https://github.com/systemd/systemd/blob/v247-rc1/NEWS. + Many smaller and bigger improvements and features are introduced. + (#1885101, #1890632, #1879216) + + A backwards-incompatible change affects PCI network devices which + are connected through a bridge which is itself associated with a + slot. When more than one device was associated with the same slot, + one of the devices would pseudo-randomly get named after the slot. + That name is now not generated at all. This changed behaviour is + causes the net naming scheme to be changed to "v247". To restore + previous behaviour, specify net.naming-scheme=v245. + + systemd-oomd is built, but should not be considered "production + ready" at this point. Testing and bug reports are welcome. + * Wed Sep 30 2020 Dusty Mabe - 246.6-3 - Try to make files in subpackages (especially the networkd subpackage) more appropriate.