systemd: Upgrade v245.6 -> v246

author Alex Kiernan <alex.kiernan@gmail.com>

Fri, 7 Aug 2020 16:42:49 +0000 (16:42 +0000)

committer Richard Purdie <richard.purdie@linuxfoundation.org>

Sat, 8 Aug 2020 08:17:35 +0000 (09:17 +0100)
author Alex Kiernan <alex.kiernan@gmail.com>
Fri, 7 Aug 2020 16:42:49 +0000 (16:42 +0000)
committer Richard Purdie <richard.purdie@linuxfoundation.org>
Sat, 8 Aug 2020 08:17:35 +0000 (09:17 +0100)
diff --git a/meta/recipes-core/systemd/systemd-boot_245.6.bb b/meta/recipes-core/systemd/systemd-boot_246.bb

similarity index 100%

rename from meta/recipes-core/systemd/systemd-boot_245.6.bb

rename to meta/recipes-core/systemd/systemd-boot_246.bb
diff --git a/meta/recipes-core/systemd/systemd-conf_245.6.bb b/meta/recipes-core/systemd/systemd-conf_246.bb

similarity index 100%

rename from meta/recipes-core/systemd/systemd-conf_245.6.bb

rename to meta/recipes-core/systemd/systemd-conf_246.bb
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc

index 8c758ab556449ff08af38398464d2ba2ac6de50a..8ce78efbbde4599d8bfc5e2427eed966087bb2cd 100644 (file)
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1"
  LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                      file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
  
-SRCREV = "aa0cb635f1f6a4d9b50ed2cca7782f3f751be933"
-SRCBRANCH = "v245-stable"
+SRCREV = "5c68ad14af6c89261f31f0abb4850fb1c99e8cfd"
+SRCBRANCH = "v246-stable"
  SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
  
  S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch

index 26a597d45b60f2d490558b46ed9195d9bfd9a2e1..723cd2e52efc0d339c4c0aac8259dd4b08b13556 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch
+++ b/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch
@@ -14,10 +14,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
   src/shared/userdb.c           |  6 ++++++
   3 files changed, 30 insertions(+)
  
