SHA256
1
0
forked from pool/tpm2.0-tools

Accepting request 603119 from security

- install-man.patch: even after update to 3.0.4 the man pages are not
  installed correctly. This patch fixes it locally.

- update to version 3.0.4:
  - Fix save and load for TPM2B_PRIVATE object.
  - Use a default buffer size for tpm2_nv{read,write} if the TPM reports a 0 size.
  - Fix --verbose and --version options crossover.
  - Generate man pages from markdown and include them in the distribution tarball.
  - Print usage summary if tools are executed with no options or man page can't be displayed.
- man pages will be shipped for SLE version now, too (pandoc dependency was removed)

OBS-URL: https://build.opensuse.org/request/show/603119
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tpm2.0-tools?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2018-05-03 10:34:00 +00:00 committed by Git OBS Bridge
commit 7314156e15
5 changed files with 51 additions and 6 deletions

20
install-man.patch Normal file
View File

@ -0,0 +1,20 @@
Index: tpm2-tools-3.0.4/Makefile.am
===================================================================
--- tpm2-tools-3.0.4.orig/Makefile.am
+++ tpm2-tools-3.0.4/Makefile.am
@@ -273,7 +273,6 @@ EXTRA_DIST = $(top_srcdir)/man \
RELEASE.md \
test/system
-if HAVE_PANDOC
man1_MANS := \
man/man1/tpm2_activatecredential.1 \
man/man1/tpm2_certify.1 \
@@ -315,6 +314,7 @@ if HAVE_PANDOC
man/man1/tpm2_unseal.1 \
man/man1/tpm2_verifysignature.1
+if HAVE_PANDOC
# If pandoc is enabled, we want to generate the manpages for the dist tarball
EXTRA_DIST += $(man1_MANS)
else

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c990c0656165afef0fad61e1852a9a189a4b93b43d2a684b151a5dc0b3c6249d
size 534212

3
tpm2-tools-3.0.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ac05028347a9fa1da79b5d53b998193de0c3a76000badb961c3feb8b8a0e8e8e
size 560648

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed May 2 12:09:22 UTC 2018 - matthias.gerstner@suse.com
- install-man.patch: even after update to 3.0.4 the man pages are not
installed correctly. This patch fixes it locally.
-------------------------------------------------------------------
Wed May 2 11:02:07 UTC 2018 - matthias.gerstner@suse.com
- update to version 3.0.4:
- Fix save and load for TPM2B_PRIVATE object.
- Use a default buffer size for tpm2_nv{read,write} if the TPM reports a 0 size.
- Fix --verbose and --version options crossover.
- Generate man pages from markdown and include them in the distribution tarball.
- Print usage summary if tools are executed with no options or man page can't be displayed.
- man pages will be shipped for SLE version now, too (pandoc dependency was removed)
-------------------------------------------------------------------
Wed Mar 7 15:44:14 UTC 2018 - matthias.gerstner@suse.com

View File

@ -17,7 +17,7 @@
Name: tpm2.0-tools
Version: 3.0.3
Version: 3.0.4
Release: 0
Summary: Trusted Platform Module (TPM) 2.0 administration tools
License: BSD-3-Clause
@ -25,6 +25,7 @@ Group: Productivity/Security
Url: https://github.com/tpm2-software/tpm2-tools/releases
Source0: https://github.com/tpm2-software/tpm2-tools/releases/download/%{version}/tpm2-tools-%{version}.tar.gz
Patch0: tpm2.0-tools-fix-hardening.patch
Patch1: install-man.patch
BuildRequires: autoconf-archive
BuildRequires: automake
BuildRequires: gcc-c++
@ -32,6 +33,14 @@ BuildRequires: libcurl-devel
BuildRequires: libopenssl-devel
BuildRequires: libtool
%if 0%{?is_opensuse}
# releases prior to 3.0.4 required pandoc for building the man pages. On SLE
# we don't have pandoc and it requires a complete haskell stack so adding it
# is out of the question just for man pages.
#
# since 3.0.4 the man pages are shipped with the distribution tarball and we
# don't need to generate them any more. On openSUSE we can still keep this
# dependency for having fresh builds of the man pages (if that helps
# anything?).
BuildRequires: pandoc
%endif
BuildRequires: pkgconfig
@ -51,6 +60,7 @@ associated interfaces.
%prep
%setup -q -n tpm2-tools-%{version}
%patch0 -p1
%patch1 -p1
%build
%configure --disable-static
@ -67,8 +77,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
%defattr(-,root,root)
%doc README.md LICENSE CHANGELOG.md
/usr/bin/tpm2_*
%if 0%{?is_opensuse}
%{_mandir}/man1/tpm2_*
%endif
%changelog