.gitignore

@@ -1 +1 @@
-SOURCES/tpm2-abrmd-3.0.0.tar.gz
+SOURCES/tpm2-abrmd-2.4.0.tar.gz

.tpm2-abrmd.metadata

@@ -1 +1 @@
-8c6281eb3b02a7097cd4aea9815aeb7f44d375b5 SOURCES/tpm2-abrmd-3.0.0.tar.gz
+ea9f83ccbbe8201519c0282f7237c175d9faac78 SOURCES/tpm2-abrmd-2.4.0.tar.gz

SPECS/tpm2-abrmd.spec

@@ -1,12 +1,11 @@
 %global selinuxtype targeted
-%global with_tests 1
 
 Name: tpm2-abrmd
-Version: 3.0.0
-Release: 6%{?dist}
+Version: 2.4.0
+Release: 3%{?dist}
 Summary: A system daemon implementing TPM2 Access Broker and Resource Manager
 
-License: BSD-2-Clause
+License: BSD
 URL:     https://github.com/tpm2-software/tpm2-abrmd
 Source0: https://github.com/tpm2-software/tpm2-abrmd/releases/download/%{version}/%{name}-%{version}.tar.gz
 
@@ -15,19 +14,16 @@ BuildRequires: make
 BuildRequires: systemd
 BuildRequires: libtool
 BuildRequires: autoconf-archive
+BuildRequires: pkgconfig(cmocka)
 BuildRequires: pkgconfig(dbus-1)
 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.4.0
-%if 0%{?with_tests}
-BuildRequires: pkgconfig(cmocka)
-%endif
 
 # 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(pre): tpm2-tss >= 2.4.0
 
 %description
 tpm2-abrmd is a system daemon implementing the TPM2 access broker (TAB) and
@@ -50,9 +46,7 @@ required to build applications that use tpm2-abrmd.
 %build
 %configure --disable-static --disable-silent-rules \
            --with-systemdsystemunitdir=%{_unitdir} \
-           --with-systemdpresetdir=%{_presetdir} \
-           --with-dbuspolicydir=%{_datarootdir}/dbus-1/system.d/
-
+           --with-systemdpresetdir=%{_presetdir}
 %make_build
 
 %install
@@ -60,10 +54,16 @@ required to build applications that use tpm2-abrmd.
 find %{buildroot}%{_libdir} -type f -name \*.la -delete
 rm -f %{buildroot}/%{_presetdir}/tpm2-abrmd.preset
 
-%if 0%{?with_tests}
-%check
-make check
-%endif
+%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
@@ -79,7 +79,7 @@ make check
 %doc README.md CHANGELOG.md
 %{_libdir}/libtss2-tcti-tabrmd.so.*
 %{_sbindir}/tpm2-abrmd
-%{_datarootdir}/dbus-1/system.d/tpm2-abrmd.conf
+%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*
@@ -93,44 +93,12 @@ make check
 
 
 %changelog
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.0.0-6
-- Rebuilt for MSVSphere 10
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.0.0-6
-- Bump release for June 2024 mass rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Sep 26 2023 Štěpán Horáček <shoracek@redhat.com> - 3.0.0-4
-- Migrate license to SPDX
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Dec 21 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 3.0.0-1
-- Update to 3.0.0
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Mar 17 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2.4.1-1
-- Update to 2.4.1
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sat Jun 12 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2.4.0-3
-- The tpm2-tss creates the tss user
+* 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
 
-* Sat Jun 12 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2.4.0-2
-- Fix DBus policy location (rhbz #1955150), enable tests
+* 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
 
 * Tue Feb 09 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2.4.0-1
 - Update to 2.4.0