From 41b96cafd0e6d4a12252bbbb6564230ecc968f30 Mon Sep 17 00:00:00 2001
From: Pinghao Wu <xdavidwuph@gmail.com>
Date: Mon, 15 Jul 2024 19:59:54 +0800
Subject: [PATCH] systemd: 256.2
---
...missing.h-check-for-missing-strndupa.patch | 699 ------------------
...-missing_type.h-add-comparison_fn_t.patch} | 14 +-
...-parse_printf_format-implementation.patch} | 24 +-
...B_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} | 20 +-
...07-add-missing-FTW_-macros-for-musl.patch} | 8 +-
...8-Use-uintmax_t-for-handling-rlim_t.patch} | 22 +-
..._SYMLINK_NOFOLLOW-flag-to-faccessat.patch} | 10 +-
...atible-basename-for-non-glibc-syste.patch} | 8 +-
...ffering-when-writing-to-oom_score_a.patch} | 10 +-
...ompliant-strerror_r-from-GNU-specif.patch} | 14 +-
...efinition-of-prctl_mm_map-structure.patch} | 12 +-
...not-disable-buffer-in-writing-files.patch} | 152 ++--
...tch => 0015-Handle-__cpu_mask-usage.patch} | 8 +-
...atch => 0016-Handle-missing-gshadow.patch} | 49 +-
....h-Define-MIPS-ABI-defines-for-musl.patch} | 10 +-
...ss-correct-parameters-to-getdents64.patch} | 10 +-
...tch => 0019-Adjust-for-musl-headers.patch} | 164 ++--
...rerror-is-assumed-to-be-GNU-specifi.patch} | 10 +-
...til-Make-STRERROR-portable-for-musl.patch} | 8 +-
...ke-malloc_trim-conditional-on-glibc.patch} | 12 +-
...ared-Do-not-use-malloc_info-on-musl.patch} | 10 +-
...4-avoid-missing-LOCK_EX-declaration.patch} | 23 +-
...gnal.h-to-avoid-the-undeclared-error.patch | 27 +
...references-using-stdin-as-a-struct-m.patch | 48 ++
...clusion-order-to-avoid-redeclaration.patch | 76 ++
....c-avoid-boot-time-segfault-for-musl.patch | 31 +
.../0100-Do-not-buffer-on-systemd-sleep.patch | 20 +-
...lpine-path-util-support-pre-usrmerge.patch | 26 +-
systemd/APKBUILD | 105 +--
29 files changed, 548 insertions(+), 1082 deletions(-)
delete mode 100644 systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch
rename systemd/{0001-missing_type.h-add-comparison_fn_t.patch => 0004-missing_type.h-add-comparison_fn_t.patch} (87%)
rename systemd/{0002-add-fallback-parse_printf_format-implementation.patch => 0005-add-fallback-parse_printf_format-implementation.patch} (96%)
rename systemd/{0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} (91%)
rename systemd/{0005-add-missing-FTW_-macros-for-musl.patch => 0007-add-missing-FTW_-macros-for-musl.patch} (86%)
rename systemd/{0006-Use-uintmax_t-for-handling-rlim_t.patch => 0008-Use-uintmax_t-for-handling-rlim_t.patch} (88%)
rename systemd/{0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch => 0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} (95%)
rename systemd/{0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch => 0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch} (84%)
rename systemd/{0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch => 0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch} (83%)
rename systemd/{0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch => 0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch} (87%)
rename systemd/{0011-avoid-redefinition-of-prctl_mm_map-structure.patch => 0013-avoid-redefinition-of-prctl_mm_map-structure.patch} (70%)
rename systemd/{0012-do-not-disable-buffer-in-writing-files.patch => 0014-do-not-disable-buffer-in-writing-files.patch} (84%)
rename systemd/{0013-Handle-__cpu_mask-usage.patch => 0015-Handle-__cpu_mask-usage.patch} (92%)
rename systemd/{0014-Handle-missing-gshadow.patch => 0016-Handle-missing-gshadow.patch} (80%)
rename systemd/{0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch => 0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch} (85%)
rename systemd/{0016-pass-correct-parameters-to-getdents64.patch => 0018-pass-correct-parameters-to-getdents64.patch} (88%)
rename systemd/{0017-Adjust-for-musl-headers.patch => 0019-Adjust-for-musl-headers.patch} (84%)
rename systemd/{0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch => 0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch} (89%)
rename systemd/{0019-errno-util-Make-STRERROR-portable-for-musl.patch => 0021-errno-util-Make-STRERROR-portable-for-musl.patch} (88%)
rename systemd/{0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch => 0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch} (77%)
rename systemd/{0021-shared-Do-not-use-malloc_info-on-musl.patch => 0023-shared-Do-not-use-malloc_info-on-musl.patch} (86%)
rename systemd/{0022-avoid-missing-LOCK_EX-declaration.patch => 0024-avoid-missing-LOCK_EX-declaration.patch} (63%)
create mode 100644 systemd/0025-include-signal.h-to-avoid-the-undeclared-error.patch
create mode 100644 systemd/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch
create mode 100644 systemd/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch
create mode 100644 systemd/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch
diff --git a/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch b/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch
deleted file mode 100644
index 5595b5b..0000000
--- a/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch
+++ /dev/null
@@ -1,699 +0,0 @@
-From 87f1d38f40c5fe9cadf2b2de442473e4e5605788 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 03/22] src/basic/missing.h: check for missing strndupa
-
-include missing.h for definition of strndupa
-
-Upstream-Status: Inappropriate [musl specific]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-[Rebased for v242]
-Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
-[rebased for systemd 243]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
-[rebased for systemd 244]
-[Rebased for v247]
-Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
-[Rebased for v254]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-[Rebased for v255.1]
----
- meson.build | 1 +
- src/backlight/backlight.c | 1 +
- src/basic/cgroup-util.c | 1 +
- src/basic/env-util.c | 1 +
- src/basic/log.c | 1 +
- src/basic/missing_stdlib.h | 12 ++++++++++++
- src/basic/mkdir.c | 1 +
- src/basic/mountpoint-util.c | 1 +
- src/basic/parse-util.c | 1 +
- src/basic/path-lookup.c | 1 +
- src/basic/percent-util.c | 1 +
- src/basic/proc-cmdline.c | 1 +
- src/basic/procfs-util.c | 1 +
- src/basic/time-util.c | 1 +
- src/boot/bless-boot.c | 1 +
- src/core/dbus-cgroup.c | 1 +
- src/core/dbus-execute.c | 1 +
- src/core/dbus-util.c | 1 +
- src/core/execute.c | 1 +
- src/core/kmod-setup.c | 1 +
- src/core/service.c | 1 +
- src/coredump/coredump-vacuum.c | 1 +
- src/fstab-generator/fstab-generator.c | 1 +
- src/journal-remote/journal-remote-main.c | 1 +
- src/journal/journalctl.c | 1 +
- src/libsystemd/sd-bus/bus-message.c | 1 +
- src/libsystemd/sd-bus/bus-objects.c | 1 +
- src/libsystemd/sd-bus/bus-socket.c | 1 +
- src/libsystemd/sd-bus/sd-bus.c | 1 +
- src/libsystemd/sd-bus/test-bus-benchmark.c | 1 +
- src/libsystemd/sd-journal/sd-journal.c | 1 +
- src/login/pam_systemd.c | 1 +
- src/network/generator/network-generator.c | 1 +
- src/nspawn/nspawn-settings.c | 1 +
- 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 +
- src/shared/dns-domain.c | 1 +
- src/shared/journal-importer.c | 1 +
- src/shared/logs-show.c | 1 +
- src/shared/pager.c | 1 +
- src/socket-proxy/socket-proxyd.c | 1 +
- src/test/test-hexdecoct.c | 1 +
- src/udev/udev-builtin-net_id.c | 1 +
- src/udev/udev-builtin-path_id.c | 1 +
- src/udev/udev-event.c | 1 +
- src/udev/udev-rules.c | 1 +
- 51 files changed, 62 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 01fd3ffc19..61a872b753 100644
---- a/meson.build
-+++ b/meson.build
-@@ -567,6 +567,7 @@ foreach ident : ['secure_getenv', '__secure_getenv']
- endforeach
-
- foreach ident : [
-+ ['strndupa' , '''#include <string.h>'''],
- ['memfd_create', '''#include <sys/mman.h>'''],
- ['gettid', '''#include <sys/types.h>
- #include <unistd.h>'''],
-diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
-index 5ac9f904a9..99d5122dd7 100644
---- a/src/backlight/backlight.c
-+++ b/src/backlight/backlight.c
-@@ -20,6 +20,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "terminal-util.h"
-+#include "missing_stdlib.h"
-
- #define PCI_CLASS_GRAPHICS_CARD 0x30000
-
-diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
-index 18b16ecc0e..d2be79622f 100644
---- a/src/basic/cgroup-util.c
-+++ b/src/basic/cgroup-util.c
-@@ -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 **ret, const char *item) {
- _cleanup_free_ char *fs = NULL;
-diff --git a/src/basic/env-util.c b/src/basic/env-util.c
-index d3bf73385f..16b17358ca 100644
---- a/src/basic/env-util.c
-+++ b/src/basic/env-util.c
-@@ -19,6 +19,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
-
- /* We follow bash for the character set. Different shells have different rules. */
- #define VALID_BASH_ENV_NAME_CHARS \
-diff --git a/src/basic/log.c b/src/basic/log.c
-index 1470611a75..9924ec2b9a 100644
---- a/src/basic/log.c
-+++ b/src/basic/log.c
-@@ -40,6 +40,7 @@
- #include "terminal-util.h"
- #include "time-util.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
-
- #define SNDBUF_SIZE (8*1024*1024)
- #define IOVEC_MAX 256U
-diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h
-index 8c76f93eb2..9068bfb4f0 100644
---- a/src/basic/missing_stdlib.h
-+++ b/src/basic/missing_stdlib.h
-@@ -11,3 +11,15 @@
- # error "neither secure_getenv nor __secure_getenv are available"
- # endif
- #endif
-+
-+/* string.h */
-+#if ! HAVE_STRNDUPA
-+#define strndupa(s, n) \
-+ ({ \
-+ const char *__old = (s); \
-+ size_t __len = strnlen(__old, (n)); \
-+ char *__new = (char *)alloca(__len + 1); \
-+ __new[__len] = '\0'; \
-+ (char *)memcpy(__new, __old, __len); \
-+ })
-+#endif
-diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
-index c770e5ed32..1fd8816cd0 100644
---- a/src/basic/mkdir.c
-+++ b/src/basic/mkdir.c
-@@ -16,6 +16,7 @@
- #include "stat-util.h"
- #include "stdio-util.h"
- #include "user-util.h"
-+#include "missing_stdlib.h"
-
- int mkdirat_safe_internal(
- int dir_fd,
-diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c
-index bf67f7e01a..409f8d8a73 100644
---- a/src/basic/mountpoint-util.c
-+++ b/src/basic/mountpoint-util.c
-@@ -18,6 +18,7 @@
- #include "missing_stat.h"
- #include "missing_syscall.h"
- #include "mkdir.h"
-+#include "missing_stdlib.h"
- #include "mountpoint-util.h"
- #include "nulstr-util.h"
- #include "parse-util.h"
-diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
-index 0430e33e40..f3728de026 100644
---- a/src/basic/parse-util.c
-+++ b/src/basic/parse-util.c
-@@ -18,6 +18,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 4e3d59fc56..726e240df0 100644
---- a/src/basic/path-lookup.c
-+++ b/src/basic/path-lookup.c
-@@ -16,6 +16,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/percent-util.c b/src/basic/percent-util.c
-index cab9d0eaea..5f6ca258e9 100644
---- a/src/basic/percent-util.c
-+++ b/src/basic/percent-util.c
-@@ -3,6 +3,7 @@
- #include "percent-util.h"
- #include "string-util.h"
- #include "parse-util.h"
-+#include "missing_stdlib.h"
-
- static int parse_parts_value_whole(const char *p, const char *symbol) {
- const char *pc, *n;
-diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
-index 522d8de1f4..7c129dc0fc 100644
---- a/src/basic/proc-cmdline.c
-+++ b/src/basic/proc-cmdline.c
-@@ -16,6 +16,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "virt.h"
-+#include "missing_stdlib.h"
-
- int proc_cmdline_filter_pid1_args(char **argv, char ***ret) {
- enum {
-diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
-index d7cfcd9105..6cb0ddf575 100644
---- a/src/basic/procfs-util.c
-+++ b/src/basic/procfs-util.c
-@@ -12,6 +12,7 @@
- #include "procfs-util.h"
- #include "stdio-util.h"
- #include "string-util.h"
-+#include "missing_stdlib.h"
-
- int procfs_get_pid_max(uint64_t *ret) {
- _cleanup_free_ char *value = NULL;
-diff --git a/src/basic/time-util.c b/src/basic/time-util.c
-index f9014dc560..1d7840a5b5 100644
---- a/src/basic/time-util.c
-+++ b/src/basic/time-util.c
-@@ -27,6 +27,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "time-util.h"
-+#include "missing_stdlib.h"
-
- static clockid_t map_clock_id(clockid_t c) {
-
-diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
-index 0c0b4f23c7..68fe5ca509 100644
---- a/src/boot/bless-boot.c
-+++ b/src/boot/bless-boot.c
-@@ -22,6 +22,7 @@
- #include "terminal-util.h"
- #include "verbs.h"
- #include "virt.h"
-+#include "missing_stdlib.h"
-
- static char **arg_path = NULL;
-
-diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
-index 4237e694c0..05f9d9d9a9 100644
---- a/src/core/dbus-cgroup.c
-+++ b/src/core/dbus-cgroup.c
-@@ -25,6 +25,7 @@
- #include "parse-util.h"
- #include "path-util.h"
- #include "percent-util.h"
-+#include "missing_stdlib.h"
- #include "socket-util.h"
-
- BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", CGroupTasksMax, cgroup_tasks_max_resolve);
-diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
-index 4daa1cefd3..2c77901471 100644
---- a/src/core/dbus-execute.c
-+++ b/src/core/dbus-execute.c
-@@ -42,6 +42,7 @@
- #include "unit-printf.h"
- #include "user-util.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
-
- 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 d680a64268..e59f48103e 100644
---- a/src/core/dbus-util.c
-+++ b/src/core/dbus-util.c
-@@ -9,6 +9,7 @@
- #include "unit-printf.h"
- #include "user-util.h"
- #include "unit.h"
-+#include "missing_stdlib.h"
-
- int bus_property_get_triggered_unit(
- sd_bus *bus,
-diff --git a/src/core/execute.c b/src/core/execute.c
-index ef0bf88687..bd3da0c401 100644
---- a/src/core/execute.c
-+++ b/src/core/execute.c
-@@ -72,6 +72,7 @@
- #include "unit-serialize.h"
- #include "user-util.h"
- #include "utmp-wtmp.h"
-+#include "missing_stdlib.h"
-
- static bool is_terminal_input(ExecInput i) {
- return IN_SET(i,
-diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
-index b8e3f7aadd..8ce8ca68d8 100644
---- a/src/core/kmod-setup.c
-+++ b/src/core/kmod-setup.c
-@@ -13,6 +13,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "virt.h"
-+#include "missing_stdlib.h"
-
- #if HAVE_KMOD
- #include "module-util.h"
-diff --git a/src/core/service.c b/src/core/service.c
-index b9eb40c555..268fe7573b 100644
---- a/src/core/service.c
-+++ b/src/core/service.c
-@@ -45,6 +45,7 @@
- #include "unit-name.h"
- #include "unit.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
-
- #define service_spawn(...) service_spawn_internal(__func__, __VA_ARGS__)
-
-diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c
-index 7e0c98cb7d..978a7f5874 100644
---- a/src/coredump/coredump-vacuum.c
-+++ b/src/coredump/coredump-vacuum.c
-@@ -17,6 +17,7 @@
- #include "string-util.h"
- #include "time-util.h"
- #include "user-util.h"
-+#include "missing_stdlib.h"
-
- #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/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 016f3baa7f..b1def81313 100644
---- a/src/fstab-generator/fstab-generator.c
-+++ b/src/fstab-generator/fstab-generator.c
-@@ -37,6 +37,7 @@
- #include "unit-name.h"
- #include "virt.h"
- #include "volatile-util.h"
-+#include "missing_stdlib.h"
-
- typedef enum MountPointFlags {
- MOUNT_NOAUTO = 1 << 0,
-diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
-index da0f20d3ce..f22ce41908 100644
---- a/src/journal-remote/journal-remote-main.c
-+++ b/src/journal-remote/journal-remote-main.c
-@@ -27,6 +27,7 @@
- #include "stat-util.h"
- #include "string-table.h"
- #include "strv.h"
-+#include "missing_stdlib.h"
-
- #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 7f3dcd56a4..41b7cbaaf1 100644
---- a/src/journal/journalctl.c
-+++ b/src/journal/journalctl.c
-@@ -77,6 +77,7 @@
- #include "unit-name.h"
- #include "user-util.h"
- #include "varlink.h"
-+#include "missing_stdlib.h"
-
- #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
- #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */
-diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
-index ff0228081f..9066fcb133 100644
---- a/src/libsystemd/sd-bus/bus-message.c
-+++ b/src/libsystemd/sd-bus/bus-message.c
-@@ -19,6 +19,7 @@
- #include "strv.h"
- #include "time-util.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
-
- static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
- static int message_parse_fields(sd_bus_message *m);
-diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
-index c25c40ff37..57a5da704f 100644
---- a/src/libsystemd/sd-bus/bus-objects.c
-+++ b/src/libsystemd/sd-bus/bus-objects.c
-@@ -11,6 +11,7 @@
- #include "missing_capability.h"
- #include "string-util.h"
- #include "strv.h"
-+#include "missing_stdlib.h"
-
- 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 3c59d0d615..746922d46f 100644
---- a/src/libsystemd/sd-bus/bus-socket.c
-+++ b/src/libsystemd/sd-bus/bus-socket.c
-@@ -29,6 +29,7 @@
- #include "string-util.h"
- #include "user-util.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
-
- #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 4a0259f8bb..aaa90d2223 100644
---- a/src/libsystemd/sd-bus/sd-bus.c
-+++ b/src/libsystemd/sd-bus/sd-bus.c
-@@ -46,6 +46,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "user-util.h"
-+#include "missing_stdlib.h"
-
- #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 d988588de0..458df8df9a 100644
---- a/src/libsystemd/sd-bus/test-bus-benchmark.c
-+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
-@@ -14,6 +14,7 @@
- #include "string-util.h"
- #include "tests.h"
- #include "time-util.h"
-+#include "missing_stdlib.h"
-
- #define MAX_SIZE (2*1024*1024)
-
-diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c
-index 6b9ff0a4ed..4a5027ad0f 100644
---- a/src/libsystemd/sd-journal/sd-journal.c
-+++ b/src/libsystemd/sd-journal/sd-journal.c
-@@ -44,6 +44,7 @@
- #include "strv.h"
- #include "syslog-util.h"
- #include "uid-alloc-range.h"
-+#include "missing_stdlib.h"
-
- #define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC)
-
-diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
-index b8da266e27..4bb8dd9496 100644
---- a/src/login/pam_systemd.c
-+++ b/src/login/pam_systemd.c
-@@ -35,6 +35,7 @@
- #include "login-util.h"
- #include "macro.h"
- #include "missing_syscall.h"
-+#include "missing_stdlib.h"
- #include "pam-util.h"
- #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 48527a2c73..9777fe0561 100644
---- a/src/network/generator/network-generator.c
-+++ b/src/network/generator/network-generator.c
-@@ -14,6 +14,7 @@
- #include "string-table.h"
- #include "string-util.h"
- #include "strv.h"
-+#include "missing_stdlib.h"
-
- /*
- # .network
-diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
-index 161b1c1c70..ba1c459f78 100644
---- a/src/nspawn/nspawn-settings.c
-+++ b/src/nspawn/nspawn-settings.c
-@@ -16,6 +16,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "user-util.h"
-+#include "missing_stdlib.h"
-
- Settings *settings_new(void) {
- Settings *s;
-diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
-index c64e79bdff..eda26b0b9a 100644
---- a/src/nss-mymachines/nss-mymachines.c
-+++ b/src/nss-mymachines/nss-mymachines.c
-@@ -21,6 +21,7 @@
- #include "nss-util.h"
- #include "signal-util.h"
- #include "string-util.h"
-+#include "missing_stdlib.h"
-
- static void setup_logging_once(void) {
- static pthread_once_t once = PTHREAD_ONCE_INIT;
-diff --git a/src/portable/portable.c b/src/portable/portable.c
-index d4b448a627..bb26623565 100644
---- a/src/portable/portable.c
-+++ b/src/portable/portable.c
-@@ -40,6 +40,7 @@
- #include "strv.h"
- #include "tmpfile-util.h"
- #include "user-util.h"
-+#include "missing_stdlib.h"
-
- /* Markers used in the first line of our 20-portable.conf unit file drop-in to determine, that a) the unit file was
- * dropped there by the portable service logic and b) for which image it was dropped there. */
-diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
-index afa537f160..32ccee4ae5 100644
---- a/src/resolve/resolvectl.c
-+++ b/src/resolve/resolvectl.c
-@@ -48,6 +48,7 @@
- #include "varlink.h"
- #include "verb-log-control.h"
- #include "verbs.h"
-+#include "missing_stdlib.h"
-
- 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 53e5d6b99f..851ecd5644 100644
---- a/src/shared/bus-get-properties.c
-+++ b/src/shared/bus-get-properties.c
-@@ -4,6 +4,7 @@
- #include "rlimit-util.h"
- #include "stdio-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 8b462b5627..183ce1c18e 100644
---- a/src/shared/bus-unit-procs.c
-+++ b/src/shared/bus-unit-procs.c
-@@ -11,6 +11,7 @@
- #include "sort-util.h"
- #include "string-util.h"
- #include "terminal-util.h"
-+#include "missing_stdlib.h"
-
- struct CGroupInfo {
- char *cgroup_path;
-diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
-index 4ee9706847..30c8084847 100644
---- a/src/shared/bus-unit-util.c
-+++ b/src/shared/bus-unit-util.c
-@@ -50,6 +50,7 @@
- #include "unit-def.h"
- #include "user-util.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
-
- 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 4123152d93..74f148c8b4 100644
---- a/src/shared/bus-util.c
-+++ b/src/shared/bus-util.c
-@@ -24,6 +24,7 @@
- #include "path-util.h"
- #include "socket-util.h"
- #include "stdio-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 = ASSERT_PTR(userdata);
-diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
-index b41c9b06ca..e69050a507 100644
---- a/src/shared/dns-domain.c
-+++ b/src/shared/dns-domain.c
-@@ -18,6 +18,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
-
- 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 83e9834bbf..74eaae6f5e 100644
---- a/src/shared/journal-importer.c
-+++ b/src/shared/journal-importer.c
-@@ -16,6 +16,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "unaligned.h"
-+#include "missing_stdlib.h"
-
- 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 a5d04003bd..10392c132d 100644
---- a/src/shared/logs-show.c
-+++ b/src/shared/logs-show.c
-@@ -41,6 +41,7 @@
- #include "time-util.h"
- #include "utf8.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 19deefab56..6b6d0af1a0 100644
---- a/src/shared/pager.c
-+++ b/src/shared/pager.c
-@@ -25,6 +25,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "terminal-util.h"
-+#include "missing_stdlib.h"
-
- static pid_t pager_pid = 0;
-
-diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
-index 287fd6c181..8f8d5493da 100644
---- a/src/socket-proxy/socket-proxyd.c
-+++ b/src/socket-proxy/socket-proxyd.c
-@@ -27,6 +27,7 @@
- #include "set.h"
- #include "socket-util.h"
- #include "string-util.h"
-+#include "missing_stdlib.h"
-
- #define BUFFER_SIZE (256 * 1024)
-
-diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
-index f884008660..987e180697 100644
---- a/src/test/test-hexdecoct.c
-+++ b/src/test/test-hexdecoct.c
-@@ -7,6 +7,7 @@
- #include "macro.h"
- #include "random-util.h"
- #include "string-util.h"
-+#include "missing_stdlib.h"
- #include "tests.h"
-
- TEST(hexchar) {
-diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 91b40088f4..f528a46b8e 100644
---- a/src/udev/udev-builtin-net_id.c
-+++ b/src/udev/udev-builtin-net_id.c
-@@ -39,6 +39,7 @@
- #include "strv.h"
- #include "strxcpyx.h"
- #include "udev-builtin.h"
-+#include "missing_stdlib.h"
-
- #define ONBOARD_14BIT_INDEX_MAX ((1U << 14) - 1)
- #define ONBOARD_16BIT_INDEX_MAX ((1U << 16) - 1)
-diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index 467c9a6ad3..f74dae60af 100644
---- a/src/udev/udev-builtin-path_id.c
-+++ b/src/udev/udev-builtin-path_id.c
-@@ -24,6 +24,7 @@
- #include "sysexits.h"
- #include "udev-builtin.h"
- #include "udev-util.h"
-+#include "missing_stdlib.h"
-
- _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 ed22c8b679..19ebe20237 100644
---- a/src/udev/udev-event.c
-+++ b/src/udev/udev-event.c
-@@ -16,6 +16,7 @@
- #include "udev-util.h"
- #include "udev-watch.h"
- #include "user-util.h"
-+#include "missing_stdlib.h"
-
- UdevEvent *udev_event_new(sd_device *dev, usec_t exec_delay_usec, sd_netlink *rtnl, int log_level) {
- UdevEvent *event;
-diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
-index 5f12002394..febe345b4c 100644
---- a/src/udev/udev-rules.c
-+++ b/src/udev/udev-rules.c
-@@ -41,6 +41,7 @@
- #include "udev-util.h"
- #include "user-util.h"
- #include "virt.h"
-+#include "missing_stdlib.h"
-
- #define RULES_DIRS ((const char* const*) CONF_PATHS_STRV("udev/rules.d"))
-
---
-2.34.1
-
diff --git a/systemd/0001-missing_type.h-add-comparison_fn_t.patch b/systemd/0004-missing_type.h-add-comparison_fn_t.patch
similarity index 87%
rename from systemd/0001-missing_type.h-add-comparison_fn_t.patch
rename to systemd/0004-missing_type.h-add-comparison_fn_t.patch
index 2aa5dee..f4456f3 100644
--- a/systemd/0001-missing_type.h-add-comparison_fn_t.patch
+++ b/systemd/0004-missing_type.h-add-comparison_fn_t.patch
@@ -1,7 +1,7 @@
-From 01195eb9f7d59139fb45df506ac6b3968c14a57f Mon Sep 17 00:00:00 2001
+From 34b7e1ed3b9a896db6fad435fd141c385c7337d1 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Mon, 25 Feb 2019 13:55:12 +0800
-Subject: [PATCH 01/22] missing_type.h: add comparison_fn_t
+Subject: [PATCH 04/27] missing_type.h: add comparison_fn_t
Make it work with musl where comparison_fn_t and is not provided.
@@ -21,12 +21,12 @@ Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
3 files changed, 6 insertions(+)
diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
-index f6233090a9..6c0456349d 100644
+index 1d17705c35..fc33b76ec1 100644
--- a/src/basic/missing_type.h
+++ b/src/basic/missing_type.h
@@ -10,3 +10,7 @@
#if !HAVE_CHAR16_T
- #define char16_t uint16_t
+ # define char16_t uint16_t
#endif
+
+#ifndef __GLIBC__
@@ -45,10 +45,10 @@ index 9c818bd747..ef10c8be2c 100644
/* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the
* external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that
diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c
-index ae91534198..7f67eea38b 100644
+index a0b673f65f..29dd2fee16 100644
--- a/src/libsystemd/sd-journal/catalog.c
+++ b/src/libsystemd/sd-journal/catalog.c
-@@ -28,6 +28,7 @@
+@@ -29,6 +29,7 @@
#include "string-util.h"
#include "strv.h"
#include "tmpfile-util.h"
@@ -57,5 +57,5 @@ index ae91534198..7f67eea38b 100644
const char * const catalog_file_dirs[] = {
"/usr/local/lib/systemd/catalog/",
--
-2.34.1
+2.45.1
diff --git a/systemd/0002-add-fallback-parse_printf_format-implementation.patch b/systemd/0005-add-fallback-parse_printf_format-implementation.patch
similarity index 96%
rename from systemd/0002-add-fallback-parse_printf_format-implementation.patch
rename to systemd/0005-add-fallback-parse_printf_format-implementation.patch
index 900a931..b0865b3 100644
--- a/systemd/0002-add-fallback-parse_printf_format-implementation.patch
+++ b/systemd/0005-add-fallback-parse_printf_format-implementation.patch
@@ -1,7 +1,7 @@
-From 872b72739e62123867ce6c4f82aa37de24cc3f75 Mon Sep 17 00:00:00 2001
+From 4a4005583e2debe491850229aa5ae2a97770532d Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Sat, 22 May 2021 20:26:24 +0200
-Subject: [PATCH 02/22] add fallback parse_printf_format implementation
+Subject: [PATCH 05/27] add fallback parse_printf_format implementation
Upstream-Status: Inappropriate [musl specific]
@@ -22,22 +22,22 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
create mode 100644 src/basic/parse-printf-format.h
diff --git a/meson.build b/meson.build
-index 7419e2b0b0..01fd3ffc19 100644
+index 52723bef09..e20bf3af8a 100644
--- a/meson.build
+++ b/meson.build
-@@ -725,6 +725,7 @@ endif
- foreach header : ['crypt.h',
+@@ -753,6 +753,7 @@ foreach header : ['crypt.h',
'linux/memfd.h',
+ 'linux/time_types.h',
'linux/vm_sockets.h',
+ 'printf.h',
'sys/auxv.h',
+ 'sys/sdt.h',
'threads.h',
- 'valgrind/memcheck.h',
diff --git a/src/basic/meson.build b/src/basic/meson.build
-index d7450d8b44..c3e3daf4bd 100644
+index 9a214575a5..b49b6ade56 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
-@@ -183,6 +183,11 @@ endforeach
+@@ -189,6 +189,11 @@ endforeach
basic_sources += generated_gperf_headers
@@ -392,7 +392,7 @@ index 0000000000..47be7522d7
+
+#endif /* HAVE_PRINTF_H */
diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
-index 4e93ac90c9..f9deb6f662 100644
+index 0a2239d022..43a765dacd 100644
--- a/src/basic/stdio-util.h
+++ b/src/basic/stdio-util.h
@@ -1,12 +1,12 @@
@@ -408,9 +408,9 @@ index 4e93ac90c9..f9deb6f662 100644
+#include "parse-printf-format.h"
_printf_(3, 4)
- static inline char *snprintf_ok(char *buf, size_t len, const char *format, ...) {
+ static inline char* snprintf_ok(char *buf, size_t len, const char *format, ...) {
diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c
-index be23b2fe75..69a2eb6404 100644
+index 7d02b57d7b..75e8e08add 100644
--- a/src/libsystemd/sd-journal/journal-send.c
+++ b/src/libsystemd/sd-journal/journal-send.c
@@ -2,7 +2,6 @@
@@ -430,5 +430,5 @@ index be23b2fe75..69a2eb6404 100644
#define SNDBUF_SIZE (8*1024*1024)
--
-2.34.1
+2.45.1
diff --git a/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/systemd/0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
similarity index 91%
rename from systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
rename to systemd/0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
index 15877be..e7a0abc 100644
--- a/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
+++ b/systemd/0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
@@ -1,7 +1,7 @@
-From 5325ab5813617f35f03806ec420829dde7104387 Mon Sep 17 00:00:00 2001
+From ed836c3478e1193e99e37d50db96d124796a3322 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Mon, 25 Feb 2019 14:56:21 +0800
-Subject: [PATCH 04/22] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not
+Subject: [PATCH 06/27] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not
defined
If the standard library doesn't provide brace
@@ -64,11 +64,11 @@ index 802ca8c655..23818a67c6 100644
return -ENOENT;
if (k == GLOB_NOSPACE)
diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
-index 9b3e73cce0..3790ba3be5 100644
+index 49d71f15c7..0a49ebcc17 100644
--- a/src/test/test-glob-util.c
+++ b/src/test/test-glob-util.c
@@ -34,6 +34,12 @@ TEST(glob_first) {
- assert_se(first == NULL);
+ ASSERT_NULL(first);
}
+/* Don't fail if the standard library
@@ -115,7 +115,7 @@ index 9b3e73cce0..3790ba3be5 100644
(void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL);
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 230ec09b97..2cc5f391d7 100644
+index 807925f199..b4f86fc611 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -73,6 +73,12 @@
@@ -131,7 +131,7 @@ index 230ec09b97..2cc5f391d7 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
-@@ -2434,7 +2440,9 @@ finish:
+@@ -2570,7 +2576,9 @@ finish:
static int glob_item(Context *c, Item *i, action_t action) {
_cleanup_globfree_ glob_t g = {
@@ -139,9 +139,9 @@ index 230ec09b97..2cc5f391d7 100644
.gl_opendir = (void *(*)(const char *)) opendir_nomod,
+#endif
};
- int r = 0, k;
+ int r;
-@@ -2461,7 +2469,9 @@ static int glob_item_recursively(
+@@ -2598,7 +2606,9 @@ static int glob_item_recursively(
fdaction_t action) {
_cleanup_globfree_ glob_t g = {
@@ -149,8 +149,8 @@ index 230ec09b97..2cc5f391d7 100644
.gl_opendir = (void *(*)(const char *)) opendir_nomod,
+#endif
};
- int r = 0, k;
+ int r;
--
-2.34.1
+2.45.1
diff --git a/systemd/0005-add-missing-FTW_-macros-for-musl.patch b/systemd/0007-add-missing-FTW_-macros-for-musl.patch
similarity index 86%
rename from systemd/0005-add-missing-FTW_-macros-for-musl.patch
rename to systemd/0007-add-missing-FTW_-macros-for-musl.patch
index a1dfca2..474a7d3 100644
--- a/systemd/0005-add-missing-FTW_-macros-for-musl.patch
+++ b/systemd/0007-add-missing-FTW_-macros-for-musl.patch
@@ -1,7 +1,7 @@
-From dad7f897c0de654fa5592fda3e90f874639849f9 Mon Sep 17 00:00:00 2001
+From 8320725f1a9088623da8753c7077473b98a63107 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Mon, 25 Feb 2019 15:00:06 +0800
-Subject: [PATCH 05/22] add missing FTW_ macros for musl
+Subject: [PATCH 07/27] add missing FTW_ macros for musl
This is to avoid build failures like below for musl.
@@ -16,7 +16,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
2 files changed, 5 insertions(+)
diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
-index 6c0456349d..73a5b90e3c 100644
+index fc33b76ec1..34a36d83f0 100644
--- a/src/basic/missing_type.h
+++ b/src/basic/missing_type.h
@@ -14,3 +14,7 @@
@@ -40,5 +40,5 @@ index 8684d064ec..70fc2b5376 100644
static char **list_nftw = NULL;
--
-2.34.1
+2.45.1
diff --git a/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch b/systemd/0008-Use-uintmax_t-for-handling-rlim_t.patch
similarity index 88%
rename from systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch
rename to systemd/0008-Use-uintmax_t-for-handling-rlim_t.patch
index 4be14b7..c8598ed 100644
--- a/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch
+++ b/systemd/0008-Use-uintmax_t-for-handling-rlim_t.patch
@@ -1,7 +1,7 @@
-From 96e975a2412a20e5f80bd3ab144057d275eb8597 Mon Sep 17 00:00:00 2001
+From 41abe1a4136babfe5df63e9561dcf29d3c8fe6e9 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Mon, 25 Feb 2019 15:12:41 +0800
-Subject: [PATCH 06/22] Use uintmax_t for handling rlim_t
+Subject: [PATCH 08/27] Use uintmax_t for handling rlim_t
PRIu{32,64} is not right format to represent rlim_t type
therefore use %ju and typecast the rlim_t variables to
@@ -27,10 +27,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/basic/format-util.h b/src/basic/format-util.h
-index 8719df3e29..9becc96066 100644
+index ba7cff6a8b..2736abb07b 100644
--- a/src/basic/format-util.h
+++ b/src/basic/format-util.h
-@@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t));
+@@ -42,13 +42,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t));
# error Unknown timex member size
#endif
@@ -46,10 +46,10 @@ index 8719df3e29..9becc96066 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 c1f0b2b974..61c5412582 100644
+index a9f7b87f28..059c67731d 100644
--- a/src/basic/rlimit-util.c
+++ b/src/basic/rlimit-util.c
-@@ -44,7 +44,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) {
+@@ -47,7 +47,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) {
fixed.rlim_max == highest.rlim_max)
return 0;
@@ -58,7 +58,7 @@ index c1f0b2b974..61c5412582 100644
return RET_NERRNO(setrlimit(resource, &fixed));
}
-@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) {
+@@ -310,13 +310,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) {
if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY)
r = free_and_strdup(&s, "infinity");
else if (rl->rlim_cur >= RLIM_INFINITY)
@@ -76,7 +76,7 @@ index c1f0b2b974..61c5412582 100644
if (r < 0)
return -ENOMEM;
-@@ -422,7 +422,7 @@ int rlimit_nofile_safe(void) {
+@@ -425,7 +425,7 @@ int rlimit_nofile_safe(void) {
rl.rlim_max = MIN(rl.rlim_max, (rlim_t) read_nr_open());
rl.rlim_cur = MIN((rlim_t) FD_SETSIZE, rl.rlim_max);
if (setrlimit(RLIMIT_NOFILE, &rl) < 0)
@@ -86,10 +86,10 @@ index c1f0b2b974..61c5412582 100644
return 1;
}
diff --git a/src/core/execute.c b/src/core/execute.c
-index bd3da0c401..df1870fd2f 100644
+index 513e95e09d..0e269617f8 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
-@@ -1045,9 +1045,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
+@@ -1067,9 +1067,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
for (unsigned i = 0; i < RLIM_NLIMITS; i++)
if (c->rlimit[i]) {
fprintf(f, "%sLimit%s: " RLIM_FMT "\n",
@@ -102,5 +102,5 @@ index bd3da0c401..df1870fd2f 100644
if (c->ioprio_set) {
--
-2.34.1
+2.45.1
diff --git a/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/systemd/0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
similarity index 95%
rename from systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
rename to systemd/0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
index 8d60842..851dcbd 100644
--- a/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
+++ b/systemd/0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
@@ -1,7 +1,7 @@
-From 4842cff4f1329f0b5034b529d56f8ad1f234ac4c Mon Sep 17 00:00:00 2001
+From 8af5d1e3c0dc7e71f7a4aee0f539a5d772d47354 Mon Sep 17 00:00:00 2001
From: Andre McCurdy <armccurdy@gmail.com>
Date: Tue, 10 Oct 2017 14:33:30 -0700
-Subject: [PATCH 07/22] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat()
+Subject: [PATCH 09/27] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat()
Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right
thing to do and it's not portable (not supported by musl). See:
@@ -31,7 +31,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
-index 1023ab73ca..c78ff6f27f 100644
+index 3e2db95304..d5747416b0 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -49,8 +49,27 @@ int futimens_opath(int fd, const struct timespec ts[2]);
@@ -64,7 +64,7 @@ index 1023ab73ca..c78ff6f27f 100644
int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);
diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
-index 569ef466c3..7ae921a113 100644
+index a4e2dae245..67aa8ea1f2 100644
--- a/src/shared/base-filesystem.c
+++ b/src/shared/base-filesystem.c
@@ -145,7 +145,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) {
@@ -95,5 +95,5 @@ index 569ef466c3..7ae921a113 100644
}
--
-2.34.1
+2.45.1
diff --git a/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/systemd/0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch
similarity index 84%
rename from systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch
rename to systemd/0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch
index c1a8bb1..1626507 100644
--- a/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch
+++ b/systemd/0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch
@@ -1,7 +1,7 @@
-From bab07e779ff23d5593bb118efaaa31b60a6dce87 Mon Sep 17 00:00:00 2001
+From ea8e85d92f67a7af8577a4ce7c67c7aaee65d10c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 27 May 2018 08:36:44 -0700
-Subject: [PATCH 08/22] Define glibc compatible basename() for non-glibc
+Subject: [PATCH 10/27] Define glibc compatible basename() for non-glibc
systems
Fixes builds with musl, even though systemd is adamant about
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 4 insertions(+)
diff --git a/src/basic/string-util.h b/src/basic/string-util.h
-index b6d8be3083..0a29036c4c 100644
+index ff5efbcf55..d1a6bb0e76 100644
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -26,6 +26,10 @@
@@ -30,5 +30,5 @@ index b6d8be3083..0a29036c4c 100644
if (!haystack || !needle)
return NULL;
--
-2.34.1
+2.45.1
diff --git a/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/systemd/0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
similarity index 83%
rename from systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
rename to systemd/0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
index 3ff0177..60cec6d 100644
--- a/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
+++ b/systemd/0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
@@ -1,7 +1,7 @@
-From 25093c5017725b8577c444dfea0f42ad85b43522 Mon Sep 17 00:00:00 2001
+From 7c8634c441401b034cd4bcf4b916a7042076fca8 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Wed, 4 Jul 2018 15:00:44 +0800
-Subject: [PATCH 09/22] Do not disable buffering when writing to oom_score_adj
+Subject: [PATCH 11/27] Do not disable buffering when writing to oom_score_adj
On musl, disabling buffering when writing to oom_score_adj will
cause the following error.
@@ -24,10 +24,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
-index 201c5596ae..ea51595b6c 100644
+index c9d968dee0..7d6d3ce7db 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
-@@ -1716,7 +1716,7 @@ int set_oom_score_adjust(int value) {
+@@ -1816,7 +1816,7 @@ int set_oom_score_adjust(int value) {
xsprintf(t, "%i", value);
return write_string_file("/proc/self/oom_score_adj", t,
@@ -37,5 +37,5 @@ index 201c5596ae..ea51595b6c 100644
int get_oom_score_adjust(int *ret) {
--
-2.34.1
+2.45.1
diff --git a/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/systemd/0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
similarity index 87%
rename from systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
rename to systemd/0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
index cf59ac7..aa3c45c 100644
--- a/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
+++ b/systemd/0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
@@ -1,7 +1,7 @@
-From 2adbe9773cd65c48eec9df96868d4a738927c8d9 Mon Sep 17 00:00:00 2001
+From 4a2df0bba1741914617ca1271e2bc68a5d9e5dac Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Tue, 10 Jul 2018 15:40:17 +0800
-Subject: [PATCH 10/22] distinguish XSI-compliant strerror_r from GNU-specifi
+Subject: [PATCH 12/27] distinguish XSI-compliant strerror_r from GNU-specifi
strerror_r
XSI-compliant strerror_r and GNU-specifi strerror_r are different.
@@ -24,10 +24,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
-index 77b2e1a0fd..fdba0e0142 100644
+index f415797700..a5c6e9a3bd 100644
--- a/src/libsystemd/sd-bus/bus-error.c
+++ b/src/libsystemd/sd-bus/bus-error.c
-@@ -408,7 +408,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) {
+@@ -410,7 +410,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) {
return;
errno = 0;
@@ -40,7 +40,7 @@ index 77b2e1a0fd..fdba0e0142 100644
if (errno == ERANGE || strlen(x) >= k - 1) {
free(m);
k *= 2;
-@@ -593,8 +598,12 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static
+@@ -595,8 +600,12 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static
if (e && e->message)
return e->message;
@@ -55,7 +55,7 @@ index 77b2e1a0fd..fdba0e0142 100644
static bool map_ok(const sd_bus_error_map *map) {
diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c
-index 69a2eb6404..1561859650 100644
+index 75e8e08add..41e5c7c2b8 100644
--- a/src/libsystemd/sd-journal/journal-send.c
+++ b/src/libsystemd/sd-journal/journal-send.c
@@ -361,7 +361,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove
@@ -72,5 +72,5 @@ index 69a2eb6404..1561859650 100644
char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1];
--
-2.34.1
+2.45.1
diff --git a/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch b/systemd/0013-avoid-redefinition-of-prctl_mm_map-structure.patch
similarity index 70%
rename from systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch
rename to systemd/0013-avoid-redefinition-of-prctl_mm_map-structure.patch
index e481b2e..c48bd58 100644
--- a/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch
+++ b/systemd/0013-avoid-redefinition-of-prctl_mm_map-structure.patch
@@ -1,7 +1,7 @@
-From 49c446cfb78cf74a909bed8c3798b77a5469866a Mon Sep 17 00:00:00 2001
+From 846b8f16cf07d9187261e06701a75eb208caa707 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Mon, 25 Feb 2019 15:44:54 +0800
-Subject: [PATCH 11/22] avoid redefinition of prctl_mm_map structure
+Subject: [PATCH 13/27] avoid redefinition of prctl_mm_map structure
Fix the following compile failure:
error: redefinition of 'struct prctl_mm_map'
@@ -14,7 +14,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h
-index 7d9e395c92..88c2d7dfac 100644
+index 2c9f9f6c50..65a984b564 100644
--- a/src/basic/missing_prctl.h
+++ b/src/basic/missing_prctl.h
@@ -1,7 +1,9 @@
@@ -25,8 +25,8 @@ index 7d9e395c92..88c2d7dfac 100644
#include <linux/prctl.h>
+#endif
- /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */
- #ifndef PR_CAP_AMBIENT
+ #include "macro.h"
+
--
-2.34.1
+2.45.1
diff --git a/systemd/0012-do-not-disable-buffer-in-writing-files.patch b/systemd/0014-do-not-disable-buffer-in-writing-files.patch
similarity index 84%
rename from systemd/0012-do-not-disable-buffer-in-writing-files.patch
rename to systemd/0014-do-not-disable-buffer-in-writing-files.patch
index 66be790..e624c2d 100644
--- a/systemd/0012-do-not-disable-buffer-in-writing-files.patch
+++ b/systemd/0014-do-not-disable-buffer-in-writing-files.patch
@@ -1,7 +1,7 @@
-From e4885a8e60f883d9217e26e1db3754c2906aca31 Mon Sep 17 00:00:00 2001
+From 88694101bcac461c39049962ce97ce579cc07e13 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Fri, 1 Mar 2019 15:22:15 +0800
-Subject: [PATCH 12/22] do not disable buffer in writing files
+Subject: [PATCH 14/27] do not disable buffer in writing files
Do not disable buffer in writing files, otherwise we get
failure at boot for musl like below.
@@ -35,7 +35,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
src/nspawn/nspawn-cgroup.c | 2 +-
src/nspawn/nspawn.c | 6 +++---
src/shared/binfmt-util.c | 2 +-
- src/shared/cgroup-setup.c | 4 ++--
+ src/shared/cgroup-setup.c | 6 +++---
src/shared/coredump-util.c | 4 ++--
src/shared/hibernate-util.c | 4 ++--
src/shared/smack-util.c | 2 +-
@@ -44,22 +44,22 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
src/storagetm/storagetm.c | 24 ++++++++++++------------
src/udev/udev-rules.c | 1 -
src/vconsole/vconsole-setup.c | 2 +-
- 22 files changed, 50 insertions(+), 51 deletions(-)
+ 22 files changed, 51 insertions(+), 52 deletions(-)
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
-index d2be79622f..e65fecb68d 100644
+index 553ee6075a..a3704baf6a 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
-@@ -417,7 +417,7 @@ int cg_kill_kernel_sigkill(const char *path) {
+@@ -457,7 +457,7 @@ int cg_kill_kernel_sigkill(const char *path) {
if (r < 0)
return r;
- r = write_string_file(killfile, "1", WRITE_STRING_FILE_DISABLE_BUFFER);
+ r = write_string_file(killfile, "1", 0);
if (r < 0)
- return r;
+ return log_debug_errno(r, "Failed to write to cgroup.kill for cgroup '%s': %m", path);
-@@ -843,7 +843,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
+@@ -885,7 +885,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
sc = strstrip(contents);
if (isempty(sc)) {
@@ -68,7 +68,7 @@ index d2be79622f..e65fecb68d 100644
if (r < 0)
return r;
} else if (!path_equal(sc, agent))
-@@ -861,7 +861,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
+@@ -903,7 +903,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
sc = strstrip(contents);
if (streq(sc, "0")) {
@@ -77,7 +77,7 @@ index d2be79622f..e65fecb68d 100644
if (r < 0)
return r;
-@@ -888,7 +888,7 @@ int cg_uninstall_release_agent(const char *controller) {
+@@ -930,7 +930,7 @@ int cg_uninstall_release_agent(const char *controller) {
if (r < 0)
return r;
@@ -86,7 +86,7 @@ index d2be79622f..e65fecb68d 100644
if (r < 0)
return r;
-@@ -898,7 +898,7 @@ int cg_uninstall_release_agent(const char *controller) {
+@@ -940,7 +940,7 @@ int cg_uninstall_release_agent(const char *controller) {
if (r < 0)
return r;
@@ -95,7 +95,7 @@ index d2be79622f..e65fecb68d 100644
if (r < 0)
return r;
-@@ -1814,7 +1814,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri
+@@ -1833,7 +1833,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri
if (r < 0)
return r;
@@ -105,29 +105,29 @@ index d2be79622f..e65fecb68d 100644
int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) {
diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c
-index 2101f617ad..63817bae17 100644
+index 5b4e43f921..42a84ded55 100644
--- a/src/basic/namespace-util.c
+++ b/src/basic/namespace-util.c
-@@ -227,12 +227,12 @@ int userns_acquire(const char *uid_map, const char *gid_map) {
+@@ -325,12 +325,12 @@ int userns_acquire(const char *uid_map, const char *gid_map) {
freeze();
xsprintf(path, "/proc/" PID_FMT "/uid_map", pid);
- r = write_string_file(path, uid_map, WRITE_STRING_FILE_DISABLE_BUFFER);
+ r = write_string_file(path, uid_map, 0);
if (r < 0)
- return log_error_errno(r, "Failed to write UID map: %m");
+ return log_debug_errno(r, "Failed to write UID map: %m");
xsprintf(path, "/proc/" PID_FMT "/gid_map", pid);
- r = write_string_file(path, gid_map, WRITE_STRING_FILE_DISABLE_BUFFER);
+ r = write_string_file(path, gid_map, 0);
if (r < 0)
- return log_error_errno(r, "Failed to write GID map: %m");
+ return log_debug_errno(r, "Failed to write GID map: %m");
diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
-index 6cb0ddf575..247cf9e1d1 100644
+index d7cfcd9105..58fb5918a3 100644
--- a/src/basic/procfs-util.c
+++ b/src/basic/procfs-util.c
-@@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limit) {
+@@ -63,13 +63,13 @@ int procfs_tasks_set_limit(uint64_t limit) {
* 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 */
@@ -144,7 +144,7 @@ index 6cb0ddf575..247cf9e1d1 100644
uint64_t threads_max;
diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c
-index b66a6622ae..8d1c93008a 100644
+index 9a1933f579..7d6fc65ee1 100644
--- a/src/basic/sysctl-util.c
+++ b/src/basic/sysctl-util.c
@@ -58,7 +58,7 @@ int sysctl_write(const char *property, const char *value) {
@@ -188,23 +188,23 @@ index d21f3f79ff..258607cc7e 100644
log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m");
else
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
-index 61ac4df1a6..ea18970196 100644
+index 34fd2a250c..cb1a6d01eb 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
-@@ -4578,7 +4578,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) {
- u->freezer_state = FREEZER_THAWING;
- }
+@@ -5173,7 +5173,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) {
+ freezer_state_to_string(u->freezer_state),
+ freezer_state_to_string(next));
-- r = write_string_file(path, one_zero(action == FREEZER_FREEZE), WRITE_STRING_FILE_DISABLE_BUFFER);
-+ r = write_string_file(path, one_zero(action == FREEZER_FREEZE), 0);
+- r = write_string_file(path, one_zero(target == FREEZER_FROZEN), WRITE_STRING_FILE_DISABLE_BUFFER);
++ r = write_string_file(path, one_zero(target == FREEZER_FROZEN), 0);
if (r < 0)
return r;
diff --git a/src/core/main.c b/src/core/main.c
-index 3f71cc0947..0e5aec3e9e 100644
+index 4b8a315d86..051a31ba84 100644
--- a/src/core/main.c
+++ b/src/core/main.c
-@@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool skip_setup) {
+@@ -1789,7 +1789,7 @@ static void initialize_core_pattern(bool skip_setup) {
if (getpid_cached() != 1)
return;
@@ -240,23 +240,24 @@ index 7ea902b6f9..1aef2988d0 100644
log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m");
#endif
diff --git a/src/home/homework.c b/src/home/homework.c
-index 066483e342..5f92dd7064 100644
+index 482db23dbc..ed6b8d271f 100644
--- a/src/home/homework.c
+++ b/src/home/homework.c
-@@ -278,7 +278,7 @@ static void drop_caches_now(void) {
- * for details. We write "2" into /proc/sys/vm/drop_caches to ensure dentries/inodes are flushed, but
+@@ -302,8 +302,8 @@ static void drop_caches_now(void) {
+ /* Drop file system caches now. See https://docs.kernel.org/admin-guide/sysctl/vm.html
+ * for details. We write "3" into /proc/sys/vm/drop_caches to ensure dentries/inodes are flushed, but
* not more. */
++ r = write_string_file("/proc/sys/vm/drop_caches", "3\n", 0);
-- r = write_string_file("/proc/sys/vm/drop_caches", "2\n", WRITE_STRING_FILE_DISABLE_BUFFER);
-+ r = write_string_file("/proc/sys/vm/drop_caches", "2\n", 0);
+- r = write_string_file("/proc/sys/vm/drop_caches", "3\n", WRITE_STRING_FILE_DISABLE_BUFFER);
if (r < 0)
log_warning_errno(r, "Failed to drop caches, ignoring: %m");
else
diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
-index 2fbc619a34..09d9591e37 100644
+index d8d151835c..268cb65ec7 100644
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
-@@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr,
+@@ -2499,7 +2499,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr,
if (!value)
return -ENOMEM;
@@ -266,10 +267,10 @@ index 2fbc619a34..09d9591e37 100644
/* On failure, clear cache entry, as we do not know how it fails. */
device_remove_cached_sysattr_value(device, sysattr);
diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
-index a5002437c6..b12e6cd9c9 100644
+index 4f28b4a225..c93c2c33b5 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) {
+@@ -93,7 +93,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) {
fn = strjoina(tree, cgroup, "/cgroup.procs");
sprintf(pid_string, PID_FMT, pid);
@@ -279,10 +280,10 @@ index a5002437c6..b12e6cd9c9 100644
log_error_errno(r, "Failed to move process: %m");
goto finish;
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 6ab604d3dc..bbec6b686c 100644
+index 5842d3ba8f..44ff9d946c 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
-@@ -2688,7 +2688,7 @@ static int reset_audit_loginuid(void) {
+@@ -2741,7 +2741,7 @@ static int reset_audit_loginuid(void) {
if (streq(p, "4294967295"))
return 0;
@@ -291,7 +292,7 @@ index 6ab604d3dc..bbec6b686c 100644
if (r < 0) {
log_error_errno(r,
"Failed to reset audit login UID. This probably means that your kernel is too\n"
-@@ -4141,7 +4141,7 @@ static int setup_uid_map(
+@@ -4450,7 +4450,7 @@ static int setup_uid_map(
return log_oom();
xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid);
@@ -300,7 +301,7 @@ index 6ab604d3dc..bbec6b686c 100644
if (r < 0)
return log_error_errno(r, "Failed to write UID map: %m");
-@@ -4151,7 +4151,7 @@ static int setup_uid_map(
+@@ -4460,7 +4460,7 @@ static int setup_uid_map(
return log_oom();
xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid);
@@ -323,10 +324,10 @@ index a26175474b..1413a9c72c 100644
return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m");
diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
-index 934a16eaf3..c921ced861 100644
+index 093b6d0d22..89d0ac612b 100644
--- a/src/shared/cgroup-setup.c
+++ b/src/shared/cgroup-setup.c
-@@ -351,7 +351,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
+@@ -364,7 +364,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
xsprintf(c, PID_FMT "\n", pid);
@@ -335,7 +336,16 @@ index 934a16eaf3..c921ced861 100644
if (r == -EOPNOTSUPP && cg_is_threaded(path) > 0)
/* When the threaded mode is used, we cannot read/write the file. Let's return recognizable error. */
return -EUCLEAN;
-@@ -966,7 +966,7 @@ int cg_enable_everywhere(
+@@ -395,7 +395,7 @@ int cg_fd_attach(int fd, pid_t pid) {
+
+ xsprintf(c, PID_FMT "\n", pid);
+
+- return write_string_file_at(fd, "cgroup.procs", c, WRITE_STRING_FILE_DISABLE_BUFFER);
++ return write_string_file_at(fd, "cgroup.procs", c, 0);
+ }
+
+ int cg_attach_fallback(const char *controller, const char *path, pid_t pid) {
+@@ -974,7 +974,7 @@ int cg_enable_everywhere(
return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p);
}
@@ -367,10 +377,10 @@ index 805503f366..01a7ccb291 100644
log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m");
}
diff --git a/src/shared/hibernate-util.c b/src/shared/hibernate-util.c
-index 3eb13d48f6..d09b901be1 100644
+index 7c21157580..06ab74b04c 100644
--- a/src/shared/hibernate-util.c
+++ b/src/shared/hibernate-util.c
-@@ -481,7 +481,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) {
+@@ -495,7 +495,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) {
/* We write the offset first since it's safer. Note that this file is only available in 4.17+, so
* fail gracefully if it doesn't exist and we're only overwriting it with 0. */
@@ -379,7 +389,7 @@ index 3eb13d48f6..d09b901be1 100644
if (r == -ENOENT) {
if (offset != 0)
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
-@@ -497,7 +497,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) {
+@@ -511,7 +511,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) {
log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.",
offset_str, device);
@@ -402,23 +412,23 @@ index 1f88e724d0..feb18b320a 100644
return r;
diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c
-index 4c1a968718..6faf6806a5 100644
+index 810c5b5206..be0d127ff3 100644
--- a/src/shared/watchdog.c
+++ b/src/shared/watchdog.c
-@@ -93,7 +93,7 @@ static int set_pretimeout_governor(const char *governor) {
+@@ -93,7 +93,7 @@ static int watchdog_set_pretimeout_governor(const char *governor) {
r = write_string_file(sys_fn,
governor,
- WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE);
+ WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE);
if (r < 0)
- return log_error_errno(r, "Failed to set pretimeout_governor to '%s': %m", governor);
+ return log_error_errno(r, "Failed to set watchdog pretimeout_governor to '%s': %m", governor);
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index 21af3e9e52..6d4b84b5d5 100644
+index 0402bb07f3..a6cbb45340 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
-@@ -137,7 +137,7 @@ static int write_state(int fd, char * const *states) {
+@@ -139,7 +139,7 @@ static int write_state(int fd, char * const *states) {
if (k < 0)
return RET_GATHER(r, k);
@@ -427,17 +437,17 @@ index 21af3e9e52..6d4b84b5d5 100644
if (k >= 0) {
log_debug("Using sleep state '%s'.", *state);
return 0;
-@@ -155,7 +155,7 @@ static int write_mode(char * const *modes) {
- STRV_FOREACH(mode, modes) {
- int k;
+@@ -157,7 +157,7 @@ static int write_mode(const char *path, char * const *modes) {
+ assert(path);
-- k = write_string_file("/sys/power/disk", *mode, WRITE_STRING_FILE_DISABLE_BUFFER);
-+ k = write_string_file("/sys/power/disk", *mode, 0);
- if (k >= 0) {
- log_debug("Using sleep disk mode '%s'.", *mode);
+ STRV_FOREACH(mode, modes) {
+- r = write_string_file(path, *mode, WRITE_STRING_FILE_DISABLE_BUFFER);
++ r = write_string_file(path, *mode, 0);
+ if (r >= 0) {
+ log_debug("Using sleep mode '%s' for %s.", *mode, path);
return 0;
diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c
-index ae63baaf79..82eeca479a 100644
+index 1bb8eec316..cf9b4c4a21 100644
--- a/src/storagetm/storagetm.c
+++ b/src/storagetm/storagetm.c
@@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSubsystem *s) {
@@ -533,22 +543,22 @@ index ae63baaf79..82eeca479a 100644
return log_error_errno(r, "Failed to set IP address on NVME port %" PRIu16 ": %m", portnr);
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
-index febe345b4c..a90b610ba1 100644
+index 581bbaf345..cdf648a2d1 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
-@@ -2711,7 +2711,6 @@ static int udev_rule_apply_token_to_event(
- log_event_debug(dev, token, "ATTR '%s' writing '%s'", buf, value);
- r = write_string_file(buf, value,
- WRITE_STRING_FILE_VERIFY_ON_FAILURE |
-- WRITE_STRING_FILE_DISABLE_BUFFER |
- WRITE_STRING_FILE_AVOID_NEWLINE |
- WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE);
- if (r < 0)
+@@ -2706,7 +2706,6 @@ static int udev_rule_apply_token_to_event(
+ log_event_debug(dev, token, "Writing ATTR{'%s'}=\"%s\".", buf, value);
+ r = write_string_file(buf, value,
+ WRITE_STRING_FILE_VERIFY_ON_FAILURE |
+- WRITE_STRING_FILE_DISABLE_BUFFER |
+ WRITE_STRING_FILE_AVOID_NEWLINE |
+ WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE);
+ if (r < 0)
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
-index 4d82c65f0a..3a3d861b83 100644
+index ba742dda69..6f20e81615 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
-@@ -261,7 +261,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) {
+@@ -277,7 +277,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) {
static int toggle_utf8_sysfs(bool utf8) {
int r;
@@ -558,5 +568,5 @@ index 4d82c65f0a..3a3d861b83 100644
return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8));
--
-2.34.1
+2.45.1
diff --git a/systemd/0013-Handle-__cpu_mask-usage.patch b/systemd/0015-Handle-__cpu_mask-usage.patch
similarity index 92%
rename from systemd/0013-Handle-__cpu_mask-usage.patch
rename to systemd/0015-Handle-__cpu_mask-usage.patch
index 43f7537..86003db 100644
--- a/systemd/0013-Handle-__cpu_mask-usage.patch
+++ b/systemd/0015-Handle-__cpu_mask-usage.patch
@@ -1,7 +1,7 @@
-From 2f90f8463423cfbb7e83fcef42f1071018c3b56e Mon Sep 17 00:00:00 2001
+From c1cbec8571855b8480d56dcad2ab81aea0782bd4 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Fri, 13 Sep 2019 19:26:27 -0400
-Subject: [PATCH 13/22] Handle __cpu_mask usage
+Subject: [PATCH 15/27] Handle __cpu_mask usage
Fixes errors:
@@ -24,7 +24,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h
-index 3c63a58826..4c2d4347fc 100644
+index 618fe1b0a3..46c92077b0 100644
--- a/src/shared/cpu-set-util.h
+++ b/src/shared/cpu-set-util.h
@@ -6,6 +6,8 @@
@@ -56,5 +56,5 @@ index ea0c58770e..b65c0bd370 100644
/* Print information about various types. Useful when diagnosing
* gcc diagnostics on an unfamiliar architecture. */
--
-2.34.1
+2.45.1
diff --git a/systemd/0014-Handle-missing-gshadow.patch b/systemd/0016-Handle-missing-gshadow.patch
similarity index 80%
rename from systemd/0014-Handle-missing-gshadow.patch
rename to systemd/0016-Handle-missing-gshadow.patch
index a751e1b..6c7b233 100644
--- a/systemd/0014-Handle-missing-gshadow.patch
+++ b/systemd/0016-Handle-missing-gshadow.patch
@@ -1,7 +1,7 @@
-From b7c827bb44edbb6251c9fcdb80aa03982c0e7bf3 Mon Sep 17 00:00:00 2001
+From 8b540d8240bbc3f917de9ca8d3b62f28c3424d91 Mon Sep 17 00:00:00 2001
From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Tue, 10 Mar 2020 11:05:20 +0000
-Subject: [PATCH 14/22] Handle missing gshadow
+Subject: [PATCH 16/27] Handle missing gshadow
gshadow usage is now present in the userdb code. Mask all uses of it to
allow compilation on musl
@@ -17,10 +17,10 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c
-index 414a49331b..1a4e1b628c 100644
+index ffb5721466..4d01815c8c 100644
--- a/src/shared/user-record-nss.c
+++ b/src/shared/user-record-nss.c
-@@ -329,8 +329,10 @@ int nss_group_to_group_record(
+@@ -286,8 +286,10 @@ int nss_group_to_group_record(
if (isempty(grp->gr_name))
return -EINVAL;
@@ -31,7 +31,7 @@ index 414a49331b..1a4e1b628c 100644
g = group_record_new();
if (!g)
-@@ -346,6 +348,7 @@ int nss_group_to_group_record(
+@@ -303,6 +305,7 @@ int nss_group_to_group_record(
g->gid = grp->gr_gid;
@@ -39,7 +39,7 @@ index 414a49331b..1a4e1b628c 100644
if (sgrp) {
if (looks_like_hashed_password(utf8_only(sgrp->sg_passwd))) {
g->hashed_password = strv_new(sgrp->sg_passwd);
-@@ -361,6 +364,7 @@ int nss_group_to_group_record(
+@@ -318,6 +321,7 @@ int nss_group_to_group_record(
if (r < 0)
return r;
}
@@ -47,7 +47,7 @@ index 414a49331b..1a4e1b628c 100644
r = json_build(&g->json, JSON_BUILD_OBJECT(
JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)),
-@@ -387,6 +391,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
+@@ -344,6 +348,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
assert(ret_sgrp);
assert(ret_buffer);
@@ -55,7 +55,7 @@ index 414a49331b..1a4e1b628c 100644
for (;;) {
_cleanup_free_ char *buf = NULL;
struct sgrp sgrp, *result;
-@@ -415,6 +420,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
+@@ -372,6 +377,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
buflen *= 2;
buf = mfree(buf);
}
@@ -65,25 +65,25 @@ index 414a49331b..1a4e1b628c 100644
}
int nss_group_record_by_name(
-@@ -426,7 +434,9 @@ int nss_group_record_by_name(
- struct group grp, *result;
+@@ -382,7 +390,9 @@ int nss_group_record_by_name(
+ _cleanup_free_ char *sbuf = NULL;
+ _cleanup_free_ struct group *result = NULL;
bool incomplete = false;
- size_t buflen = 4096;
+#if ENABLE_GSHADOW
struct sgrp sgrp, *sresult = NULL;
+#endif
int r;
assert(name);
-@@ -455,6 +465,7 @@ int nss_group_record_by_name(
- buf = mfree(buf);
- }
+@@ -391,6 +401,7 @@ int nss_group_record_by_name(
+ if (r < 0)
+ return r;
+#if ENABLE_GSHADOW
if (with_shadow) {
r = nss_sgrp_for_group(result, &sgrp, &sbuf);
if (r < 0) {
-@@ -466,6 +477,9 @@ int nss_group_record_by_name(
+@@ -402,6 +413,9 @@ int nss_group_record_by_name(
incomplete = true;
r = nss_group_to_group_record(result, sresult, ret);
@@ -93,25 +93,24 @@ index 414a49331b..1a4e1b628c 100644
if (r < 0)
return r;
-@@ -483,7 +497,9 @@ int nss_group_record_by_gid(
- struct group grp, *result;
+@@ -418,13 +432,16 @@ int nss_group_record_by_gid(
+ _cleanup_free_ char *sbuf = NULL;
+ _cleanup_free_ struct group *result = NULL;
bool incomplete = false;
- size_t buflen = 4096;
+#if ENABLE_GSHADOW
struct sgrp sgrp, *sresult = NULL;
+#endif
int r;
- for (;;) {
-@@ -509,6 +525,7 @@ int nss_group_record_by_gid(
- buf = mfree(buf);
- }
+ r = getgrgid_malloc(gid, &result);
+ if (r < 0)
+ return r;
+#if ENABLE_GSHADOW
if (with_shadow) {
r = nss_sgrp_for_group(result, &sgrp, &sbuf);
if (r < 0) {
-@@ -520,6 +537,9 @@ int nss_group_record_by_gid(
+@@ -436,6 +453,9 @@ int nss_group_record_by_gid(
incomplete = true;
r = nss_group_to_group_record(result, sresult, ret);
@@ -138,7 +137,7 @@ index 22ab04d6ee..4e52e7a911 100644
#include <shadow.h>
diff --git a/src/shared/userdb.c b/src/shared/userdb.c
-index f60d48ace4..e878199a28 100644
+index 75dece3442..5628e1410f 100644
--- a/src/shared/userdb.c
+++ b/src/shared/userdb.c
@@ -1038,13 +1038,15 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
@@ -169,5 +168,5 @@ index f60d48ace4..e878199a28 100644
return r;
--
-2.34.1
+2.45.1
diff --git a/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/systemd/0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
similarity index 85%
rename from systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
rename to systemd/0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
index e112766..04b2fb7 100644
--- a/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
+++ b/systemd/0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
@@ -1,7 +1,7 @@
-From 3dc9d9d410bcce54fddfd94f43f7f77f3aa8e281 Mon Sep 17 00:00:00 2001
+From 45bb63a1727097683acad23f270968026671ec6a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 12 Apr 2021 23:44:53 -0700
-Subject: [PATCH 15/22] missing_syscall.h: Define MIPS ABI defines for musl
+Subject: [PATCH 17/27] missing_syscall.h: Define MIPS ABI defines for musl
musl does not define _MIPS_SIM_ABI32, _MIPS_SIM_NABI32, _MIPS_SIM_ABI64
unlike glibc where these are provided by libc headers, therefore define
@@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
2 files changed, 7 insertions(+)
diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
-index d795efd8f2..d6729d3c1d 100644
+index 86280771c4..20d05db506 100644
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -20,6 +20,12 @@
@@ -33,7 +33,7 @@ index d795efd8f2..d6729d3c1d 100644
#include "missing_keyctl.h"
#include "missing_stat.h"
diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
-index 7ae921a113..0ef9d1fd39 100644
+index 67aa8ea1f2..8d9824495e 100644
--- a/src/shared/base-filesystem.c
+++ b/src/shared/base-filesystem.c
@@ -20,6 +20,7 @@
@@ -45,5 +45,5 @@ index 7ae921a113..0ef9d1fd39 100644
typedef struct BaseFilesystem {
const char *dir; /* directory or symlink to create */
--
-2.34.1
+2.45.1
diff --git a/systemd/0016-pass-correct-parameters-to-getdents64.patch b/systemd/0018-pass-correct-parameters-to-getdents64.patch
similarity index 88%
rename from systemd/0016-pass-correct-parameters-to-getdents64.patch
rename to systemd/0018-pass-correct-parameters-to-getdents64.patch
index 0be817e..b4b6be0 100644
--- a/systemd/0016-pass-correct-parameters-to-getdents64.patch
+++ b/systemd/0018-pass-correct-parameters-to-getdents64.patch
@@ -1,7 +1,7 @@
-From 0994b59dba9f248ad31cb7087046dc00b72cb4ea Mon Sep 17 00:00:00 2001
+From 78a59a540d425e677d5652d9b72d7b175e36f4dd Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 21 Jan 2022 15:15:11 -0800
-Subject: [PATCH 16/22] pass correct parameters to getdents64
+Subject: [PATCH 18/27] pass correct parameters to getdents64
Fixes
../git/src/basic/recurse-dir.c:57:40: error: incompatible pointer types passing 'uint8_t *' (aka 'unsigned char *') to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types]
@@ -20,10 +20,10 @@ Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c
-index 5e98b7a5d8..aef065047b 100644
+index 776733148b..d37419658c 100644
--- a/src/basic/recurse-dir.c
+++ b/src/basic/recurse-dir.c
-@@ -55,7 +55,7 @@ int readdir_all(int dir_fd,
+@@ -56,7 +56,7 @@ int readdir_all(int dir_fd,
bs = MIN(MALLOC_SIZEOF_SAFE(de) - offsetof(DirectoryEntries, buffer), (size_t) SSIZE_MAX);
assert(bs > de->buffer_size);
@@ -33,5 +33,5 @@ index 5e98b7a5d8..aef065047b 100644
return -errno;
if (n == 0)
--
-2.34.1
+2.45.1
diff --git a/systemd/0017-Adjust-for-musl-headers.patch b/systemd/0019-Adjust-for-musl-headers.patch
similarity index 84%
rename from systemd/0017-Adjust-for-musl-headers.patch
rename to systemd/0019-Adjust-for-musl-headers.patch
index 4176522..44eebe1 100644
--- a/systemd/0017-Adjust-for-musl-headers.patch
+++ b/systemd/0019-Adjust-for-musl-headers.patch
@@ -1,7 +1,7 @@
-From 3c094d443ca30f19114392fd8ef274af6eabc12d Mon Sep 17 00:00:00 2001
+From 585e04673da62a8bf50e00fd6c1ae9ffc66c3b2f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 21 Jan 2022 22:19:37 -0800
-Subject: [PATCH 17/22] Adjust for musl headers
+Subject: [PATCH 19/27] Adjust for musl headers
Upstream-Status: Inappropriate [musl specific]
@@ -14,7 +14,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
src/network/netdev/bareudp.c | 2 +-
src/network/netdev/batadv.c | 2 +-
src/network/netdev/bond.c | 2 +-
- src/network/netdev/bridge.c | 2 +-
+ src/network/netdev/bridge.c | 3 ++-
src/network/netdev/dummy.c | 2 +-
src/network/netdev/geneve.c | 2 +-
src/network/netdev/ifb.c | 2 +-
@@ -34,7 +34,6 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
src/network/netdev/vxlan.c | 2 +-
src/network/netdev/wireguard.c | 2 +-
src/network/netdev/xfrm.c | 2 +-
- src/network/networkd-bridge-mdb.c | 4 ++--
src/network/networkd-dhcp-common.c | 3 ++-
src/network/networkd-dhcp-prefix-delegation.c | 3 ++-
src/network/networkd-dhcp-server.c | 2 +-
@@ -42,16 +41,15 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
src/network/networkd-ipv6ll.c | 2 +-
src/network/networkd-link.c | 2 +-
src/network/networkd-ndisc.c | 2 +-
- src/network/networkd-route.c | 8 ++++----
src/network/networkd-setlink.c | 2 +-
src/network/networkd-sysctl.c | 2 +-
src/shared/linux/ethtool.h | 3 ++-
src/shared/netif-util.c | 2 +-
src/udev/udev-builtin-net_id.c | 2 +-
- 38 files changed, 45 insertions(+), 42 deletions(-)
+ 36 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
-index c20367dfc9..b8d4cd8c2a 100644
+index 3e992d7cad..c7e1ff4dbf 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -5,7 +5,7 @@
@@ -90,7 +88,7 @@ index 26da0231d4..2e8002af8c 100644
#include "batadv.h"
#include "fileio.h"
diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
-index 4d75a0d6bf..985b3197e0 100644
+index 52a7f126b6..74ca0812db 100644
--- a/src/network/netdev/bond.c
+++ b/src/network/netdev/bond.c
@@ -1,7 +1,7 @@
@@ -103,18 +101,19 @@ index 4d75a0d6bf..985b3197e0 100644
#include "alloc-util.h"
#include "bond.h"
diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
-index 3e394edadf..f12f667687 100644
+index d426c0c501..14432adb95 100644
--- a/src/network/netdev/bridge.c
+++ b/src/network/netdev/bridge.c
-@@ -2,7 +2,7 @@
+@@ -2,7 +2,8 @@
+ /* Make sure the net/if.h header is included before any linux/ one */
#include <net/if.h>
- #include <netinet/in.h>
-#include <linux/if_arp.h>
++#include <netinet/in.h>
+//#include <linux/if_arp.h>
#include <linux/if_bridge.h>
+ #include <netinet/in.h>
- #include "bridge.h"
diff --git a/src/network/netdev/dummy.c b/src/network/netdev/dummy.c
index 00df1d2787..77b506b422 100644
--- a/src/network/netdev/dummy.c
@@ -128,18 +127,18 @@ index 00df1d2787..77b506b422 100644
#include "dummy.h"
diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c
-index bc655ec7ff..a77e8e17e4 100644
+index 22c2b00e1b..1d762c4911 100644
--- a/src/network/netdev/geneve.c
+++ b/src/network/netdev/geneve.c
@@ -2,7 +2,7 @@
+ /* Make sure the net/if.h header is included before any linux/ one */
#include <net/if.h>
- #include <netinet/in.h>
-#include <linux/if_arp.h>
+//#include <linux/if_arp.h>
+ #include <netinet/in.h>
#include "alloc-util.h"
- #include "conf-parser.h"
diff --git a/src/network/netdev/ifb.c b/src/network/netdev/ifb.c
index d7ff44cb9e..e037629ae4 100644
--- a/src/network/netdev/ifb.c
@@ -166,11 +165,11 @@ index d5fe299b7b..c9c8002eac 100644
#include "ipoib.h"
diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c
-index 05d5d010f6..d440f49537 100644
+index 51ae64341d..46460efabd 100644
--- a/src/network/netdev/ipvlan.c
+++ b/src/network/netdev/ipvlan.c
-@@ -2,7 +2,7 @@
-
+@@ -3,7 +3,7 @@
+ /* Make sure the net/if.h header is included before any linux/ one */
#include <net/if.h>
#include <netinet/in.h>
-#include <linux/if_arp.h>
@@ -179,7 +178,7 @@ index 05d5d010f6..d440f49537 100644
#include "conf-parser.h"
#include "ipvlan.h"
diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
-index 17d6acefb6..679d0984f9 100644
+index 4b9f19cc95..6c4951a7e6 100644
--- a/src/network/netdev/macsec.c
+++ b/src/network/netdev/macsec.c
@@ -1,7 +1,7 @@
@@ -192,11 +191,11 @@ index 17d6acefb6..679d0984f9 100644
#include <linux/if_macsec.h>
#include <linux/genetlink.h>
diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c
-index 203807e3a5..8ab09a387e 100644
+index 21933d3970..a4ace19dc6 100644
--- a/src/network/netdev/macvlan.c
+++ b/src/network/netdev/macvlan.c
-@@ -2,7 +2,7 @@
-
+@@ -3,7 +3,7 @@
+ /* Make sure the net/if.h header is included before any linux/ one */
#include <net/if.h>
#include <netinet/in.h>
-#include <linux/if_arp.h>
@@ -205,11 +204,11 @@ index 203807e3a5..8ab09a387e 100644
#include "conf-parser.h"
#include "macvlan.h"
diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
-index 57127a861a..7f787d0b9f 100644
+index 2b411425ba..fe00200135 100644
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
-@@ -2,7 +2,7 @@
-
+@@ -3,7 +3,7 @@
+ /* Make sure the net/if.h header is included before any linux/ one */
#include <net/if.h>
#include <netinet/in.h>
-#include <linux/if_arp.h>
@@ -267,40 +266,41 @@ index 380547ee1e..137c1adf8a 100644
#include "vcan.h"
diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c
-index e0f5b4ebb1..8a424ed03d 100644
+index 78555286d1..e7eff072e4 100644
--- a/src/network/netdev/veth.c
+++ b/src/network/netdev/veth.c
@@ -3,7 +3,7 @@
- #include <errno.h>
+ /* Make sure the net/if.h header is included before any linux/ one */
#include <net/if.h>
- #include <netinet/in.h>
+ #include <errno.h>
-#include <linux/if_arp.h>
+//#include <linux/if_arp.h>
#include <linux/veth.h>
+ #include <netinet/in.h>
- #include "netlink-util.h"
diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c
-index 2390206993..efec630e30 100644
+index 60e49a5b8a..266fd58813 100644
--- a/src/network/netdev/vlan.c
+++ b/src/network/netdev/vlan.c
-@@ -2,7 +2,7 @@
-
- #include <errno.h>
+@@ -3,7 +3,7 @@
+ /* Make sure the net/if.h header is included before any linux/ one */
#include <net/if.h>
+ #include <errno.h>
-#include <linux/if_arp.h>
+//#include <linux/if_arp.h>
#include <linux/if_vlan.h>
#include "parse-util.h"
diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c
-index b75ec2bcc6..6aeeea640b 100644
+index 24079a7203..33ff17ea82 100644
--- a/src/network/netdev/vrf.c
+++ b/src/network/netdev/vrf.c
-@@ -2,7 +2,7 @@
+@@ -2,8 +2,8 @@
+ /* Make sure the net/if.h header is included before any linux/ one */
#include <net/if.h>
- #include <netinet/in.h>
-#include <linux/if_arp.h>
+ #include <netinet/in.h>
+//#include <linux/if_arp.h>
#include "vrf.h"
@@ -319,11 +319,11 @@ index c0343f45b6..f9e718f40b 100644
#include "vxcan.h"
diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c
-index b11fdbbd0d..a971a917f0 100644
+index 37f65967a6..bdd8848a02 100644
--- a/src/network/netdev/vxlan.c
+++ b/src/network/netdev/vxlan.c
-@@ -2,7 +2,7 @@
-
+@@ -3,7 +3,7 @@
+ /* Make sure the net/if.h header is included before any linux/ one */
#include <net/if.h>
#include <netinet/in.h>
-#include <linux/if_arp.h>
@@ -332,18 +332,18 @@ index b11fdbbd0d..a971a917f0 100644
#include "conf-parser.h"
#include "alloc-util.h"
diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c
-index 4c7d837c41..6df6dfb816 100644
+index fed1be8d11..94b659fd23 100644
--- a/src/network/netdev/wireguard.c
+++ b/src/network/netdev/wireguard.c
-@@ -6,7 +6,7 @@
- #include <sys/ioctl.h>
+@@ -5,7 +5,7 @@
+
+ /* Make sure the net/if.h header is included before any linux/ one */
#include <net/if.h>
- #include <netinet/in.h>
-#include <linux/if_arp.h>
+//#include <linux/if_arp.h>
#include <linux/ipv6_route.h>
-
- #include "sd-resolve.h"
+ #include <netinet/in.h>
+ #include <sys/ioctl.h>
diff --git a/src/network/netdev/xfrm.c b/src/network/netdev/xfrm.c
index 905bfc0bdf..39e34dbb3b 100644
--- a/src/network/netdev/xfrm.c
@@ -356,29 +356,8 @@ index 905bfc0bdf..39e34dbb3b 100644
#include "missing_network.h"
#include "xfrm.h"
-diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c
-index bd1a9745dc..949d3da029 100644
---- a/src/network/networkd-bridge-mdb.c
-+++ b/src/network/networkd-bridge-mdb.c
-@@ -1,7 +1,5 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
-
--#include <net/if.h>
--#include <linux/if_bridge.h>
-
- #include "netlink-util.h"
- #include "networkd-bridge-mdb.h"
-@@ -11,6 +9,8 @@
- #include "networkd-queue.h"
- #include "string-util.h"
- #include "vlan-util.h"
-+#include <net/if.h>
-+#include <linux/if_bridge.h>
-
- #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U
-
diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
-index 080b15387c..efe8283957 100644
+index 9f0268d934..8cd605ab4a 100644
--- a/src/network/networkd-dhcp-common.c
+++ b/src/network/networkd-dhcp-common.c
@@ -1,7 +1,8 @@
@@ -392,7 +371,7 @@ index 080b15387c..efe8283957 100644
#include "bus-error.h"
#include "bus-locator.h"
diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c
-index af2fe9efcd..511565700f 100644
+index 2e660b7763..b8dd6240a0 100644
--- a/src/network/networkd-dhcp-prefix-delegation.c
+++ b/src/network/networkd-dhcp-prefix-delegation.c
@@ -1,6 +1,5 @@
@@ -412,7 +391,7 @@ index af2fe9efcd..511565700f 100644
assert(link);
diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
-index 607fe0053c..9ce4005874 100644
+index c35102af74..3be469ae16 100644
--- a/src/network/networkd-dhcp-server.c
+++ b/src/network/networkd-dhcp-server.c
@@ -1,7 +1,7 @@
@@ -425,7 +404,7 @@ index 607fe0053c..9ce4005874 100644
#include "sd-dhcp-server.h"
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
-index efbae6d868..1ea2151d50 100644
+index 4dd6044b18..15a598f9db 100644
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -3,7 +3,7 @@
@@ -451,10 +430,10 @@ index 32229a3fc7..662a345d6e 100644
#include "in-addr-util.h"
#include "networkd-address.h"
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index ee5f0f2c0a..ea5269a2de 100644
+index 6b0f09926a..81f44f6e6a 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
-@@ -3,7 +3,7 @@
+@@ -4,7 +4,7 @@
#include <net/if.h>
#include <netinet/in.h>
#include <linux/if.h>
@@ -464,7 +443,7 @@ index ee5f0f2c0a..ea5269a2de 100644
#include <linux/netdevice.h>
#include <sys/socket.h>
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
-index ab9eeb13a5..dd96fe7483 100644
+index 7cafe1f6a3..07c293c9a6 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -6,7 +6,7 @@
@@ -476,33 +455,8 @@ index ab9eeb13a5..dd96fe7483 100644
#include "sd-ndisc.h"
-diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
-index 7218d799fc..30d5574eae 100644
---- a/src/network/networkd-route.c
-+++ b/src/network/networkd-route.c
-@@ -1,9 +1,5 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
-
--#include <linux/icmpv6.h>
--#include <linux/ipv6_route.h>
--#include <linux/nexthop.h>
--
- #include "alloc-util.h"
- #include "event-util.h"
- #include "netlink-util.h"
-@@ -21,6 +17,10 @@
- #include "vrf.h"
- #include "wireguard.h"
-
-+#include <linux/icmpv6.h>
-+#include <linux/ipv6_route.h>
-+#include <linux/nexthop.h>
-+
- int route_new(Route **ret) {
- _cleanup_(route_freep) Route *route = NULL;
-
diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c
-index 2298f9ea3a..7d5f87de53 100644
+index 058bc00ba1..bb0a430a0b 100644
--- a/src/network/networkd-setlink.c
+++ b/src/network/networkd-setlink.c
@@ -2,7 +2,7 @@
@@ -515,7 +469,7 @@ index 2298f9ea3a..7d5f87de53 100644
#include "missing_network.h"
diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c
-index 2b226b2e2a..f12a474e2f 100644
+index 68c23e0eb7..e177c49d9b 100644
--- a/src/network/networkd-sysctl.c
+++ b/src/network/networkd-sysctl.c
@@ -2,7 +2,7 @@
@@ -525,8 +479,8 @@ index 2b226b2e2a..f12a474e2f 100644
-#include <linux/if_arp.h>
+//#include <linux/if_arp.h>
+ #include "af-list.h"
#include "missing_network.h"
- #include "networkd-link.h"
diff --git a/src/shared/linux/ethtool.h b/src/shared/linux/ethtool.h
index 3d1da515c0..3fca9a4faf 100644
--- a/src/shared/linux/ethtool.h
@@ -542,7 +496,7 @@ index 3d1da515c0..3fca9a4faf 100644
#include <limits.h> /* for INT_MAX */
diff --git a/src/shared/netif-util.c b/src/shared/netif-util.c
-index f56c5646c1..5af28ff119 100644
+index 8adc2c89c8..1977e28d7f 100644
--- a/src/shared/netif-util.c
+++ b/src/shared/netif-util.c
@@ -1,7 +1,7 @@
@@ -555,10 +509,10 @@ index f56c5646c1..5af28ff119 100644
#include "arphrd-util.h"
#include "device-util.h"
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index f528a46b8e..830318cda5 100644
+index 384a1f31cb..c94bb70afb 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
-@@ -18,7 +18,7 @@
+@@ -19,7 +19,7 @@
#include <stdarg.h>
#include <unistd.h>
#include <linux/if.h>
@@ -568,5 +522,5 @@ index f528a46b8e..830318cda5 100644
#include <linux/pci_regs.h>
--
-2.34.1
+2.45.1
diff --git a/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch b/systemd/0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
similarity index 89%
rename from systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
rename to systemd/0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
index 75f6b90..b3fbfee 100644
--- a/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
+++ b/systemd/0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
@@ -1,7 +1,7 @@
-From be02bd0876a061728661535a709d313e39fe1ac3 Mon Sep 17 00:00:00 2001
+From e01f0c444423eb65d176713735ff8cefb3068f3d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 8 Nov 2022 13:31:34 -0800
-Subject: [PATCH 18/22] test-bus-error: strerror() is assumed to be GNU
+Subject: [PATCH 20/27] test-bus-error: strerror() is assumed to be GNU
specific version mark it so
Upstream-Status: Inappropriate [Upstream systemd only supports glibc]
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c
-index a55f3f9856..4123bf3da0 100644
+index 91045c06c2..a06b9bac0c 100644
--- a/src/libsystemd/sd-bus/test-bus-error.c
+++ b/src/libsystemd/sd-bus/test-bus-error.c
@@ -99,7 +99,9 @@ TEST(error) {
@@ -27,7 +27,7 @@ index a55f3f9856..4123bf3da0 100644
assert_se(sd_bus_error_get_errno(&error) == EBUSY);
assert_se(sd_bus_error_is_set(&error));
diff --git a/src/test/test-errno-util.c b/src/test/test-errno-util.c
-index 376d532281..967cfd4d67 100644
+index ab463bd1b3..e2ebcaaf33 100644
--- a/src/test/test-errno-util.c
+++ b/src/test/test-errno-util.c
@@ -4,7 +4,7 @@
@@ -48,5 +48,5 @@ index 376d532281..967cfd4d67 100644
TEST(PROTECT_ERRNO) {
errno = 12;
--
-2.34.1
+2.45.1
diff --git a/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch b/systemd/0021-errno-util-Make-STRERROR-portable-for-musl.patch
similarity index 88%
rename from systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch
rename to systemd/0021-errno-util-Make-STRERROR-portable-for-musl.patch
index e038b73..6e899d0 100644
--- a/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch
+++ b/systemd/0021-errno-util-Make-STRERROR-portable-for-musl.patch
@@ -1,7 +1,7 @@
-From 46d80840bfe37e67d4f18c37a77751ea1fe63a07 Mon Sep 17 00:00:00 2001
+From d2f632dd6a8cca0fbdd6568ce84004335c004f58 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 23 Jan 2023 23:39:46 -0800
-Subject: [PATCH 19/22] errno-util: Make STRERROR portable for musl
+Subject: [PATCH 21/27] errno-util: Make STRERROR portable for musl
Sadly, systemd has decided to use yet another GNU extention in a macro
lets make this such that we can use XSI compliant strerror_r() for
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h
-index 27804e6382..274c1c6ef1 100644
+index 48b76e4bf7..6e7653e2d9 100644
--- a/src/basic/errno-util.h
+++ b/src/basic/errno-util.h
@@ -15,8 +15,16 @@
@@ -38,5 +38,5 @@ index 27804e6382..274c1c6ef1 100644
* Note that we can't use ({ … }) to define a temporary variable, so errnum is
* evaluated twice. */
--
-2.34.1
+2.45.1
diff --git a/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch b/systemd/0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch
similarity index 77%
rename from systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch
rename to systemd/0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch
index b83fffe..ed7e3ea 100644
--- a/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch
+++ b/systemd/0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch
@@ -1,7 +1,7 @@
-From 9eb4867b4e2dbdb2484ae854022aff97e2f0feb3 Mon Sep 17 00:00:00 2001
+From 4a3ed5aaaf108d3a07f24997698906e801ba2412 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 2 Aug 2023 12:06:27 -0700
-Subject: [PATCH 20/22] sd-event: Make malloc_trim() conditional on glibc
+Subject: [PATCH 22/27] sd-event: Make malloc_trim() conditional on glibc
musl does not have this API
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
-index 288798a0dc..6419a7f216 100644
+index a1305ef014..b8a73da2a3 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
-@@ -1874,7 +1874,7 @@ _public_ int sd_event_add_exit(
+@@ -1877,7 +1877,7 @@ _public_ int sd_event_add_exit(
}
_public_ int sd_event_trim_memory(void) {
@@ -24,7 +24,7 @@ index 288798a0dc..6419a7f216 100644
/* A default implementation of a memory pressure callback. Simply releases our own allocation caches
* and glibc's. This is automatically used when people call sd_event_add_memory_pressure() with a
-@@ -1888,7 +1888,9 @@ _public_ int sd_event_trim_memory(void) {
+@@ -1891,7 +1891,9 @@ _public_ int sd_event_trim_memory(void) {
usec_t before_timestamp = now(CLOCK_MONOTONIC);
hashmap_trim_pools();
@@ -35,5 +35,5 @@ index 288798a0dc..6419a7f216 100644
if (r > 0)
--
-2.34.1
+2.45.1
diff --git a/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch b/systemd/0023-shared-Do-not-use-malloc_info-on-musl.patch
similarity index 86%
rename from systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch
rename to systemd/0023-shared-Do-not-use-malloc_info-on-musl.patch
index 7eff069..b8583c7 100644
--- a/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch
+++ b/systemd/0023-shared-Do-not-use-malloc_info-on-musl.patch
@@ -1,7 +1,7 @@
-From 502597b9ddd6b145541b23fadca0b1d3ca9f6367 Mon Sep 17 00:00:00 2001
+From d3880d167d8dfafbb8ee62f7737a869f9525f303 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 2 Aug 2023 12:20:40 -0700
-Subject: [PATCH 21/22] shared: Do not use malloc_info on musl
+Subject: [PATCH 23/27] shared: Do not use malloc_info on musl
Upstream-Status: Inappropriate [musl-specific]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
-index 74f148c8b4..2d862a123d 100644
+index 30f9602b1e..5308f168db 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
-@@ -611,15 +611,16 @@ static int method_dump_memory_state_by_fd(sd_bus_message *message, void *userdat
+@@ -755,15 +755,16 @@ static int method_dump_memory_state_by_fd(sd_bus_message *message, void *userdat
_cleanup_close_ int fd = -EBADF;
size_t dump_size;
FILE *f;
@@ -53,5 +53,5 @@ index 8e70e365dd..9e782caec9 100644
break;
}
--
-2.34.1
+2.45.1
diff --git a/systemd/0022-avoid-missing-LOCK_EX-declaration.patch b/systemd/0024-avoid-missing-LOCK_EX-declaration.patch
similarity index 63%
rename from systemd/0022-avoid-missing-LOCK_EX-declaration.patch
rename to systemd/0024-avoid-missing-LOCK_EX-declaration.patch
index 24f3bf7..6804c7c 100644
--- a/systemd/0022-avoid-missing-LOCK_EX-declaration.patch
+++ b/systemd/0024-avoid-missing-LOCK_EX-declaration.patch
@@ -1,7 +1,7 @@
-From fd52f1764647e03a35e8f0ed0ef952049073ccbd Mon Sep 17 00:00:00 2001
+From ca2a736627f8ee8dd9dbbf5b3149d4c8493833ff Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Tue, 2 Jan 2024 11:03:27 +0800
-Subject: [PATCH 22/22] avoid missing LOCK_EX declaration
+Subject: [PATCH 24/27] avoid missing LOCK_EX declaration
This only happens on MUSL. Include sys/file.h to avoid compilation
error about missing LOCK_EX declaration.
@@ -10,12 +10,25 @@ Upstream-Status: Inappropriate [musl specific]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
+ src/basic/fd-util.h | 1 +
src/core/exec-invoke.c | 1 +
src/shared/dev-setup.h | 1 +
- 2 files changed, 2 insertions(+)
+ 3 files changed, 3 insertions(+)
+diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
+index af17481dd8..fa20bfa30f 100644
+--- a/src/basic/fd-util.h
++++ b/src/basic/fd-util.h
+@@ -6,6 +6,7 @@
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <sys/socket.h>
++#include <sys/file.h>
+
+ #include "macro.h"
+ #include "missing_fcntl.h"
diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c
-index 70d963e269..7084811439 100644
+index ee8db04e76..2aff654f0f 100644
--- a/src/core/exec-invoke.c
+++ b/src/core/exec-invoke.c
@@ -4,6 +4,7 @@
@@ -39,5 +52,5 @@ index 5339bc4e5e..0697495f23 100644
int lock_dev_console(void);
--
-2.34.1
+2.45.1
diff --git a/systemd/0025-include-signal.h-to-avoid-the-undeclared-error.patch b/systemd/0025-include-signal.h-to-avoid-the-undeclared-error.patch
new file mode 100644
index 0000000..5cfb112
--- /dev/null
+++ b/systemd/0025-include-signal.h-to-avoid-the-undeclared-error.patch
@@ -0,0 +1,27 @@
+From ecf124ab2e488a71741fe443ff4863f7ed172968 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Tue, 2 Jul 2024 22:18:47 -0700
+Subject: [PATCH 25/27] include signal.h to avoid the 'undeclared' error
+
+Upstream-Status: Inappropriate [musl specific]
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ src/basic/pidref.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/basic/pidref.h b/src/basic/pidref.h
+index 9920ebb9b3..2fdd4ff50f 100644
+--- a/src/basic/pidref.h
++++ b/src/basic/pidref.h
+@@ -1,6 +1,7 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ #pragma once
+
++#include <signal.h>
+ #include "macro.h"
+
+ /* An embeddable structure carrying a reference to a process. Supposed to be used when tracking processes continuously. */
+--
+2.45.1
+
diff --git a/systemd/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch b/systemd/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch
new file mode 100644
index 0000000..ca1a525
--- /dev/null
+++ b/systemd/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch
@@ -0,0 +1,48 @@
+From 787606c6ff822fb3fe41ba951ee289bbf6d4def3 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Tue, 2 Jul 2024 22:44:31 -0700
+Subject: [PATCH 26/27] undef stdin for references using stdin as a struct
+ member
+
+In musl stdio.h, we have:
+include/stdio.h:#define stdin (stdin)
+
+This causes error when a struct member is also named stdin. undef it.
+
+Upstream-Status: Inappropriate [musl specific]
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ src/shared/edit-util.c | 2 ++
+ src/systemctl/systemctl-edit.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/shared/edit-util.c b/src/shared/edit-util.c
+index cfb2828f4e..1794a7b269 100644
+--- a/src/shared/edit-util.c
++++ b/src/shared/edit-util.c
+@@ -3,6 +3,8 @@
+ #include <errno.h>
+ #include <stdio.h>
+
++#undef stdin
++
+ #include "alloc-util.h"
+ #include "copy.h"
+ #include "edit-util.h"
+diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c
+index 15398f8364..e7d53ca9a1 100644
+--- a/src/systemctl/systemctl-edit.c
++++ b/src/systemctl/systemctl-edit.c
+@@ -13,6 +13,8 @@
+ #include "systemctl.h"
+ #include "terminal-util.h"
+
++#undef stdin
++
+ int verb_cat(int argc, char *argv[], void *userdata) {
+ _cleanup_hashmap_free_ Hashmap *cached_id_map = NULL, *cached_name_map = NULL;
+ _cleanup_(lookup_paths_done) LookupPaths lp = {};
+--
+2.45.1
+
diff --git a/systemd/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch b/systemd/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch
new file mode 100644
index 0000000..1be075d
--- /dev/null
+++ b/systemd/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch
@@ -0,0 +1,76 @@
+From cf94d43572770007f95b832f477aa5a03624a1e5 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Tue, 2 Jul 2024 23:23:57 -0700
+Subject: [PATCH 27/27] adjust header inclusion order to avoid redeclaration
+
+Upstream-Status: Inappropriate [musl specific]
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ src/network/netdev/wireguard.c | 2 +-
+ src/network/networkd-bridge-mdb.c | 3 ++-
+ src/network/networkd-route.c | 6 +++---
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c
+index 94b659fd23..a78ad5762d 100644
+--- a/src/network/netdev/wireguard.c
++++ b/src/network/netdev/wireguard.c
+@@ -5,9 +5,9 @@
+
+ /* Make sure the net/if.h header is included before any linux/ one */
+ #include <net/if.h>
++#include <netinet/in.h>
+ //#include <linux/if_arp.h>
+ #include <linux/ipv6_route.h>
+-#include <netinet/in.h>
+ #include <sys/ioctl.h>
+
+ #include "sd-resolve.h"
+diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c
+index 7ff4a18846..fe1a9cf888 100644
+--- a/src/network/networkd-bridge-mdb.c
++++ b/src/network/networkd-bridge-mdb.c
+@@ -2,7 +2,6 @@
+
+ /* Make sure the net/if.h header is included before any linux/ one */
+ #include <net/if.h>
+-#include <linux/if_bridge.h>
+
+ #include "netlink-util.h"
+ #include "networkd-bridge-mdb.h"
+@@ -13,6 +12,8 @@
+ #include "string-util.h"
+ #include "vlan-util.h"
+
++#include <linux/if_bridge.h>
++
+ #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U
+
+ /* remove MDB entry. */
+diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
+index d596fd81e6..0dc0d2a7a3 100644
+--- a/src/network/networkd-route.c
++++ b/src/network/networkd-route.c
+@@ -1,8 +1,5 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+
+-#include <linux/ipv6_route.h>
+-#include <linux/nexthop.h>
+-
+ #include "alloc-util.h"
+ #include "event-util.h"
+ #include "netlink-util.h"
+@@ -20,6 +17,9 @@
+ #include "vrf.h"
+ #include "wireguard.h"
+
++#include <linux/ipv6_route.h>
++#include <linux/nexthop.h>
++
+ static Route* route_detach_impl(Route *route) {
+ assert(route);
+ assert(!!route->network + !!route->manager + !!route->wireguard <= 1);
+--
+2.45.1
+
diff --git a/systemd/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch b/systemd/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch
new file mode 100644
index 0000000..501728c
--- /dev/null
+++ b/systemd/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch
@@ -0,0 +1,31 @@
+From 0e4379088b1cf607b605b785f6f23943ebeb6584 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Wed, 3 Jul 2024 07:18:42 -0700
+Subject: [PATCH 28/28] build-path.c: avoid boot time segfault for musl
+
+This function, at runtime, should return -ENOEXEC. For musl, it
+somehow segfaults. I think it's related to getauxval, but it's
+really does not matter, just return -ENOEXEC.
+
+Upstream-Status: Inappropriate [musl specific]
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ src/basic/build-path.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/basic/build-path.c b/src/basic/build-path.c
+index b5972658df..4ef551034e 100644
+--- a/src/basic/build-path.c
++++ b/src/basic/build-path.c
+@@ -151,6 +151,7 @@ int get_build_exec_dir(char **ret) {
+ */
+
+ static int runpath_cached = -ERRNO_MAX-1;
++ return -ENOEXEC;
+ if (runpath_cached == -ERRNO_MAX-1) {
+ const char *runpath = NULL;
+
+--
+2.45.1
+
diff --git a/systemd/0100-Do-not-buffer-on-systemd-sleep.patch b/systemd/0100-Do-not-buffer-on-systemd-sleep.patch
index c658662..3d132d7 100644
--- a/systemd/0100-Do-not-buffer-on-systemd-sleep.patch
+++ b/systemd/0100-Do-not-buffer-on-systemd-sleep.patch
@@ -1,6 +1,8 @@
+diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
+index 0402bb07f3..a6cbb45340 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
-@@ -137,7 +137,7 @@ static int write_state(int fd, char * const *states) {
+@@ -139,7 +139,7 @@ static int write_state(int fd, char * const *states) {
if (k < 0)
return RET_GATHER(r, k);
@@ -9,12 +11,12 @@
if (k >= 0) {
log_debug("Using sleep state '%s'.", *state);
return 0;
-@@ -155,7 +155,7 @@ static int write_mode(char * const *modes) {
- STRV_FOREACH(mode, modes) {
- int k;
+@@ -157,7 +157,7 @@ static int write_mode(const char *path, char * const *modes) {
+ assert(path);
-- k = write_string_file("/sys/power/disk", *mode, 0);
-+ k = write_string_file("/sys/power/disk", *mode, WRITE_STRING_FILE_DISABLE_BUFFER);
- if (k >= 0) {
- log_debug("Using sleep disk mode '%s'.", *mode);
- return 0;
+ STRV_FOREACH(mode, modes) {
+- r = write_string_file(path, *mode, 0);
++ r = write_string_file(path, *mode, WRITE_STRING_FILE_DISABLE_BUFFER);
+ if (r >= 0) {
+ log_debug("Using sleep mode '%s' for %s.", *mode, path);
+ return 0;
diff --git a/systemd/0104-DNM-alpine-path-util-support-pre-usrmerge.patch b/systemd/0104-DNM-alpine-path-util-support-pre-usrmerge.patch
index d8155a5..478e0e2 100644
--- a/systemd/0104-DNM-alpine-path-util-support-pre-usrmerge.patch
+++ b/systemd/0104-DNM-alpine-path-util-support-pre-usrmerge.patch
@@ -1,6 +1,6 @@
-From cffc7b910d4c8688567add8939dd496ab63ccecf Mon Sep 17 00:00:00 2001
+From 919b6f1a541064f29afcbffd80912909f2e2c809 Mon Sep 17 00:00:00 2001
From: Pinghao Wu <xdavidwuph@gmail.com>
-Date: Thu, 15 Feb 2024 13:39:02 +0800
+Date: Mon, 15 Jul 2024 19:56:42 +0800
Subject: [PATCH] [DNM][alpine] path-util: support pre-usrmerge
---
@@ -8,20 +8,20 @@ Subject: [PATCH] [DNM][alpine] path-util: support pre-usrmerge
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
-index 6d943e9..90cc4f4 100644
+index 792b8ff2cb..a224091db4 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
-@@ -25,8 +25,8 @@
- # define PATH_SBIN_BIN_NULSTR(x) PATH_NORMAL_SBIN_BIN_NULSTR(x)
- #endif
+@@ -17,8 +17,8 @@
+ #define PATH_MERGED_BIN(x) x "bin"
+ #define PATH_MERGED_BIN_NULSTR(x) x "bin\0"
--#define DEFAULT_PATH PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/")
--#define DEFAULT_PATH_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/")
-+#define DEFAULT_PATH PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/") ":" PATH_SBIN_BIN("/")
-+#define DEFAULT_PATH_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/") PATH_SBIN_BIN_NULSTR("/")
- #define DEFAULT_PATH_COMPAT PATH_SPLIT_SBIN_BIN("/usr/local/") ":" PATH_SPLIT_SBIN_BIN("/usr/") ":" PATH_SPLIT_SBIN_BIN("/")
+-#define DEFAULT_PATH_WITH_SBIN PATH_SPLIT_BIN("/usr/local/") ":" PATH_SPLIT_BIN("/usr/")
+-#define DEFAULT_PATH_WITHOUT_SBIN PATH_MERGED_BIN("/usr/local/") ":" PATH_MERGED_BIN("/usr/")
++#define DEFAULT_PATH_WITH_SBIN PATH_SPLIT_BIN("/usr/local/") ":" PATH_SPLIT_BIN("/usr/") ":" PATH_SPLIT_BIN("/")
++#define DEFAULT_PATH_WITHOUT_SBIN PATH_MERGED_BIN("/usr/local/") ":" PATH_MERGED_BIN("/usr/") ":" PATH_MERGED_BIN("/")
+
+ #define DEFAULT_PATH_COMPAT PATH_SPLIT_BIN("/usr/local/") ":" PATH_SPLIT_BIN("/usr/") ":" PATH_SPLIT_BIN("/")
- #ifndef DEFAULT_USER_PATH
--
-2.43.0
+2.45.2
diff --git a/systemd/APKBUILD b/systemd/APKBUILD
index 106a33f..baa0f65 100644
--- a/systemd/APKBUILD
+++ b/systemd/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: xdavidwu <xdavidwuph@gmail.com>
# Maintainer: xdavidwu <xdavidwuph@gmail.com>
pkgname=systemd
-pkgver=255.9
+pkgver=256.2
pkgrel=0
pkgdesc="System and Service Manager"
url="https://www.github.com/systemd/systemd"
@@ -15,29 +15,32 @@ makedepends="coreutils py3-jinja2 gperf libcap-dev util-linux-dev gettext-dev km
checkdepends=""
install="$pkgname.pre-install"
subpackages="$pkgname-dev $pkgname-doc $pkgname-bash-completion $pkgname-zsh-completion"
-source="$pkgname-$pkgver.tar.gz::https://github.com/systemd/systemd-stable/archive/refs/tags/v$pkgver.tar.gz
- 0001-missing_type.h-add-comparison_fn_t.patch
- 0002-add-fallback-parse_printf_format-implementation.patch
- 0003-src-basic-missing.h-check-for-missing-strndupa.patch
- 0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
- 0005-add-missing-FTW_-macros-for-musl.patch
- 0006-Use-uintmax_t-for-handling-rlim_t.patch
- 0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
- 0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch
- 0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
- 0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
- 0011-avoid-redefinition-of-prctl_mm_map-structure.patch
- 0012-do-not-disable-buffer-in-writing-files.patch
- 0013-Handle-__cpu_mask-usage.patch
- 0014-Handle-missing-gshadow.patch
- 0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
- 0016-pass-correct-parameters-to-getdents64.patch
- 0017-Adjust-for-musl-headers.patch
- 0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
- 0019-errno-util-Make-STRERROR-portable-for-musl.patch
- 0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch
- 0021-shared-Do-not-use-malloc_info-on-musl.patch
- 0022-avoid-missing-LOCK_EX-declaration.patch
+source="$pkgname-$pkgver.tar.gz::https://github.com/systemd/systemd/archive/refs/tags/v$pkgver.tar.gz
+ 0004-missing_type.h-add-comparison_fn_t.patch
+ 0005-add-fallback-parse_printf_format-implementation.patch
+ 0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
+ 0007-add-missing-FTW_-macros-for-musl.patch
+ 0008-Use-uintmax_t-for-handling-rlim_t.patch
+ 0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
+ 0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch
+ 0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
+ 0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
+ 0013-avoid-redefinition-of-prctl_mm_map-structure.patch
+ 0014-do-not-disable-buffer-in-writing-files.patch
+ 0015-Handle-__cpu_mask-usage.patch
+ 0016-Handle-missing-gshadow.patch
+ 0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
+ 0018-pass-correct-parameters-to-getdents64.patch
+ 0019-Adjust-for-musl-headers.patch
+ 0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
+ 0021-errno-util-Make-STRERROR-portable-for-musl.patch
+ 0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch
+ 0023-shared-Do-not-use-malloc_info-on-musl.patch
+ 0024-avoid-missing-LOCK_EX-declaration.patch
+ 0025-include-signal.h-to-avoid-the-undeclared-error.patch
+ 0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch
+ 0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch
+ 0028-build-path.c-avoid-boot-time-segfault-for-musl.patch
0100-Do-not-buffer-on-systemd-sleep.patch
0101-efi-do-not-set-wide-exec-charset.patch
0102-efi-hack-out-musl-wchar-definition.patch
@@ -46,7 +49,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/systemd/systemd-stable/archi
pkgusers="systemd-network systemd-resolve systemd-coredump"
pkggroups="systemd-journal"
provides="hwids-udev=99999999 eudev=99 eudev-libs=99"
-builddir="$srcdir/systemd-stable-$pkgver"
build() {
env CFLAGS=" -D__UAPI_DEF_ETHHDR=0 " meson \
@@ -128,32 +130,35 @@ dev() {
}
sha512sums="
-75b46e443bcbe5e4ae812b6cbbd4ea6485caf5b4addea78a0b42365147a0bdc390a288b4aeda1fc7f3e9a46abf2881cda0e45bb8cb782daa50ea5661514b1af8 systemd-255.9.tar.gz
-b985aec9f03b35bb4fb9927405e8ab1def6c1b2a5f2f15323164c7ff0b330b011778fa433f9335e971c6c149ce316c5b7bad7f077a5ca0695e2fbf1836265077 0001-missing_type.h-add-comparison_fn_t.patch
-fe34196887b961baadef9f0cc93668e70570da7f3826bcc60b3daed3c286361ec5b5f923bc1d34fc78e67c801d10889999523acbe5fc73205f75435e77ca5347 0002-add-fallback-parse_printf_format-implementation.patch
-ba776e6822db80a8e980b803fbee454157340fbb3bf7224b43e836273baffd06be70e70120444b7f243d412ccc9a84f1fa54c3f4259c41c9c89760aed3168c10 0003-src-basic-missing.h-check-for-missing-strndupa.patch
-898a985dd1900721914880fc1d4fe028c73942469436051e5f4fb571b7a5ff1dfbac834613563db9257a99c2706398048a4210628f3b690b8dc31c3862d38cf9 0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
-f04619649e11af4673e472fc64520d1eb9e50b4e0d6531768b5a863d1813ad274525dcd029e4595cf07060ef239478817a0ff9686494d83876fa589dde27f8b8 0005-add-missing-FTW_-macros-for-musl.patch
-5b15a8421016d6f673ab0145b7282b37a3bca2effbaaa3773f8fa95b38a91588dec81d00c13f4170a3762a2c39c79d840a5a27ab05ae046267faed4a170f51bc 0006-Use-uintmax_t-for-handling-rlim_t.patch
-5542d1f6d9af2e4c4e321e8ee01ff86bb17f31924c610ee27364b1168aae491547e72380b1699387ac4cabfa538f5d5bfd77818a255e64c0ac8e36511cdfe20d 0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
-5adb506e12b441791c2b6af76d1a18d68fc6af0bc1f7dbbc458cdbac8fddeff6130cb1d93d93fa2f05417283787f13c2011488f815efc03b3f65991074c1040c 0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch
-0aecbaae0076ca47208f5469471633931c76750a0cbb1310e5297501bf884e376d04d1e8f212f6a23c546300bf157606d31047df0fd20ce7ef9136edb0e0829b 0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
-cd9109805ef0ece6081180a1dc30158c4358374eb979fc19896d505a3e664e83b439bfdcdcb24aeb14cc91140ab8de02f228be59b070305156f05b17729b88eb 0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
-ce9aa83edbdcef13a77a3197b411f0bc8a843c72ef5c9e1e8ac15b9a9c137bc80c776b50db1a6d62e2a0a86f1b3033c757faa40d8c33ba64160e50f5d03e9600 0011-avoid-redefinition-of-prctl_mm_map-structure.patch
-162ea03f13f8d9e52322ac0810d71cdb58b3939e5bd3b421d9a1810eecd593b15d0cf68404e32657c4b320a7f2513fda3180684b0ba6786d9148adb261065d34 0012-do-not-disable-buffer-in-writing-files.patch
-f52575fc69963d2edf9285644f6ebb25d58b01bcf777fa7e7866e0cde5d34b5f64d86b92311443b49e583672b7c77506b8bde94ded318a4427e5fc41699d9a9c 0013-Handle-__cpu_mask-usage.patch
-4577d05cae8058eee12b7bb5b35a8ee05d74e4609cf194b63bc590b3adb0d9cc77bb6b776dcad4644e976344e7ddb618dc638755fb395fb425e6fd7ef71a40ca 0014-Handle-missing-gshadow.patch
-82ebd1b1f6f64b0661b2499f8f44995f2fbb84eba52f2a8377fbc548983b4507ceab3648987b15c5f1641bc259ba19a6251a23204bc9784200702603bcbe123f 0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
-0c886530eae19d1fcd06ae873910c9272b2dc80a9bc1e0b5e22ca049707acc22977cfc42fd85387fc2a3d8b7753484db02625a14072edbaf9604130f894667ab 0016-pass-correct-parameters-to-getdents64.patch
-6f403b6898b64a2fa509f390bd9137a49bfebca57bafc9bd98e7cb47af158d6ea0ff851dd15ca5e54a6e19b233254119a55b871f8c9d6286875e04c89bde4590 0017-Adjust-for-musl-headers.patch
-6addbd80091f052fc5e0349689f55a50e3e02e54d2d7322426808217e3f378e14010b7a3107e1cfbab8b378c2db4563bfaa4401b107652e7af015da9c7cb9d4f 0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
-c1ae5eb03a1702b7c1882b6c235933813fc27db79cde7b230cebb9ee2bcdcff317d2fcac005da00adec11d29b633714cd6a81368c8d8b49ee0dcd2c8fc35e9b7 0019-errno-util-Make-STRERROR-portable-for-musl.patch
-00dec5f9a7a6d53844e2461bc44549249466c3602e0f643c4a2fe99364c6ca3af58771e482ac77daf43d169251d52e446fd7d5a88f013069f6350ed878d9e42e 0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch
-4bce8082b3500a31670afbcea711df1b4d97da268d12f9280c673d82a75bb03d9e15602fc1c4360d8b168a39a12fb1d258cc338bd913368f04e629e0cea13fcb 0021-shared-Do-not-use-malloc_info-on-musl.patch
-5c2007242e5006589b106b4ea9fd10ce890093076aedf84f4d973a510ef4eb8c970bd3cacff68aecd89ce8f7991aacd83fa5812193aed4272177d49d0ccb1113 0022-avoid-missing-LOCK_EX-declaration.patch
-d2ab37ed91af87b70f18ff1f05c9959f20cfafe78e1d49f18a522d41ce4a8ed1c2851826fad1c4f5b8b4b28ada2b4681c33fed6f97ad24d029fe68ddacb01349 0100-Do-not-buffer-on-systemd-sleep.patch
+10da82ee58d3608c41cb0204fdf0227af965b13b8f3716e4f5dea994c236c08a5e31f09ba0d3774cea20a365e1d959c8c865fdeacc82400da55e94ad800e75ba systemd-256.2.tar.gz
+8c49e9bd1f98a08c536fada241c0eea556a9c0fd2ed52ffc23e39663cf94e53ec6a8539f4dba0d193542341932063a6a8b7fe63ed4636ae35c517355f9163f19 0004-missing_type.h-add-comparison_fn_t.patch
+47c709c3420673fe64921f0ceb8c6fb12b8d1b836dfd3f09ee80b8628debb77071851fc5957f30246895a4416b8684ec704c27acf332939e3b5686fa693af5ba 0005-add-fallback-parse_printf_format-implementation.patch
+84e1f974f26d97e7cb12562496fee68480a7cc8683d352ade72e0d1d6739b9755fad1e81fc097b05368e6ab4762892d1afaac20ea366ee4f6b859b0f60492c88 0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
+1d81b848dcfe29f30871e871fa1fa8a495a3b76108355723d85c44adc4dd1900464ebd5fc9b9dda1d2bb818f4d351d591f4335f47036882f1ce1709ecbcb80ed 0007-add-missing-FTW_-macros-for-musl.patch
+31233b22f7ca7cef9d7be1946b3ebefe7116aa96f549a1812ceadee535649bf15725e48551dfd9416eeb98436af42ad98132a818793f3b99b4f93cc8ac42a02f 0008-Use-uintmax_t-for-handling-rlim_t.patch
+8ac89bab45cef2a958abd65d5ba9adb31b4a3da1abde0a699ea0926024a80530f8329a9b4deafb0c01a146ca6a74dc9b6d523495590f8495c89dc76fb9d3b961 0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
+f73d3101ed69d966366181b14e9f7fabf02dd984398256650799e6a19260e18efc9b120ba3fe33655b5468e67d501c0ee0f03fe318350956cd0bf7cac70035b1 0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch
+500d772d8db50fba5d47eb40ad0002036eb963ec4101f61175e49515f33c3fb9a421f02b48a266e8c328a4b29a06870dfed8334f3bb0e038afd0f87067ba626f 0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
+4d7829249e1a14261a5950a09dc4c84914cc8779720aaefd3064a7e1c2e271fb456511a0f1c5cf8b2a0c26e39f8107eba0c7808c4802f7941c03935ae02f2dc2 0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
+ad6438c062e1d3840cf9eaf34684f9a8443e5552bf0518a36d8cbd17ee28328d1876de28b21b96bba0978a1867dd93e4458dd8dcb5d19f946bab14e4d88a29fb 0013-avoid-redefinition-of-prctl_mm_map-structure.patch
+9b5ce75f909ca1f3c189d715d9af945ce3099393ad99da0ec81c948de61e076cba89439eaba001bd7fc827f0385159fd79d3ff5889f3aeef9ebfe49de0ec1210 0014-do-not-disable-buffer-in-writing-files.patch
+5a5b5ace349d9dd9b06096573c44275d8f49209edcaff64e48f3eb5d96ab651ca1384860e0ae4db6da104e0a1b8b2d47d504e87355548f87030bf03acb4a47f1 0015-Handle-__cpu_mask-usage.patch
+9b80f17838e87ff8230cfb2b1f08c28112231af2961e60162674938f298c2f4d85085ac35f44d1655e34ccc716946352e7fa258be3e35f66b28c358ae02483b5 0016-Handle-missing-gshadow.patch
+aa0ec779c158f782802b98da96c997d034112990140fb72883de1eb37b87048a7ee63a69e1a0ddac198d5ecd279aca5dc4b9c91c4ff90da3cbf8cc67ef72f27a 0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
+2fec0244271fa5c79b16031a12079a47162b8f2611a7ccc7cf631fa003809dcbb0d4b3e2bf23e6f9ec3db380bf9e70011b17dc16dcab0c4900e0138e3c1ecbc2 0018-pass-correct-parameters-to-getdents64.patch
+4cf905b4c5caa03816af3a4befe06deb7d3270bf14eed649b5e8415b3a840dc16e292a7d812a45c346f0de30996380ef97432894f8badacf3aa55d2fd8f16491 0019-Adjust-for-musl-headers.patch
+af26d46af5ab4596d113b92c2a170ea75d7095694b341f5f283fc48981237a4e97c09355f432fe26507240cc6bb2e62bf69be4d87eeb44b8d002d581cc2abf63 0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
+58c3d593fad7b834c95d91b5facc0a831bc1ad4a7b962e56d9d4e124b7ab0b98330f939e54d525ff6529905540fe8f5111637e5b22b03760bd8962ced86f751b 0021-errno-util-Make-STRERROR-portable-for-musl.patch
+b931d5916349534154bfd82eddad80a3d6b0ffe2c31e11934d6cc7f1db80263d697731064f28748883e84994e3fc07f9e86aa329cb90f04ee492d66220aeaffd 0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch
+a494bbc2852c516cdb41cb7e412ec65180544298469b27782483c50bdd4b4193ab886046c0803c651d0a5a6571c1b5737c7ff6ea7e251b76b223a2c7f8318892 0023-shared-Do-not-use-malloc_info-on-musl.patch
+133801b668da725259426ddd893c20aa6a66e2beb3edb896a62d95ffb0e667cdbf68101a89102e8aceb61c50105b044178bd970c16a7a4139f336c5159b0f924 0024-avoid-missing-LOCK_EX-declaration.patch
+0881dc9c854734689d8b83bd5680d7863af721ddb7cbcd157cdf26c5daf7c2f3cd870736785ad86e9b62e1c6c8c2b1dd9c5a30b1afdff2a826cf9cd5d1e9dfad 0025-include-signal.h-to-avoid-the-undeclared-error.patch
+ab39b15c5b2216db65f60300c2246182b51c9da529e35991cdd6c350602c8012c505788483294b4696738b1ad8377556325d4b595c79d2c03981d8336a75390c 0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch
+c32cc25479e251c5293e80499d96ab437bddf9a55329c74675f96f4cfac1244b1637faddd6427e3229491e8eb6e037686fc7d94a155247894183c6f4b1a212e1 0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch
+4c6ef1b0811cfcd403a9aaa60f14aaa1704b675592c0f49ad4c8215fc9415a3d0b36528a9cf338965c6dec9c41d3e4c580bf70151dca5a63dca2665c189967a5 0028-build-path.c-avoid-boot-time-segfault-for-musl.patch
+09ffd63addf1ae060ce617695b587963da6c1300595b01f8edc5ee4c4d4182f6ef909f2b07489f6fb9e3cbdad73dfb57dc932722c7422e1596b68327d7da3769 0100-Do-not-buffer-on-systemd-sleep.patch
4ea51f1b47140ee79d738fa983c42402ed0bb4c5ae79880fd30555c7571b5e0a4e7e86457be987bfdf0da928a1111a54709ed54a6676305e5036920347adb5cd 0101-efi-do-not-set-wide-exec-charset.patch
ab3075a07010708fa795a9ff2a0f08f9a0a317034479e41bc8948c0d24155087b797b832e13dc6f534151600dbe5ad4526e9a48eec0328fc00c6609a8328aee7 0102-efi-hack-out-musl-wchar-definition.patch
ec8feed6259e52874ff8c3019746a6c40d38cc4b5a775d934161c51515f435768baad7d87315ecf8192266d2a5e096137a73c8bbe2f8f88b6844e53c276cfdd1 0103-meson-lintl-for-musl-gettext.patch
-3a489e3d79590b8a8c9fc523602b7cf2e90c0f221b0d97ea51fceb071d8fd66fca3e93764ff6b0cba0a21528b3252a81f10a01e017d6529a6255f6e1c31fffc9 0104-DNM-alpine-path-util-support-pre-usrmerge.patch
+d70800a1e7ce4de3a297420ddb9071f3ea68eb5bc87a0f17f06557556b4b0467fc3afaa6eebe8c0553cc8860327455e17e5a25d27b27abc46ac45062ea168201 0104-DNM-alpine-path-util-support-pre-usrmerge.patch
"
--
2.45.2