Date: Thursday, June 2, 2022 @ 20:13:07 Author: eworm Revision: 1219075
cherry-pick upstream commit Modified: lib32-systemd/trunk/PKGBUILD Deleted: lib32-systemd/trunk/0001-shared-utmp-wtmp-fix-build-without-utmp.patch ----------------------------------------------------+ 0001-shared-utmp-wtmp-fix-build-without-utmp.patch | 28 ------------------- PKGBUILD | 10 ++---- 2 files changed, 4 insertions(+), 34 deletions(-) Deleted: 0001-shared-utmp-wtmp-fix-build-without-utmp.patch =================================================================== --- 0001-shared-utmp-wtmp-fix-build-without-utmp.patch 2022-06-02 20:06:54 UTC (rev 1219074) +++ 0001-shared-utmp-wtmp-fix-build-without-utmp.patch 2022-06-02 20:13:07 UTC (rev 1219075) @@ -1,28 +0,0 @@ -From 30a0e11edc3ac73d5c00debde98cb82ada54a33b Mon Sep 17 00:00:00 2001 -From: Christian Hesse <[email protected]> -Date: Thu, 2 Jun 2022 20:49:46 +0200 -Subject: [PATCH 1/1] 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. ---- - 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 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-06-02 20:06:54 UTC (rev 1219074) +++ PKGBUILD 2022-06-02 20:13:07 UTC (rev 1219075) @@ -22,13 +22,13 @@ '9A774DB5DB996C154EBBFBFDA0099A18E29326E1' # Yu Watanabe <[email protected]> '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <[email protected]> source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"; - "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed"; - '0001-shared-utmp-wtmp-fix-build-without-utmp.patch') + "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed";) sha512sums=('SKIP' - 'SKIP' - '36020ebe1437910c936fedfdef33dec67f8d3679e1b95c86b71ac2a0d91ae0e85c5f436187173e656752f3eb7069a72f21163778403f88011b4c8ae9432cbca8') + 'SKIP') _backports=( + # shared/utmp-wtmp: fix build without utmp + 'd6e2c2d34d336398f5948a8b731fefff3dc0ff12' ) _reverts=( @@ -37,8 +37,6 @@ prepare() { cd "$_pkgbasename-stable" - patch -Np1 < ../0001-shared-utmp-wtmp-fix-build-without-utmp.patch - # add upstream repository for cherry-picking git remote add -f upstream ../systemd
