diff --git a/ibmtss.changes b/ibmtss.changes index 36f3f09..1bdb7b2 100644 --- a/ibmtss.changes +++ b/ibmtss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 8 15:35:53 UTC 2017 - msuchanek@suse.com + +- Update to upstream 1045 (bsc#1066914) + ------------------------------------------------------------------- Thu Mar 2 12:28:23 UTC 2017 - msuchanek@suse.com diff --git a/ibmtss.spec b/ibmtss.spec index 02bbbf1..f148326 100644 --- a/ibmtss.spec +++ b/ibmtss.spec @@ -1,7 +1,7 @@ # # spec file for package ibmtss # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,18 +20,17 @@ %define suite ibmtss Name: ibmtss -Version: 755 +Version: 1045 Release: 0 Summary: IBM's TPM 2.0 TSS License: BSD-3-Clause Group: Productivity/Security -Url: https://sourceforge.net/projects/ibmtpm20tss/ -Source: %{name}%{version}withman.tar.gz -Patch0: makefile.patch +Url: https://sourceforge.net/projects/ibmtpm20tss +Source: https://sourceforge.net/projects/ibmtpm20tss/files/ibmtss%{version}.tar.gz +Patch: makefile.patch Source1: %{name} Source2: %{name}.1 -BuildRequires: libopenssl-devel <= 1.1 -BuildRequires: libopenssl-devel >= 1.0 +BuildRequires: libopenssl-devel %ifnarch s390x s390 ppc64 ppc BuildRequires: ibmswtpm2 %define test 1 @@ -67,7 +66,7 @@ Includes IBM's TPM 2.0 TSS C header files %prep %setup -c -q -%patch0 -p1 +%patch -p 1 %build cd utils @@ -81,7 +80,8 @@ testfailed=0 %install cd utils install -m 755 -D -t %{buildroot}/%{_libexecdir}/%{suite} libtss.so -install -m 755 -D -t %{buildroot}/%{_libexecdir}/%{suite} activatecredential certify changeeps changepps clear clearcontrol clockrateadjust clockset contextload contextsave create createek createprimary dictionaryattacklockreset dictionaryattackparameters duplicate eccparameters encryptdecrypt eventextend eventsequencecomplete evictcontrol flushcontext getcapability getcommandauditdigest getrandom getsessionauditdigest gettime hash hashsequencestart hierarchychangeauth hierarchycontrol hmac hmacstart import load loadexternal makecredential nvcertify nvchangeauth nvdefinespace nvextend nvglobalwritelock nvincrement nvread nvreadlock nvreadpublic nvsetbits nvundefinespace nvundefinespacespecial nvwrite nvwritelock objectchangeauth pcrallocate pcrevent pcrextend pcrread pcrreset policyauthorize policyauthvalue policycommandcode policycountertimer policycphash policygetdigest policymaker policymakerpcr policynv policynvwritten policyor policypassword policypcr policyrestart policysecret policysigned policyticket powerup quote readclock readpublic returncode rewrap rsadecrypt rsaencrypt sequencecomplete sequenceupdate setprimarypolicy shutdown sign signapp startauthsession startup stirrandom unseal verifysignature writeapp +install -m 755 -D -t %{buildroot}/%{_libexecdir}/%{suite} \ +activatecredential eventextend imaextend certify certifycreation changeeps changepps clear clearcontrol clockrateadjust clockset commit contextload contextsave create createloaded createprimary dictionaryattacklockreset dictionaryattackparameters duplicate eccparameters ecephemeral encryptdecrypt eventsequencecomplete evictcontrol flushcontext getcommandauditdigest getcapability getrandom getsessionauditdigest gettime hashsequencestart hash hierarchycontrol hierarchychangeauth hmac hmacstart import importpem load loadexternal makecredential nvcertify nvchangeauth nvdefinespace nvextend nvglobalwritelock nvincrement nvread nvreadlock nvreadpublic nvsetbits nvundefinespace nvundefinespacespecial nvwrite nvwritelock objectchangeauth pcrallocate pcrevent pcrextend pcrread pcrreset policyauthorize policyauthvalue policycommandcode policycphash policycountertimer policygetdigest policymaker policymakerpcr policyauthorizenv policynv policynvwritten policyor policypassword policypcr policyrestart policysigned policysecret policytemplate policyticket quote powerup readclock readpublic returncode rewrap rsadecrypt rsaencrypt sequenceupdate sequencecomplete setprimarypolicy shutdown sign startauthsession startup stirrandom unseal verifysignature signapp writeapp timepacket createek ntc2getconfig ntc2preconfig ntc2lockconfig mkdir -p %{buildroot}/%{_datadir}/%{suite} cp -a policies certificates %{buildroot}/%{_datadir}/%{suite} mkdir -p %{buildroot}/%{_includedir}/%{suite} diff --git a/ibmtss1045.tar.gz b/ibmtss1045.tar.gz new file mode 100644 index 0000000..409204e --- /dev/null +++ b/ibmtss1045.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cb9ff5feccd11769dedf609717687b4f94c48d9227265b0b6eedbb1ad16a020 +size 625952 diff --git a/ibmtss755withman.tar.gz b/ibmtss755withman.tar.gz deleted file mode 100644 index 2cf56ed..0000000 --- a/ibmtss755withman.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e760b6792d3174e0c3e969c2bd87ce8a25f78d2c5f036a491b3ebd1dc2ff4811 -size 586695 diff --git a/makefile.patch b/makefile.patch index 4ab08cd..f488a1f 100644 --- a/makefile.patch +++ b/makefile.patch @@ -1,29 +1,22 @@ -Index: ibmtss-755/utils/makefile -=================================================================== ---- ibmtss-755.orig/utils/makefile -+++ ibmtss-755/utils/makefile -@@ -44,9 +44,8 @@ CC = /usr/bin/gcc +--- ibmtss-1045/utils/makefile 2017-07-17 21:52:31.000000000 +0200 ++++ ibmtss-1045/utils/makefile 2017-11-08 15:45:41.458998485 +0100 +@@ -44,7 +44,7 @@ # compile - common flags for TSS library and applications --CCFLAGS = -DTPM_POSIX -- --# -DTPM_INTERFACE_TYPE_DEFAULT="\"dev\"" -+CCFLAGS += -DTPM_POSIX \ -+ -DTPM_INTERFACE_TYPE_DEFAULT="\"dev\"" - - # compile - for TSS library - -Index: ibmtss-755/utils/makefile-common -=================================================================== ---- ibmtss-755.orig/utils/makefile-common -+++ ibmtss-755/utils/makefile-common -@@ -43,7 +43,7 @@ +-CCFLAGS += -DTPM_POSIX ++CCFLAGS += -DTPM_POSIX -DTPM_INTERFACE_TYPE_DEFAULT="\"dev\"" + # example of pointing to a locally built openssl 1.1 + # CCFLAGS += -I/home/kgold/openssl-1.1.0c/include +--- ibmtss-996/utils/makefile-common 2017-04-19 21:22:21.000000000 +0200 ++++ ibmtss-996/utils/makefile-common 2017-06-08 15:47:04.771866677 +0200 +@@ -44,7 +44,7 @@ CCFLAGS += \ -Wall -W -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -- -ggdb -O0 -c \ -+ -ggdb -c \ - -DTPM_ENCRYPT_SESSIONS_DEFAULT="\"0\"" - + -Wformat=2 -Wold-style-definition \ +- -ggdb -O0 -c ++ -ggdb -fno-strict-aliasing -c + # to compile with optimizations on (warning will result) + # -O3 -c