diff --git a/tpm2-abrmd-2.3.3.tar.gz b/tpm2-abrmd-2.3.3.tar.gz deleted file mode 100644 index 0d449c1..0000000 Binary files a/tpm2-abrmd-2.3.3.tar.gz and /dev/null differ diff --git a/tpm2-abrmd-2.4.0.tar.gz b/tpm2-abrmd-2.4.0.tar.gz new file mode 100644 index 0000000..598f8ab Binary files /dev/null and b/tpm2-abrmd-2.4.0.tar.gz differ diff --git a/tpm2-abrmd.spec b/tpm2-abrmd.spec index a8f8005..88314ba 100644 --- a/tpm2-abrmd.spec +++ b/tpm2-abrmd.spec @@ -1,15 +1,15 @@ %global selinuxtype targeted Name: tpm2-abrmd -Version: 2.3.3 -Release: 2 +Version: 2.4.0 +Release: 1 Summary: A system daemon implementing the TPM2 access broker (TAB) & Resource Manager (RM) spec from the TCG 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 BuildRequires: systemd pkgconfig(cmocka) pkgconfig(dbus-1) pkgconfig(gio-unix-2.0) pkgconfig(tss2-mu) pkgconfig(tss2-sys) -BuildRequires: tpm2-tss-devel libtool autoconf-archive libgcrypt libgcrypt-devel +BuildRequires: tpm2-tss-devel >= 2.4.0 libtool autoconf-archive libgcrypt libgcrypt-devel BuildRequires: chrpath BuildRequires: selinux-policy-devel pkgconfig(systemd) @@ -23,7 +23,7 @@ The daemon (tpm2-abrmd) is implemented using Glib and the GObject system. %package devel Summary: Files necessary to develop applications with tpm2-abrmd Requires: %{name}%{_isa} = %{version}-%{release} -Requires: tpm2-tss-devel +Requires: tpm2-tss-devel >= 2.4.0 %description devel @@ -51,7 +51,9 @@ export GDBUS_CODEGEN="/usr/bin/gdbus-codegen" %configure --disable-static --disable-silent-rules \ --with-systemdsystemunitdir=%{_unitdir} \ --with-systemdpresetdir=%{_presetdir} \ - --with-sepolicy + --with-sepolicy \ + --with-dbuspolicydir=%{_datadir}/dbus-1/system.d/ + %make_build %install @@ -72,15 +74,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d echo "/usr/lib64/" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf %check -make test - -%pre -#add a user to sandbox the tpm2-abrmd daemon -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 -exit 0 +make check %pre selinux %selinux_relabel_pre -s targeted @@ -116,7 +110,7 @@ fi %{_unitdir}/tpm2-abrmd.service %{_presetdir}/tpm2-abrmd.preset %{_datadir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/tpm2-abrmd.conf +%{_datadir}/dbus-1/system.d/tpm2-abrmd.conf %config(noreplace) /etc/ld.so.conf.d/* %files devel @@ -137,11 +131,17 @@ fi %{_datadir}/selinux/packages/tabrmd.pp.bz2 %changelog +* Mon Feb 14 2022 panxiaohe - 2.4.0-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: update to 2.4.0 + * Tue May 25 2021 Hugel - 2.3.3-2 - Type:bugfix - ID:NA - SUG:NA -- DESC:fix the SELinux label missing issue +- DESC: fix the SELinux label missing issue * Mon Aug 31 2020 Hugel - 2.3.3-1 - Type:enhancement