diff --git a/.gitattributes b/.gitattributes index 1c20a17..9b03811 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,5 +21,3 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text -## Specific LFS patterns -ibmtss713.tar filter=lfs diff=lfs merge=lfs -text diff --git a/ibmtss.changes b/ibmtss.changes index 24145a8..9730c71 100644 --- a/ibmtss.changes +++ b/ibmtss.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 1 17:06:55 UTC 2017 - meissner@suse.com + +- update to v755 (FATE#321601) + - This is the version prefered by IBM. + ------------------------------------------------------------------- Wed Feb 8 09:33:13 UTC 2017 - jengelh@inai.de diff --git a/ibmtss.spec b/ibmtss.spec index f4e1057..e1dd7f3 100644 --- a/ibmtss.spec +++ b/ibmtss.spec @@ -20,14 +20,14 @@ %define suite ibmtss Name: ibmtss -Version: 713 +Version: 755 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}.tar -Patch: makefile.patch +Source: %{name}%{version}withman.tar.gz +Patch0: makefile.patch Source1: %{name} Source2: %{name}.1 BuildRequires: libopenssl-devel <= 1.1 @@ -67,7 +67,7 @@ Includes IBM's TPM 2.0 TSS certificates and policy files. %prep %setup -c -q -%patch -p 1 +%patch0 -p1 %build cd utils diff --git a/ibmtss713.tar b/ibmtss713.tar deleted file mode 100644 index 9bb06f5..0000000 --- a/ibmtss713.tar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d464252a1fce8b2302887cc02e3864b15eb1d071ddf4e028d35c4ba08cd1b0f -size 5447680 diff --git a/ibmtss755withman.tar.gz b/ibmtss755withman.tar.gz new file mode 100644 index 0000000..2cf56ed --- /dev/null +++ b/ibmtss755withman.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e760b6792d3174e0c3e969c2bd87ce8a25f78d2c5f036a491b3ebd1dc2ff4811 +size 586695 diff --git a/makefile.patch b/makefile.patch index 9fd8c56..4ab08cd 100644 --- a/makefile.patch +++ b/makefile.patch @@ -1,17 +1,8 @@ ---- ibmtss713/utils/makefile-common~ 2016-08-09 22:28:08.000000000 +0200 -+++ ibmtss713/utils/makefile-common 2017-01-30 16:36:53.844633306 +0100 -@@ -43,7 +43,7 @@ - - CCFLAGS += \ - -Wall -W -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -- -ggdb -O0 -c \ -+ -ggdb -fno-strict-aliasing -c \ - -DTPM_BITFIELD_LE \ - -DTPM_ENCRYPT_SESSIONS_DEFAULT="\"0\"" - ---- ibmtss713/utils/makefile~ 2016-08-09 22:28:08.000000000 +0200 -+++ ibmtss713/utils/makefile 2017-01-30 16:46:22.512727982 +0100 -@@ -44,9 +44,8 @@ +Index: ibmtss-755/utils/makefile +=================================================================== +--- ibmtss-755.orig/utils/makefile ++++ ibmtss-755/utils/makefile +@@ -44,9 +44,8 @@ CC = /usr/bin/gcc # compile - common flags for TSS library and applications @@ -23,3 +14,16 @@ # 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 += \ + -Wall -W -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ +- -ggdb -O0 -c \ ++ -ggdb -c \ + -DTPM_ENCRYPT_SESSIONS_DEFAULT="\"0\"" + +