From d7435d91e03df9fcf6ee260a73de7c33f67e3452 Mon Sep 17 00:00:00 2001 From: xdavidwu Date: Fri, 15 Jul 2022 12:58:47 +0800 Subject: [PATCH] systemd: drop upstreamed patches --- systemd/0001-Add-sys-file.h-for-LOCK_.patch | 78 ------------------- ...red-utmp-wtmp-fix-build-without-utmp.patch | 32 -------- systemd/APKBUILD | 4 - 3 files changed, 114 deletions(-) delete mode 100644 systemd/0001-Add-sys-file.h-for-LOCK_.patch delete mode 100644 systemd/0001-shared-utmp-wtmp-fix-build-without-utmp.patch diff --git a/systemd/0001-Add-sys-file.h-for-LOCK_.patch b/systemd/0001-Add-sys-file.h-for-LOCK_.patch deleted file mode 100644 index a3e148e..0000000 --- a/systemd/0001-Add-sys-file.h-for-LOCK_.patch +++ /dev/null @@ -1,78 +0,0 @@ -From c193380a08f5adea1fd514e0a20abd1d7b50d08c Mon Sep 17 00:00:00 2001 -From: Pavel Zhukov -Date: Mon, 20 Jun 2022 11:24:52 +0200 -Subject: [PATCH] Add sys/file.h for LOCK_ - -Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/23790] - -Signed-off-by: Pavel Zhukov - ---- - src/core/namespace.c | 1 + - src/dissect/dissect.c | 1 + - src/shared/dissect-image.c | 2 ++ - src/sysext/sysext.c | 1 + - src/test/test-loop-block.c | 1 + - 5 files changed, 6 insertions(+) - -diff --git a/src/core/namespace.c b/src/core/namespace.c -index 926aa96174..39f9e21c93 100644 ---- a/src/core/namespace.c -+++ b/src/core/namespace.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - - #include "alloc-util.h" - #include "base-filesystem.h" -diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c -index bd94a755db..a0d2a6f287 100644 ---- a/src/dissect/dissect.c -+++ b/src/dissect/dissect.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - - #include "architecture.h" - #include "chase-symlinks.h" -diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c -index 1ab88839aa..a9e3fe4b44 100644 ---- a/src/shared/dissect-image.c -+++ b/src/shared/dissect-image.c -@@ -4,6 +4,8 @@ - #include - #endif - -+#include -+ - #include - #include - #include -diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c -index 364af195e0..85686c0fab 100644 ---- a/src/sysext/sysext.c -+++ b/src/sysext/sysext.c -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - - #include "capability-util.h" - #include "chase-symlinks.h" -diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c -index d1793222f0..6886c4cd31 100644 ---- a/src/test/test-loop-block.c -+++ b/src/test/test-loop-block.c -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - #include "alloc-util.h" - #include "dissect-image.h" diff --git a/systemd/0001-shared-utmp-wtmp-fix-build-without-utmp.patch b/systemd/0001-shared-utmp-wtmp-fix-build-without-utmp.patch deleted file mode 100644 index 2bb9565..0000000 --- a/systemd/0001-shared-utmp-wtmp-fix-build-without-utmp.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d6e2c2d34d336398f5948a8b731fefff3dc0ff12 Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Thu, 2 Jun 2022 20:49:46 +0200 -Subject: [PATCH] shared/utmp-wtmp: fix build without utmp - -Commit 16618332388442f2f1c3e52b0a9fde00121564a3 changed a function to -add an extra argument. The data types used when building without utmp -missed the change. - -Upstream-Status: Backport [d6e2c2d34d336398f5948a8b731fefff3dc0ff12] -Signed-off-by: Martin Jansa - ---- - src/shared/utmp-wtmp.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h -index 36e4203b4f..188d011fdd 100644 ---- a/src/shared/utmp-wtmp.h -+++ b/src/shared/utmp-wtmp.h -@@ -59,7 +59,7 @@ static inline int utmp_wall( - const char *message, - const char *username, - const char *origin_tty, -- bool (*match_tty)(const char *tty, void *userdata), -+ bool (*match_tty)(const char *tty, bool is_local, void *userdata), - void *userdata) { - return 0; - } --- -2.36.1 - diff --git a/systemd/APKBUILD b/systemd/APKBUILD index 2d40174..cac24c4 100644 --- a/systemd/APKBUILD +++ b/systemd/APKBUILD @@ -16,8 +16,6 @@ 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-Add-sys-file.h-for-LOCK_.patch - 0001-shared-utmp-wtmp-fix-build-without-utmp.patch 0001-Adjust-for-musl-headers.patch 0001-pass-correct-parameters-to-getdents64.patch 0002-Add-sys-stat.h-for-S_IFDIR.patch @@ -143,8 +141,6 @@ package() { sha512sums=" fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f systemd-251.3.tar.gz -05b77c89c9314b40c44d882d36af25f99b42aed997f09d0f5307249bb7c36adfd2f770d1570b0019138dea6f23a2ea483fa66d4e3ba4e9a6622cd406d85b8ad4 0001-Add-sys-file.h-for-LOCK_.patch -d44497bc2884f387ad1e9529c8b953d45a3f953895331c4dfb54c4b31823b6703c03fd9ca03c06dc435339681ab3924a13a74ac32df38c555df5a1ca72179fe6 0001-shared-utmp-wtmp-fix-build-without-utmp.patch f076304ea23382099c6b96b2f839f5e5b1e5847af3165f2a468fd5f9db605aa12a0a92ed565cefce58a9323eb8b9cac3a823cd2f55523b913bb8fb4fc6d84dff 0001-Adjust-for-musl-headers.patch ac874fd9352460005d0a4b5aec04b92943d7a16621946e240eff56e74fc4b15924179889950d8c4b94f541ad7df6d2b670d5a407e2e52b05b3ea2c2464bc4efb 0001-pass-correct-parameters-to-getdents64.patch fba959ab24acead001efe812b0fd64b62be805347050ce997e7ba38c6aae74b9968f88883ec5f7886e38dbd8f4e04c130e726a192bac06d685fb7a2ff9be2a14 0002-Add-sys-stat.h-for-S_IFDIR.patch -- 2.43.0