开源软件构建与测试

_service:tar_scm:systemd.spec Changed

@@ -25,7 +25,7 @@
 Name:           systemd
 Url:            https://systemd.io/
 Version:        255
-Release:        10
+Release:        17
 License:        MIT and LGPLv2+ and GPLv2+
 Summary:        System and Service Manager
 
@@ -57,6 +57,16 @@
 Patch6004:      backport-core-exec-do-not-crash-with-UtmpMode-user-without-Us.patch
 Patch6005:      backport-CVE-2023-50387.patch
 Patch6006:      backport-CVE-2023-50868.patch
+Patch6007:      backport-fix-analyze-q-option-invalid-issue.patch
+Patch6008:      backport-allow-override-default-log-level-by-environment-variable.patch
+Patch6009:      backport-login-user-runtime-dir-properly-check-for-mount-poin.patch
+Patch6010:      backport-user-util-validate-the-right-field.patch
+Patch6011:      backport-fix-conf-parser-oom-check-issue.patch
+Patch6012:      backport-unit-check-for-correct-function-in-vtable.patch
+Patch6013:      backport-fix-homed-log-message-typo-error.patch
+Patch6014:      backport-bash-completion-add-systemctl-service-log-level-target.patch
+Patch6015:      backport-fix-log-message-not-match-glob-patterns-passed-to-disable-command.patch
+Patch6016:	backport-main-pass-the-right-error-variable.patch
 
 Patch9008:      update-rtc-with-system-clock-when-shutdown.patch
 Patch9009:      udev-add-actions-while-rename-netif-failed.patch
@@ -1636,6 +1646,32 @@
 %{_libdir}/security/pam_systemd_loadkey.so
 
 %changelog
+* Tue May 21 2024 dufuhang <dufuhang@kylinos.cn> - 255-17
+- main: pass the right error variable
+
+* Thu May 16 2024 Han Jinpeng <hanjinpeng@kylinos.cn> - 255-16
+- Fix log message print not match when glob patterns passed to disable service
+
+* Thu May 9 2024 Han Jinpeng <hanjinpeng@kylinos.cn> - 255-15
+- Add bash completion for systemctl service-log-level/target
+
+* Wed May 8 2024 Han Jinpeng <hanjinpeng@kylinos.cn> - 255-14
+- backport: sync patches from systemd community
+  add backport-fix-conf-parser-oom-check-issue.patch
+      backport-unit-check-for-correct-function-in-vtable.patch
+      backport-fix-homed-log-message-typo-error.patch
+
+* Mon Apr 29 2024 huyubiao <huyubiao@huawei.com> - 255-13
+- add backport-login-user-runtime-dir-properly-check-for-mount-poin.patch
+      backport-user-util-validate-the-right-field.patch
+
+* Thu Apr 25 2024 Han Jinpeng <hanjinpeng@kylinos.cn> - 255-12
+- udevadm: allow override default log level for udevadm test-builtin commands 
+  by environment variable
+
+* Wed Apr 24 2024 Han Jinpeng <hanjinpeng@kylinos.cn> - 255-11
+- Fix systemd-analyze -q option invalid issue
+
 * Thu Apr 18 2024 Han Jinpeng <hanjinpeng@kylinos.cn> - 255-10
 - Fix warning for file not found during rpm packaging

_service:tar_scm:backport-allow-override-default-log-level-by-environment-variable.patch Added