-diff --git a/src/shared/group-record-nss.c b/src/shared/group-record-nss.c
-index 77924f1c4067..c64490253ff3 100644
---- a/src/shared/group-record-nss.c
-+++ b/src/shared/group-record-nss.c
+Index: systemd-stable/src/shared/group-record-nss.c
+===================================================================
+--- systemd-stable.orig/src/shared/group-record-nss.c
++++ systemd-stable/src/shared/group-record-nss.c
  @@ -19,8 +19,10 @@ int nss_group_to_group_record(
           if (isempty(grp->gr_name))
                   return -EINVAL;
@@ -45,7 +45,7 @@ index 77924f1c4067..c64490253ff3 100644
   
           r = json_build(&g->json, JSON_BUILD_OBJECT(
                                          JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)),
-@@ -76,6 +80,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
+@@ -76,6 +80,7 @@ int nss_sgrp_for_group(const struct grou
           assert(ret_sgrp);
           assert(ret_buffer);
   
@@ -53,7 +53,7 @@ index 77924f1c4067..c64490253ff3 100644
           for (;;) {
                   _cleanup_free_ char *buf = NULL;
                   struct sgrp sgrp, *result;
-@@ -104,6 +109,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
+@@ -104,6 +109,9 @@ int nss_sgrp_for_group(const struct grou
                   buflen *= 2;
                   buf = mfree(buf);
           }
@@ -62,67 +62,67 @@ index 77924f1c4067..c64490253ff3 100644
  +#endif
   }
   
- int nss_group_record_by_name(const char *name, GroupRecord **ret) {
-@@ -111,7 +119,9 @@ int nss_group_record_by_name(const char *name, GroupRecord **ret) {
+ int nss_group_record_by_name(
+@@ -115,7 +123,9 @@ int nss_group_record_by_name(
           struct group grp, *result;
           bool incomplete = false;
           size_t buflen = 4096;
  +#if ENABLE_GSHADOW
-         struct sgrp sgrp;
+         struct sgrp sgrp, *sresult = NULL;
  +#endif
           int r;
   
           assert(name);
-@@ -141,6 +151,7 @@ int nss_group_record_by_name(const char *name, GroupRecord **ret) {
+@@ -145,6 +155,7 @@ int nss_group_record_by_name(
                   buf = mfree(buf);
           }
   
  +#if ENABLE_GSHADOW
-         r = nss_sgrp_for_group(result, &sgrp, &sbuf);
-         if (r < 0) {
-                 log_debug_errno(r, "Failed to do shadow lookup for group %s, ignoring: %m", result->gr_name);
-@@ -148,6 +159,9 @@ int nss_group_record_by_name(const char *name, GroupRecord **ret) {
-         }
+         if (with_shadow) {
+                 r = nss_sgrp_for_group(result, &sgrp, &sbuf);
+                 if (r < 0) {
+@@ -156,6 +167,9 @@ int nss_group_record_by_name(
+                 incomplete = true;
   
-         r = nss_group_to_group_record(result, r >= 0 ? &sgrp : NULL, ret);
+         r = nss_group_to_group_record(result, sresult, ret);
  +#else
  +        r = nss_group_to_group_record(result, NULL, ret);
  +#endif
           if (r < 0)
                   return r;
   
-@@ -160,7 +174,9 @@ int nss_group_record_by_gid(gid_t gid, GroupRecord **ret) {
+@@ -172,7 +186,9 @@ int nss_group_record_by_gid(
           struct group grp, *result;
           bool incomplete = false;
           size_t buflen = 4096;
  +#if ENABLE_GSHADOW
-         struct sgrp sgrp;
+         struct sgrp sgrp, *sresult = NULL;
  +#endif
           int r;
   
           assert(ret);
-@@ -188,6 +204,7 @@ int nss_group_record_by_gid(gid_t gid, GroupRecord **ret) {
+@@ -200,6 +216,7 @@ int nss_group_record_by_gid(
                   buf = mfree(buf);
           }
   
  +#if ENABLE_GSHADOW
-         r = nss_sgrp_for_group(result, &sgrp, &sbuf);
-         if (r < 0) {
-                 log_debug_errno(r, "Failed to do shadow lookup for group %s, ignoring: %m", result->gr_name);
-@@ -195,6 +212,9 @@ int nss_group_record_by_gid(gid_t gid, GroupRecord **ret) {
-         }
+         if (with_shadow) {
+                 r = nss_sgrp_for_group(result, &sgrp, &sbuf);
+                 if (r < 0) {
+@@ -211,6 +228,9 @@ int nss_group_record_by_gid(
+                 incomplete = true;
   
-         r = nss_group_to_group_record(result, r >= 0 ? &sgrp : NULL, ret);
+         r = nss_group_to_group_record(result, sresult, ret);
  +#else
  +        r = nss_group_to_group_record(result, NULL, ret);
  +#endif
           if (r < 0)
                   return r;
   
-diff --git a/src/shared/group-record-nss.h b/src/shared/group-record-nss.h
-index 38b2995178ff..d7d95c44cf11 100644
---- a/src/shared/group-record-nss.h
-+++ b/src/shared/group-record-nss.h
+Index: systemd-stable/src/shared/group-record-nss.h
+===================================================================
+--- systemd-stable.orig/src/shared/group-record-nss.h
++++ systemd-stable/src/shared/group-record-nss.h
  @@ -2,7 +2,11 @@
   #pragma once
   
@@ -135,11 +135,11 @@ index 38b2995178ff..d7d95c44cf11 100644
   
   #include "group-record.h"
   
-diff --git a/src/shared/userdb.c b/src/shared/userdb.c
-index 92f8796768d7..5d912862f85c 100644
---- a/src/shared/userdb.c
-+++ b/src/shared/userdb.c
-@@ -924,13 +924,16 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
+Index: systemd-stable/src/shared/userdb.c
+===================================================================
+--- systemd-stable.orig/src/shared/userdb.c
++++ systemd-stable/src/shared/userdb.c
+@@ -930,13 +930,16 @@ int groupdb_iterator_get(UserDBIterator
                   if (gr) {
                           _cleanup_free_ char *buffer = NULL;
                           bool incomplete = false;
@@ -156,7 +156,7 @@ index 92f8796768d7..5d912862f85c 100644
                           r = nss_sgrp_for_group(gr, &sgrp, &buffer);
                           if (r < 0) {
                                   log_debug_errno(r, "Failed to acquire shadow entry for group %s, ignoring: %m", gr->gr_name);
-@@ -938,6 +941,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
+@@ -944,6 +947,9 @@ int groupdb_iterator_get(UserDBIterator
                           }
   
                           r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret);
@@ -166,6 +166,3 @@ index 92f8796768d7..5d912862f85c 100644
                           if (r < 0)
                                   return r;
   
--- 
-2.17.1
-
diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch

index 26f70b35d014c7d5edc4dc3db2760b0afda7f860..2676c144f2f0f4b371af15136e8ed61e38780e20 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
+++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
@@ -25,21 +25,21 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
   units/systemd-binfmt.service.in         | 4 ++++
   3 files changed, 9 insertions(+), 4 deletions(-)
  
-diff --git a/units/meson.build b/units/meson.build
-index ea91f0cc9ea7..25186f88dfeb 100644
---- a/units/meson.build
-+++ b/units/meson.build
-@@ -52,8 +52,7 @@ units = [
+Index: systemd-stable/units/meson.build
+===================================================================
+--- systemd-stable.orig/units/meson.build
++++ systemd-stable/units/meson.build
+@@ -54,8 +54,7 @@ units = [
           ['poweroff.target',                     '',
-          'runlevel0.target'],
+          (with_runlevels ? 'runlevel0.target' : '')],
           ['printer.target',                      ''],
  -        ['proc-sys-fs-binfmt_misc.automount',   'ENABLE_BINFMT',
  -         'sysinit.target.wants/'],
  +        ['proc-sys-fs-binfmt_misc.automount',   'ENABLE_BINFMT'],
           ['proc-sys-fs-binfmt_misc.mount',       'ENABLE_BINFMT'],
           ['reboot.target',                       '',
-          'runlevel6.target ctrl-alt-del.target'],
-@@ -161,8 +160,7 @@ in_units = [
+          (with_runlevels ? 'runlevel6.target ctrl-alt-del.target' : 'ctrl-alt-del.target')],
+@@ -162,8 +161,7 @@ in_units = [
           ['rc-local.service',                     'HAVE_SYSV_COMPAT'],
           ['rescue.service',                       ''],
           ['systemd-backlight@.service',           'ENABLE_BACKLIGHT'],
@@ -49,10 +49,10 @@ index ea91f0cc9ea7..25186f88dfeb 100644
           ['systemd-bless-boot.service',           'ENABLE_EFI HAVE_BLKID'],
           ['systemd-boot-check-no-failures.service', ''],
           ['systemd-coredump@.service',            'ENABLE_COREDUMP'],
-diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
-index 30a6bc991844..4231f3b70fe9 100644
---- a/units/proc-sys-fs-binfmt_misc.automount
-+++ b/units/proc-sys-fs-binfmt_misc.automount
+Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount
+===================================================================
+--- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount
++++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount
  @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/
   
   [Automount]
@@ -60,11 +60,11 @@ index 30a6bc991844..4231f3b70fe9 100644
  +
  +[Install]
  +WantedBy=sysinit.target
-diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
-index e54e95e11d5d..372a598614d3 100644
---- a/units/systemd-binfmt.service.in
-+++ b/units/systemd-binfmt.service.in
-@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
+Index: systemd-stable/units/systemd-binfmt.service.in
+===================================================================
+--- systemd-stable.orig/units/systemd-binfmt.service.in
++++ systemd-stable/units/systemd-binfmt.service.in
+@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc
   Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
   DefaultDependencies=no
   Conflicts=shutdown.target
diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch

index 4eeec7b7dac1d120da0089501d8b78a83809e46a..39a975319b276f3dfef78d82a9732af1b5113389 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch
+++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch
@@ -40,11 +40,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
   src/vconsole/vconsole-setup.c           |  2 +-
   18 files changed, 35 insertions(+), 35 deletions(-)
  
-diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
-index a5141f4cbedd..04c06e7a55cb 100644
---- a/src/basic/cgroup-util.c
-+++ b/src/basic/cgroup-util.c
-@@ -739,7 +739,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
+Index: systemd-stable/src/basic/cgroup-util.c
+===================================================================
+--- systemd-stable.orig/src/basic/cgroup-util.c
++++ systemd-stable/src/basic/cgroup-util.c
+@@ -769,7 +769,7 @@ int cg_install_release_agent(const char
   
           sc = strstrip(contents);
           if (isempty(sc)) {
@@ -53,7 +53,7 @@ index a5141f4cbedd..04c06e7a55cb 100644
                   if (r < 0)
                           return r;
           } else if (!path_equal(sc, agent))
-@@ -757,7 +757,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
+@@ -787,7 +787,7 @@ int cg_install_release_agent(const char
   
           sc = strstrip(contents);
           if (streq(sc, "0")) {
@@ -62,7 +62,7 @@ index a5141f4cbedd..04c06e7a55cb 100644
                   if (r < 0)
                           return r;
   
-@@ -784,7 +784,7 @@ int cg_uninstall_release_agent(const char *controller) {
+@@ -814,7 +814,7 @@ int cg_uninstall_release_agent(const cha
           if (r < 0)
                   return r;
   
@@ -71,7 +71,7 @@ index a5141f4cbedd..04c06e7a55cb 100644
           if (r < 0)
                   return r;
   
-@@ -794,7 +794,7 @@ int cg_uninstall_release_agent(const char *controller) {
+@@ -824,7 +824,7 @@ int cg_uninstall_release_agent(const cha
           if (r < 0)
                   return r;
   
@@ -80,7 +80,7 @@ index a5141f4cbedd..04c06e7a55cb 100644
           if (r < 0)
                   return r;
   
-@@ -1650,7 +1650,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri
+@@ -1656,7 +1656,7 @@ int cg_set_attribute(const char *control
           if (r < 0)
                   return r;
   
@@ -89,11 +89,11 @@ index a5141f4cbedd..04c06e7a55cb 100644
   }
   
   int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) {
-diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
-index da7e836f143e..2138f20bcc03 100644
---- a/src/basic/procfs-util.c
-+++ b/src/basic/procfs-util.c
-@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) {
+Index: systemd-stable/src/basic/procfs-util.c
+===================================================================
+--- systemd-stable.orig/src/basic/procfs-util.c
++++ systemd-stable/src/basic/procfs-util.c
+@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi
            * decrease it, as threads-max is the much more relevant sysctl. */
           if (limit > pid_max-1) {
                   sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */
@@ -109,11 +109,11 @@ index da7e836f143e..2138f20bcc03 100644
           if (r < 0) {
                   uint64_t threads_max;
   
-diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c
-index da9a2139d31a..5e91f5b8f5d9 100644
---- a/src/basic/smack-util.c
-+++ b/src/basic/smack-util.c
-@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) {
+Index: systemd-stable/src/basic/smack-util.c
+===================================================================
+--- systemd-stable.orig/src/basic/smack-util.c
++++ systemd-stable/src/basic/smack-util.c
+@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const
                   return 0;
   
           p = procfs_file_alloca(pid, "attr/current");
@@ -122,10 +122,10 @@ index da9a2139d31a..5e91f5b8f5d9 100644
           if (r < 0)
                   return r;
   
-diff --git a/src/basic/util.c b/src/basic/util.c
-index 2b3b3918a32f..aff8d0fcd473 100644
---- a/src/basic/util.c
-+++ b/src/basic/util.c
+Index: systemd-stable/src/basic/util.c
+===================================================================
+--- systemd-stable.orig/src/basic/util.c
++++ systemd-stable/src/basic/util.c
  @@ -267,7 +267,7 @@ void disable_coredumps(void) {
           if (detect_container() > 0)
                   return;
@@ -135,11 +135,11 @@ index 2b3b3918a32f..aff8d0fcd473 100644
           if (r < 0)
                   log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m");
   }
-diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
-index 7ff844c78c3a..5c5721d7c2f7 100644
---- a/src/binfmt/binfmt.c
-+++ b/src/binfmt/binfmt.c
-@@ -47,7 +47,7 @@ static int delete_rule(const char *rule) {
+Index: systemd-stable/src/binfmt/binfmt.c
+===================================================================
+--- systemd-stable.orig/src/binfmt/binfmt.c
++++ systemd-stable/src/binfmt/binfmt.c
+@@ -48,7 +48,7 @@ static int delete_rule(const char *rule)
           if (!fn)
                   return log_oom();
   
@@ -148,7 +148,7 @@ index 7ff844c78c3a..5c5721d7c2f7 100644
   }
   
   static int apply_rule(const char *rule) {
-@@ -55,7 +55,7 @@ static int apply_rule(const char *rule) {
+@@ -56,7 +56,7 @@ static int apply_rule(const char *rule)
   
           (void) delete_rule(rule);
   
@@ -157,7 +157,7 @@ index 7ff844c78c3a..5c5721d7c2f7 100644
           if (r < 0)
                   return log_error_errno(r, "Failed to add binary format: %m");
   
-@@ -212,7 +212,7 @@ static int run(int argc, char *argv[]) {
+@@ -223,7 +223,7 @@ static int run(int argc, char *argv[]) {
                   }
   
                   /* Flush out all rules */
@@ -166,11 +166,11 @@ index 7ff844c78c3a..5c5721d7c2f7 100644
   
                   STRV_FOREACH(f, files) {
                           k = apply_file(*f, true);
-diff --git a/src/core/main.c b/src/core/main.c
-index 3c6b66e89c8e..c39ebe56a5b3 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -1312,7 +1312,7 @@ static int bump_unix_max_dgram_qlen(void) {
+Index: systemd-stable/src/core/main.c
+===================================================================
+--- systemd-stable.orig/src/core/main.c
++++ systemd-stable/src/core/main.c
+@@ -1382,7 +1382,7 @@ static int bump_unix_max_dgram_qlen(void
           if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN)
                   return 0;
   
@@ -179,7 +179,7 @@ index 3c6b66e89c8e..c39ebe56a5b3 100644
           if (r < 0)
                   return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r,
                                         "Failed to bump AF_UNIX datagram queue length, ignoring: %m");
-@@ -1536,7 +1536,7 @@ static void initialize_core_pattern(bool skip_setup) {
+@@ -1668,7 +1668,7 @@ static void initialize_core_pattern(bool
           if (getpid_cached() != 1)
                   return;
   
@@ -188,11 +188,11 @@ index 3c6b66e89c8e..c39ebe56a5b3 100644
           if (r < 0)
                   log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern);
   }
-diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
-index 4427397f2715..8aeb5c829513 100644
---- a/src/core/smack-setup.c
-+++ b/src/core/smack-setup.c
-@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) {
+Index: systemd-stable/src/core/smack-setup.c
+===================================================================
+--- systemd-stable.orig/src/core/smack-setup.c
++++ systemd-stable/src/core/smack-setup.c
+@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy)
           }
   
   #ifdef SMACK_RUN_LABEL
@@ -214,10 +214,10 @@ index 4427397f2715..8aeb5c829513 100644
           if (r < 0)
                   log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m");
   #endif
-diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
-index 17e7cd1a009b..87a766771663 100644
---- a/src/hibernate-resume/hibernate-resume.c
-+++ b/src/hibernate-resume/hibernate-resume.c
+Index: systemd-stable/src/hibernate-resume/hibernate-resume.c
+===================================================================
+--- systemd-stable.orig/src/hibernate-resume/hibernate-resume.c
++++ systemd-stable/src/hibernate-resume/hibernate-resume.c
  @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
                   return EXIT_FAILURE;
           }
@@ -227,11 +227,11 @@ index 17e7cd1a009b..87a766771663 100644
           if (r < 0) {
                   log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor);
                   return EXIT_FAILURE;
-diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
-index 1f2451f8e1b4..3f676ec2841a 100644
---- a/src/libsystemd/sd-device/sd-device.c
-+++ b/src/libsystemd/sd-device/sd-device.c
-@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr,
+Index: systemd-stable/src/libsystemd/sd-device/sd-device.c
+===================================================================
+--- systemd-stable.orig/src/libsystemd/sd-device/sd-device.c
++++ systemd-stable/src/libsystemd/sd-device/sd-device.c
+@@ -1877,7 +1877,7 @@ _public_ int sd_device_set_sysattr_value
           if (!value)
                   return -ENOMEM;
   
@@ -240,11 +240,11 @@ index 1f2451f8e1b4..3f676ec2841a 100644
           if (r < 0) {
                   if (r == -ELOOP)
                           return -EINVAL;
-diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
-index 52a7ea3c77e9..9703de0dabee 100644
---- a/src/login/logind-dbus.c
-+++ b/src/login/logind-dbus.c
-@@ -1339,7 +1339,7 @@ static int trigger_device(Manager *m, sd_device *d) {
+Index: systemd-stable/src/login/logind-dbus.c
+===================================================================
+--- systemd-stable.orig/src/login/logind-dbus.c
++++ systemd-stable/src/login/logind-dbus.c
+@@ -1341,7 +1341,7 @@ static int trigger_device(Manager *m, sd
                   if (!t)
                           return -ENOMEM;
   
@@ -253,11 +253,11 @@ index 52a7ea3c77e9..9703de0dabee 100644
           }
   
           return 0;
-diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
-index f5048d9473cb..b6383ab5c97e 100644
---- a/src/nspawn/nspawn-cgroup.c
-+++ b/src/nspawn/nspawn-cgroup.c
-@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) {
+Index: systemd-stable/src/nspawn/nspawn-cgroup.c
+===================================================================
+--- systemd-stable.orig/src/nspawn/nspawn-cgroup.c
++++ systemd-stable/src/nspawn/nspawn-cgroup.c
+@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified
           fn = strjoina(tree, cgroup, "/cgroup.procs");
   
           sprintf(pid_string, PID_FMT, pid);
@@ -266,11 +266,11 @@ index f5048d9473cb..b6383ab5c97e 100644
           if (r < 0) {
                   log_error_errno(r, "Failed to move process: %m");
                   goto finish;
-diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 734dee1130e0..71add9a055d2 100644
---- a/src/nspawn/nspawn.c
-+++ b/src/nspawn/nspawn.c
-@@ -2440,7 +2440,7 @@ static int reset_audit_loginuid(void) {
+Index: systemd-stable/src/nspawn/nspawn.c
+===================================================================
+--- systemd-stable.orig/src/nspawn/nspawn.c
++++ systemd-stable/src/nspawn/nspawn.c
+@@ -2493,7 +2493,7 @@ static int reset_audit_loginuid(void) {
           if (streq(p, "4294967295"))
                   return 0;
   
@@ -279,7 +279,7 @@ index 734dee1130e0..71add9a055d2 100644
           if (r < 0) {
                   log_error_errno(r,
                                   "Failed to reset audit login UID. This probably means that your kernel is too\n"
-@@ -3665,13 +3665,13 @@ static int setup_uid_map(pid_t pid) {
+@@ -3726,13 +3726,13 @@ static int setup_uid_map(pid_t pid) {
   
           xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid);
           xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range);
@@ -295,11 +295,11 @@ index 734dee1130e0..71add9a055d2 100644
           if (r < 0)
                   return log_error_errno(r, "Failed to write GID map: %m");
   
-diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
-index e8398cbde5ba..ba682ec0c9e7 100644
---- a/src/shared/cgroup-setup.c
-+++ b/src/shared/cgroup-setup.c
-@@ -267,7 +267,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
+Index: systemd-stable/src/shared/cgroup-setup.c
+===================================================================
+--- systemd-stable.orig/src/shared/cgroup-setup.c
++++ systemd-stable/src/shared/cgroup-setup.c
+@@ -267,7 +267,7 @@ int cg_attach(const char *controller, co
   
           xsprintf(c, PID_FMT "\n", pid);
   
@@ -317,11 +317,11 @@ index e8398cbde5ba..ba682ec0c9e7 100644
                           if (r < 0) {
                                   log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m",
                                                   FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs);
-diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
-index 8543dbd2d05f..76162599817e 100644
---- a/src/shared/sysctl-util.c
-+++ b/src/shared/sysctl-util.c
-@@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c
+Index: systemd-stable/src/shared/sysctl-util.c
+===================================================================
+--- systemd-stable.orig/src/shared/sysctl-util.c
++++ systemd-stable/src/shared/sysctl-util.c
+@@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, con
   
           log_debug("Setting '%s' to '%s'", p, value);
   
@@ -330,11 +330,11 @@ index 8543dbd2d05f..76162599817e 100644
   }
   
   int sysctl_read(const char *property, char **content) {
-diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index fbfddc0262fc..7cc2902154e9 100644
---- a/src/sleep/sleep.c
-+++ b/src/sleep/sleep.c
-@@ -47,7 +47,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca
+Index: systemd-stable/src/sleep/sleep.c
+===================================================================
+--- systemd-stable.orig/src/sleep/sleep.c
++++ systemd-stable/src/sleep/sleep.c
+@@ -48,7 +48,7 @@ static int write_hibernate_location_info
           assert(hibernate_location->swap);
   
           xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno));
@@ -343,7 +343,7 @@ index fbfddc0262fc..7cc2902154e9 100644
           if (r < 0)
                   return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m",
                                          hibernate_location->swap->device, resume_str);
-@@ -74,7 +74,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca
+@@ -75,7 +75,7 @@ static int write_hibernate_location_info
           }
   
           xsprintf(offset_str, "%" PRIu64, hibernate_location->offset);
@@ -352,7 +352,7 @@ index fbfddc0262fc..7cc2902154e9 100644
           if (r < 0)
                   return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m",
                                          hibernate_location->swap->device, offset_str);
-@@ -91,7 +91,7 @@ static int write_mode(char **modes) {
+@@ -92,7 +92,7 @@ static int write_mode(char **modes) {
           STRV_FOREACH(mode, modes) {
                   int k;
   
@@ -361,7 +361,7 @@ index fbfddc0262fc..7cc2902154e9 100644
                   if (k >= 0)
                           return 0;
   
-@@ -110,7 +110,7 @@ static int write_state(FILE **f, char **states) {
+@@ -114,7 +114,7 @@ static int write_state(FILE **f, char **
           STRV_FOREACH(state, states) {
                   int k;
   
@@ -370,11 +370,11 @@ index fbfddc0262fc..7cc2902154e9 100644
                   if (k >= 0)
                           return 0;
                   log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state);
-diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
-index 60c68b5029cf..fdca03d3d42c 100644
---- a/src/udev/udevadm-trigger.c
-+++ b/src/udev/udevadm-trigger.c
-@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se
+Index: systemd-stable/src/udev/udevadm-trigger.c
+===================================================================
+--- systemd-stable.orig/src/udev/udevadm-trigger.c
++++ systemd-stable/src/udev/udevadm-trigger.c
+@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato
                   if (!filename)
                           return log_oom();
   
@@ -383,11 +383,11 @@ index 60c68b5029cf..fdca03d3d42c 100644
                   if (r < 0) {
                           bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS);
   
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index ca65474f2763..38780681431a 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -1089,7 +1089,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) {
+Index: systemd-stable/src/udev/udevd.c
+===================================================================
+--- systemd-stable.orig/src/udev/udevd.c
++++ systemd-stable/src/udev/udevd.c
+@@ -1153,7 +1153,7 @@ static int synthesize_change_one(sd_devi
   
           filename = strjoina(syspath, "/uevent");
           log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath);
@@ -396,11 +396,11 @@ index ca65474f2763..38780681431a 100644
           if (r < 0)
                   return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename);
           return 0;
-diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
-index 9d706085fb47..30dcfa86f4d0 100644
---- a/src/vconsole/vconsole-setup.c
-+++ b/src/vconsole/vconsole-setup.c
-@@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) {
+Index: systemd-stable/src/vconsole/vconsole-setup.c
+===================================================================
+--- systemd-stable.orig/src/vconsole/vconsole-setup.c
++++ systemd-stable/src/vconsole/vconsole-setup.c
+@@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *na
   static int toggle_utf8_sysfs(bool utf8) {
           int r;
   
diff --git a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch

index a5e41bfabf233d9d2db896e9bd4f1c5b55635a8c..30fe9a14dfc1c0d740d78688903f3a0f0dd9ce69 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch
+++ b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch
@@ -17,13 +17,13 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
   src/shared/format-table.c          | 36 ++++++++++++++++++++----------
   3 files changed, 38 insertions(+), 31 deletions(-)
  
-diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h
-index e029f8646eb0..27d68b341cf3 100644
---- a/src/basic/sort-util.h
-+++ b/src/basic/sort-util.h
-@@ -54,17 +54,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn
+Index: systemd-stable/src/basic/sort-util.h
+===================================================================
+--- systemd-stable.orig/src/basic/sort-util.h
++++ systemd-stable/src/basic/sort-util.h
+@@ -54,17 +54,3 @@ static inline void _qsort_safe(void *bas
                   int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \
-                 qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \
+                 _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \
           })
  -
  -static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) {
@@ -39,11 +39,11 @@ index e029f8646eb0..27d68b341cf3 100644
  -                int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \
  -                qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \
  -        })
-diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c
-index d790e8fd0b19..42e0fd7c9b3c 100644
---- a/src/libsystemd/sd-hwdb/hwdb-util.c
-+++ b/src/libsystemd/sd-hwdb/hwdb-util.c
-@@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) {
+Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c
+===================================================================
+--- systemd-stable.orig/src/libsystemd/sd-hwdb/hwdb-util.c
++++ systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c
+@@ -128,9 +128,13 @@ static void trie_free(struct trie *trie)
   
   DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free);
   
@@ -60,7 +60,7 @@ index d790e8fd0b19..42e0fd7c9b3c 100644
   }
   
   static int trie_node_add_value(struct trie *trie, struct trie_node *node,
-@@ -158,7 +162,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
+@@ -158,7 +162,10 @@ static int trie_node_add_value(struct tr
                           .value_off = v,
                   };
   
@@ -72,7 +72,7 @@ index d790e8fd0b19..42e0fd7c9b3c 100644
                   if (val) {
                           /* At this point we have 2 identical properties on the same match-string.
                            * Since we process files in order, we just replace the previous value. */
-@@ -184,7 +191,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
+@@ -184,7 +191,9 @@ static int trie_node_add_value(struct tr
                   .line_number = line_number,
           };
           node->values_count++;
@@ -83,11 +83,11 @@ index d790e8fd0b19..42e0fd7c9b3c 100644
           return 0;
   }
   
-diff --git a/src/shared/format-table.c b/src/shared/format-table.c
-index 425013046491..33c1c5a12d43 100644
---- a/src/shared/format-table.c
-+++ b/src/shared/format-table.c
-@@ -1164,31 +1164,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t
+Index: systemd-stable/src/shared/format-table.c
+===================================================================
+--- systemd-stable.orig/src/shared/format-table.c
++++ systemd-stable/src/shared/format-table.c
+@@ -1246,31 +1246,33 @@ static int cell_data_compare(TableData *
           return CMP(index_a, index_b);
   }
   
@@ -131,7 +131,7 @@ index 425013046491..33c1c5a12d43 100644
           }
   
           /* Order identical lines by the order there were originally added in */
-@@ -1690,7 +1692,12 @@ int table_print(Table *t, FILE *f) {
+@@ -1798,7 +1800,12 @@ int table_print(Table *t, FILE *f) {
                   for (i = 0; i < n_rows; i++)
                           sorted[i] = i * t->n_columns;
   
@@ -145,7 +145,7 @@ index 425013046491..33c1c5a12d43 100644
           }
   
           if (t->display_map)
-@@ -2236,7 +2243,12 @@ int table_to_json(Table *t, JsonVariant **ret) {
+@@ -2375,7 +2382,12 @@ int table_to_json(Table *t, JsonVariant
                   for (i = 0; i < n_rows; i++)
                           sorted[i] = i * t->n_columns;
   
diff --git a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch

index 0dea933270258303dd91fd2848d1f81ad90932cc..e65c54361428c1305e70aa7496f4a05602b1d51e 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
+++ b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
@@ -22,11 +22,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
   create mode 100644 src/basic/parse-printf-format.c
   create mode 100644 src/basic/parse-printf-format.h
  
-diff --git a/meson.build b/meson.build
-index fc216d22da24..a25996803d64 100644
---- a/meson.build
-+++ b/meson.build
-@@ -640,6 +640,7 @@ endif
+Index: systemd-stable/meson.build
+===================================================================
+--- systemd-stable.orig/meson.build
++++ systemd-stable/meson.build
+@@ -638,6 +638,7 @@ endif
   foreach header : ['crypt.h',
                     'linux/memfd.h',
                     'linux/vm_sockets.h',
@@ -34,11 +34,11 @@ index fc216d22da24..a25996803d64 100644
                     'sys/auxv.h',
                     'valgrind/memcheck.h',
                     'valgrind/valgrind.h',
-diff --git a/src/basic/meson.build b/src/basic/meson.build
-index ccb22e159505..25c77ea6bc0e 100644
---- a/src/basic/meson.build
-+++ b/src/basic/meson.build
-@@ -313,6 +313,11 @@ foreach item : [['af',     af_list_txt,     'af',         ''],
+Index: systemd-stable/src/basic/meson.build
+===================================================================
+--- systemd-stable.orig/src/basic/meson.build
++++ systemd-stable/src/basic/meson.build
+@@ -317,6 +317,11 @@ foreach item : [['af',     af_list_txt,
   endforeach
   
   basic_sources += generated_gperf_headers
@@ -50,11 +50,10 @@ index ccb22e159505..25c77ea6bc0e 100644
   basic_gcrypt_sources = files(
           'gcrypt-util.c',
           'gcrypt-util.h')
-diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c
-new file mode 100644
-index 000000000000..49437e544540
+Index: systemd-stable/src/basic/parse-printf-format.c
+===================================================================
  --- /dev/null
-+++ b/src/basic/parse-printf-format.c
++++ systemd-stable/src/basic/parse-printf-format.c
  @@ -0,0 +1,273 @@
  +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
  +
@@ -329,11 +328,10 @@ index 000000000000..49437e544540
  +
  +        return last;
  +}
-diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h
-new file mode 100644
-index 000000000000..47be7522d7fa
+Index: systemd-stable/src/basic/parse-printf-format.h
+===================================================================
  --- /dev/null
-+++ b/src/basic/parse-printf-format.h
++++ systemd-stable/src/basic/parse-printf-format.h
  @@ -0,0 +1,57 @@
  +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
  +
@@ -392,10 +390,10 @@ index 000000000000..47be7522d7fa
  +size_t parse_printf_format(const char *fmt, size_t n, int *types);
  +
  +#endif /* HAVE_PRINTF_H */
-diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
-index c3b9448d4f4f..2937aa13b178 100644
---- a/src/basic/stdio-util.h
-+++ b/src/basic/stdio-util.h
+Index: systemd-stable/src/basic/stdio-util.h
+===================================================================
+--- systemd-stable.orig/src/basic/stdio-util.h
++++ systemd-stable/src/basic/stdio-util.h
  @@ -1,13 +1,13 @@
   /* SPDX-License-Identifier: LGPL-2.1+ */
   #pragma once
@@ -411,10 +409,10 @@ index c3b9448d4f4f..2937aa13b178 100644
   
   #define snprintf_ok(buf, len, fmt, ...) \
           ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len))
-diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
-index 912ecef73cce..43ed756bda53 100644
---- a/src/journal/journal-send.c
-+++ b/src/journal/journal-send.c
+Index: systemd-stable/src/journal/journal-send.c
+===================================================================
+--- systemd-stable.orig/src/journal/journal-send.c
++++ systemd-stable/src/journal/journal-send.c
  @@ -2,7 +2,6 @@
   
   #include <errno.h>
@@ -423,7 +421,7 @@ index 912ecef73cce..43ed756bda53 100644
   #include <stddef.h>
   #include <sys/un.h>
   #include <unistd.h>
-@@ -20,6 +19,7 @@
+@@ -21,6 +20,7 @@
   #include "stdio-util.h"
   #include "string-util.h"
   #include "tmpfile-util.h"
diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch

index ca4f0d5d623f2f4074d981f11c4ce06917e8ef80..8e7a2fb6e4f87c20c65d58af3fee9c0a412009a5 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
+++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
@@ -1,4 +1,4 @@
-From 85dcaad8f38521ec3dc580794072b601900eed84 Mon Sep 17 00:00:00 2001
+From 7e771de87cf728a8678f1f28f391bba3589e2496 Mon Sep 17 00:00:00 2001
  From: Chen Qi <Qi.Chen@windriver.com>
  Date: Mon, 25 Feb 2019 14:18:21 +0800
  Subject: [PATCH] src/basic/missing.h: check for missing strndupa
@@ -25,6 +25,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
   src/basic/missing_stdlib.h                 | 12 ++++++++++++
   src/basic/mkdir.c                          |  1 +
   src/basic/parse-util.c                     |  1 +
+ src/basic/path-lookup.c                    |  1 +
   src/basic/proc-cmdline.c                   |  1 +
   src/basic/procfs-util.c                    |  1 +
   src/basic/selinux-util.c                   |  1 +
@@ -52,6 +53,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
   src/nss-mymachines/nss-mymachines.c        |  1 +
   src/portable/portable.c                    |  1 +
   src/resolve/resolvectl.c                   |  1 +
+ src/shared/bus-get-properties.c            |  1 +
   src/shared/bus-unit-procs.c                |  1 +
   src/shared/bus-unit-util.c                 |  1 +
   src/shared/bus-util.c                      |  1 +
@@ -59,20 +61,19 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
   src/shared/journal-importer.c              |  1 +
   src/shared/logs-show.c                     |  1 +
   src/shared/pager.c                         |  1 +
- src/shared/path-lookup.c                   |  1 +
   src/shared/uid-range.c                     |  1 +
   src/socket-proxy/socket-proxyd.c           |  1 +
   src/test/test-hexdecoct.c                  |  1 +
   src/udev/udev-builtin-path_id.c            |  1 +
   src/udev/udev-event.c                      |  1 +
   src/udev/udev-rules.c                      |  1 +
- 49 files changed, 60 insertions(+)
+ 50 files changed, 61 insertions(+)
  
  diff --git a/meson.build b/meson.build
-index a25996803d64..72b305b5ab58 100644
+index 9187439bdd..bea9935a91 100644
  --- a/meson.build
  +++ b/meson.build
-@@ -529,6 +529,7 @@ foreach ident : [
+@@ -527,6 +527,7 @@ foreach ident : [
                                    #include <unistd.h>
                                    #include <signal.h>
                                    #include <sys/wait.h>'''],
@@ -81,7 +82,7 @@ index a25996803d64..72b305b5ab58 100644
   
           have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE')
  diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
-index 048441429025..01d74ea0ed4e 100644
+index 3a644363e1..73946a829b 100644
  --- a/src/backlight/backlight.c
  +++ b/src/backlight/backlight.c
  @@ -17,6 +17,7 @@
@@ -93,19 +94,19 @@ index 048441429025..01d74ea0ed4e 100644
   static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) {
           const char *subsystem, *sysname, *value;
  diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
-index 54fc6ecf8b20..a5141f4cbedd 100644
+index e94fcfad02..856a7068b0 100644
  --- a/src/basic/cgroup-util.c
  +++ b/src/basic/cgroup-util.c
-@@ -37,6 +37,7 @@
- #include "strv.h"
+@@ -38,6 +38,7 @@
   #include "unit-name.h"
   #include "user-util.h"
+ #include "xattr-util.h"
  +#include "missing_stdlib.h"
   
   static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) {
           _cleanup_free_ char *fs = NULL;
  diff --git a/src/basic/env-util.c b/src/basic/env-util.c
-index b8dc98915f81..5049b37594bc 100644
+index b8dc98915f..5049b37594 100644
  --- a/src/basic/env-util.c
  +++ b/src/basic/env-util.c
  @@ -15,6 +15,7 @@
@@ -117,10 +118,10 @@ index b8dc98915f81..5049b37594bc 100644
   #define VALID_CHARS_ENV_NAME                    \
           DIGITS LETTERS                          \
  diff --git a/src/basic/log.c b/src/basic/log.c
-index 17557e1844b2..6cec4d324aab 100644
+index c6fe203808..b7ef932d28 100644
  --- a/src/basic/log.c
  +++ b/src/basic/log.c
-@@ -34,6 +34,7 @@
+@@ -35,6 +35,7 @@
   #include "terminal-util.h"
   #include "time-util.h"
   #include "utf8.h"
@@ -129,7 +130,7 @@ index 17557e1844b2..6cec4d324aab 100644
   #define SNDBUF_SIZE (8*1024*1024)
   
  diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h
-index 188a8d44066a..1e16ec287aad 100644
+index 188a8d4406..1e16ec287a 100644
  --- a/src/basic/missing_stdlib.h
  +++ b/src/basic/missing_stdlib.h
  @@ -11,3 +11,15 @@
@@ -149,7 +150,7 @@ index 188a8d44066a..1e16ec287aad 100644
  +  })
  +#endif
  diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
-index fa682d4c438e..37902551490a 100644
+index 6ebc2b95fd..88f4359bab 100644
  --- a/src/basic/mkdir.c
  +++ b/src/basic/mkdir.c
  @@ -13,6 +13,7 @@
@@ -158,22 +159,34 @@ index fa682d4c438e..37902551490a 100644
   #include "user-util.h"
  +#include "missing_stdlib.h"
   
- int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) {
-         struct stat st;
+ int mkdir_safe_internal(
+                 const char *path,
  diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
-index e0094b0f370a..00da6518124b 100644
+index 44f0438cf4..54b4133343 100644
  --- a/src/basic/parse-util.c
  +++ b/src/basic/parse-util.c
-@@ -18,6 +18,7 @@
- #include "process-util.h"
+@@ -19,6 +19,7 @@
   #include "stat-util.h"
   #include "string-util.h"
+ #include "strv.h"
  +#include "missing_stdlib.h"
   
   int parse_boolean(const char *v) {
           if (!v)
+diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
+index 52968dee34..2f4f7e3dcd 100644
+--- a/src/basic/path-lookup.c
++++ b/src/basic/path-lookup.c
+@@ -15,6 +15,7 @@
+ #include "strv.h"
+ #include "tmpfile-util.h"
+ #include "user-util.h"
++#include "missing_stdlib.h"
+ 
+ int xdg_user_runtime_dir(char **ret, const char *suffix) {
+         const char *e;
  diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
-index 1af58717c686..c1020f4611d4 100644
+index ba47ca5812..8baf728fde 100644
  --- a/src/basic/proc-cmdline.c
  +++ b/src/basic/proc-cmdline.c
  @@ -15,6 +15,7 @@
@@ -185,7 +198,7 @@ index 1af58717c686..c1020f4611d4 100644
   int proc_cmdline(char **ret) {
           const char *e;
  diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
-index 7aaf95bfced2..da7e836f143e 100644
+index 7aaf95bfce..da7e836f14 100644
  --- a/src/basic/procfs-util.c
  +++ b/src/basic/procfs-util.c
  @@ -11,6 +11,7 @@
@@ -197,10 +210,10 @@ index 7aaf95bfced2..da7e836f143e 100644
   int procfs_tasks_get_limit(uint64_t *ret) {
           _cleanup_free_ char *value = NULL;
  diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
-index 1095cb426cce..806ef4bd97a9 100644
+index c94ee26bd9..14e35b4653 100644
  --- a/src/basic/selinux-util.c
  +++ b/src/basic/selinux-util.c
-@@ -26,6 +26,7 @@
+@@ -27,6 +27,7 @@
   #include "selinux-util.h"
   #include "stdio-util.h"
   #include "time-util.h"
@@ -209,7 +222,7 @@ index 1095cb426cce..806ef4bd97a9 100644
   #if HAVE_SELINUX
   DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free);
  diff --git a/src/basic/time-util.c b/src/basic/time-util.c
-index 105584e2e72f..eb0bed47dac3 100644
+index 15cc1b8851..02bb3f01f9 100644
  --- a/src/basic/time-util.c
  +++ b/src/basic/time-util.c
  @@ -26,6 +26,7 @@
@@ -221,7 +234,7 @@ index 105584e2e72f..eb0bed47dac3 100644
   static clockid_t map_clock_id(clockid_t c) {
   
  diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
-index b96e1f927fff..cba979baca3e 100644
+index b96e1f927f..cba979baca 100644
  --- a/src/boot/bless-boot.c
  +++ b/src/boot/bless-boot.c
  @@ -18,6 +18,7 @@
@@ -233,7 +246,7 @@ index b96e1f927fff..cba979baca3e 100644
   static char **arg_path = NULL;
   
  diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
-index 27dc9e43c3e2..b1a83023600b 100644
+index b7d2e32639..fdbc1df95e 100644
  --- a/src/core/dbus-cgroup.c
  +++ b/src/core/dbus-cgroup.c
  @@ -15,6 +15,7 @@
@@ -245,7 +258,7 @@ index 27dc9e43c3e2..b1a83023600b 100644
   BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve);
   
  diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
-index d8ba3e5d9241..729e13fda64c 100644
+index 50f7ada8ce..5c760ee487 100644
  --- a/src/core/dbus-execute.c
  +++ b/src/core/dbus-execute.c
  @@ -41,6 +41,7 @@
@@ -257,7 +270,7 @@ index d8ba3e5d9241..729e13fda64c 100644
   BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput);
   static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput);
  diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
-index 7862beaacb6d..3b1ea53a5f0d 100644
+index 951450e53d..50d134e9a1 100644
  --- a/src/core/dbus-util.c
  +++ b/src/core/dbus-util.c
  @@ -7,6 +7,7 @@
@@ -269,10 +282,10 @@ index 7862beaacb6d..3b1ea53a5f0d 100644
   int bus_property_get_triggered_unit(
                   sd_bus *bus,
  diff --git a/src/core/execute.c b/src/core/execute.c
-index 89dbf6fbd2c1..9762dc57443c 100644
+index 2a4840a3a9..d3f1e0e0f8 100644
  --- a/src/core/execute.c
  +++ b/src/core/execute.c
-@@ -88,6 +88,7 @@
+@@ -89,6 +89,7 @@
   #include "unit.h"
   #include "user-util.h"
   #include "utmp-wtmp.h"
@@ -281,7 +294,7 @@ index 89dbf6fbd2c1..9762dc57443c 100644
   #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
   #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC)
  diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
-index 09ccd613e32c..f4e64fa283e9 100644
+index 09ccd613e3..f4e64fa283 100644
  --- a/src/core/kmod-setup.c
  +++ b/src/core/kmod-setup.c
  @@ -11,6 +11,7 @@
@@ -293,7 +306,7 @@ index 09ccd613e32c..f4e64fa283e9 100644
   #if HAVE_KMOD
   #include "module-util.h"
  diff --git a/src/core/service.c b/src/core/service.c
-index 17f27a4abce3..e5dcc532d0ce 100644
+index 00e61945ba..1ecab28354 100644
  --- a/src/core/service.c
  +++ b/src/core/service.c
  @@ -41,6 +41,7 @@
@@ -305,7 +318,7 @@ index 17f27a4abce3..e5dcc532d0ce 100644
   static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
           [SERVICE_DEAD] = UNIT_INACTIVE,
  diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c
-index 35885dfb47c4..bb9f0660a6a0 100644
+index 35885dfb47..bb9f0660a6 100644
  --- a/src/coredump/coredump-vacuum.c
  +++ b/src/coredump/coredump-vacuum.c
  @@ -16,6 +16,7 @@
@@ -317,7 +330,7 @@ index 35885dfb47c4..bb9f0660a6a0 100644
   #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL)           /* 1 MiB */
   #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL)   /* 4 GiB */
  diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
-index 88e42d3a984b..0f08376e5399 100644
+index 77dfdefd64..e21ecbeff8 100644
  --- a/src/journal-remote/journal-remote-main.c
  +++ b/src/journal-remote/journal-remote-main.c
  @@ -22,6 +22,7 @@
@@ -329,7 +342,7 @@ index 88e42d3a984b..0f08376e5399 100644
   #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem"
   #define CERT_FILE     CERTIFICATE_ROOT "/certs/journal-remote.pem"
  diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index e5feec83bce6..c3aec1e219d7 100644
+index 8d4897b942..15476b3c83 100644
  --- a/src/journal/journalctl.c
  +++ b/src/journal/journalctl.c
  @@ -69,6 +69,7 @@
@@ -341,7 +354,7 @@ index e5feec83bce6..c3aec1e219d7 100644
   #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
   #define PROCESS_INOTIFY_INTERVAL 1024   /* Every 1,024 messages processed */
  diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 3fa98dfda237..e655d77e714a 100644
+index 6fb0abb419..2d94d9938e 100644
  --- a/src/journal/sd-journal.c
  +++ b/src/journal/sd-journal.c
  @@ -40,6 +40,7 @@
@@ -353,7 +366,7 @@ index 3fa98dfda237..e655d77e714a 100644
   #define JOURNAL_FILES_MAX 7168
   
  diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
-index 73127dfe0253..cc8635dea591 100644
+index 55e35cd902..0ed98f9224 100644
  --- a/src/libsystemd/sd-bus/bus-message.c
  +++ b/src/libsystemd/sd-bus/bus-message.c
  @@ -21,6 +21,7 @@
@@ -365,7 +378,7 @@ index 73127dfe0253..cc8635dea591 100644
   static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
   
  diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
-index 6d140348ec4c..9126b8801bc5 100644
+index 6abac8822c..c74c9cd7fa 100644
  --- a/src/libsystemd/sd-bus/bus-objects.c
  +++ b/src/libsystemd/sd-bus/bus-objects.c
  @@ -13,6 +13,7 @@
@@ -377,7 +390,7 @@ index 6d140348ec4c..9126b8801bc5 100644
   static int node_vtable_get_userdata(
                   sd_bus *bus,
  diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
-index 18d30d010a20..be2ab703f8ed 100644
+index fc7e8e844a..7af4dd2712 100644
  --- a/src/libsystemd/sd-bus/bus-socket.c
  +++ b/src/libsystemd/sd-bus/bus-socket.c
  @@ -28,6 +28,7 @@
@@ -389,7 +402,7 @@ index 18d30d010a20..be2ab703f8ed 100644
   #define SNDBUF_SIZE (8*1024*1024)
   
  diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
-index 7ad03680f48d..b9d2181e4910 100644
+index 9de5e454a6..fe86c93c63 100644
  --- a/src/libsystemd/sd-bus/sd-bus.c
  +++ b/src/libsystemd/sd-bus/sd-bus.c
  @@ -41,6 +41,7 @@
@@ -401,7 +414,7 @@ index 7ad03680f48d..b9d2181e4910 100644
   #define log_debug_bus_message(m)                                         \
           do {                                                             \
  diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
-index 8de0a859ee94..58044b6ba908 100644
+index 8de0a859ee..58044b6ba9 100644
  --- a/src/libsystemd/sd-bus/test-bus-benchmark.c
  +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
  @@ -14,6 +14,7 @@
@@ -413,7 +426,7 @@ index 8de0a859ee94..58044b6ba908 100644
   #define MAX_SIZE (2*1024*1024)
   
  diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
-index 30669a9359e5..6544b3722099 100644
+index 233d081300..40a32b9700 100644
  --- a/src/locale/keymap-util.c
  +++ b/src/locale/keymap-util.c
  @@ -21,6 +21,7 @@
@@ -425,7 +438,7 @@ index 30669a9359e5..6544b3722099 100644
   static bool startswith_comma(const char *s, const char *prefix) {
           s = startswith(s, prefix);
  diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
-index 84bea21ab7be..49720c7f742e 100644
+index 16f4289585..6c5e438b36 100644
  --- a/src/login/pam_systemd.c
  +++ b/src/login/pam_systemd.c
  @@ -31,6 +31,7 @@
@@ -437,7 +450,7 @@ index 84bea21ab7be..49720c7f742e 100644
   #include "parse-util.h"
   #include "path-util.h"
  diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
-index bed1e42697c4..e4847c2beea2 100644
+index bed1e42697..e4847c2bee 100644
  --- a/src/network/generator/network-generator.c
  +++ b/src/network/generator/network-generator.c
  @@ -13,6 +13,7 @@
@@ -449,7 +462,7 @@ index bed1e42697c4..e4847c2beea2 100644
   /*
     # .network
  diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
-index 5fb5b49bbcc3..785ccc2da307 100644
+index d341fa25aa..91646bc2c2 100644
  --- a/src/nspawn/nspawn-settings.c
  +++ b/src/nspawn/nspawn-settings.c
  @@ -16,6 +16,7 @@
@@ -461,19 +474,19 @@ index 5fb5b49bbcc3..785ccc2da307 100644
   Settings *settings_new(void) {
           Settings *s;
  diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
-index 364356da5622..47d4ea44e40f 100644
+index 5db0dcef76..681f8677e4 100644
  --- a/src/nss-mymachines/nss-mymachines.c
  +++ b/src/nss-mymachines/nss-mymachines.c
  @@ -19,6 +19,7 @@
+ #include "nss-util.h"
   #include "signal-util.h"
   #include "string-util.h"
- #include "user-util.h"
  +#include "missing_stdlib.h"
   
   NSS_GETHOSTBYNAME_PROTOTYPES(mymachines);
   NSS_GETPW_PROTOTYPES(mymachines);
  diff --git a/src/portable/portable.c b/src/portable/portable.c
-index e18826ab2685..d9f4b81d8937 100644
+index 3a1367ec2b..f29336cb1e 100644
  --- a/src/portable/portable.c
  +++ b/src/portable/portable.c
  @@ -31,6 +31,7 @@
@@ -485,10 +498,10 @@ index e18826ab2685..d9f4b81d8937 100644
   static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile");
   
  diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
-index f20e8c44b8bc..9f6c4e8f49a7 100644
+index 3072b984e5..c46ae374bf 100644
  --- a/src/resolve/resolvectl.c
  +++ b/src/resolve/resolvectl.c
-@@ -33,6 +33,7 @@
+@@ -36,6 +36,7 @@
   #include "strv.h"
   #include "terminal-util.h"
   #include "verbs.h"
@@ -496,8 +509,20 @@ index f20e8c44b8bc..9f6c4e8f49a7 100644
   
   static int arg_family = AF_UNSPEC;
   static int arg_ifindex = 0;
+diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c
+index 8ad4694046..da5082c02a 100644
+--- a/src/shared/bus-get-properties.c
++++ b/src/shared/bus-get-properties.c
+@@ -3,6 +3,7 @@
+ #include "bus-get-properties.h"
+ #include "rlimit-util.h"
+ #include "string-util.h"
++#include "missing_stdlib.h"
+ 
+ int bus_property_get_bool(
+                 sd_bus *bus,
  diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c
-index b21fe393265f..af2640005c1d 100644
+index b21fe39326..af2640005c 100644
  --- a/src/shared/bus-unit-procs.c
  +++ b/src/shared/bus-unit-procs.c
  @@ -10,6 +10,7 @@
@@ -509,10 +534,10 @@ index b21fe393265f..af2640005c1d 100644
   struct CGroupInfo {
           char *cgroup_path;
  diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
-index 28d85944a8a7..4743a84a417e 100644
+index f2652ed9a5..eb019fc89f 100644
  --- a/src/shared/bus-unit-util.c
  +++ b/src/shared/bus-unit-util.c
-@@ -34,6 +34,7 @@
+@@ -39,6 +39,7 @@
   #include "unit-def.h"
   #include "user-util.h"
   #include "utf8.h"
@@ -521,19 +546,19 @@ index 28d85944a8a7..4743a84a417e 100644
   int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
           assert(message);
  diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
-index 8e6a6e2ce2de..0cbf4b1997df 100644
+index 77c1c62182..5cd31f3c15 100644
  --- a/src/shared/bus-util.c
  +++ b/src/shared/bus-util.c
-@@ -30,6 +30,7 @@
+@@ -22,6 +22,7 @@
+ #include "socket-util.h"
   #include "stdio-util.h"
- #include "strv.h"
- #include "user-util.h"
+ /* #include "string-util.h" */
  +#include "missing_stdlib.h"
   
   static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
           sd_event *e = userdata;
  diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
-index b812665315f6..8e68f7f8fc6c 100644
+index b812665315..8e68f7f8fc 100644
  --- a/src/shared/dns-domain.c
  +++ b/src/shared/dns-domain.c
  @@ -23,6 +23,7 @@
@@ -545,7 +570,7 @@ index b812665315f6..8e68f7f8fc6c 100644
   int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) {
           const char *n;
  diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c
-index 7c4fc7021dec..3fbaf5a63969 100644
+index 7c4fc7021d..3fbaf5a639 100644
  --- a/src/shared/journal-importer.c
  +++ b/src/shared/journal-importer.c
  @@ -14,6 +14,7 @@
@@ -557,19 +582,19 @@ index 7c4fc7021dec..3fbaf5a63969 100644
   enum {
           IMPORTER_STATE_LINE = 0,    /* waiting to read, or reading line */
  diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
-index 2bfd0b60c26b..6a1bb3a0760f 100644
+index 899e894ab7..628854ac9c 100644
  --- a/src/shared/logs-show.c
  +++ b/src/shared/logs-show.c
-@@ -39,6 +39,7 @@
- #include "time-util.h"
+@@ -41,6 +41,7 @@
   #include "utf8.h"
   #include "util.h"
+ #include "web-util.h"
  +#include "missing_stdlib.h"
   
   /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */
   #define PRINT_LINE_THRESHOLD 3
  diff --git a/src/shared/pager.c b/src/shared/pager.c
-index 1fe9db179176..67954b5cab93 100644
+index e03be6d23b..50e3d1f75c 100644
  --- a/src/shared/pager.c
  +++ b/src/shared/pager.c
  @@ -23,6 +23,7 @@
@@ -580,20 +605,8 @@ index 1fe9db179176..67954b5cab93 100644
   
   static pid_t pager_pid = 0;
   
-diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
-index 5b1620974536..0e7cd1c2af12 100644
---- a/src/shared/path-lookup.c
-+++ b/src/shared/path-lookup.c
-@@ -19,6 +19,7 @@
- #include "tmpfile-util.h"
- #include "user-util.h"
- #include "util.h"
-+#include "missing_stdlib.h"
- 
- int xdg_user_runtime_dir(char **ret, const char *suffix) {
-         const char *e;
  diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
-index 7cb7d8a477e9..8e7d7f9e7ca6 100644
+index 7cb7d8a477..8e7d7f9e7c 100644
  --- a/src/shared/uid-range.c
  +++ b/src/shared/uid-range.c
  @@ -9,6 +9,7 @@
@@ -605,7 +618,7 @@ index 7cb7d8a477e9..8e7d7f9e7ca6 100644
   static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
           assert(range);
  diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
-index 2ee6fc2f0a6a..4a9934f9c14d 100644
+index b461aead60..9941695ed9 100644
  --- a/src/socket-proxy/socket-proxyd.c
  +++ b/src/socket-proxy/socket-proxyd.c
  @@ -26,6 +26,7 @@
@@ -617,7 +630,7 @@ index 2ee6fc2f0a6a..4a9934f9c14d 100644
   #define BUFFER_SIZE (256 * 1024)
   
  diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
-index 52217429b154..70708dedf318 100644
+index 52217429b1..70708dedf3 100644
  --- a/src/test/test-hexdecoct.c
  +++ b/src/test/test-hexdecoct.c
  @@ -6,6 +6,7 @@
@@ -629,7 +642,7 @@ index 52217429b154..70708dedf318 100644
   static void test_hexchar(void) {
           assert_se(hexchar(0xa) == 'a');
  diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index ca38f5608791..9d8cf4d2807b 100644
+index 6c020ac0ed..10723ec46c 100644
  --- a/src/udev/udev-builtin-path_id.c
  +++ b/src/udev/udev-builtin-path_id.c
  @@ -22,6 +22,7 @@
@@ -641,7 +654,7 @@ index ca38f5608791..9d8cf4d2807b 100644
   _printf_(2,3)
   static void path_prepend(char **path, const char *fmt, ...) {
  diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
-index eb51139e519c..977cc16e9d7c 100644
+index e1c2baf7f2..62d4086802 100644
  --- a/src/udev/udev-event.c
  +++ b/src/udev/udev-event.c
  @@ -34,6 +34,7 @@
@@ -653,7 +666,7 @@ index eb51139e519c..977cc16e9d7c 100644
   typedef struct Spawn {
           sd_device *device;
  diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
-index b9b350d1ef7a..2c114cc77572 100644
+index c36f032f66..36970813d8 100644
  --- a/src/udev/udev-rules.c
  +++ b/src/udev/udev-rules.c
  @@ -30,6 +30,7 @@
diff --git a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch

index 9142d7b45c8d71e5512e0267afdb53d6e714287d..abc438e4ba3fd1730a45813fc2198f6474766e3b 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
+++ b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
@@ -52,10 +52,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
   src/udev/udev-builtin-net_setup_link.c    | 1 +
   19 files changed, 18 insertions(+), 4 deletions(-)
  
-diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
-index eac2e725cce7..1beae7ba91cc 100644
---- a/src/libsystemd-network/sd-dhcp6-client.c
-+++ b/src/libsystemd-network/sd-dhcp6-client.c
+Index: systemd-stable/src/libsystemd-network/sd-dhcp6-client.c
+===================================================================
+--- systemd-stable.orig/src/libsystemd-network/sd-dhcp6-client.c
++++ systemd-stable/src/libsystemd-network/sd-dhcp6-client.c
  @@ -5,7 +5,6 @@
   
   #include <errno.h>
@@ -64,10 +64,10 @@ index eac2e725cce7..1beae7ba91cc 100644
   #include <linux/if_infiniband.h>
   
   #include "sd-dhcp6-client.h"
-diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
-index e35127a4cd2e..4f6ad9ef5886 100644
---- a/src/libsystemd/sd-netlink/netlink-types.c
-+++ b/src/libsystemd/sd-netlink/netlink-types.c
+Index: systemd-stable/src/libsystemd/sd-netlink/netlink-types.c
+===================================================================
+--- systemd-stable.orig/src/libsystemd/sd-netlink/netlink-types.c
++++ systemd-stable/src/libsystemd/sd-netlink/netlink-types.c
  @@ -3,6 +3,7 @@
   #include <netinet/in.h>
   #include <stdint.h>
@@ -76,10 +76,10 @@ index e35127a4cd2e..4f6ad9ef5886 100644
   #include <linux/can/vxcan.h>
   #include <linux/netlink.h>
   #include <linux/rtnetlink.h>
-diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
-index a2990452af17..5af350883c28 100644
---- a/src/machine/machine-dbus.c
-+++ b/src/machine/machine-dbus.c
+Index: systemd-stable/src/machine/machine-dbus.c
+===================================================================
+--- systemd-stable.orig/src/machine/machine-dbus.c
++++ systemd-stable/src/machine/machine-dbus.c
  @@ -3,6 +3,7 @@
   #include <errno.h>
   #include <sys/mount.h>
@@ -88,21 +88,21 @@ index a2990452af17..5af350883c28 100644
   
   /* When we include libgen.h because we need dirname() we immediately
    * undefine basename() since libgen.h defines it as a macro to the POSIX
-diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
-index 8df39e35843f..8d697894f970 100644
---- a/src/network/netdev/bond.c
-+++ b/src/network/netdev/bond.c
+Index: systemd-stable/src/network/netdev/bond.c
+===================================================================
+--- systemd-stable.orig/src/network/netdev/bond.c
++++ systemd-stable/src/network/netdev/bond.c
  @@ -1,5 +1,6 @@
   /* SPDX-License-Identifier: LGPL-2.1+ */
   
  +#include <netinet/if_ether.h>
   #include "alloc-util.h"
   #include "bond.h"
- #include "conf-parser.h"
-diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
-index 6b8f9944612e..7f81ec25c407 100644
---- a/src/network/netdev/bridge.c
-+++ b/src/network/netdev/bridge.c
+ #include "bond-util.h"
+Index: systemd-stable/src/network/netdev/bridge.c
+===================================================================
+--- systemd-stable.orig/src/network/netdev/bridge.c
++++ systemd-stable/src/network/netdev/bridge.c
  @@ -1,5 +1,6 @@
   /* SPDX-License-Identifier: LGPL-2.1+ */
   
@@ -110,10 +110,10 @@ index 6b8f9944612e..7f81ec25c407 100644
   #include <net/if.h>
   
   #include "bridge.h"
-diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
-index 7d1fec3afe6d..e948a335336d 100644
---- a/src/network/netdev/macsec.c
-+++ b/src/network/netdev/macsec.c
+Index: systemd-stable/src/network/netdev/macsec.c
+===================================================================
+--- systemd-stable.orig/src/network/netdev/macsec.c
++++ systemd-stable/src/network/netdev/macsec.c
  @@ -1,5 +1,6 @@
   /* SPDX-License-Identifier: LGPL-2.1+ */
   
@@ -121,10 +121,10 @@ index 7d1fec3afe6d..e948a335336d 100644
   #include <netinet/in.h>
   #include <linux/if_ether.h>
   #include <linux/if_macsec.h>
-diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf
-index 09a5f4822e03..873299b1f98a 100644
---- a/src/network/netdev/netdev-gperf.gperf
-+++ b/src/network/netdev/netdev-gperf.gperf
+Index: systemd-stable/src/network/netdev/netdev-gperf.gperf
+===================================================================
+--- systemd-stable.orig/src/network/netdev/netdev-gperf.gperf
++++ systemd-stable/src/network/netdev/netdev-gperf.gperf
  @@ -2,6 +2,7 @@
   #if __GNUC__ >= 7
   _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")
@@ -133,21 +133,21 @@ index 09a5f4822e03..873299b1f98a 100644
   #include <stddef.h>
   #include "bond.h"
   #include "bridge.h"
-diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
-index f8121a48ed92..437f411c61e8 100644
---- a/src/network/netdev/netdev.c
-+++ b/src/network/netdev/netdev.c
+Index: systemd-stable/src/network/netdev/netdev.c
+===================================================================
+--- systemd-stable.orig/src/network/netdev/netdev.c
++++ systemd-stable/src/network/netdev/netdev.c
  @@ -1,5 +1,6 @@
   /* SPDX-License-Identifier: LGPL-2.1+ */
   
  +#include <netinet/if_ether.h>
   #include <net/if.h>
   #include <netinet/in.h>
- 
-diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
-index 41f09287f2b7..b67ce4fc8844 100644
---- a/src/network/networkd-brvlan.c
-+++ b/src/network/networkd-brvlan.c
+ #include <unistd.h>
+Index: systemd-stable/src/network/networkd-brvlan.c
+===================================================================
+--- systemd-stable.orig/src/network/networkd-brvlan.c
++++ systemd-stable/src/network/networkd-brvlan.c
  @@ -4,6 +4,7 @@
   ***/
   
@@ -156,11 +156,11 @@ index 41f09287f2b7..b67ce4fc8844 100644
   #include <linux/if_bridge.h>
   #include <stdbool.h>
   
-diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
-index 8664d8cdc0d4..e9f91f74c1a1 100644
---- a/src/network/networkd-dhcp-common.c
-+++ b/src/network/networkd-dhcp-common.c
-@@ -4,6 +4,7 @@
+Index: systemd-stable/src/network/networkd-dhcp-common.c
+===================================================================
+--- systemd-stable.orig/src/network/networkd-dhcp-common.c
++++ systemd-stable/src/network/networkd-dhcp-common.c
+@@ -5,6 +5,7 @@
   #include "escape.h"
   #include "in-addr-util.h"
   #include "networkd-dhcp-common.h"
@@ -168,10 +168,10 @@ index 8664d8cdc0d4..e9f91f74c1a1 100644
   #include "networkd-network.h"
   #include "parse-util.h"
   #include "string-table.h"
-diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
-index 13e3e32f40e8..5394399c9150 100644
---- a/src/network/networkd-dhcp4.c
-+++ b/src/network/networkd-dhcp4.c
+Index: systemd-stable/src/network/networkd-dhcp4.c
+===================================================================
+--- systemd-stable.orig/src/network/networkd-dhcp4.c
++++ systemd-stable/src/network/networkd-dhcp4.c
  @@ -1,9 +1,9 @@
   /* SPDX-License-Identifier: LGPL-2.1+ */
   
@@ -181,12 +181,12 @@ index 13e3e32f40e8..5394399c9150 100644
   #include <linux/if.h>
  -#include <linux/if_arp.h>
   
+ #include "escape.h"
   #include "alloc-util.h"
- #include "dhcp-client-internal.h"
-diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
-index 7304270c60b1..099064f64715 100644
---- a/src/network/networkd-dhcp6.c
-+++ b/src/network/networkd-dhcp6.c
+Index: systemd-stable/src/network/networkd-dhcp6.c
+===================================================================
+--- systemd-stable.orig/src/network/networkd-dhcp6.c
++++ systemd-stable/src/network/networkd-dhcp6.c
  @@ -3,9 +3,9 @@
     Copyright © 2014 Intel Corporation. All rights reserved.
   ***/
@@ -195,13 +195,13 @@ index 7304270c60b1..099064f64715 100644
   #include <netinet/in.h>
   #include <linux/if.h>
  -#include <linux/if_arp.h>
- #include "sd-radv.h"
   
   #include "sd-dhcp6-client.h"
-diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index 99d4b29c31ec..e8b467d6ac09 100644
---- a/src/network/networkd-link.c
-+++ b/src/network/networkd-link.c
+ 
+Index: systemd-stable/src/network/networkd-link.c
+===================================================================
+--- systemd-stable.orig/src/network/networkd-link.c
++++ systemd-stable/src/network/networkd-link.c
  @@ -1,8 +1,8 @@
   /* SPDX-License-Identifier: LGPL-2.1+ */
   
@@ -209,13 +209,13 @@ index 99d4b29c31ec..e8b467d6ac09 100644
   #include <netinet/in.h>
   #include <linux/if.h>
  -#include <linux/if_arp.h>
+ #include <linux/if_link.h>
   #include <unistd.h>
   
- #include "alloc-util.h"
-diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
-index 2e716b291e97..56f18cea57fe 100644
---- a/src/network/networkd-network.c
-+++ b/src/network/networkd-network.c
+Index: systemd-stable/src/network/networkd-network.c
+===================================================================
+--- systemd-stable.orig/src/network/networkd-network.c
++++ systemd-stable/src/network/networkd-network.c
  @@ -1,5 +1,6 @@
   /* SPDX-License-Identifier: LGPL-2.1+ */
   
@@ -223,19 +223,19 @@ index 2e716b291e97..56f18cea57fe 100644
   #include <net/if.h>
   #include <netinet/in.h>
   #include <linux/netdevice.h>
-diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c
-index 25b939639775..530e4928835c 100644
---- a/src/network/test-network-tables.c
-+++ b/src/network/test-network-tables.c
+Index: systemd-stable/src/network/test-network-tables.c
+===================================================================
+--- systemd-stable.orig/src/network/test-network-tables.c
++++ systemd-stable/src/network/test-network-tables.c
  @@ -1,3 +1,4 @@
  +#include <netinet/if_ether.h>
   #include "bond.h"
   #include "dhcp6-internal.h"
   #include "dhcp6-protocol.h"
-diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c
-index 00a71d64a638..4593e89120b8 100644
---- a/src/shared/ethtool-util.c
-+++ b/src/shared/ethtool-util.c
+Index: systemd-stable/src/shared/ethtool-util.c
+===================================================================
+--- systemd-stable.orig/src/shared/ethtool-util.c
++++ systemd-stable/src/shared/ethtool-util.c
  @@ -1,5 +1,6 @@
   /* SPDX-License-Identifier: LGPL-2.1+ */
   
@@ -243,10 +243,10 @@ index 00a71d64a638..4593e89120b8 100644
   #include <net/if.h>
   #include <sys/ioctl.h>
   #include <linux/ethtool.h>
-diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h
-index c1d5d7590ef9..b3e018bf76e9 100644
---- a/src/shared/ethtool-util.h
-+++ b/src/shared/ethtool-util.h
+Index: systemd-stable/src/shared/ethtool-util.h
+===================================================================
+--- systemd-stable.orig/src/shared/ethtool-util.h
++++ systemd-stable/src/shared/ethtool-util.h
  @@ -3,6 +3,7 @@
   
   #include <macro.h>
@@ -255,21 +255,21 @@ index c1d5d7590ef9..b3e018bf76e9 100644
   #include <linux/ethtool.h>
   
   #include "conf-parser.h"
-diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
-index 0332e99269c9..ff3aead4a779 100644
---- a/src/udev/net/link-config.c
-+++ b/src/udev/net/link-config.c
+Index: systemd-stable/src/udev/net/link-config.c
+===================================================================
+--- systemd-stable.orig/src/udev/net/link-config.c
++++ systemd-stable/src/udev/net/link-config.c
  @@ -1,5 +1,6 @@
   /* SPDX-License-Identifier: LGPL-2.1+ */
   
  +#include <netinet/if_ether.h>
   #include <linux/netdevice.h>
   #include <netinet/ether.h>
- 
-diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c
-index ee3ca9fa3846..9aa4e828741f 100644
---- a/src/udev/udev-builtin-net_setup_link.c
-+++ b/src/udev/udev-builtin-net_setup_link.c
+ #include <unistd.h>
+Index: systemd-stable/src/udev/udev-builtin-net_setup_link.c
+===================================================================
+--- systemd-stable.orig/src/udev/udev-builtin-net_setup_link.c
++++ systemd-stable/src/udev/udev-builtin-net_setup_link.c
  @@ -1,5 +1,6 @@
   /* SPDX-License-Identifier: LGPL-2.1+ */
   
diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch

index 580c49fecfbd083df0758a401a8fd2cb6b2847b9..dd6ecebeb4308850ddbb13d39add3dc5bd2ad715 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch
+++ b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch
@@ -23,10 +23,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
   src/tmpfiles/tmpfiles.c   | 10 ++++++++++
   3 files changed, 38 insertions(+)
  
-diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
-index e3aa6c2e152b..38070b79c83a 100644
---- a/src/basic/glob-util.c
-+++ b/src/basic/glob-util.c
+Index: systemd-stable/src/basic/glob-util.c
+===================================================================
+--- systemd-stable.orig/src/basic/glob-util.c
++++ systemd-stable/src/basic/glob-util.c
  @@ -12,6 +12,12 @@
   #include "path-util.h"
   #include "strv.h"
@@ -48,7 +48,7 @@ index e3aa6c2e152b..38070b79c83a 100644
           /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */
           assert(!(flags & GLOB_ALTDIRFUNC));
   
-@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
+@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flag
                   pglob->gl_lstat = lstat;
           if (!pglob->gl_stat)
                   pglob->gl_stat = stat;
@@ -63,10 +63,10 @@ index e3aa6c2e152b..38070b79c83a 100644
           if (k == GLOB_NOMATCH)
                   return -ENOENT;
           if (k == GLOB_NOSPACE)
-diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
-index 667d15335fbf..76a84443aacf 100644
---- a/src/test/test-glob-util.c
-+++ b/src/test/test-glob-util.c
+Index: systemd-stable/src/test/test-glob-util.c
+===================================================================
+--- systemd-stable.orig/src/test/test-glob-util.c
++++ systemd-stable/src/test/test-glob-util.c
  @@ -12,6 +12,12 @@
   #include "rm-rf.h"
   #include "tmpfile-util.h"
@@ -114,11 +114,11 @@ index 667d15335fbf..76a84443aacf 100644
           assert_se(r == GLOB_NOMATCH);
   
           (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL);
-diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 193ed0bc781b..2f94fd2efd8f 100644
---- a/src/tmpfiles/tmpfiles.c
-+++ b/src/tmpfiles/tmpfiles.c
-@@ -58,6 +58,12 @@
+Index: systemd-stable/src/tmpfiles/tmpfiles.c
+===================================================================
+--- systemd-stable.orig/src/tmpfiles/tmpfiles.c
++++ systemd-stable/src/tmpfiles/tmpfiles.c
+@@ -59,6 +59,12 @@
   #include "umask-util.h"
   #include "user-util.h"
   
@@ -131,7 +131,7 @@ index 193ed0bc781b..2f94fd2efd8f 100644
   /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates
    * them in the file system. This is intended to be used to create
    * properly owned directories beneath /tmp, /var/tmp, /run, which are
-@@ -1850,7 +1856,9 @@ finish:
+@@ -1867,7 +1873,9 @@ finish:
   
   static int glob_item(Item *i, action_t action) {
           _cleanup_globfree_ glob_t g = {
@@ -141,7 +141,7 @@ index 193ed0bc781b..2f94fd2efd8f 100644
           };
           int r = 0, k;
           char **fn;
-@@ -1870,7 +1878,9 @@ static int glob_item(Item *i, action_t action) {
+@@ -1887,7 +1895,9 @@ static int glob_item(Item *i, action_t a
   
   static int glob_item_recursively(Item *i, fdaction_t action) {
           _cleanup_globfree_ glob_t g = {
diff --git a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch

index 5ee501f23596a2c999c5c727d7f0f039e4afd29e..15055161fc267a08d24d9ffab0c8e003a3ff3845 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch
+++ b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch
@@ -11,10 +11,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
   src/basic/process-util.c | 7 +++++++
   1 file changed, 7 insertions(+)
  
-diff --git a/src/basic/process-util.c b/src/basic/process-util.c
-index 5de366f830e8..644f53aee005 100644
---- a/src/basic/process-util.c
-+++ b/src/basic/process-util.c
+Index: systemd-stable/src/basic/process-util.c
+===================================================================
+--- systemd-stable.orig/src/basic/process-util.c
++++ systemd-stable/src/basic/process-util.c
  @@ -18,6 +18,9 @@
   #if HAVE_VALGRIND_VALGRIND_H
   #include <valgrind/valgrind.h>
@@ -25,7 +25,7 @@ index 5de366f830e8..644f53aee005 100644
   
   #include "alloc-util.h"
   #include "architecture.h"
-@@ -1116,11 +1119,15 @@ void reset_cached_pid(void) {
+@@ -1143,11 +1146,15 @@ void reset_cached_pid(void) {
           cached_pid = CACHED_PID_UNSET;
   }
   
diff --git a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch

index e5d9515e86398b0ffe5a3d4f84f823f1a6d134ca..a6fcd2f5dae2cf813a5a6a0b48d4105b2b627e63 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch
+++ b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch
@@ -27,11 +27,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
   src/core/execute.c      |  4 ++--
   3 files changed, 8 insertions(+), 14 deletions(-)
  
-diff --git a/src/basic/format-util.h b/src/basic/format-util.h
-index c47fa76ea8ff..14a78d9f5fd0 100644
---- a/src/basic/format-util.h
-+++ b/src/basic/format-util.h
-@@ -32,13 +32,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t));
+Index: systemd-stable/src/basic/format-util.h
+===================================================================
+--- systemd-stable.orig/src/basic/format-util.h
++++ systemd-stable/src/basic/format-util.h
+@@ -32,13 +32,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32
   #  define PRI_TIMEX "li"
   #endif
   
@@ -46,11 +46,11 @@ index c47fa76ea8ff..14a78d9f5fd0 100644
   
   #if SIZEOF_DEV_T == 8
   #  define DEV_FMT "%" PRIu64
-diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
-index 2dc13eabc30d..0633cc67f417 100644
---- a/src/basic/rlimit-util.c
-+++ b/src/basic/rlimit-util.c
-@@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) {
+Index: systemd-stable/src/basic/rlimit-util.c
+===================================================================
+--- systemd-stable.orig/src/basic/rlimit-util.c
++++ systemd-stable/src/basic/rlimit-util.c
+@@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *r
           if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY)
                   s = strdup("infinity");
           else if (rl->rlim_cur >= RLIM_INFINITY)
@@ -77,11 +77,11 @@ index 2dc13eabc30d..0633cc67f417 100644
   
           return 1;
   }
-diff --git a/src/core/execute.c b/src/core/execute.c
-index 9762dc57443c..4a3421bb3ee6 100644
---- a/src/core/execute.c
-+++ b/src/core/execute.c
-@@ -4567,9 +4567,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
+Index: systemd-stable/src/core/execute.c
+===================================================================
+--- systemd-stable.orig/src/core/execute.c
++++ systemd-stable/src/core/execute.c
+@@ -4686,9 +4686,9 @@ void exec_context_dump(const ExecContext
           for (i = 0; i < RLIM_NLIMITS; i++)
                   if (c->rlimit[i]) {
                           fprintf(f, "%sLimit%s: " RLIM_FMT "\n",
diff --git a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch

index efeef072950bcfd668c2b1515fdb7dd24fbb85fc..0a7594c068077ffb9c6eaaf492b38d7342565274 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
+++ b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
@@ -31,13 +31,13 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
   src/shared/base-filesystem.c |  6 +++---
   2 files changed, 24 insertions(+), 4 deletions(-)
  
-diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
-index 78d68be9fd85..c5dc84d41868 100644
---- a/src/basic/fs-util.h
-+++ b/src/basic/fs-util.h
-@@ -40,7 +40,27 @@ int fchmod_opath(int fd, mode_t m);
- 
+Index: systemd-stable/src/basic/fs-util.h
+===================================================================
+--- systemd-stable.orig/src/basic/fs-util.h
++++ systemd-stable/src/basic/fs-util.h
+@@ -42,7 +42,27 @@ int fchmod_opath(int fd, mode_t m);
   int fd_warn_permissions(const char *path, int fd);
+ int stat_warn_permissions(const char *path, const struct stat *st);
   
  -#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW)
  +/*
@@ -64,11 +64,11 @@ index 78d68be9fd85..c5dc84d41868 100644
   
   int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);
   int touch(const char *path);
-diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
-index 657407da2d37..fbd5782d84fc 100644
---- a/src/shared/base-filesystem.c
-+++ b/src/shared/base-filesystem.c
-@@ -54,7 +54,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
+Index: systemd-stable/src/shared/base-filesystem.c
+===================================================================
+--- systemd-stable.orig/src/shared/base-filesystem.c
++++ systemd-stable/src/shared/base-filesystem.c
+@@ -54,7 +54,7 @@ int base_filesystem_create(const char *r
                   return log_error_errno(errno, "Failed to open root file system: %m");
   
           for (i = 0; i < ELEMENTSOF(table); i ++) {
@@ -77,7 +77,7 @@ index 657407da2d37..fbd5782d84fc 100644
                           continue;
   
                   if (table[i].target) {
-@@ -62,7 +62,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
+@@ -62,7 +62,7 @@ int base_filesystem_create(const char *r
   
                           /* check if one of the targets exists */
                           NULSTR_FOREACH(s, table[i].target) {
@@ -86,7 +86,7 @@ index 657407da2d37..fbd5782d84fc 100644
                                           continue;
   
                                   /* check if a specific file exists at the target path */
-@@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
+@@ -73,7 +73,7 @@ int base_filesystem_create(const char *r
                                           if (!p)
                                                   return log_oom();
   
diff --git a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch

index 19a3eef847011c283929cf93793bd3b1f8f6c6e7..67d5041917ff720d5ff15c56a0c2b147363b38ae 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch
+++ b/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
   src/machine/machine-dbus.c | 5 +++++
   1 file changed, 5 insertions(+)
  
-diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
-index 760ccb445cd0..0df20f3864b3 100644
---- a/src/machine/machine-dbus.c
-+++ b/src/machine/machine-dbus.c
+Index: systemd-stable/src/machine/machine-dbus.c
+===================================================================
+--- systemd-stable.orig/src/machine/machine-dbus.c
++++ systemd-stable/src/machine/machine-dbus.c
  @@ -11,6 +11,11 @@
   #include <libgen.h>
   #undef basename
@@ -29,4 +29,4 @@ index 760ccb445cd0..0df20f3864b3 100644
  +
   #include "alloc-util.h"
   #include "bus-common-errors.h"
- #include "bus-internal.h"
+ #include "bus-get-properties.h"
diff --git a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch

index 1934b783dc391717337ee9c30cc21d9f46fd5706..3d456ec83a6c3fb09c0674e4e01f71a3f8209447 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
+++ b/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
@@ -24,11 +24,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
   src/basic/process-util.c | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
  
-diff --git a/src/basic/process-util.c b/src/basic/process-util.c
-index 644f53aee005..acaf13591396 100644
---- a/src/basic/process-util.c
-+++ b/src/basic/process-util.c
-@@ -1500,7 +1500,7 @@ int set_oom_score_adjust(int value) {
+Index: systemd-stable/src/basic/process-util.c
+===================================================================
+--- systemd-stable.orig/src/basic/process-util.c
++++ systemd-stable/src/basic/process-util.c
+@@ -1536,7 +1536,7 @@ int set_oom_score_adjust(int value) {
           sprintf(t, "%i", value);
   
           return write_string_file("/proc/self/oom_score_adj", t,
diff --git a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch

index 84a492f2904fc9313bd31ddf8e5a1b93be2e680c..48fd007e11bc774fbbbf90c9223ff4b1ce135a4e 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
+++ b/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
@@ -24,11 +24,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
   src/libsystemd/sd-bus/bus-error.c | 5 +++++
   2 files changed, 10 insertions(+)
  
-diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
-index 43ed756bda53..227ea64dbb48 100644
---- a/src/journal/journal-send.c
-+++ b/src/journal/journal-send.c
-@@ -336,7 +336,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove
+Index: systemd-stable/src/journal/journal-send.c
+===================================================================
+--- systemd-stable.orig/src/journal/journal-send.c
++++ systemd-stable/src/journal/journal-send.c
+@@ -348,7 +348,12 @@ static int fill_iovec_perror_and_send(co
                   char* j;
   
                   errno = 0;
@@ -41,11 +41,11 @@ index 43ed756bda53..227ea64dbb48 100644
                   if (errno == 0) {
                           char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1];
   
-diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
-index f760f0fdd21c..28a5159c4480 100644
---- a/src/libsystemd/sd-bus/bus-error.c
-+++ b/src/libsystemd/sd-bus/bus-error.c
-@@ -379,7 +379,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) {
+Index: systemd-stable/src/libsystemd/sd-bus/bus-error.c
+===================================================================
+--- systemd-stable.orig/src/libsystemd/sd-bus/bus-error.c
++++ systemd-stable/src/libsystemd/sd-bus/bus-error.c
+@@ -379,7 +379,12 @@ static void bus_error_strerror(sd_bus_er
                           return;
   
                   errno = 0;
diff --git a/meta/recipes-core/systemd/systemd/0021-Handle-missing-LOCK_EX.patch b/meta/recipes-core/systemd/systemd/0021-Handle-missing-LOCK_EX.patch

new file mode 100644 (file)

index 0000000..67d9162
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0021-Handle-missing-LOCK_EX.patch
@@ -0,0 +1,23 @@
+From 190854c2114dc6e74c8859dc251e3737e3c0f353 Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <alex.kiernan@gmail.com>
+Date: Fri, 7 Aug 2020 15:19:27 +0000
+Subject: [PATCH] Handle missing LOCK_EX
+
+Upstream-Status: Inappropriate [musl specific]
+Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
+---
+ src/partition/makefs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/partition/makefs.c b/src/partition/makefs.c
+index 97f50c9033..7f55acd229 100644
+--- a/src/partition/makefs.c
++++ b/src/partition/makefs.c
+@@ -5,6 +5,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <sys/file.h>
+ 
+ #include "alloc-util.h"
+ #include "blockdev-util.h"
diff --git a/meta/recipes-core/systemd/systemd/0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch b/meta/recipes-core/systemd/systemd/0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch

new file mode 100644 (file)

index 0000000..d57ca1f
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch
@@ -0,0 +1,37 @@
+From 328c39fae2631deb5737dd56f46159dd6b4cdbed Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <alex.kiernan@gmail.com>
+Date: Fri, 7 Aug 2020 15:20:17 +0000
+Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un *
+
+| ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c: In function 'cant_be_in_netns':
+| ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:4893:25: error: passing argument 2 of 'connect' from incompatible pointer type [-Werror=incompatible-pointer-types]
+|  4893 |         if (connect(fd, &sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) {
+|       |                         ^~~~~~
+|       |                         |
+|       |                         struct sockaddr_un *
+| In file included from ../../../../../../workspace/sources/systemd/src/systemd/sd-daemon.h:22,
+|                  from ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:21:
+| /home/ubuntu/poky/build/tmp/work/core2-64-poky-linux-musl/systemd/1_246-r0/recipe-sysroot/usr/include/sys/socket.h:384:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *'
+|   384 | int connect (int, const struct sockaddr *, socklen_t);
+|       |                   ^~~~~~~~~~~~~~~~~~~~~~~
+| cc1: some warnings being treated as errors
+
+Upstream-Status: Inappropriate [musl specific]
+Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
+---
+ src/nspawn/nspawn.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
+index 0450c9f795..7305db04ef 100644
+--- a/src/nspawn/nspawn.c
++++ b/src/nspawn/nspawn.c
+@@ -4890,7 +4890,7 @@ static int cant_be_in_netns(void) {
+         if (fd < 0)
+                 return log_error_errno(errno, "Failed to allocate udev control socket: %m");
+ 
+-        if (connect(fd, &sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) {
++        if (connect(fd, (struct sockaddr *)&sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) {
+ 
+                 if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno))
+                         return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
diff --git a/meta/recipes-core/systemd/systemd/0023-Fix-field-efi_loader_entry_one_shot_stat-has-incompl.patch b/meta/recipes-core/systemd/systemd/0023-Fix-field-efi_loader_entry_one_shot_stat-has-incompl.patch

new file mode 100644 (file)

index 0000000..7866069
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0023-Fix-field-efi_loader_entry_one_shot_stat-has-incompl.patch
@@ -0,0 +1,31 @@
+From f939d3e07e1175caac5cf4cbf54bd8a58c2f198a Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <alex.kiernan@gmail.com>
+Date: Fri, 7 Aug 2020 15:30:52 +0000
+Subject: [PATCH] Fix field 'efi_loader_entry_one_shot_stat' has incomplete
+ type
+
+| In file included from ../../../../../../workspace/sources/systemd/src/login/logind-gperf.gperf:7:
+| ../../../../../../workspace/sources/systemd/src/login/logind.h:131:21: error: field 'efi_loader_entry_one_shot_stat' has incomplete type
+|   131 |         struct stat efi_loader_entry_one_shot_stat;
+|       |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Inappropriate [musl specific]
+Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
+---
+ src/login/logind.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/login/logind.h b/src/login/logind.h
+index e64ecce8e2..2d4007d84b 100644
+--- a/src/login/logind.h
++++ b/src/login/logind.h
+@@ -2,6 +2,9 @@
+ #pragma once
+ 
+ #include <stdbool.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
+ 
+ #include "sd-bus.h"
+ #include "sd-device.h"
diff --git a/meta/recipes-core/systemd/systemd/CVE-2020-13776.patch b/meta/recipes-core/systemd/systemd/CVE-2020-13776.patch

deleted file mode 100644 (file)

index 7b5e3e7..0000000
--- a/meta/recipes-core/systemd/systemd/CVE-2020-13776.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 156a5fd297b61bce31630d7a52c15614bf784843 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Sun, 31 May 2020 18:21:09 +0200
-Subject: [PATCH 1/1] basic/user-util: always use base 10 for user/group
- numbers
-
-We would parse numbers with base prefixes as user identifiers. For example,
-"0x2b3bfa0" would be interpreted as UID==45334432 and "01750" would be
-interpreted as UID==1000. This parsing was used also in cases where either a
-user/group name or number may be specified. This means that names like
-0x2b3bfa0 would be ambiguous: they are a valid user name according to our
-documented relaxed rules, but they would also be parsed as numeric uids.
-
-This behaviour is definitely not expected by users, since tools generally only
-accept decimal numbers (e.g. id, getent passwd), while other tools only accept
-user names and thus will interpret such strings as user names without even
-attempting to convert them to numbers (su, ssh). So let's follow suit and only
-accept numbers in decimal notation. Effectively this means that we will reject
-such strings as a username/uid/groupname/gid where strict mode is used, and try
-to look up a user/group with such a name in relaxed mode.
-
-Since the function changed is fairly low-level and fairly widely used, this
-affects multiple tools: loginctl show-user/enable-linger/disable-linger foo',
-the third argument in sysusers.d, fourth and fifth arguments in tmpfiles.d,
-etc.
-
-Fixes #15985.
----
- src/basic/user-util.c     |  2 +-
- src/test/test-user-util.c | 10 ++++++++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
---- end of commit 156a5fd297b61bce31630d7a52c15614bf784843 ---
-
-
-Add definition of safe_atou32_full() from commit b934ac3d6e7dcad114776ef30ee9098693e7ab7e
-
-CVE: CVE-2020-13776
-
-Upstream-Status: Backport [https://github.com/systemd/systemd.git]
-
-Signed-off-by: Joe Slater <joe.slater@windriver.com>
-
-
-
---- git.orig/src/basic/user-util.c
-+++ git/src/basic/user-util.c
-@@ -49,7 +49,7 @@ int parse_uid(const char *s, uid_t *ret)
-         assert(s);
- 
-         assert_cc(sizeof(uid_t) == sizeof(uint32_t));
--        r = safe_atou32(s, &uid);
-+        r = safe_atou32_full(s, 10, &uid);
-         if (r < 0)
-                 return r;
- 
---- git.orig/src/test/test-user-util.c
-+++ git/src/test/test-user-util.c
-@@ -48,9 +48,19 @@ static void test_parse_uid(void) {
- 
-         r = parse_uid("65535", &uid);
-         assert_se(r == -ENXIO);
-+        assert_se(uid == 100);
-+
-+        r = parse_uid("0x1234", &uid);
-+        assert_se(r == -EINVAL);
-+        assert_se(uid == 100);
-+
-+        r = parse_uid("01234", &uid);
-+        assert_se(r == 0);
-+        assert_se(uid == 1234);
- 
-         r = parse_uid("asdsdas", &uid);
-         assert_se(r == -EINVAL);
-+        assert_se(uid == 1234);
- }
- 
- static void test_uid_ptr(void) {
---- git.orig/src/basic/parse-util.h
-+++ git/src/basic/parse-util.h
-@@ -45,9 +45,13 @@ static inline int safe_atoux16(const cha
- 
- int safe_atoi16(const char *s, int16_t *ret);
- 
--static inline int safe_atou32(const char *s, uint32_t *ret_u) {
-+static inline int safe_atou32_full(const char *s, unsigned base, uint32_t *ret_u) {
-         assert_cc(sizeof(uint32_t) == sizeof(unsigned));
--        return safe_atou(s, (unsigned*) ret_u);
-+        return safe_atou_full(s, base, (unsigned*) ret_u);
-+}
-+
-+static inline int safe_atou32(const char *s, uint32_t *ret_u) {
-+        return safe_atou32_full(s, 0, (unsigned*) ret_u);
- }
- 
- static inline int safe_atoi32(const char *s, int32_t *ret_i) {
diff --git a/meta/recipes-core/systemd/systemd_245.6.bb b/meta/recipes-core/systemd/systemd_246.bb

similarity index 99%

rename from meta/recipes-core/systemd/systemd_245.6.bb

rename to meta/recipes-core/systemd/systemd_246.bb

index cdafb982475a81906a5dd37ce4e934ed0530f5c6..a463aab1e30262abf712a04346c5ff38cf4af80b 100644 (file)
--- a/meta/recipes-core/systemd/systemd_245.6.bb
+++ b/meta/recipes-core/systemd/systemd_246.bb
@@ -20,7 +20,9 @@ SRC_URI += "file://touchscreen.rules \
             file://99-default.preset \
             file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
             file://0003-implment-systemd-sysv-install-for-OE.patch \
-           file://CVE-2020-13776.patch \
+           file://0021-Handle-missing-LOCK_EX.patch \
+           file://0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \
+           file://0023-Fix-field-efi_loader_entry_one_shot_stat-has-incompl.patch \
             "
  
  # patches needed by musl
@@ -605,6 +607,7 @@ FILES_udev += "${base_sbindir}/udevd \
                 ${rootlibexecdir}/udev/v4l_id \
                 ${rootlibexecdir}/udev/keymaps \
                 ${rootlibexecdir}/udev/rules.d/50-udev-default.rules \
+               ${rootlibexecdir}/udev/rules.d/60-autosuspend.rules \
                 ${rootlibexecdir}/udev/rules.d/60-autosuspend-chromiumos.rules \
                 ${rootlibexecdir}/udev/rules.d/60-block.rules \
                 ${rootlibexecdir}/udev/rules.d/60-cdrom_id.rules \
author	Alex Kiernan <alex.kiernan@gmail.com>
	Fri, 7 Aug 2020 16:42:49 +0000 (16:42 +0000)
committer	Richard Purdie <richard.purdie@linuxfoundation.org>
	Sat, 8 Aug 2020 08:17:35 +0000 (09:17 +0100)
meta/recipes-core/systemd/systemd-boot_246.bb	[moved from meta/recipes-core/systemd/systemd-boot_245.6.bb with 100% similarity]	patch \| blob \| history
meta/recipes-core/systemd/systemd-conf_246.bb	[moved from meta/recipes-core/systemd/systemd-conf_245.6.bb with 100% similarity]	patch \| blob \| history
meta/recipes-core/systemd/systemd.inc		patch \| blob \| history
meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch		patch \| blob \| history
meta/recipes-core/systemd/systemd/0021-Handle-missing-LOCK_EX.patch	[new file with mode: 0644]	patch \| blob
meta/recipes-core/systemd/systemd/0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch	[new file with mode: 0644]	patch \| blob
meta/recipes-core/systemd/systemd/0023-Fix-field-efi_loader_entry_one_shot_stat-has-incompl.patch	[new file with mode: 0644]	patch \| blob
meta/recipes-core/systemd/systemd/CVE-2020-13776.patch	[deleted file]	patch \| blob \| history
meta/recipes-core/systemd/systemd_246.bb	[moved from meta/recipes-core/systemd/systemd_245.6.bb with 99% similarity]	patch \| blob \| history