From e7dad1f5b713d99a7a9e4f980afb43407e5eab00 Mon Sep 17 00:00:00 2001 From: wenyuzifangtest001 Date: Mon, 15 Sep 2025 12:00:13 +0800 Subject: [PATCH] Update code from upstream --- trousers-0.3.14-fix-indent-obj_policy.patch | 12 ++++++++++++ trousers.spec | 11 +++++++---- 2 files changed, 19 insertions(+), 4 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..530cf4d 100644 --- a/trousers.spec +++ b/trousers.spec @@ -1,16 +1,17 @@ -%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 Url: http://trousers.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: tcsd.service +Source0: http://downloads.sourceforge.net/trousers/trousers-0.3.15.tar.gz +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 +* Mon Sep 15 2025 wenyuzifangtest001 - 0.3.15-4 +- Fixes incorrect SecretSet flag handling, ensuring proper policy secret state management. * Wed Apr 12 2023 Shawn Wang - 0.3.15-3 - Optimize the spec file -- Gitee