diff --git a/Revert-objectattrs-clear-before-or-ing-in-values.patch b/Revert-objectattrs-clear-before-or-ing-in-values.patch deleted file mode 100644 index 13a6fb0..0000000 --- a/Revert-objectattrs-clear-before-or-ing-in-values.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1f3451ee7b046a590b6dfc20b6af010166670ff7 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Thu, 12 Jul 2018 19:50:26 +0200 -Subject: [PATCH 1/1] Revert "objectattrs: clear before or'ing in values" - -This reverts commit e103bbf5117b0b62b358fd15f18f848854fcb0ee. - -The tpm2-tools 3.1.0 release contains a backward incompatible change that -was introduced by commit e103bbf5117 ("objectattrs: clear before or'ing -in values"), that changed the way that object attributes were specified. - -Before there were a set of default attributes and the user could specify -additional attributes to be used, but after the mentioned commit the user -must specify all attributes. - -This is a user visible change that changes the tools semantics, so is not -a suitable change for a MINOR version number increment, according to the -Semantic Versioning document (https://semver.org) since it breaks rule 2: - -2.MINOR version when you add functionality in a backwards-compatible manner - -Fixes: #1097 - -Signed-off-by: Javier Martinez Canillas ---- - lib/tpm2_attr_util.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/lib/tpm2_attr_util.c b/lib/tpm2_attr_util.c -index d461a744c0d..e43d03f9e0a 100644 ---- a/lib/tpm2_attr_util.c -+++ b/lib/tpm2_attr_util.c -@@ -501,7 +501,6 @@ bool tpm2_attr_util_nv_strtoattr(char *attribute_list, TPMA_NV *nvattrs) { - - bool tpm2_attr_util_obj_strtoattr(char *attribute_list, TPMA_OBJECT *objattrs) { - -- memset(objattrs, 0, sizeof(*objattrs)); - return common_strtoattr(attribute_list, objattrs, obj_attr_table, - ARRAY_LEN(obj_attr_table)); - } - --- -2.17.1 - diff --git a/tpm2-tools-4.1.3.tar.gz b/tpm2-tools-4.1.3.tar.gz deleted file mode 100644 index 854b8da..0000000 Binary files a/tpm2-tools-4.1.3.tar.gz and /dev/null differ diff --git a/tpm2-tools-5.0.tar.gz b/tpm2-tools-5.0.tar.gz new file mode 100644 index 0000000..80adb10 Binary files /dev/null and b/tpm2-tools-5.0.tar.gz differ diff --git a/tpm2-tools.spec b/tpm2-tools.spec index b997390..9fb3c6d 100644 --- a/tpm2-tools.spec +++ b/tpm2-tools.spec @@ -1,15 +1,13 @@ Name: tpm2-tools -Version: 4.1.3 +Version: 5.0 Release: 1 Summary: A TPM2.0 testing tool based on TPM2.0-TSS License: BSD URL: https://github.com/tpm2-software/tpm2-tools Source0: https://github.com/tpm2-software/tpm2-tools/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch0: Revert-objectattrs-clear-before-or-ing-in-values.patch - BuildRequires: gcc-c++ libtool autoconf-archive pkgconfig(cmocka) pkgconfig(libcurl) pkgconfig(openssl) -BuildRequires: pkgconfig(tss2-mu) pkgconfig(tss2-sys) pkgconfig(tss2-esys) git libgcrypt +BuildRequires: pkgconfig(tss2-mu) pkgconfig(tss2-sys) pkgconfig(tss2-esys) pkgconfig(uuid) git libgcrypt BuildRequires: libgcrypt-devel gdb Requires: tpm2-tss >= 2.3.1 Obsoletes: tpm2-tools <= 2.1.1-2 @@ -47,15 +45,19 @@ make check %files %defattr(-,root,root) -%license LICENSE +%license doc/LICENSE %{_bindir}/* %{_datadir}/bash-completion/completions/tpm2* +%{_datadir}/bash-completion/completions/tss2* %files help -%doc README.md CHANGELOG.md +%doc README.md doc/CHANGELOG.md %{_mandir}/*/* %changelog +* Mon Jan 25 2021 panxiaohe - 5.0-1 +- update to 5.0 + * Thu Aug 6 2020 zhangxingliang - 4.1.3-1 - update to 4.1.3