Skip to contentSkip to conversation

systemd: upgrade from 256.9 to 257

PATCH New [email protected] 1 participant 1 message Dec 17, 2024 exec and binfmt

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 systemd: upgrade from 256.9 to 257

From: Chen Qi <[email protected]>

Patch changes:
* 0003-coredump-set-ProtectHome-to-read-only.patch is drop as it's a backported patch.
* 0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch is drop as AT_SYMLINK_NOFOLLOW has been supportd in musl.
* Other patches are either refreshed or changed to fit the current version.

systemd-boot changes:
* Use src/boot instead src/boot/efi in do_install and do_deploy. See upstream change 97318131fd06 (Rename src/boot/efi to just src/boot).

---
 ...ve_256.9.bb => systemd-boot-native_257.bb} |   0
 ...temd-boot_256.9.bb => systemd-boot_257.bb} |   8 +-
 meta/recipes-core/systemd/systemd.inc         |   4 +-
 ...tall-dependency-links-at-install-tim.patch |   8 +-
 ...implment-systemd-sysv-install-for-OE.patch |   6 +-
 ...oredump-set-ProtectHome-to-read-only.patch |  38 ---
 ...-missing_type.h-add-comparison_fn_t.patch} |   8 +-
 ...-parse_printf_format-implementation.patch} |  16 +-
 ...B_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} |  12 +-
 ...06-add-missing-FTW_-macros-for-musl.patch} |   6 +-
 ...7-Use-uintmax_t-for-handling-rlim_t.patch} |  14 +-
 ...atible-basename-for-non-glibc-syste.patch} |  10 +-
 ...ffering-when-writing-to-oom_score_a.patch} |  10 +-
 ...T_SYMLINK_NOFOLLOW-flag-to-faccessat.patch |  99 ------
 ...ompliant-strerror_r-from-GNU-specif.patch} |  12 +-
 ...efinition-of-prctl_mm_map-structure.patch} |   6 +-
 ...not-disable-buffer-in-writing-files.patch} | 258 +++++++---------
 ...tch => 0013-Handle-__cpu_mask-usage.patch} |   8 +-
 ...atch => 0014-Handle-missing-gshadow.patch} |  32 +-
 ....h-Define-MIPS-ABI-defines-for-musl.patch} |  11 +-
 ...ss-correct-parameters-to-getdents64.patch} |   8 +-
 ...tch => 0017-Adjust-for-musl-headers.patch} | 100 +++---
 ...rerror-is-assumed-to-be-GNU-specifi.patch} |   6 +-
 ...til-Make-STRERROR-portable-for-musl.patch} |   6 +-
 ...ke-malloc_trim-conditional-on-glibc.patch} |  12 +-
 ...ared-Do-not-use-malloc_info-on-musl.patch} |  10 +-
 ...2-avoid-missing-LOCK_EX-declaration.patch} |  16 +-
 ...nal.h-to-avoid-the-undeclared-error.patch} |  16 +-
 ...eferences-using-stdin-as-a-struct-m.patch} |  10 +-
 ...clusion-order-to-avoid-redeclaration.patch | 288 ++++++++++++++++++
 ...c-avoid-boot-time-segfault-for-musl.patch} |   6 +-
 ...clusion-order-to-avoid-redeclaration.patch |  76 -----
 .../{systemd_256.9.bb => systemd_257.bb}      |  50 ++-
 33 files changed, 604 insertions(+), 566 deletions(-)
 rename meta/recipes-core/systemd/{systemd-boot-native_256.9.bb => systemd-boot-native_257.bb} (100%)
 rename meta/recipes-core/systemd/{systemd-boot_256.9.bb => systemd-boot_257.bb} (86%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0003-coredump-set-ProtectHome-to-read-only.patch
 rename meta/recipes-core/systemd/systemd/{0004-missing_type.h-add-comparison_fn_t.patch => 0003-missing_type.h-add-comparison_fn_t.patch} (91%)
 rename meta/recipes-core/systemd/systemd/{0005-add-fallback-parse_printf_format-implementation.patch => 0004-add-fallback-parse_printf_format-implementation.patch} (97%)
 rename meta/recipes-core/systemd/systemd/{0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0005-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} (94%)
 rename meta/recipes-core/systemd/systemd/{0007-add-missing-FTW_-macros-for-musl.patch => 0006-add-missing-FTW_-macros-for-musl.patch} (89%)
 rename meta/recipes-core/systemd/systemd/{0008-Use-uintmax_t-for-handling-rlim_t.patch => 0007-Use-uintmax_t-for-handling-rlim_t.patch} (93%)
 rename meta/recipes-core/systemd/systemd/{0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch => 0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch} (82%)
 rename meta/recipes-core/systemd/systemd/{0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch => 0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch} (83%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
 rename meta/recipes-core/systemd/systemd/{0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch => 0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch} (88%)
 rename meta/recipes-core/systemd/systemd/{0013-avoid-redefinition-of-prctl_mm_map-structure.patch => 0011-avoid-redefinition-of-prctl_mm_map-structure.patch} (83%)
 rename meta/recipes-core/systemd/systemd/{0014-do-not-disable-buffer-in-writing-files.patch => 0012-do-not-disable-buffer-in-writing-files.patch} (77%)
 rename meta/recipes-core/systemd/systemd/{0015-Handle-__cpu_mask-usage.patch => 0013-Handle-__cpu_mask-usage.patch} (92%)
 rename meta/recipes-core/systemd/systemd/{0016-Handle-missing-gshadow.patch => 0014-Handle-missing-gshadow.patch} (84%)
 rename meta/recipes-core/systemd/systemd/{0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch => 0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch} (75%)
 rename meta/recipes-core/systemd/systemd/{0018-pass-correct-parameters-to-getdents64.patch => 0016-pass-correct-parameters-to-getdents64.patch} (90%)
 rename meta/recipes-core/systemd/systemd/{0019-Adjust-for-musl-headers.patch => 0017-Adjust-for-musl-headers.patch} (90%)
 rename meta/recipes-core/systemd/systemd/{0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch => 0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch} (93%)
 rename meta/recipes-core/systemd/systemd/{0021-errno-util-Make-STRERROR-portable-for-musl.patch => 0019-errno-util-Make-STRERROR-portable-for-musl.patch} (91%)
 rename meta/recipes-core/systemd/systemd/{0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch => 0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch} (77%)
 rename meta/recipes-core/systemd/systemd/{0023-shared-Do-not-use-malloc_info-on-musl.patch => 0021-shared-Do-not-use-malloc_info-on-musl.patch} (86%)
 rename meta/recipes-core/systemd/systemd/{0024-avoid-missing-LOCK_EX-declaration.patch => 0022-avoid-missing-LOCK_EX-declaration.patch} (78%)
 rename meta/recipes-core/systemd/systemd/{0025-include-signal.h-to-avoid-the-undeclared-error.patch => 0023-include-signal.h-to-avoid-the-undeclared-error.patch} (51%)
 rename meta/recipes-core/systemd/systemd/{0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch => 0024-undef-stdin-for-references-using-stdin-as-a-struct-m.patch} (84%)
 create mode 100644 meta/recipes-core/systemd/systemd/0025-adjust-header-inclusion-order-to-avoid-redeclaration.patch
 rename meta/recipes-core/systemd/systemd/{0028-build-path.c-avoid-boot-time-segfault-for-musl.patch => 0026-build-path.c-avoid-boot-time-segfault-for-musl.patch} (85%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch
 rename meta/recipes-core/systemd/{systemd_256.9.bb => systemd_257.bb} (96%)
meta/recipes-core/systemd/systemd-boot-native_257.bb renamed from meta/recipes-core/systemd/systemd-boot-native_256.9.bb +0 -0
similarity index 100%
rename from meta/recipes-core/systemd/systemd-boot-native_256.9.bb
rename to meta/recipes-core/systemd/systemd-boot-native_257.bb
meta/recipes-core/systemd/systemd-boot_257.bb renamed from meta/recipes-core/systemd/systemd-boot_256.9.bb +4 -4
similarity index 86%
rename from meta/recipes-core/systemd/systemd-boot_256.9.bb
rename to meta/recipes-core/systemd/systemd-boot_257.bb
index 10b532d47c..6a50ac05aa 100644
@@ -54,13 +54,13 @@ COMPATIBLE_HOST:x86-x32 = "null"
 
 do_install() {
 	install -d ${D}${EFI_FILES_PATH}
-	install ${B}/src/boot/efi/systemd-boot*.efi ${D}${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}
+	install ${B}/src/boot/systemd-boot*.efi ${D}${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}
 }
 
 do_deploy () {
-	install ${B}/src/boot/efi/systemd-boot*.efi ${DEPLOYDIR}
-	install ${B}/src/boot/efi/linux*.efi.stub ${DEPLOYDIR}
-	install ${B}/src/boot/efi/addon*.efi.stub ${DEPLOYDIR}
+	install ${B}/src/boot/systemd-boot*.efi ${DEPLOYDIR}
+	install ${B}/src/boot/linux*.efi.stub ${DEPLOYDIR}
+	install ${B}/src/boot/addon*.efi.stub ${DEPLOYDIR}
 }
 
 addtask deploy before do_build after do_compile
meta/recipes-core/systemd/systemd.inc +2 -2
index b85d5b187d..79d344b78d 100644
@@ -15,8 +15,8 @@ LICENSE:libsystemd = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "f15fd96efd5ebdfb18746acb0cbb35a4331b4d8b"
-SRCBRANCH = "v256-stable"
+SRCREV = "70bae7648f2c18010187c9cf20093155eaa26029"
+SRCBRANCH = "v257-stable"
 SRC_URI = "git://github.com/systemd/systemd.git;protocol=https;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +4 -4
index 4ffcb2ed46..5101f9227e 100644
@@ -1,7 +1,7 @@
-From ca94c86736ca7917e6c50d09d6c6ba56ba139709 Mon Sep 17 00:00:00 2001
+From e5fd143f215f072404c544f694cb026a4231503e Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Thu, 21 Feb 2019 16:23:24 +0800
-Subject: [PATCH 01/27] binfmt: Don't install dependency links at install time
+Subject: [PATCH 01/26] binfmt: Don't install dependency links at install time
  for the binfmt services
 
 use [Install] blocks so that they get created when the service is enabled
@@ -25,7 +25,7 @@ Signed-off-by: Scott Murray <[email protected]>
  3 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/units/meson.build b/units/meson.build
-index b231341a1f..b613a188a4 100644
+index 96f4852741..0a3a4fee67 100644
 --- a/units/meson.build
 +++ b/units/meson.build
 @@ -156,7 +156,6 @@ units = [
@@ -75,5 +75,5 @@ index 318bf8efc2..6ef684861d 100644
 +[Install]
 +WantedBy=sysinit.target
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0002-implment-systemd-sysv-install-for-OE.patch +3 -3
index 36cc5678c0..d8bb572261 100644
@@ -1,7 +1,7 @@
-From 40ae40de3db990a7e56694f24fc625b1b71a98f7 Mon Sep 17 00:00:00 2001
+From fab8c573d06340868f070446118673b1c23584c5 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Sat, 5 Sep 2015 06:31:47 +0000
-Subject: [PATCH 02/27] implment systemd-sysv-install for OE
+Subject: [PATCH 02/26] implment systemd-sysv-install for OE
 
 Use update-rc.d for enabling/disabling and status command
 to check the status of the sysv service
@@ -39,5 +39,5 @@ index cb58d8243b..000bdf6165 100755
      *)
          usage ;;
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0003-coredump-set-ProtectHome-to-read-only.patch deleted +0 -38
deleted file mode 100644
index feb1178d23..0000000000
@@ -1,38 +0,0 @@
-From 4ac1755be2d6c141fae7e57c42936e507c5b54e3 Mon Sep 17 00:00:00 2001
-From: Etienne Cordonnier <[email protected]>
-Date: Fri, 6 Sep 2024 10:36:28 +0200
-Subject: [PATCH] coredump: set ProtectHome to read-only
-
-In https://github.com/systemd/systemd/pull/5283/commits/924453c22599cc246746a0233b2f52a27ade0819
-ProtectHome was set to true for systemd-coredump in order to reduce risk, since an attacker could craft a malicious binary in order to compromise systemd-coredump.
-At that point the object analysis was done in the main systemd-coredump process.
-Because of this systemd-coredump is unable to product symbolicated call-stacks for binaries running under /home ("n/a" is shown instead of function names).
-
-However, later in https://github.com/systemd/systemd/commit/61aea456c12c54f49c4a76259af130e576130ce9 systemd-coredump was changed to do the object analysis in a forked process,
-covering those security concerns.
-
-Let's set ProtectHome to read-only so that systemd-coredump produces symbolicated call-stacks for processes running under /home.
-
-Upstream-Status: Backport [https://github.com/systemd/systemd/commit/4ac1755be2d6c141fae7e57c42936e507c5b54e3]
-
-Signed-off-by: Etienne Cordonnier <[email protected]>
----
- units/[email protected] | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/units/[email protected] b/units/[email protected]
-index 012c60d2f6..fa3206d07b 100644
---- a/units/[email protected]
-+++ b/units/[email protected]
-@@ -28,7 +28,7 @@ PrivateDevices=yes
- PrivateNetwork=yes
- PrivateTmp=yes
- ProtectControlGroups=yes
--ProtectHome=yes
-+ProtectHome=read-only
- ProtectHostname=yes
- ProtectKernelModules=yes
- ProtectKernelTunables=yes
--- 
-2.43.0
-
meta/recipes-core/systemd/systemd/0003-missing_type.h-add-comparison_fn_t.patch renamed from meta/recipes-core/systemd/systemd/0004-missing_type.h-add-comparison_fn_t.patch +4 -4
similarity index 91%
rename from meta/recipes-core/systemd/systemd/0004-missing_type.h-add-comparison_fn_t.patch
rename to meta/recipes-core/systemd/systemd/0003-missing_type.h-add-comparison_fn_t.patch
index f4456f3c15..f2094eb71d 100644
@@ -1,7 +1,7 @@
-From 34b7e1ed3b9a896db6fad435fd141c385c7337d1 Mon Sep 17 00:00:00 2001
+From f99ef6c4407b56e8d15455fe27eb732ada87215b Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Mon, 25 Feb 2019 13:55:12 +0800
-Subject: [PATCH 04/27] missing_type.h: add comparison_fn_t
+Subject: [PATCH 03/26] missing_type.h: add comparison_fn_t
 
 Make it work with musl where comparison_fn_t and is not provided.
 
@@ -45,7 +45,7 @@ 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 a0b673f65f..29dd2fee16 100644
+index 7dcc35d8d5..87b8d6aad6 100644
 --- a/src/libsystemd/sd-journal/catalog.c
 +++ b/src/libsystemd/sd-journal/catalog.c
 @@ -29,6 +29,7 @@
@@ -57,5 +57,5 @@ index a0b673f65f..29dd2fee16 100644
  const char * const catalog_file_dirs[] = {
          "/usr/local/lib/systemd/catalog/",
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch renamed from meta/recipes-core/systemd/systemd/0005-add-fallback-parse_printf_format-implementation.patch +8 -8
similarity index 97%
rename from meta/recipes-core/systemd/systemd/0005-add-fallback-parse_printf_format-implementation.patch
rename to meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
index b0865b32af..f9a45bb40b 100644
@@ -1,7 +1,7 @@
-From 4a4005583e2debe491850229aa5ae2a97770532d Mon Sep 17 00:00:00 2001
+From 34fe809cf686c1a81db5f3f027e33fece350ba0b Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Sat, 22 May 2021 20:26:24 +0200
-Subject: [PATCH 05/27] add fallback parse_printf_format implementation
+Subject: [PATCH 04/26] add fallback parse_printf_format implementation
 
 Upstream-Status: Inappropriate [musl specific]
 
@@ -22,22 +22,22 @@ Signed-off-by: Scott Murray <[email protected]>
  create mode 100644 src/basic/parse-printf-format.h
 
 diff --git a/meson.build b/meson.build
-index 52723bef09..e20bf3af8a 100644
+index bffda86845..4146f4beef 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -753,6 +753,7 @@ foreach header : ['crypt.h',
+@@ -773,6 +773,7 @@ foreach header : ['crypt.h',
+                   'linux/ioprio.h',
                    'linux/memfd.h',
                    'linux/time_types.h',
-                   'linux/vm_sockets.h',
 +                  'printf.h',
                    'sys/auxv.h',
                    'sys/sdt.h',
                    'threads.h',
 diff --git a/src/basic/meson.build b/src/basic/meson.build
-index 9a214575a5..b49b6ade56 100644
+index e02f787c75..9435df895d 100644
 --- a/src/basic/meson.build
 +++ b/src/basic/meson.build
-@@ -189,6 +189,11 @@ endforeach
+@@ -188,6 +188,11 @@ endforeach
  
  basic_sources += generated_gperf_headers
  
@@ -430,5 +430,5 @@ index 7d02b57d7b..75e8e08add 100644
  #define SNDBUF_SIZE (8*1024*1024)
  
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0005-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch renamed from meta/recipes-core/systemd/systemd/0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch +6 -6
similarity index 94%
rename from meta/recipes-core/systemd/systemd/0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
rename to meta/recipes-core/systemd/systemd/0005-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
index e7a0abcf9a..1b5e0d54c4 100644
@@ -1,7 +1,7 @@
-From ed836c3478e1193e99e37d50db96d124796a3322 Mon Sep 17 00:00:00 2001
+From d368a0317c747961f69a455a09a3de3fd13410a2 Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Mon, 25 Feb 2019 14:56:21 +0800
-Subject: [PATCH 06/27] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not
+Subject: [PATCH 05/26] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not
  defined
 
 If the standard library doesn't provide brace
@@ -115,7 +115,7 @@ index 49d71f15c7..0a49ebcc17 100644
  
          (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL);
 diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 807925f199..b4f86fc611 100644
+index 86bf16356d..da552dbaab 100644
 --- a/src/tmpfiles/tmpfiles.c
 +++ b/src/tmpfiles/tmpfiles.c
 @@ -73,6 +73,12 @@
@@ -131,7 +131,7 @@ index 807925f199..b4f86fc611 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
-@@ -2570,7 +2576,9 @@ finish:
+@@ -2573,7 +2579,9 @@ finish:
  
  static int glob_item(Context *c, Item *i, action_t action) {
          _cleanup_globfree_ glob_t g = {
@@ -141,7 +141,7 @@ index 807925f199..b4f86fc611 100644
          };
          int r;
  
-@@ -2598,7 +2606,9 @@ static int glob_item_recursively(
+@@ -2601,7 +2609,9 @@ static int glob_item_recursively(
                  fdaction_t action) {
  
          _cleanup_globfree_ glob_t g = {
@@ -152,5 +152,5 @@ index 807925f199..b4f86fc611 100644
          int r;
  
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0006-add-missing-FTW_-macros-for-musl.patch renamed from meta/recipes-core/systemd/systemd/0007-add-missing-FTW_-macros-for-musl.patch +3 -3
similarity index 89%
rename from meta/recipes-core/systemd/systemd/0007-add-missing-FTW_-macros-for-musl.patch
rename to meta/recipes-core/systemd/systemd/0006-add-missing-FTW_-macros-for-musl.patch
index 474a7d38d8..578411c4cf 100644
@@ -1,7 +1,7 @@
-From 8320725f1a9088623da8753c7077473b98a63107 Mon Sep 17 00:00:00 2001
+From 54b6e10aea2b0fb52782c3a71f06654a89b46bff Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Mon, 25 Feb 2019 15:00:06 +0800
-Subject: [PATCH 07/27] add missing FTW_ macros for musl
+Subject: [PATCH 06/26] add missing FTW_ macros for musl
 
 This is to avoid build failures like below for musl.
 
@@ -40,5 +40,5 @@ index 8684d064ec..70fc2b5376 100644
  static char **list_nftw = NULL;
  
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0007-Use-uintmax_t-for-handling-rlim_t.patch renamed from meta/recipes-core/systemd/systemd/0008-Use-uintmax_t-for-handling-rlim_t.patch +7 -7
similarity index 93%
rename from meta/recipes-core/systemd/systemd/0008-Use-uintmax_t-for-handling-rlim_t.patch
rename to meta/recipes-core/systemd/systemd/0007-Use-uintmax_t-for-handling-rlim_t.patch
index c8598ed2ea..b4a570e1f5 100644
@@ -1,7 +1,7 @@
-From 41abe1a4136babfe5df63e9561dcf29d3c8fe6e9 Mon Sep 17 00:00:00 2001
+From 85d8c4c27e855d54c1740902a836c8f2aea9bebc Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Mon, 25 Feb 2019 15:12:41 +0800
-Subject: [PATCH 08/27] Use uintmax_t for handling rlim_t
+Subject: [PATCH 07/26] 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 <[email protected]>
  3 files changed, 9 insertions(+), 15 deletions(-)
 
 diff --git a/src/basic/format-util.h b/src/basic/format-util.h
-index ba7cff6a8b..2736abb07b 100644
+index b528c005ca..41c4c095be 100644
 --- a/src/basic/format-util.h
 +++ b/src/basic/format-util.h
-@@ -42,13 +42,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t));
+@@ -41,13 +41,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t));
  #  error Unknown timex member size
  #endif
  
@@ -86,10 +86,10 @@ index a9f7b87f28..059c67731d 100644
          return 1;
  }
 diff --git a/src/core/execute.c b/src/core/execute.c
-index 513e95e09d..0e269617f8 100644
+index 3d55b0b772..4824ff159e 100644
 --- a/src/core/execute.c
 +++ b/src/core/execute.c
-@@ -1067,9 +1067,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
+@@ -1162,9 +1162,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 513e95e09d..0e269617f8 100644
  
          if (c->ioprio_set) {
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch renamed from meta/recipes-core/systemd/systemd/0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch +5 -5
similarity index 82%
rename from meta/recipes-core/systemd/systemd/0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch
rename to meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch
index 162650725d..22e2ceadcc 100644
@@ -1,7 +1,7 @@
-From ea8e85d92f67a7af8577a4ce7c67c7aaee65d10c Mon Sep 17 00:00:00 2001
+From f4cd939c7cc1ce0a59bab2693768f2c95d9ced00 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Sun, 27 May 2018 08:36:44 -0700
-Subject: [PATCH 10/27] Define glibc compatible basename() for non-glibc
+Subject: [PATCH 08/26] Define glibc compatible basename() for non-glibc
  systems
 
 Fixes builds with musl, even though systemd is adamant about
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 4 insertions(+)
 
 diff --git a/src/basic/string-util.h b/src/basic/string-util.h
-index ff5efbcf55..d1a6bb0e76 100644
+index cc6aa183c0..0b035125cd 100644
 --- a/src/basic/string-util.h
 +++ b/src/basic/string-util.h
-@@ -26,6 +26,10 @@
+@@ -27,6 +27,10 @@
  #define URI_UNRESERVED      ALPHANUMERICAL "-._~"       /* [RFC3986] */
  #define URI_VALID           URI_RESERVED URI_UNRESERVED /* [RFC3986] */
  
@@ -30,5 +30,5 @@ index ff5efbcf55..d1a6bb0e76 100644
          if (!haystack || !needle)
                  return NULL;
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch renamed from meta/recipes-core/systemd/systemd/0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +5 -5
similarity index 83%
rename from meta/recipes-core/systemd/systemd/0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
rename to meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
index 60cec6dc7e..8e3eb15b54 100644
@@ -1,7 +1,7 @@
-From 7c8634c441401b034cd4bcf4b916a7042076fca8 Mon Sep 17 00:00:00 2001
+From 6959db351fdd551d46e22667deec6032552b2662 Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Wed, 4 Jul 2018 15:00:44 +0800
-Subject: [PATCH 11/27] Do not disable buffering when writing to oom_score_adj
+Subject: [PATCH 09/26] 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 <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/basic/process-util.c b/src/basic/process-util.c
-index c9d968dee0..7d6d3ce7db 100644
+index 3253a9c3fb..772c4082a1 100644
 --- a/src/basic/process-util.c
 +++ b/src/basic/process-util.c
-@@ -1816,7 +1816,7 @@ int set_oom_score_adjust(int value) {
+@@ -1848,7 +1848,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 c9d968dee0..7d6d3ce7db 100644
  
  int get_oom_score_adjust(int *ret) {
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch deleted +0 -99

99 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch renamed from meta/recipes-core/systemd/systemd/0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +6 -6
similarity index 88%
rename from meta/recipes-core/systemd/systemd/0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
rename to meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
index aa3c45cb5f..0dfb77890e 100644
@@ -1,7 +1,7 @@
-From 4a2df0bba1741914617ca1271e2bc68a5d9e5dac Mon Sep 17 00:00:00 2001
+From b7f6c245b4ae72999f23eecc2bbb6d6fb8db667c Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Tue, 10 Jul 2018 15:40:17 +0800
-Subject: [PATCH 12/27] distinguish XSI-compliant strerror_r from GNU-specifi
+Subject: [PATCH 10/26] 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 <[email protected]>
  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 f415797700..a5c6e9a3bd 100644
+index 58c24d25c0..69a0d09d42 100644
 --- a/src/libsystemd/sd-bus/bus-error.c
 +++ b/src/libsystemd/sd-bus/bus-error.c
-@@ -410,7 +410,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) {
+@@ -405,7 +405,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) {
                          return;
  
                  errno = 0;
@@ -40,7 +40,7 @@ index f415797700..a5c6e9a3bd 100644
                  if (errno == ERANGE || strlen(x) >= k - 1) {
                          free(m);
                          k *= 2;
-@@ -595,8 +600,12 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static
+@@ -590,8 +595,12 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static
  
          if (e && e->message)
                  return e->message;
@@ -72,5 +72,5 @@ index 75e8e08add..41e5c7c2b8 100644
                          char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1];
  
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch renamed from meta/recipes-core/systemd/systemd/0013-avoid-redefinition-of-prctl_mm_map-structure.patch +3 -3
similarity index 83%
rename from meta/recipes-core/systemd/systemd/0013-avoid-redefinition-of-prctl_mm_map-structure.patch
rename to meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch
index c48bd58383..16d741cf87 100644
@@ -1,7 +1,7 @@
-From 846b8f16cf07d9187261e06701a75eb208caa707 Mon Sep 17 00:00:00 2001
+From 43b0269e850a2fbcb6ca615258aa8f8a9b4f6a9d Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Mon, 25 Feb 2019 15:44:54 +0800
-Subject: [PATCH 13/27] avoid redefinition of prctl_mm_map structure
+Subject: [PATCH 11/26] avoid redefinition of prctl_mm_map structure
 
 Fix the following compile failure:
 error: redefinition of 'struct prctl_mm_map'
@@ -28,5 +28,5 @@ index 2c9f9f6c50..65a984b564 100644
  #include "macro.h"
  
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch renamed from meta/recipes-core/systemd/systemd/0014-do-not-disable-buffer-in-writing-files.patch +108 -150

490 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch renamed from meta/recipes-core/systemd/systemd/0015-Handle-__cpu_mask-usage.patch +4 -4
similarity index 92%
rename from meta/recipes-core/systemd/systemd/0015-Handle-__cpu_mask-usage.patch
rename to meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch
index 86003db4de..35009cba42 100644
@@ -1,7 +1,7 @@
-From c1cbec8571855b8480d56dcad2ab81aea0782bd4 Mon Sep 17 00:00:00 2001
+From ab4fda874b26542de96720db58cb0e8704a40108 Mon Sep 17 00:00:00 2001
 From: Scott Murray <[email protected]>
 Date: Fri, 13 Sep 2019 19:26:27 -0400
-Subject: [PATCH 15/27] Handle __cpu_mask usage
+Subject: [PATCH 13/26] Handle __cpu_mask usage
 
 Fixes errors:
 
@@ -24,7 +24,7 @@ Signed-off-by: Scott Murray <[email protected]>
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h
-index 618fe1b0a3..46c92077b0 100644
+index 2c477d8a01..c026ce77a6 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.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch renamed from meta/recipes-core/systemd/systemd/0016-Handle-missing-gshadow.patch +16 -16
similarity index 84%
rename from meta/recipes-core/systemd/systemd/0016-Handle-missing-gshadow.patch
rename to meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch
index 6c7b233f95..08d4e384ff 100644
@@ -1,7 +1,7 @@
-From 8b540d8240bbc3f917de9ca8d3b62f28c3424d91 Mon Sep 17 00:00:00 2001
+From c5165f6adf8a9cfe8c0784c598b87d7d7e8b7d1a Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <[email protected]>
 Date: Tue, 10 Mar 2020 11:05:20 +0000
-Subject: [PATCH 16/27] Handle missing gshadow
+Subject: [PATCH 14/26] Handle missing gshadow
 
 gshadow usage is now present in the userdb code. Mask all uses of it to
 allow compilation on musl
@@ -17,7 +17,7 @@ Signed-off-by: Luca Boccassi <[email protected]>
  3 files changed, 30 insertions(+), 1 deletion(-)
 
 diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c
-index ffb5721466..4d01815c8c 100644
+index 9223a2e6ca..f9eb1a5b64 100644
 --- a/src/shared/user-record-nss.c
 +++ b/src/shared/user-record-nss.c
 @@ -286,8 +286,10 @@ int nss_group_to_group_record(
@@ -45,9 +45,9 @@ index ffb5721466..4d01815c8c 100644
          }
 +#endif
  
-         r = json_build(&g->json, JSON_BUILD_OBJECT(
-                                        JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)),
-@@ -344,6 +348,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
+         r = sd_json_buildo(
+                         &g->json,
+@@ -345,6 +349,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 ffb5721466..4d01815c8c 100644
          for (;;) {
                  _cleanup_free_ char *buf = NULL;
                  struct sgrp sgrp, *result;
-@@ -372,6 +377,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
+@@ -373,6 +378,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
                  buflen *= 2;
                  buf = mfree(buf);
          }
@@ -65,7 +65,7 @@ index ffb5721466..4d01815c8c 100644
  }
  
  int nss_group_record_by_name(
-@@ -382,7 +390,9 @@ int nss_group_record_by_name(
+@@ -383,7 +391,9 @@ int nss_group_record_by_name(
          _cleanup_free_ char *sbuf = NULL;
          _cleanup_free_ struct group *result = NULL;
          bool incomplete = false;
@@ -75,7 +75,7 @@ index ffb5721466..4d01815c8c 100644
          int r;
  
          assert(name);
-@@ -391,6 +401,7 @@ int nss_group_record_by_name(
+@@ -392,6 +402,7 @@ int nss_group_record_by_name(
          if (r < 0)
                  return r;
  
@@ -83,7 +83,7 @@ index ffb5721466..4d01815c8c 100644
          if (with_shadow) {
                  r = nss_sgrp_for_group(result, &sgrp, &sbuf);
                  if (r < 0) {
-@@ -402,6 +413,9 @@ int nss_group_record_by_name(
+@@ -403,6 +414,9 @@ int nss_group_record_by_name(
                  incomplete = true;
  
          r = nss_group_to_group_record(result, sresult, ret);
@@ -93,7 +93,7 @@ index ffb5721466..4d01815c8c 100644
          if (r < 0)
                  return r;
  
-@@ -418,13 +432,16 @@ int nss_group_record_by_gid(
+@@ -419,13 +433,16 @@ int nss_group_record_by_gid(
          _cleanup_free_ char *sbuf = NULL;
          _cleanup_free_ struct group *result = NULL;
          bool incomplete = false;
@@ -110,7 +110,7 @@ index ffb5721466..4d01815c8c 100644
          if (with_shadow) {
                  r = nss_sgrp_for_group(result, &sgrp, &sbuf);
                  if (r < 0) {
-@@ -436,6 +453,9 @@ int nss_group_record_by_gid(
+@@ -437,6 +454,9 @@ int nss_group_record_by_gid(
                  incomplete = true;
  
          r = nss_group_to_group_record(result, sresult, ret);
@@ -137,10 +137,10 @@ index 22ab04d6ee..4e52e7a911 100644
  #include <shadow.h>
  
 diff --git a/src/shared/userdb.c b/src/shared/userdb.c
-index 75dece3442..5628e1410f 100644
+index ff83d4bf90..54d36cc706 100644
 --- a/src/shared/userdb.c
 +++ b/src/shared/userdb.c
-@@ -1038,13 +1038,15 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
+@@ -1041,13 +1041,15 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
                  if (gr) {
                          _cleanup_free_ char *buffer = NULL;
                          bool incomplete = false;
@@ -157,7 +157,7 @@ index 75dece3442..5628e1410f 100644
                          if (!FLAGS_SET(iterator->flags, USERDB_SUPPRESS_SHADOW)) {
                                  r = nss_sgrp_for_group(gr, &sgrp, &buffer);
                                  if (r < 0) {
-@@ -1057,6 +1059,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
+@@ -1060,6 +1062,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
                          }
  
                          r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret);
@@ -168,5 +168,5 @@ index 75dece3442..5628e1410f 100644
                                  return r;
  
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch renamed from meta/recipes-core/systemd/systemd/0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch +9 -2
similarity index 75%
rename from meta/recipes-core/systemd/systemd/0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
rename to meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
index a7a641e0ad..f0aa3a0bd8 100644
@@ -1,7 +1,7 @@
-From 45bb63a1727097683acad23f270968026671ec6a Mon Sep 17 00:00:00 2001
+From ef9ad83759f78de983d2d7c4f95bc48b83bb8f66 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Mon, 12 Apr 2021 23:44:53 -0700
-Subject: [PATCH 17/27] missing_syscall.h: Define MIPS ABI defines for musl
+Subject: [PATCH 15/26] 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
@@ -15,6 +15,8 @@ Signed-off-by: Khem Raj <[email protected]>
  src/shared/base-filesystem.c | 1 +
  2 files changed, 7 insertions(+)
 
+diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
+index e2cd8b4e35..f2fe489de7 100644
 --- a/src/basic/missing_syscall.h
 +++ b/src/basic/missing_syscall.h
 @@ -20,6 +20,12 @@
@@ -30,6 +32,8 @@ Signed-off-by: Khem Raj <[email protected]>
  #include "macro.h"
  #include "missing_keyctl.h"
  #include "missing_sched.h"
+diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
+index 389c77eee0..e3627c4603 100644
 --- a/src/shared/base-filesystem.c
 +++ b/src/shared/base-filesystem.c
 @@ -20,6 +20,7 @@
@@ -40,3 +44,6 @@ Signed-off-by: Khem Raj <[email protected]>
  
  typedef struct BaseFilesystem {
          const char *dir;      /* directory or symlink to create */
+-- 
+2.34.1
+
meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch renamed from meta/recipes-core/systemd/systemd/0018-pass-correct-parameters-to-getdents64.patch +4 -4
similarity index 90%
rename from meta/recipes-core/systemd/systemd/0018-pass-correct-parameters-to-getdents64.patch
rename to meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch
index b4b6be0e75..b802106155 100644
@@ -1,7 +1,7 @@
-From 78a59a540d425e677d5652d9b72d7b175e36f4dd Mon Sep 17 00:00:00 2001
+From 9079b158779a9c395c24f882f72a1c734795045d Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 21 Jan 2022 15:15:11 -0800
-Subject: [PATCH 18/27] pass correct parameters to getdents64
+Subject: [PATCH 16/26] 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,7 +20,7 @@ Signed-off-by: Jiaqing Zhao <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c
-index 776733148b..d37419658c 100644
+index 378fd92b06..5b567b457d 100644
 --- a/src/basic/recurse-dir.c
 +++ b/src/basic/recurse-dir.c
 @@ -56,7 +56,7 @@ int readdir_all(int dir_fd,
@@ -33,5 +33,5 @@ index 776733148b..d37419658c 100644
                          return -errno;
                  if (n == 0)
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch renamed from meta/recipes-core/systemd/systemd/0019-Adjust-for-musl-headers.patch +50 -50

304 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch renamed from meta/recipes-core/systemd/systemd/0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch +3 -3
similarity index 93%
rename from meta/recipes-core/systemd/systemd/0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
rename to meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
index b3fbfee08d..a92b8cc80f 100644
@@ -1,7 +1,7 @@
-From e01f0c444423eb65d176713735ff8cefb3068f3d Mon Sep 17 00:00:00 2001
+From 349f9a0f9ecfc6575a3d9eeaffe89536e6a43914 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Tue, 8 Nov 2022 13:31:34 -0800
-Subject: [PATCH 20/27] test-bus-error: strerror() is assumed to be GNU
+Subject: [PATCH 18/26] test-bus-error: strerror() is assumed to be GNU
  specific version mark it so
 
 Upstream-Status: Inappropriate [Upstream systemd only supports glibc]
@@ -48,5 +48,5 @@ index ab463bd1b3..e2ebcaaf33 100644
  TEST(PROTECT_ERRNO) {
          errno = 12;
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch renamed from meta/recipes-core/systemd/systemd/0021-errno-util-Make-STRERROR-portable-for-musl.patch +3 -3
similarity index 91%
rename from meta/recipes-core/systemd/systemd/0021-errno-util-Make-STRERROR-portable-for-musl.patch
rename to meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch
index 6e899d0905..791079a19f 100644
@@ -1,7 +1,7 @@
-From d2f632dd6a8cca0fbdd6568ce84004335c004f58 Mon Sep 17 00:00:00 2001
+From 28fa1d5f56c6ddee9e336e6f2051c55e9f2f98b4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Mon, 23 Jan 2023 23:39:46 -0800
-Subject: [PATCH 21/27] errno-util: Make STRERROR portable for musl
+Subject: [PATCH 19/26] 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
@@ -38,5 +38,5 @@ index 48b76e4bf7..6e7653e2d9 100644
   * Note that we can't use ({ … }) to define a temporary variable, so errnum is
   * evaluated twice. */
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch renamed from meta/recipes-core/systemd/systemd/0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch +6 -6
similarity index 77%
rename from meta/recipes-core/systemd/systemd/0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch
rename to meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch
index ed7e3ea586..16df44cd86 100644
@@ -1,7 +1,7 @@
-From 4a3ed5aaaf108d3a07f24997698906e801ba2412 Mon Sep 17 00:00:00 2001
+From 66de8a53849f76f5596327c38ae5f002b9f534cd Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 2 Aug 2023 12:06:27 -0700
-Subject: [PATCH 22/27] sd-event: Make malloc_trim() conditional on glibc
+Subject: [PATCH 20/26] sd-event: Make malloc_trim() conditional on glibc
 
 musl does not have this API
 
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <[email protected]>
  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 a1305ef014..b8a73da2a3 100644
+index 7aea7d2581..d3f4001f53 100644
 --- a/src/libsystemd/sd-event/sd-event.c
 +++ b/src/libsystemd/sd-event/sd-event.c
-@@ -1877,7 +1877,7 @@ _public_ int sd_event_add_exit(
+@@ -1881,7 +1881,7 @@ _public_ int sd_event_add_exit(
  }
  
  _public_ int sd_event_trim_memory(void) {
@@ -24,7 +24,7 @@ index a1305ef014..b8a73da2a3 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
-@@ -1891,7 +1891,9 @@ _public_ int sd_event_trim_memory(void) {
+@@ -1895,7 +1895,9 @@ _public_ int sd_event_trim_memory(void) {
  
          usec_t before_timestamp = now(CLOCK_MONOTONIC);
          hashmap_trim_pools();
@@ -35,5 +35,5 @@ index a1305ef014..b8a73da2a3 100644
  
          if (r > 0)
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch renamed from meta/recipes-core/systemd/systemd/0023-shared-Do-not-use-malloc_info-on-musl.patch +5 -5
similarity index 86%
rename from meta/recipes-core/systemd/systemd/0023-shared-Do-not-use-malloc_info-on-musl.patch
rename to meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch
index b8583c7af7..7ab56ef8fb 100644
@@ -1,7 +1,7 @@
-From d3880d167d8dfafbb8ee62f7737a869f9525f303 Mon Sep 17 00:00:00 2001
+From 93d13363c605fb2de484f38f3726f8fbad1c3540 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 2 Aug 2023 12:20:40 -0700
-Subject: [PATCH 23/27] shared: Do not use malloc_info on musl
+Subject: [PATCH 21/26] shared: Do not use malloc_info on musl
 
 Upstream-Status: Inappropriate [musl-specific]
 Signed-off-by: Khem Raj <[email protected]>
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <[email protected]>
  2 files changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
-index 30f9602b1e..5308f168db 100644
+index ff80e580fc..a628a29d0c 100644
 --- a/src/shared/bus-util.c
 +++ b/src/shared/bus-util.c
-@@ -755,15 +755,16 @@ static int method_dump_memory_state_by_fd(sd_bus_message *message, void *userdat
+@@ -787,15 +787,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.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch renamed from meta/recipes-core/systemd/systemd/0024-avoid-missing-LOCK_EX-declaration.patch +8 -8
similarity index 78%
rename from meta/recipes-core/systemd/systemd/0024-avoid-missing-LOCK_EX-declaration.patch
rename to meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch
index 6804c7c62e..d06967f8d5 100644
@@ -1,7 +1,7 @@
-From ca2a736627f8ee8dd9dbbf5b3149d4c8493833ff Mon Sep 17 00:00:00 2001
+From 5b8df64993b68a5a4af0f214d8cae77f4e716593 Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Tue, 2 Jan 2024 11:03:27 +0800
-Subject: [PATCH 24/27] avoid missing LOCK_EX declaration
+Subject: [PATCH 22/26] avoid missing LOCK_EX declaration
 
 This only happens on MUSL. Include sys/file.h to avoid compilation
 error about missing LOCK_EX declaration.
@@ -16,7 +16,7 @@ Signed-off-by: Chen Qi <[email protected]>
  3 files changed, 3 insertions(+)
 
 diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
-index af17481dd8..fa20bfa30f 100644
+index 93b254c680..5f0b1a816d 100644
 --- a/src/basic/fd-util.h
 +++ b/src/basic/fd-util.h
 @@ -6,6 +6,7 @@
@@ -28,10 +28,10 @@ index af17481dd8..fa20bfa30f 100644
  #include "macro.h"
  #include "missing_fcntl.h"
 diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c
-index ee8db04e76..2aff654f0f 100644
+index 9d636f5529..6be43caa57 100644
 --- a/src/core/exec-invoke.c
 +++ b/src/core/exec-invoke.c
-@@ -4,6 +4,7 @@
+@@ -5,6 +5,7 @@
  #include <sys/ioctl.h>
  #include <sys/mount.h>
  #include <sys/prctl.h>
@@ -40,7 +40,7 @@ index ee8db04e76..2aff654f0f 100644
  #if HAVE_PAM
  #include <security/pam_appl.h>
 diff --git a/src/shared/dev-setup.h b/src/shared/dev-setup.h
-index 5339bc4e5e..0697495f23 100644
+index 92ba6cf764..ba01a0ae55 100644
 --- a/src/shared/dev-setup.h
 +++ b/src/shared/dev-setup.h
 @@ -2,6 +2,7 @@
@@ -49,8 +49,8 @@ index 5339bc4e5e..0697495f23 100644
  #include <sys/types.h>
 +#include <sys/file.h>
  
- int lock_dev_console(void);
+ int dev_setup(const char *prefix, uid_t uid, gid_t gid);
  
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0023-include-signal.h-to-avoid-the-undeclared-error.patch renamed from meta/recipes-core/systemd/systemd/0025-include-signal.h-to-avoid-the-undeclared-error.patch +8 -8
similarity index 51%
rename from meta/recipes-core/systemd/systemd/0025-include-signal.h-to-avoid-the-undeclared-error.patch
rename to meta/recipes-core/systemd/systemd/0023-include-signal.h-to-avoid-the-undeclared-error.patch
index 5cfb112d67..c8bcd9e355 100644
@@ -1,7 +1,7 @@
-From ecf124ab2e488a71741fe443ff4863f7ed172968 Mon Sep 17 00:00:00 2001
+From e39afec7e5a2f3a9de7202affab4d0340ba879d7 Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Tue, 2 Jul 2024 22:18:47 -0700
-Subject: [PATCH 25/27] include signal.h to avoid the 'undeclared' error
+Subject: [PATCH 23/26] include signal.h to avoid the 'undeclared' error
 
 Upstream-Status: Inappropriate [musl specific]
 
@@ -11,17 +11,17 @@ Signed-off-by: Chen Qi <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/src/basic/pidref.h b/src/basic/pidref.h
-index 9920ebb9b3..2fdd4ff50f 100644
+index 42ddf4e50b..b9cf53680f 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
+@@ -3,6 +3,7 @@
+ 
+ typedef struct PidRef PidRef;
  
 +#include <signal.h>
  #include "macro.h"
+ #include "process-util.h"
  
- /* An embeddable structure carrying a reference to a process. Supposed to be used when tracking processes continuously. */
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0024-undef-stdin-for-references-using-stdin-as-a-struct-m.patch renamed from meta/recipes-core/systemd/systemd/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch +5 -5
similarity index 84%
rename from meta/recipes-core/systemd/systemd/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch
rename to meta/recipes-core/systemd/systemd/0024-undef-stdin-for-references-using-stdin-as-a-struct-m.patch
index ca1a525a0a..9532e6b9af 100644
@@ -1,7 +1,7 @@
-From 787606c6ff822fb3fe41ba951ee289bbf6d4def3 Mon Sep 17 00:00:00 2001
+From 5a4334fde21b896cd75b2d1a56e06a4f365e9c4d Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Tue, 2 Jul 2024 22:44:31 -0700
-Subject: [PATCH 26/27] undef stdin for references using stdin as a struct
+Subject: [PATCH 24/26] undef stdin for references using stdin as a struct
  member
 
 In musl stdio.h, we have:
@@ -18,7 +18,7 @@ Signed-off-by: Chen Qi <[email protected]>
  2 files changed, 4 insertions(+)
 
 diff --git a/src/shared/edit-util.c b/src/shared/edit-util.c
-index cfb2828f4e..1794a7b269 100644
+index e37609c2e1..1b212ae7b4 100644
 --- a/src/shared/edit-util.c
 +++ b/src/shared/edit-util.c
 @@ -3,6 +3,8 @@
@@ -31,7 +31,7 @@ index cfb2828f4e..1794a7b269 100644
  #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
+index c42a31153d..7695ceeead 100644
 --- a/src/systemctl/systemctl-edit.c
 +++ b/src/systemctl/systemctl-edit.c
 @@ -13,6 +13,8 @@
@@ -44,5 +44,5 @@ index 15398f8364..e7d53ca9a1 100644
          _cleanup_hashmap_free_ Hashmap *cached_id_map = NULL, *cached_name_map = NULL;
          _cleanup_(lookup_paths_done) LookupPaths lp = {};
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0025-adjust-header-inclusion-order-to-avoid-redeclaration.patch new file +288 -0

288 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0026-build-path.c-avoid-boot-time-segfault-for-musl.patch renamed from meta/recipes-core/systemd/systemd/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch +3 -3
similarity index 85%
rename from meta/recipes-core/systemd/systemd/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch
rename to meta/recipes-core/systemd/systemd/0026-build-path.c-avoid-boot-time-segfault-for-musl.patch
index 501728cbc8..a7549ee151 100644
@@ -1,7 +1,7 @@
-From 0e4379088b1cf607b605b785f6f23943ebeb6584 Mon Sep 17 00:00:00 2001
+From f2a7cf1d2a2bc2516a180809efd85c828cd9c7f4 Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Wed, 3 Jul 2024 07:18:42 -0700
-Subject: [PATCH 28/28] build-path.c: avoid boot time segfault for musl
+Subject: [PATCH 26/26] 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
@@ -27,5 +27,5 @@ index b5972658df..4ef551034e 100644
                  const char *runpath = NULL;
  
 -- 
-2.45.1
+2.34.1
 
meta/recipes-core/systemd/systemd/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch deleted +0 -76

76 lines not on this page · raw message

meta/recipes-core/systemd/systemd_257.bb renamed from meta/recipes-core/systemd/systemd_256.9.bb +24 -26

61 lines not on this page · raw message

Signature · 1 line
2.34.1