From e7ea3e4418bf65617fe820db75a708e86b418e20 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 9 Feb 2021 10:42:35 +0000
Subject: [PATCH] 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/tpm2-abrmd.git#03c88f028c3cc960d7d585ae9dfd6dca8ec5fa38
---
 sources         |  2 +-
 tpm2-abrmd.spec | 79 +++++++++++++++++++++++++++----------------------
 2 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/sources b/sources
index 8e224ef..6f68922 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tpm2-abrmd-2.3.3.tar.gz) = 2191c7e466271cb85fcb20fcd91c78df80f53030fb055d0b4670db33708939b60a9124955356f27662975abdcb9c8d144df884003986ffdbd801ca4e47edc21a
+SHA512 (tpm2-abrmd-2.4.0.tar.gz) = c2ef05ca2db5a33d3067052779aa4c2485a63bd357d5fd90ef9d4644530b37aa28b906064eed3b15729131697a2a9d6b9cc3f05bea04810fd6601e405af48110
diff --git a/tpm2-abrmd.spec b/tpm2-abrmd.spec
index 17e1df7..e6fe763 100644
--- a/tpm2-abrmd.spec
+++ b/tpm2-abrmd.spec
@@ -1,8 +1,8 @@
 %global selinuxtype targeted
 
 Name: tpm2-abrmd
-Version: 2.3.3
-Release: 2%{?dist}
+Version: 2.4.0
+Release: 1%{?dist}
 Summary: A system daemon implementing TPM2 Access Broker and Resource Manager
 
 License: BSD
@@ -20,7 +20,7 @@ BuildRequires: pkgconfig(gio-unix-2.0)
 BuildRequires: pkgconfig(tss2-mu)
 BuildRequires: pkgconfig(tss2-sys)
 # tpm2-abrmd depends on tpm2-tss-devel for tss2-mu/sys libs
-BuildRequires: tpm2-tss-devel >= 2.3.1-1%{?dist}
+BuildRequires: tpm2-tss-devel >= 2.4.0
 
 # tpm2-abrmd depends on the package that contains its SELinux policy module
 Requires: (%{name}-selinux >= 2.0.0-1%{?dist} if selinux-policy-%{selinuxtype})
@@ -29,6 +29,17 @@ Requires: (%{name}-selinux >= 2.0.0-1%{?dist} if selinux-policy-%{selinuxtype})
 tpm2-abrmd is a system daemon implementing the TPM2 access broker (TAB) and
 Resource Manager (RM) spec from the TCG.
 
+%package devel
+Summary: Headers, static libraries and package config files of tpm2-abrmd
+Requires: %{name}%{_isa} = %{version}-%{release}
+# tpm2-abrmd-devel depends on tpm2-tss-devel for tss2-mu/sys libs
+Requires: tpm2-tss-devel%{?_isa} >= 2.4.0
+
+%description devel
+This package contains headers, static libraries and package config files
+required to build applications that use tpm2-abrmd.
+
+
 %prep
 %autosetup -p1 -n %{name}-%{version}
 
@@ -44,41 +55,16 @@ find %{buildroot}%{_libdir} -type f -name \*.la -delete
 rm -f %{buildroot}/%{_presetdir}/tpm2-abrmd.preset
 
 %pre
-getent group tss >/dev/null || groupadd -g 59 -r tss
-getent passwd tss >/dev/null || \
-useradd -r -u 59 -g tss -d /dev/null -s /sbin/nologin \
- -c "Account used by the tpm2-abrmd package to sandbox the tpm2-abrmd daemon" tss
+getent group tss >/dev/null || groupadd -f -g 59 -r tss
+if ! getent passwd tss >/dev/null ; then
+    if ! getent passwd 59 >/dev/null ; then
+      useradd -r -u 59 -g tss -d /dev/null -s /sbin/nologin -c "Account used for TPM access" tss
+    else
+      useradd -r -g tss -d /dev/null -s /sbin/nologin -c "Account used for TPM access" tss
+    fi
+fi
 exit 0
 
-%files
-%doc README.md CHANGELOG.md
-%license LICENSE
-%{_libdir}/libtss2-tcti-tabrmd.so.*
-%{_sbindir}/tpm2-abrmd
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/tpm2-abrmd.conf
-%{_datarootdir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service
-%{_unitdir}/tpm2-abrmd.service
-%{_mandir}/man3/Tss2_Tcti_Tabrmd_Init.3*
-%{_mandir}/man7/tss2-tcti-tabrmd.7*
-%{_mandir}/man8/tpm2-abrmd.8*
-
-
-%package devel
-Summary: Headers, static libraries and package config files of tpm2-abrmd
-Requires: %{name}%{_isa} = %{version}-%{release}
-# tpm2-abrmd-devel depends on tpm2-tss-devel for tss2-mu/sys libs
-Requires: tpm2-tss-devel%{?_isa} >= 2.0.0-1%{?dist}
-
-%description devel
-This package contains headers, static libraries and package config files
-required to build applications that use tpm2-abrmd.
-
-%files devel
-%{_includedir}/tss2/tss2-tcti-tabrmd.h
-%{_libdir}/libtss2-tcti-tabrmd.so
-%{_libdir}/pkgconfig/tss2-tcti-tabrmd.pc
-
-# on package installation
 %post
 %systemd_post tpm2-abrmd.service
 
@@ -88,7 +74,28 @@ required to build applications that use tpm2-abrmd.
 %postun
 %systemd_postun tpm2-abrmd.service
 
+%files
+%license LICENSE
+%doc README.md CHANGELOG.md
+%{_libdir}/libtss2-tcti-tabrmd.so.*
+%{_sbindir}/tpm2-abrmd
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/tpm2-abrmd.conf
+%{_datarootdir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service
+%{_unitdir}/tpm2-abrmd.service
+%{_mandir}/man3/Tss2_Tcti_Tabrmd_Init.3*
+%{_mandir}/man7/tss2-tcti-tabrmd.7*
+%{_mandir}/man8/tpm2-abrmd.8*
+
+%files devel
+%{_includedir}/tss2/tss2-tcti-tabrmd.h
+%{_libdir}/libtss2-tcti-tabrmd.so
+%{_libdir}/pkgconfig/tss2-tcti-tabrmd.pc
+
+
 %changelog
+* Tue Feb 09 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2.4.0-1
+- Update to 2.4.0
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild