From 85aa5f150f4d68e2e9c7c60f2f5e95909deae71e Mon Sep 17 00:00:00 2001 From: xdavidwu Date: Thu, 10 Aug 2023 01:24:23 +0800 Subject: [PATCH] systemd: 254.1 --- .../0025-include-sys-file.h-for-LOCK_EX.patch | 29 ------ ...-Include-sys-timex.h-for-struct-time.patch | 28 ------ ...clude-missing-sys-file.h-for-LOCK_EX.patch | 98 ------------------- systemd/APKBUILD | 12 +-- 4 files changed, 3 insertions(+), 164 deletions(-) delete mode 100644 systemd/0025-include-sys-file.h-for-LOCK_EX.patch delete mode 100644 systemd/0026-test-test-sizeof-Include-sys-timex.h-for-struct-time.patch delete mode 100644 systemd/0027-include-missing-sys-file.h-for-LOCK_EX.patch diff --git a/systemd/0025-include-sys-file.h-for-LOCK_EX.patch b/systemd/0025-include-sys-file.h-for-LOCK_EX.patch deleted file mode 100644 index 7827cc1..0000000 --- a/systemd/0025-include-sys-file.h-for-LOCK_EX.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 2 Aug 2023 10:33:48 -0700 -Subject: [PATCH] include sys/file.h for LOCK_EX - -Fixes -| ../git/src/basic/user-util.c:708:30: error: use of undeclared identifier 'LOCK_EX'; did you mean 'LOCK_BSD'? -| 708 | r = unposix_lock(fd, LOCK_EX); -| | ^~~~~~~ -| | LOCK_BSD - -Upstream-Status: Backport [https://github.com/systemd/systemd/pull/28647] -Signed-off-by: Khem Raj ---- - src/basic/user-util.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/basic/user-util.c b/src/basic/user-util.c -index fe61a09005..5c39847733 100644 ---- a/src/basic/user-util.c -+++ b/src/basic/user-util.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/systemd/0026-test-test-sizeof-Include-sys-timex.h-for-struct-time.patch b/systemd/0026-test-test-sizeof-Include-sys-timex.h-for-struct-time.patch deleted file mode 100644 index f2130c8..0000000 --- a/systemd/0026-test-test-sizeof-Include-sys-timex.h-for-struct-time.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 2 Aug 2023 12:14:56 -0700 -Subject: [PATCH] test/test-sizeof: Include sys/timex.h for struct timex - -Fixes - -../git/src/test/test-sizeof.c:64:41: error: incomplete definition of type 'struct timex' - 64 | check(typeof(((struct timex *)0)->freq), SIZEOF_TIMEX_MEMBER); - | ~~~~~~~~~~~~~~~~~~~^ - -Upstream-Status: Backport [https://github.com/systemd/systemd/pull/28651] ---- - src/test/test-sizeof.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index 9d969cf8f1..b65c0bd370 100644 ---- a/src/test/test-sizeof.c -+++ b/src/test/test-sizeof.c -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - #include - - #define __STDC_WANT_IEC_60559_TYPES_EXT__ diff --git a/systemd/0027-include-missing-sys-file.h-for-LOCK_EX.patch b/systemd/0027-include-missing-sys-file.h-for-LOCK_EX.patch deleted file mode 100644 index 1901480..0000000 --- a/systemd/0027-include-missing-sys-file.h-for-LOCK_EX.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 2 Aug 2023 12:18:24 -0700 -Subject: [PATCH] include missing sys/file.h for LOCK_EX - -Upstream-Status: Backport [https://github.com/systemd/systemd/pull/28651] ---- - src/core/execute.c | 1 + - src/shared/btrfs-util.c | 1 + - src/shared/copy.c | 1 + - src/test/test-btrfs.c | 1 + - src/test/test-fs-util.c | 1 + - src/test/test-lock-util.c | 1 + - src/vconsole/vconsole-setup.c | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/src/core/execute.c b/src/core/execute.c -index 5b2ae861ff..2ebf19ffaa 100644 ---- a/src/core/execute.c -+++ b/src/core/execute.c -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/shared/btrfs-util.c b/src/shared/btrfs-util.c -index 5128b308ab..3ded95ea82 100644 ---- a/src/shared/btrfs-util.c -+++ b/src/shared/btrfs-util.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/shared/copy.c b/src/shared/copy.c -index 241a2d112b..7e47dc002c 100644 ---- a/src/shared/copy.c -+++ b/src/shared/copy.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c -index 95b7ef25d8..ba09563058 100644 ---- a/src/test/test-btrfs.c -+++ b/src/test/test-btrfs.c -@@ -1,6 +1,7 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - - #include -+#include - - #include "btrfs-util.h" - #include "fd-util.h" -diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c -index 1beba916a4..5de1eea0d4 100644 ---- a/src/test/test-fs-util.c -+++ b/src/test/test-fs-util.c -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - -+#include - #include - - #include "alloc-util.h" -diff --git a/src/test/test-lock-util.c b/src/test/test-lock-util.c -index a9a1b438ff..28fc54a5d6 100644 ---- a/src/test/test-lock-util.c -+++ b/src/test/test-lock-util.c -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - -+#include - #include - - #include "fd-util.h" -diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c -index d57d8b4001..86348d08c1 100644 ---- a/src/vconsole/vconsole-setup.c -+++ b/src/vconsole/vconsole-setup.c -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/systemd/APKBUILD b/systemd/APKBUILD index a1a9d67..ae99e52 100644 --- a/systemd/APKBUILD +++ b/systemd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: xdavidwu # Maintainer: xdavidwu pkgname=systemd -pkgver=254 -pkgrel=3 +pkgver=254.1 +pkgrel=0 pkgdesc="System and Service Manager" url="https://www.github.com/systemd/systemd" arch="all" @@ -33,9 +33,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/systemd/systemd-stable/archi 0021-do-not-disable-buffer-in-writing-files.patch 0022-Handle-__cpu_mask-usage.patch 0023-Handle-missing-gshadow.patch - 0025-include-sys-file.h-for-LOCK_EX.patch - 0026-test-test-sizeof-Include-sys-timex.h-for-struct-time.patch - 0027-include-missing-sys-file.h-for-LOCK_EX.patch 0028-sd-event-Make-malloc_trim-conditional-on-glibc.patch 0029-shared-Do-not-use-malloc_info-on-musl.patch 0100-Do-not-buffer-on-systemd-sleep.patch @@ -156,7 +153,7 @@ dev() { } sha512sums=" -2e9567473d6913483074be5b79090c75dfc965a7afa1b617e18780f3a41787b08ffde0d5cfd115b0b01a84a04a8623db004c7ec29e1c0442c94f7817a4616ad4 systemd-254.tar.gz +eb2f4a95c890792fe11080e8dafc1eb4588ee98a3084d28083c4dd1f97962f56188c41641708c23267d01f1431821e823e1b89012f90d6ede80a12a0ce11a6d7 systemd-254.1.tar.gz 365360cc6b7591152fd8043eb1173c239b9b0290e4f7f5c52e60213e75997034e1e62d3e03187420e1b5e003881f2d748a5dda18b9e7d13e7c97a2caf942ed8c 0001-Adjust-for-musl-headers.patch e27af86219786437f66d9ecfea4996f95608e6d64baf7dcfb3421d40de863abdb2dedc114939b6f05feaec3cb3790c8214f92d5df95ea022d6037fe6d3ff6663 0003-errno-util-Make-STRERROR-portable-for-musl.patch c7c92dd6e98c0960fb6744b78ef60df1cd33e6ac71cce02146b656c795fc181d8e20609381d0bae07d95716e3eb8bed9aa1185494cfe074cfa2b67fcdf4f4940 0005-pass-correct-parameters-to-getdents64.patch @@ -174,9 +171,6 @@ d6cd00693af5c905ab17764e45825eb5a8c23f727b9296efa0603207f48debe6f4a376681517d755 b9f2e50da7c6328bbaa547e2ab4bc4bbcc210bd8157b3c828fd252abbbf5b44fd5cd173b6ec3f5cc17371c532fa67809e16d677dbc895e22609765efb5c5ec3a 0021-do-not-disable-buffer-in-writing-files.patch b25970c4bbe715b44cacc684c3d1efa9f50cf23df6ef7a365b072e1de62b69c23f5db341bee193b0367eda86cd3b288bdec55d9f4ff748d54c39992be4d567df 0022-Handle-__cpu_mask-usage.patch 987318b986efa081627fce402262484fac6e792d55ede8dade88336a0e91c0aa3fcbae9951614407879f8dc5015e71c706a78242889ffeea70081c14d0395bb8 0023-Handle-missing-gshadow.patch -4a011879e78cba8962cb238df064eb03f8007a1c97345fb24e1b01a149a715ce0c7c16c27752d412ae737b7054e99033bf7bad099391f5366fbd4d1f04d2fa74 0025-include-sys-file.h-for-LOCK_EX.patch -462febd7b76f8959fe93518860d7ed90a49f0eb279de1cb3d8b6cc98598f0e8c962ecdb9447753fb8a0476775fb2ed460e462f9b3c0e93738b357c03c48259f2 0026-test-test-sizeof-Include-sys-timex.h-for-struct-time.patch -00eef49f259c4c1a78c6177707ba4464229690c749d580aa96972e2c71a9bc67ea416eadf0c77ec7b8c1e92cdbe04fceadbd3fe9fa5be7d886403d3a1a6cfefe 0027-include-missing-sys-file.h-for-LOCK_EX.patch d4a5c506dc2378033a4fc15eba510e8cf8bc5642000758dd1b05526ccac8a4ce47c23297e301ec99bdf4a19ce9f84a008b4714cc9e655a596d1aa58de47f683b 0028-sd-event-Make-malloc_trim-conditional-on-glibc.patch fcee3a9384cb27083b82792a246045b1d1d974ee200fd772661766e9445ea36d8c0c9003527783f2a7958107261ec7fa1b0e0a30200b3e2d0f2ea51657bba166 0029-shared-Do-not-use-malloc_info-on-musl.patch 9737f2d261fca96f0038489e0d3b166de015a76aa8738413afa8a44da6ebb6c9cf55f4642b9b2ddd9000f76880dc9b2b077ac655597b11cdb79ccfb0196190bd 0100-Do-not-buffer-on-systemd-sleep.patch -- 2.45.2