From 8dcb8b80af425ddd4a426fd3d7f9c22d8afcde18 Mon Sep 17 00:00:00 2001
From: jengelh <>
Date: Feb 04 2024 19:04:51 +0000
Subject: Update boinc-client to version 7.24.1 / rev 61 via SR 1143836


https://build.opensuse.org/request/show/1143836
by user jengelh + anag+factory
- Employ %sysuser macros to generate "boinc" user

---

diff --git a/.files b/.files
index 4ca8d0f..820310d 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 8bc52b4..ff308e0 100644
--- a/.rev
+++ b/.rev
@@ -491,4 +491,12 @@ replace plaintext widget with mini-html widget (forwarded request 522296 from je
   systemctl instead of the no longer relevant init script. (forwarded request 1137157 from aaronpuchert)</comment>
     <requestid>1137176</requestid>
   </revision>
+  <revision rev="61" vrev="3">
+    <srcmd5>09d5245cc2716a85d2b253cb06043e95</srcmd5>
+    <version>7.24.1</version>
+    <time>1707070161</time>
+    <user>anag+factory</user>
+    <comment>- Employ %sysuser macros to generate &quot;boinc&quot; user</comment>
+    <requestid>1143836</requestid>
+  </revision>
 </revisionlist>
diff --git a/boinc-client.changes b/boinc-client.changes
index 96a09db..d912ce7 100644
--- a/boinc-client.changes
+++ b/boinc-client.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Sat Feb  3 12:56:03 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Employ %sysuser macros to generate "boinc" user
+
+-------------------------------------------------------------------
 Thu Jan  4 21:22:29 UTC 2024 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 
 - Use systemd-sysusers to create service user and group.
diff --git a/boinc-client.spec b/boinc-client.spec
index ecf5b80..a01e21c 100644
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -36,7 +36,7 @@
 Name:           boinc-client
 %define rel_name        %{name}_release
 %define minor_version   7.24
-Version:        %{minor_version}.1
+Version:        %minor_version.1
 Release:        0
 Summary:        Client for Berkeley Open Infrastructure for Network Computing
 License:        GPL-3.0-or-later OR LGPL-3.0-or-later
@@ -45,7 +45,6 @@ URL:            https://boinc.berkeley.edu/
 
 #Git-Clone:     https://github.com/BOINC/boinc
 Source0:        https://github.com/BOINC/boinc/archive/client_release/%{minor_version}/%{version}.tar.gz
-Source2:        boinc-sysusers
 Source3:        README.SUSE
 Source4:        sysconfig.%{name}
 Source5:        boinc-logrotate
@@ -71,12 +70,13 @@ BuildRequires:  libtool
 BuildRequires:  openssl-devel
 BuildRequires:  pkg-config
 BuildRequires:  sqlite3-devel
+BuildRequires:  sysuser-tools
 BuildRequires:  xorg-x11-libXmu-devel
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(xcb)
 BuildRequires:  pkgconfig(xcb-util)
 BuildRequires:  pkgconfig(xi)
-Requires(pre):  shadow
+%sysusers_requires
 Requires:       ca-certificates-mozilla
 Recommends:     boinc-client-lang = %{version}
 Recommends:     logrotate
@@ -198,6 +198,16 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 %install
 %make_install
+mkdir -p "%buildroot/%_sysusersdir"
+cat >system-user-boinc.conf <<-EOF
+	g boinc -
+	u boinc -:boinc "BOINC Client" /var/lib/boinc
+	# Several BOINC applications want to use the GPU for computations.
+	m boinc render
+EOF
+cp -a system-user-boinc.conf "%buildroot/%_sysusersdir/"
+%sysusers_generate_pre system-user-boinc.conf random system-user-boinc.conf
+
 %if %{with manager}
 for i in clientgui locale; do
 %else
@@ -246,9 +256,6 @@ sed -i \
 # Remove {buildroot}/etc/sysconfig/boinc-client, it is added by %%fillup_and_insserv
 rm -f %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
-# Install sysusers config
-install -Dm0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
-
 # Install init and create symlink for rcboinc
 install -dm0755 %{buildroot}%{_sbindir}
 install -D -m0644 %{SOURCE20} %{buildroot}%{_unitdir}/%{name}.service
@@ -285,7 +292,7 @@ find %{buildroot}/%{_datadir}/locale/ -name "BOINC-Manager.mo" -delete
 
 %fdupes -s %{buildroot}
 
-%pre
+%pre -f random.pre
 # fix replacing old sysconfig file (r21)
 if [ -f %{_sysconfdir}/sysconfig/%{name} ]; then
   if ! grep -q "BOINC_BOINC_USR" %{_sysconfdir}/sysconfig/boinc-client; then
@@ -332,7 +339,7 @@ fi
 %{_unitdir}/%{name}.service
 %{_sbindir}/rc%{name}
 %{_fillupdir}/sysconfig.%{name}
-%{_sysusersdir}/%{name}.conf
+%_sysusersdir/*
 %attr(-,boinc,boinc) %{boinc_dir}/
 
 %files -n %{name}-lang -f BOINC-Client.lang
diff --git a/boinc-sysusers b/boinc-sysusers
deleted file mode 100644
index a9225b1..0000000
--- a/boinc-sysusers
+++ /dev/null
@@ -1,4 +0,0 @@
-g boinc -
-u boinc -:boinc "BOINC Client" /var/lib/boinc
-# Several BOINC applications want to use the GPU for computations.
-m boinc render