From 1748f5fb392d990962ab575e52d6c11bd340da68af2d1a9c614a7bff402c698e Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Tue, 30 Nov 2021 08:01:35 +0000
Subject: [PATCH] Accepting request 931252 from home:gmbr3:Active

- Change to systemd-sysusers

OBS-URL: https://build.opensuse.org/request/show/931252
OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pcsc-lite?expand=0&rev=172
---
 pcsc-lite.changes  |  5 +++++
 pcsc-lite.spec     | 13 ++++++++-----
 pcsc-lite.sysusers |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 pcsc-lite.sysusers

diff --git a/pcsc-lite.changes b/pcsc-lite.changes
index c0e6e84..74f5204 100644
--- a/pcsc-lite.changes
+++ b/pcsc-lite.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Nov 13 13:20:53 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Change to systemd-sysusers
+
 -------------------------------------------------------------------
 Mon Oct 18 13:25:25 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
 
diff --git a/pcsc-lite.spec b/pcsc-lite.spec
index efab7c7..5736c2d 100644
--- a/pcsc-lite.spec
+++ b/pcsc-lite.spec
@@ -39,21 +39,23 @@ Source4:        baselibs.conf
 Source6:        pcsc-lite-reader-conf
 Source7:        https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2.asc
 Source8:        %{name}.keyring
+Source9:        %{name}.sysusers
 Patch0:         systemd-service.patch
 Patch1:         harden_pcscd.service.patch
 BuildRequires:  gcc
 BuildRequires:  libtool
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
 BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  sysuser-tools
 Requires:       libpcsclite1 = %{version}
 Requires(post): %fillup_prereq
-Requires(pre):  shadow
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  polkit-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(libudev)
 %{?systemd_requires}
+%sysusers_requires
 
 %description
 PC/SC Lite provides a Windows SCard interface in a small form factor
@@ -113,6 +115,7 @@ cp -a %{SOURCE1} %{SOURCE2} %{SOURCE6} .
 %patch1 -p1
 
 %build
+%sysusers_generate_pre %{SOURCE9} %{PKG_USER} %{PKG_USER}.conf
 %configure \
 	--disable-silent-rules \
 	--docdir=%{_docdir}/%{name} \
@@ -135,10 +138,9 @@ mkdir -p %{buildroot}%{_docdir}/%{name}
 cp -a AUTHORS ChangeLog COPYING HELP NEWS README README.SUSE SECURITY TODO %{buildroot}%{_docdir}/%{name}
 # Remove useless la files
 find %{buildroot} -type f -name "*.la" -delete -print
+install -Dm0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/%{PKG_USER}.conf
 
-%pre
-getent group %{PKG_GROUP} >/dev/null || groupadd -r %{PKG_GROUP}
-getent passwd %{PKG_USER} >/dev/null || useradd -r -g %{PKG_GROUP} -s %{_sbindir}/nologin -c "Smart Card Reader" -d /run/pcscd %{PKG_USER}
+%pre -f %{PKG_USER}.pre
 %service_add_pre pcscd.service pcscd.socket
 
 %post
@@ -178,6 +180,7 @@ getent passwd %{PKG_USER} >/dev/null || useradd -r -g %{PKG_GROUP} -s %{_sbindir
 %config(noreplace) %{_sysconfdir}/reader.conf.d/reader.conf
 %{ifddir}
 %{_unitdir}/*
+%{_sysusersdir}/%{PKG_USER}.conf
 %{_fillupdir}/sysconfig.pcscd
 # libpcsclite.so should stay in the main package (#732911). Third party packages may need it for dlopen().
 %{_libdir}/libpcsclite.so
diff --git a/pcsc-lite.sysusers b/pcsc-lite.sysusers
new file mode 100644
index 0000000..f7981db
--- /dev/null
+++ b/pcsc-lite.sysusers
@@ -0,0 +1,2 @@
+#Type Name  ID GECOS               Home directory Shell
+u     scard -  "Smart Card Reader" /run/pcscd     -