diff --git a/1.0-alpha_0.zip b/1.0-alpha_0.zip new file mode 100644 index 0000000..f6e17af --- /dev/null +++ b/1.0-alpha_0.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0ccb7095ac77f25b32a788cf114d5e7b23b85acaf1b7624dd259dfa95570e31 +size 3043469 diff --git a/tpm2-install-binaries.patch b/tpm2-install-binaries.patch new file mode 100644 index 0000000..6825917 --- /dev/null +++ b/tpm2-install-binaries.patch @@ -0,0 +1,13 @@ +Index: tpm2.0-tools-1.0.1/sapi-tools/Makefile.am +=================================================================== +--- tpm2.0-tools-1.0.1.orig/sapi-tools/Makefile.am ++++ tpm2.0-tools-1.0.1/sapi-tools/Makefile.am +@@ -91,7 +91,7 @@ LIBTPM = ../tss/sysapi/libtpm.a + $(LIBTPM): + $(MAKE) -C ../tss/ + +-noinst_PROGRAMS = tpm2_listpcrs \ ++sbin_PROGRAMS = tpm2_listpcrs \ + tpm2_quote \ + tpm2_takeownership \ + tpm2_getpubek \ diff --git a/tpm2.0-tools.spec b/tpm2.0-tools.spec index 294d1a1..ce1aa60 100644 --- a/tpm2.0-tools.spec +++ b/tpm2.0-tools.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define lib_name libtpm_unseal1 Name: tpm2.0-tools Version: 1.0.1 Release: 0 @@ -25,12 +23,14 @@ License: IPL-1.0 Group: Productivity/Security Url: http://trousers.sourceforge.net/ Source0: https://github.com/01org/tpm2.0-tools/archive/v%{version}.zip -BuildRequires: autoconf +# https://github.com/01org/TPM2.0-TSS ... +Source1: https://github.com/01org/TPM2.0-TSS/archive/1.0-alpha_0.zip +Patch0: tpm2-install-binaries.patch +BuildRequires: unzip +BuildRequires: gcc-c++ +BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: libtool -BuildRequires: openCryptoki-devel -BuildRequires: openssl-devel -BuildRequires: trousers-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -41,99 +41,36 @@ provides tools for enablement and configuration of the TPM and associated interfaces. Also look inside the trousers package for more software for TC. -%package pkcs11 -Summary: Management tools using PKCS#11 for the TPM hardware -Group: Applications/System - -%description pkcs11 -Trusted Computing is a set of specifications published by the Trusted -Computing Group (TCG). The Trusted Platform Module (TPM) is the -hardware component for Trusted Computing. The tpm-tools package -provides tools for enablement and configuration of the TPM and -associated interfaces. Also look inside the trousers package for more -software for TC. - -This package contains group of tools that use the TPM PKCS#11 token. All data -contained in the PKCS#11 data store is protected by the TPM (keys, -certificates, etc.). You can import keys and certificates, list out the -objects in the data store, and protect data. - -%package -n %{lib_name} -Summary: Management tools for the TPM hardware (library) -Group: System/Libraries - -%description -n %{lib_name} -Trusted Computing is a set of specifications published by the Trusted -Computing Group (TCG). The Trusted Platform Module (TPM) is the -hardware component for Trusted Computing. The tpm-tools package -provides tools for enablement and configuration of the TPM and -associated interfaces. Also look inside the trousers package for more -software for TC. - -This package contains shared libraries - -%package devel -Summary: Files to use the library routines supplied with tpm-tools -Group: Development/Libraries -Requires: %{lib_name} = %{version} - -%description devel -Trusted Computing is a set of specifications published by the Trusted -Computing Group (TCG). The Trusted Platform Module (TPM) is the -hardware component for Trusted Computing. The tpm-tools package -provides tools for enablement and configuration of the TPM and -associated interfaces. Also look inside the trousers package for more -software for TC. - -This package contains the libraries and headers necessary for developing -tpm-tools applications. - %prep %setup -q +%patch0 -p1 + +# embedded tss copy for now +unzip %{SOURCE1} +mv TPM2.0-TSS-1.0-alpha_0 tss %build -autoreconf -fiv -sed -i -e 's@-Werror@@g' configure.in -# Disable unused-but-set warnings with gcc >= 4.6 -%configure \ - --disable-static +cd tss +bash ./bootstrap +./configure +make %{?_smp_mflags} +cd .. +aclocal +autoconf +automake --add-missing +%configure --disable-static make %{?_smp_mflags} %check make %{?_smp_mflags} check -%post -n %{lib_name} -p /sbin/ldconfig - -%postun -n %{lib_name} -p /sbin/ldconfig - %install make DESTDIR=%{buildroot} install %{?_smp_mflags} find %{buildroot} -type f -name "*.la" -delete -print -cp include/*.h %{buildroot}%{_includedir}/tpm_tools %files %defattr(-,root,root) -%doc README LICENSE -%{_mandir}/man1/tpm_* -%{_mandir}/man8/tpm_* -%{_sbindir}/tpm_* -%{_bindir}/tpm_* - -%files -n %{lib_name} -%defattr(-,root,root,-) -%doc LICENSE -%{_libdir}/*.so.* - -%files pkcs11 -%defattr(-,root,root,-) -%doc LICENSE -%{_bindir}/tpmtoken_* -%{_mandir}/man1/tpmtoken_* - -%files devel -%defattr(-,root,root) -%{_libdir}/*.so -%{_includedir}/tpm_tools -%{_mandir}/man3/tpmUnseal* +%doc README.md manual LICENSE +/usr/sbin/tpm2_* %changelog