diff --git a/backport-Fix-invalid-memory-access-in-tcti_tabrmd_read.patch b/backport-Fix-invalid-memory-access-in-tcti_tabrmd_read.patch deleted file mode 100644 index d524b3e9d494f0f0eb644f156050901b6de5974b..0000000000000000000000000000000000000000 --- a/backport-Fix-invalid-memory-access-in-tcti_tabrmd_read.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6af641bfa46130670a8462d1031f9276aeb0af1f Mon Sep 17 00:00:00 2001 -From: Nicolas Iooss -Date: Mon, 27 Sep 2021 16:46:42 +0200 -Subject: [PATCH] tcti: initialize GError to NULL - -When an error happens in `tcti_tabrmd_read`, Glib reports: - - (process:905338): GLib-WARNING **: 06:59:08.971: GError set over the - top of a previous GError or uninitialized memory. - This indicates a bug in someone's code. You must ensure an error is - NULL before it's set. - The overwriting error message was: Error receiving data: Connection - reset by peer - -This warning was reported on -https://github.com/tpm2-software/tpm2-pkcs11/issues/705 - -Fix the warning by initializing `error` correctly. - -Signed-off-by: Nicolas Iooss ---- - src/tcti-tabrmd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tcti-tabrmd.c b/src/tcti-tabrmd.c -index dffe9062..f00a1f1c 100644 ---- a/src/tcti-tabrmd.c -+++ b/src/tcti-tabrmd.c -@@ -187,7 +187,7 @@ tcti_tabrmd_read (TSS2_TCTI_TABRMD_CONTEXT *ctx, - size_t size, - int32_t timeout) - { -- GError *error; -+ GError *error = NULL; - ssize_t num_read; - int ret; - diff --git a/tpm2-abrmd-2.4.0.tar.gz b/tpm2-abrmd-2.4.0.tar.gz deleted file mode 100644 index 598f8abdee8ae1af9da951a2887e562687e0985f..0000000000000000000000000000000000000000 Binary files a/tpm2-abrmd-2.4.0.tar.gz and /dev/null differ diff --git a/tpm2-abrmd-2.4.1.tar.gz b/tpm2-abrmd-2.4.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..6f282cc57b6b92840cfdec348a58b155b12c7d63 Binary files /dev/null and b/tpm2-abrmd-2.4.1.tar.gz differ diff --git a/tpm2-abrmd.spec b/tpm2-abrmd.spec index aeaffbd8ff2568b80bf3caffa3cd81014340c775..b6d5269a54f893410e61cd7bebdabc85a1f3f3a8 100644 --- a/tpm2-abrmd.spec +++ b/tpm2-abrmd.spec @@ -1,15 +1,13 @@ %global selinuxtype targeted Name: tpm2-abrmd -Version: 2.4.0 -Release: 2 +Version: 2.4.1 +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 -Patch6000: backport-Fix-invalid-memory-access-in-tcti_tabrmd_read.patch - BuildRequires: systemd pkgconfig(cmocka) pkgconfig(dbus-1) pkgconfig(gio-unix-2.0) pkgconfig(tss2-mu) pkgconfig(tss2-sys) BuildRequires: tpm2-tss-devel >= 2.4.0 libtool autoconf-archive libgcrypt libgcrypt-devel BuildRequires: chrpath @@ -47,9 +45,9 @@ This package contains SELinux policies for tpm2-abrmd %prep %autosetup -p1 -n %{name}-%{version} +autoreconf --install %build -export GDBUS_CODEGEN="/usr/bin/gdbus-codegen" %configure --disable-static --disable-silent-rules \ --with-systemdsystemunitdir=%{_unitdir} \ --with-systemdpresetdir=%{_presetdir} \ @@ -133,6 +131,12 @@ fi %{_datadir}/selinux/packages/tabrmd.pp.bz2 %changelog +* Fri Nov 5 2022 jinlun - 2.4.1-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: update to 2.4.1 + * Mon Oct 10 2022 jinlun - 2.4.0-2 - Type:bugfix - ID:NA