Update tests

Resolves: RHEL-8814

Signed-off-by: Štěpán Horáček <shoracek@redhat.com>

.tpm2-abrmd.metadata

@@ -0,0 +1 @@
+ea9f83ccbbe8201519c0282f7237c175d9faac78 tpm2-abrmd-2.4.0.tar.gz

tests/runtest.sh

@@ -17,7 +17,7 @@ pushd ibmtpm
 tar xf ../ibmtpm$IBMTPM_VERSION.tar.gz
 pushd src
 # fixup for openssl 3
-sed -i -e "s|OPENSSL_VERSION_NUMBER >= 0x10200000L|OPENSSL_VERSION_NUMBER > 0x30000000L|" TpmToOsslMath.h
+sed -i -e "s|OPENSSL_VERSION_NUMBER >= 0x10200000L|OPENSSL_VERSION_NUMBER > 0x30000070L|" TpmToOsslMath.h
 sed -i -e "s|CCFLAGS = -Wall|CCFLAGS = -Wall -Wno-error=deprecated-declarations|" makefile
 make
 

tpm2-abrmd.spec

@@ -2,7 +2,7 @@
 
 Name: tpm2-abrmd
 Version: 2.4.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: A system daemon implementing TPM2 Access Broker and Resource Manager
 
 License: BSD
@@ -24,6 +24,7 @@ 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})
+Requires: tpm2-tss >= 2.4.0
 
 %description
 tpm2-abrmd is a system daemon implementing the TPM2 access broker (TAB) and
@@ -54,17 +55,6 @@ required to build applications that use tpm2-abrmd.
 find %{buildroot}%{_libdir} -type f -name \*.la -delete
 rm -f %{buildroot}/%{_presetdir}/tpm2-abrmd.preset
 
-%pre
-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
-
 %post
 %systemd_post tpm2-abrmd.service
 
@@ -93,6 +83,14 @@ exit 0
 
 
 %changelog
+* Tue Oct 3 2023 Štěpán Horáček <shoracek@redhat.com> - 2.4.0-4
+- Remove user-creation code that is already handled by a requirement.
+  Resolves: RHEL-8814
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.0-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.0-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937