From 27e00a1b6746d21d558590e0858f2499a3463cbc Mon Sep 17 00:00:00 2001 From: xdavidwu Date: Wed, 22 Jun 2022 22:23:42 +0800 Subject: [PATCH] systemd: add fix for building without utmp --- ...red-utmp-wtmp-fix-build-without-utmp.patch | 32 +++++++++++++++++++ systemd/APKBUILD | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 systemd/0001-shared-utmp-wtmp-fix-build-without-utmp.patch diff --git a/systemd/0001-shared-utmp-wtmp-fix-build-without-utmp.patch b/systemd/0001-shared-utmp-wtmp-fix-build-without-utmp.patch new file mode 100644 index 0000000..2bb9565 --- /dev/null +++ b/systemd/0001-shared-utmp-wtmp-fix-build-without-utmp.patch @@ -0,0 +1,32 @@ +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 46fff58..4b16d9a 100644 --- a/systemd/APKBUILD +++ b/systemd/APKBUILD @@ -15,6 +15,7 @@ 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-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 @@ -140,6 +141,7 @@ package() { sha512sums=" 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c systemd-251.2.tar.gz +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