@@ -0,0 +1,41 @@
+From cd6ec641deaf94e2eb2fcaf87b9236f65479ef3f Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sat, 6 Jan 2024 03:27:07 +0900
+Subject: PATCH udevadm: allow to override the default log level by
+ environment variable
+
+Previously, there was no way to override the log level for test and
+test-builtin commands. Let's re-parse environment after setting the log
+level to debug. Then, we can control the log level through environment
+variable.
+
+(cherry picked from commit 7ba3e44651d43d8bc3644b991a060842649a34a7)
+---
+ src/udev/udevadm-test-builtin.c | 1 +
+ src/udev/udevadm-test.c         | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/udev/udevadm-test-builtin.c b/src/udev/udevadm-test-builtin.c
+index f5498a1e5b1..088b4da3c1a 100644
+--- a/src/udev/udevadm-test-builtin.c
++++ b/src/udev/udevadm-test-builtin.c
+@@ -78,6 +78,7 @@ int builtin_main(int argc, char *argv, void *userdata) {
+         int r;
+ 
+         log_set_max_level(LOG_DEBUG);
++        log_parse_environment();
+ 
+         r = parse_argv(argc, argv);
+         if (r <= 0)
+diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
+index 809143ede0b..e1afd7d29e6 100644
+--- a/src/udev/udevadm-test.c
++++ b/src/udev/udevadm-test.c
+@@ -95,6 +95,7 @@ int test_main(int argc, char *argv, void *userdata) {
+         int r;
+ 
+         log_set_max_level(LOG_DEBUG);
++        log_parse_environment();
+ 
+         r = parse_argv(argc, argv);
+         if (r <= 0)

_service:tar_scm:backport-bash-completion-add-systemctl-service-log-level-target.patch Added

@@ -0,0 +1,46 @@
+From 8bfc0e2d5ca09985900e8a2494b797f3086e9649 Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <bluca@debian.org>
+Date: Wed, 27 Dec 2023 16:59:03 +0100
+Subject: PATCH bash completion: add systemctl service-log-level/target
+
+(cherry picked from commit 79272d3098597686d9e796bd946ea272304fd720)
+---
+ shell-completion/bash/systemctl.in | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in
+index 03c3b701504..ef8cd8f4be2 100644
+--- a/shell-completion/bash/systemctl.in
++++ b/shell-completion/bash/systemctl.in
+@@ -236,6 +236,8 @@ _systemctl () {
+         MACHINES='list-machines'
+         LOG_LEVEL='log-level'
+         LOG_TARGET='log-target'
++        SERVICE_LOG_LEVEL='service-log-level'
++        SERVICE_LOG_TARGET='service-log-target'
+         SERVICE_WATCHDOGS='service-watchdogs'
+     )
+ 
+@@ -365,6 +367,22 @@ _systemctl () {
+         comps='debug info notice warning err crit alert emerg'
+     elif __contains_word "$verb" ${VERBSLOG_TARGET}; then
+         comps='console journal kmsg journal-or-kmsg null'
++    elif __contains_word "$verb" ${VERBSSERVICE_LOG_LEVEL}; then
++        if __contains_word "$prev" ${VERBSSERVICE_LOG_LEVEL}; then
++            comps=$( __get_all_unit_files $mode "$cur" )
++        elif __contains_word "$prev" debug info notice warning err crit alert emerg; then
++            return 0
++        else
++            comps='debug info notice warning err crit alert emerg'
++        fi
++    elif __contains_word "$verb" ${VERBSSERVICE_LOG_TARGET}; then
++        if __contains_word "$prev" ${VERBSSERVICE_LOG_TARGET}; then
++            comps=$( __get_all_unit_files $mode "$cur" )
++        elif __contains_word "$prev" console journal kmsg journal-or-kmsg null; then
++            return 0
++        else
++            comps='console journal kmsg journal-or-kmsg null'
++        fi
+     elif __contains_word "$verb" ${VERBSSERVICE_WATCHDOGS}; then
+         comps='on off'
+     fi

_service:tar_scm:backport-fix-analyze-q-option-invalid-issue.patch Added

@@ -0,0 +1,52 @@
+From b0d294099790e75b0d8a1c90847895f5c7925354 Mon Sep 17 00:00:00 2001
+From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
+Date: Tue, 9 Jan 2024 09:05:50 +0100
+Subject: PATCH analyze: fix -q option
+
+Follow-up to 52117f5af831a816c47ceebb83c8244ee93b72fe
+
+(cherry picked from commit 7c0e0bbb6b13d70500da79ce0270ed6da09327a0)
+---
+ man/systemd-analyze.xml               | 1 +
+ shell-completion/bash/systemd-analyze | 2 +-
+ src/analyze/analyze.c                 | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
+index 2f2873452ac..63232ad1f02 100644
+--- a/man/systemd-analyze.xml
++++ b/man/systemd-analyze.xml
+@@ -1481,6 +1481,7 @@ NR NAME                SHA256
+       <xi:include href="user-system-options.xml" xpointer="machine" />
+ 
+       <varlistentry>
++        <term><option>-q</option></term>
+         <term><option>--quiet</option></term>
+ 
+         <listitem><para>Suppress hints and other non-essential output.</para>
+diff --git a/shell-completion/bash/systemd-analyze b/shell-completion/bash/systemd-analyze
+index 8ecf9935715..1fde67218b9 100644
+--- a/shell-completion/bash/systemd-analyze
++++ b/shell-completion/bash/systemd-analyze
+@@ -57,7 +57,7 @@ _systemd_analyze() {
+ 
+     local -A OPTS=(
+         STANDALONE='-h --help --version --system --user --global --order --require --no-pager
+-                             --man=no --generators=yes --quiet'
++                             --man=no --generators=yes -q --quiet'
+         ARG='-H --host -M --machine --fuzz --from-pattern --to-pattern --root'
+     )
+ 
+diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
+index d2be144f4f4..ba95bbaba59 100644
+--- a/src/analyze/analyze.c
++++ b/src/analyze/analyze.c
+@@ -360,7 +360,7 @@ static int parse_argv(int argc, char *argv) {
+         assert(argc >= 0);
+         assert(argv);
+ 
+-        while ((c = getopt_long(argc, argv, "hH:M:U:", options, NULL)) >= 0)
++        while ((c = getopt_long(argc, argv, "hH:M:U:q", options, NULL)) >= 0)
+                 switch (c) {
+ 
+                 case 'h':

_service:tar_scm:backport-fix-conf-parser-oom-check-issue.patch Added

_service:tar_scm:backport-fix-homed-log-message-typo-error.patch Added

@@ -0,0 +1,23 @@
+From 5df96d470fea91b29279e3ae7ff31deff907f751 Mon Sep 17 00:00:00 2001
+From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
+Date: Tue, 12 Mar 2024 15:22:43 +0100
+Subject: PATCH homed: fix typo
+
+(cherry picked from commit d3d880e558e608de351c0b518c10953cba2ed0b3)
+---
+ src/home/homed-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/home/homed-manager.c b/src/home/homed-manager.c
+index c4525310fc2..b8bef53db52 100644
+--- a/src/home/homed-manager.c
++++ b/src/home/homed-manager.c
+@@ -1040,7 +1040,7 @@ static int manager_bind_varlink(Manager *m) {
+         assert(!m->userdb_service);
+         r = path_extract_filename(socket_path, &m->userdb_service);
+         if (r < 0)
+-                return log_error_errno(r, "Failed to extra filename from socket path '%s': %m", socket_path);
++                return log_error_errno(r, "Failed to extract filename from socket path '%s': %m", socket_path);
+ 
+         /* Avoid recursion */
+         if (setenv("SYSTEMD_BYPASS_USERDB", m->userdb_service, 1) < 0)

_service:tar_scm:backport-fix-log-message-not-match-glob-patterns-passed-to-disable-command.patch Added

@@ -0,0 +1,27 @@
+From 819f3f0be986848d0b1ed82166e1244a6bd6d508 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Wed, 1 May 2024 15:14:37 +0900
+Subject: PATCH systemctl: fix log message when glob patterns passed to
+ disable command and friends
+
+Fixes #32599.
+
+(cherry picked from commit 1cca93f7f33547629cc174ec3690a2d40971d021)
+---
+ src/systemctl/systemctl-enable.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c
+index 7d9b7c794a1..fc746b2b2be 100644
+--- a/src/systemctl/systemctl-enable.c
++++ b/src/systemctl/systemctl-enable.c
+@@ -71,7 +71,8 @@ int verb_enable(int argc, char *argv, void *userdata) {
+         if (!argv1)
+                 return 0;
+ 
+-        r = mangle_names("to enable", strv_skip(argv, 1), &names);
++        const char *operation = strjoina("to ", verb);
++        r = mangle_names(operation, strv_skip(argv, 1), &names);
+         if (r < 0)
+                 return r;
+

_service:tar_scm:backport-login-user-runtime-dir-properly-check-for-mount-poin.patch Added

@@ -0,0 +1,32 @@
+From 4c3e455c093c274e3ccbc4662e47a72c3f43a34d Mon Sep 17 00:00:00 2001
+From: Mike Yuan <me@yhndnzj.com>
+Date: Mon, 5 Feb 2024 04:53:14 +0800
+Subject: PATCH login/user-runtime-dir: properly check for mount point
+
+(cherry picked from commit 561d8793058bba886d71f96fa157ca77cd6b5c23)
+(cherry picked from commit 0ec2d29241b9d5d77630ba5ad7fa1cf4f632e1f6)
+(cherry picked from commit ad9eafcc8264976b762efe4d0ce70f924d2be0bc)
+
+Conflict:NA
+Reference:https://github.com/systemd/systemd-stable/commit/4c3e455c093c274e3ccbc4662e47a72c3f43a34d
+
+---
+ src/login/user-runtime-dir.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c
+index f96a2d8662..c74d8b8d0e 100644
+--- a/src/login/user-runtime-dir.c
++++ b/src/login/user-runtime-dir.c
+@@ -66,7 +66,7 @@ static int user_mkdir_runtime_path(
+         if (r < 0)
+                 return log_error_errno(r, "Failed to create /run/user: %m");
+ 
+-        if (path_is_mount_point(runtime_path, NULL, 0) >= 0)
++        if (path_is_mount_point(runtime_path, NULL, 0) > 0)
+                 log_debug("%s is already a mount point", runtime_path);
+         else {
+                 char optionssizeof("mode=0700,uid=,gid=,size=,nr_inodes=,smackfsroot=*")
+-- 
+2.33.0
+

_service:tar_scm:backport-main-pass-the-right-error-variable.patch Added

_service:tar_scm:backport-unit-check-for-correct-function-in-vtable.patch Added

@@ -0,0 +1,25 @@
+From 891be0c2e7da8d95217e25e91cf1216b46be73fd Mon Sep 17 00:00:00 2001
+From: Mike Yuan <me@yhndnzj.com>
+Date: Wed, 17 Jan 2024 17:20:29 +0800
+Subject: PATCH core/unit: check for correct function in vtable
+
+Prompted by https://github.com/systemd/systemd/pull/30974/commits/61e44e01325eca50e88fc9cd400ee340081e9134
+
+(cherry picked from commit 18cf8411b712e7264c56d80369c8945491af90ee)
+---
+ src/core/unit.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/unit.c b/src/core/unit.c
+index 41f3bdb226a..2fc9f5ad2d3 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -6605,7 +6605,7 @@ int activation_details_append_pair(ActivationDetails *details, char ***strv) {
+                         return r;
+         }
+ 
+-        if (ACTIVATION_DETAILS_VTABLE(details)->append_env) {
++        if (ACTIVATION_DETAILS_VTABLE(details)->append_pair) {
+                 r = ACTIVATION_DETAILS_VTABLE(details)->append_pair(details, strv);
+                 if (r < 0)
+                         return r;

_service:tar_scm:backport-user-util-validate-the-right-field.patch Added

@@ -0,0 +1,32 @@
+From 3db209c9567c728c13b5d901e81f151ed1d2b0f7 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 19 Jan 2024 11:32:26 +0100
+Subject: PATCH user-util: validate the right field
+
+(cherry picked from commit 829854afa5e38db30be207fc8f8f80705e623795)
+(cherry picked from commit 624984ff423a98f1fd66e64ddfe3a8972d2f911f)
+(cherry picked from commit 641b8d700694984e40199008b059a65184dc946b)
+
+Conflict:NA
+Reference:https://github.com/systemd/systemd-stable/commit/3db209c9567c728c13b5d901e81f151ed1d2b0f7
+
+---
+ src/basic/user-util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/basic/user-util.c b/src/basic/user-util.c
+index 519ab70118..c81d19409d 100644
+--- a/src/basic/user-util.c
++++ b/src/basic/user-util.c
+@@ -314,7 +314,7 @@ int get_user_creds(
+         if (shell) {
+                 if (FLAGS_SET(flags, USER_CREDS_CLEAN) &&
+                     (isempty(p->pw_shell) ||
+-                     !path_is_valid(p->pw_dir) ||
++                     !path_is_valid(p->pw_shell) ||
+                      !path_is_absolute(p->pw_shell) ||
+                      is_nologin_shell(p->pw_shell)))
+                         *shell = NULL;
+-- 
+2.33.0
+

Changes of Revision 16