[arch-commits] Commit in lib32-systemd/trunk (2 files)

[Christian Hesse]

    Date: Thursday, June 2, 2022 @ 18:55:31
  Author: eworm
Revision: 1218930

upgpkg: lib32-systemd 251.2-1: new upstream release

Added:
  lib32-systemd/trunk/0001-shared-utmp-wtmp-fix-build-without-utmp.patch
Modified:
  lib32-systemd/trunk/PKGBUILD

----------------------------------------------------+
 0001-shared-utmp-wtmp-fix-build-without-utmp.patch |   28 +++++++++++++++++++
 PKGBUILD                                           |   12 +++++---
 2 files changed, 36 insertions(+), 4 deletions(-)

Added: 0001-shared-utmp-wtmp-fix-build-without-utmp.patch
===================================================================
--- 0001-shared-utmp-wtmp-fix-build-without-utmp.patch	                        (rev 0)
+++ 0001-shared-utmp-wtmp-fix-build-without-utmp.patch	2022-06-02 18:55:31 UTC (rev 1218930)
@@ -0,0 +1,28 @@
+From 30a0e11edc3ac73d5c00debde98cb82ada54a33b Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+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 18:34:31 UTC (rev 1218929)
+++ PKGBUILD	2022-06-02 18:55:31 UTC (rev 1218930)
@@ -2,8 +2,8 @@
 
 pkgname=lib32-systemd
 _pkgbasename=systemd
-_tag='a57280c2c63622b0f31b707db0ea13ce0c7ce6a0' # git rev-parse v${_tag_name}
-_tag_name=251.1
+_tag='615e67a0eeb479009f185d2526acf7cc1ed36e62' # git rev-parse v${_tag_name}
+_tag_name=251.2
 pkgver="${_tag_name/-/}"
 pkgrel=1
 pkgdesc='system and service manager (32-bit)'
@@ -22,9 +22,11 @@
               '9A774DB5DB996C154EBBFBFDA0099A18E29326E1'  # Yu Watanabe <watanabe.yu+github at gmail.com>
               '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
 source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
-        "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed")
+        "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed"
+        '0001-shared-utmp-wtmp-fix-build-without-utmp.patch')
 sha512sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            '36020ebe1437910c936fedfdef33dec67f8d3679e1b95c86b71ac2a0d91ae0e85c5f436187173e656752f3eb7069a72f21163778403f88011b4c8ae9432cbca8')
 
 _backports=(
 )
@@ -35,6 +37,8 @@
 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