pool/ibmswtpm2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 541071 from home:michals

Browse Source 
Make buildable with openssl 1.0.0 legacy

OBS-URL: https://build.opensuse.org/request/show/541071
OBS-URL: https://build.opensuse.org/package/show/security/ibmswtpm2?expand=0&rev=11
This commit is contained in:
Michal Suchanek 2017-11-12 13:01:57 +00:00 committed by Git OBS Bridge
parent 3574d964cf
commit fbfa3e1174
6 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -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
ibmtpm832.tar filter=lfs diff=lfs merge=lfs -text

13
bits.patch
View File

@ -13,16 +13,3 @@ diff -ur ibmtpm832/src/Implementation.h ibmswtpm2-832/src/Implementation.h
#endif
#ifdef TPM_WINDOWS
#define RADIX_BITS 32 /* kgold */
diff -ur ibmtpm832/src/Clock.c ibmswtpm2-832/src/Clock.c
--- ibmtpm832/src/Clock.c 2016-11-18 22:41:02.000000000 +0100
+++ ibmswtpm2-832/src/Clock.c 2017-01-30 17:55:23.251624384 +0100
@@ -164,7 +164,7 @@
clock_t timeDiff;
uint64_t adjusted;
/* TOP is a base line or reference point, and BOTTOM is the current scale factor. */
-# define TOP (CLOCKS_PER_SEC * CLOCK_NOMINAL) /* kgold */
+# define TOP ((uint64_t)CLOCKS_PER_SEC * CLOCK_NOMINAL) /* kgold */
/* # define BOTTOM ((uint64_t)s_adjustRate * CLOCKS_PER_SEC) */
# define BOTTOM ((uint64_t)s_adjustRate * CLOCKS_PER_SEC)
// Save the value previously read from the system clock

8
ibmswtpm2.changes
View File

@ -1,7 +1,13 @@
-------------------------------------------------------------------
Wed Nov 8 15:04:35 UTC 2017 - msuchanek@suse.com
- Update to upstream version 974
- deal with openssl 1.0 vs 1.1 split (bsc#1066916)
-------------------------------------------------------------------
Mon Jun 5 11:49:18 UTC 2017 - msuchanek@suse.com
- fic build with gcc7: fix_unreferenced_macro-gcc7.patch
- fix build with gcc7: fix_unreferenced_macro-gcc7.patch
-------------------------------------------------------------------
Tue Feb 14 12:16:37 UTC 2017 - msuchanek@suse.com

8
ibmswtpm2.spec
View File

@ -19,20 +19,24 @@
%define suite ibmtss
Name: ibmswtpm2
Version: 832
Version: 974
Release: 0
Summary: IBM's Software TPM 2.0
License: BSD-3-Clause
Group: Development/Tools/Other
Url: https://sourceforge.net/projects/ibmswtpm2
Source: ibmtpm%{version}.tar
Source: https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm%{version}.tar.gz
Patch1: makefile.patch
Patch2: bits.patch
Patch3: fix_unreferenced_macro-gcc7.patch
# FIXME this is broken on BE - upstream is waiting for current spec testing to finish before porting
ExcludeArch: ppc ppc64 s390 s390x
%if 0%{?suse_version} <= 1320
BuildRequires: libopenssl-devel < 1.1
BuildRequires: libopenssl-devel >= 1.0
%else
BuildRequires: libopenssl-1_0_0-devel
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description

3
ibmtpm832.tar
View File

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

3
ibmtpm974.tar.gz Normal file
View File

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