From a80de907764ba997bd74daae329b671c4fca91ff Mon Sep 17 00:00:00 2001 From: wenyuzifang Date: Thu, 21 Aug 2025 02:48:02 +0800 Subject: [PATCH] Update code from upstream --- trousers-0.3.14-fix-indent-obj_policy.patch | 12 ++++++++++++ trousers.spec | 7 +++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 trousers-0.3.14-fix-indent-obj_policy.patch diff --git a/trousers-0.3.14-fix-indent-obj_policy.patch b/trousers-0.3.14-fix-indent-obj_policy.patch new file mode 100644 index 0000000..af53ee4 --- /dev/null +++ b/trousers-0.3.14-fix-indent-obj_policy.patch @@ -0,0 +1,12 @@ +diff -ur trousers-0.3.14/src/tspi/obj_policy.c trousers-0.3.14-new/src/tspi/obj_policy.c +--- trousers-0.3.14/src/tspi/obj_policy.c 2014-07-23 12:42:44.000000000 -0700 ++++ trousers-0.3.14-new/src/tspi/obj_policy.c 2019-05-27 13:29:56.720899059 -0700 +@@ -984,7 +984,7 @@ + policy->popupString, + policy->Secret))) + goto done; +- policy->SecretSet = TRUE; ++ policy->SecretSet = TRUE; + } + memcpy(secret, policy->Secret, TPM_SHA1_160_HASH_LEN); + *mode = policy->SecretMode; diff --git a/trousers.spec b/trousers.spec index 5d91c0c..1ff8aee 100644 --- a/trousers.spec +++ b/trousers.spec @@ -1,7 +1,7 @@ -%define anolis_release 3 +%define anolis_release 4 Name: trousers -Version: 0.3.15 +Version: 0.3.15 Release: %{anolis_release}%{?dist} Summary: The open-source TCG Software Stack License: BSD @@ -11,6 +11,7 @@ Source1: tcsd.service Patch1: trousers-0.3.14-noinline.patch Patch2: trousers-0.3.14-unlock-in-err-path.patch +Patch3: trousers-0.3.14-fix-indent-obj_policy.patch BuildRequires: autoconf automake make BuildRequires: libtool openssl-devel gettext-devel systemd @@ -127,6 +128,8 @@ exit 0 %doc README ChangeLog %changelog +* Thu Aug 21 2025 wenyuzifang - 0.3.15-4 +- Fixes logic error, ensures consistent SecretSet behavior, prevents bugs, improves reliability. * Wed Apr 12 2023 Shawn Wang - 0.3.15-3 - Optimize the spec file -- Gitee