Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/clevis.git#79bc444333b6f4fda831f1301527a5eb14c31271

clevis.spec

@@ -1,11 +1,12 @@
 Name:           clevis
 Version:        15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Automated decryption framework
 
 License:        GPLv3+
 URL:            https://github.com/latchset/%{name}
 Source0:        https://github.com/latchset/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
+Source1:        clevis.sysusers
 Patch0:         clevis-tpm2-tools-5.patch
 
 BuildRequires:  git-core
@@ -25,6 +26,7 @@ BuildRequires:  tpm2-tools >= 4.0.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig
 BuildRequires:  systemd
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  dracut
 BuildRequires:  tang >= 6
 BuildRequires:  curl
@@ -111,6 +113,7 @@ use UDisks2 or storaged (like GNOME).
 
 %install
 %meson_install
+install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/clevis.conf
 
 %check
 desktop-file-validate \
@@ -118,10 +121,7 @@ desktop-file-validate \
 %meson_test
 
 %pre
-getent group %{name} >/dev/null || groupadd -r %{name} &>/dev/null
+%sysusers_create_compat %{SOURCE1}
-getent passwd %{name} >/dev/null || \
-    useradd -r -g %{name} -d %{_localstatedir}/cache/%{name} -s /sbin/nologin \
-    -c "Clevis Decryption Framework unprivileged user" %{name} &>/dev/null
 # Add clevis user to tss group.
 if getent group tss >/dev/null && ! groups %{name} | grep -q "\btss\b"; then
     usermod -a -G tss %{name} &>/dev/null
@@ -155,6 +155,7 @@ exit 0
 %{_mandir}/man1/%{name}-encrypt-sss.1*
 %{_mandir}/man1/%{name}-decrypt.1*
 %{_mandir}/man1/%{name}.1*
+%{_sysusersdir}/clevis.conf
 
 %files luks
 %{_mandir}/man7/%{name}-luks-unlockers.7*
@@ -190,6 +191,9 @@ exit 0
 %attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 15-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Nov 23 08:14:40 GMT 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 15-3
 - Upstream patch for tpm-tools 5.0 support
 

clevis.sysusers

@@ -0,0 +1 @@
+u clevis - "Clevis Decryption Framework unprivileged user" /var/cache/clevis /usr/sbin/nologin