From 40b71d3c3566db1a0abe30a71efb100113952a555d4d038ae6defe792bb911e0 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 29 Jun 2021 12:06:33 +0000
Subject: [PATCH] Accepting request 902431 from home:gmbr3:Active

- Change to using systemd-sysusers

OBS-URL: https://build.opensuse.org/request/show/902431
OBS-URL: https://build.opensuse.org/package/show/Base:System/at?expand=0&rev=116
---
 at.changes          |  5 +++++
 at.spec             | 16 +++++++++-------
 system-user-at.conf |  3 +++
 3 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 system-user-at.conf

diff --git a/at.changes b/at.changes
index 223029e..bbd3a82 100644
--- a/at.changes
+++ b/at.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun  3 11:39:32 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Change to using systemd-sysusers
+
 -------------------------------------------------------------------
 Fri Oct  2 21:20:32 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/at.spec b/at.spec
index cf97abf..9cd08df 100644
--- a/at.spec
+++ b/at.spec
@@ -31,6 +31,7 @@ Source:         http://software.calhariz.com/at/%{name}_%{version}.orig.tar.gz
 Source2:        atd.pamd
 Source3:        sysconfig.atd
 Source5:        atd.service
+Source6:        system-user-at.conf
 Patch0:         at-3.1.14.patch
 Patch4:         at-3.1.14-joblist.patch
 Patch10:        at-3.1.13-massive_batch.patch
@@ -67,10 +68,10 @@ BuildRequires:  pkgconfig
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(libHX)
 BuildRequires:  pkgconfig(libselinux)
+BuildRequires:  sysuser-tools
 Requires(post): %fillup_prereq
-Requires(pre):  %{_sbindir}/groupadd
-Requires(pre):  %{_sbindir}/useradd
 Requires(pre):  permissions
+%sysusers_requires
 Recommends:     smtp_daemon
 
 %description
@@ -91,6 +92,7 @@ autoreconf -fvi
   --with-daemon_groupname=at
 
 %make_build
+%sysusers_generate_pre %{SOURCE6} at system-user-at.conf
 
 %install
 install -d %{buildroot}{%{_sysconfdir}/pam.d,%{_bindir},%{_sbindir},%{_mandir}/man{1,5,8},%{_fillupdir}}
@@ -110,11 +112,10 @@ ln -s service %{buildroot}%{_sbindir}/rcatd
 install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/atd
 install -m644 %{SOURCE3} %{buildroot}%{_fillupdir}
 
-%pre
-getent group at >/dev/null || %{_sbindir}/groupadd -g 25 -o -r at
-getent passwd at >/dev/null || %{_sbindir}/useradd -r -o -g at -u 25 \
-	-s /bin/false -c "Batch jobs daemon" \
-	-d %{_localstatedir}/spool/atjobs at
+mkdir -p %{buildroot}%{_sysusersdir}
+install -m 0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/
+
+%pre -f at.pre
 %service_add_pre atd.service
 
 %preun
@@ -149,5 +150,6 @@ getent passwd at >/dev/null || %{_sbindir}/useradd -r -o -g at -u 25 \
 %attr(600,at,at) %{_localstatedir}/spool/atjobs/.SEQ
 %{_fillupdir}/sysconfig.atd
 %{_unitdir}/atd.service
+%{_sysusersdir}/system-user-at.conf
 
 %changelog
diff --git a/system-user-at.conf b/system-user-at.conf
new file mode 100644
index 0000000..0e126b8
--- /dev/null
+++ b/system-user-at.conf
@@ -0,0 +1,3 @@
+#Type Name ID GECOS               Home directory    Shell
+g     at   25 -                   -                 -
+u     at   25 "Batch jobs daemon" /var/spool/atjobs -