Hello community, here is the log from the commit of package ibmswtpm2 for openSUSE:Factory checked in at 2017-11-12 18:10:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibmswtpm2 (Old) and /work/SRC/openSUSE:Factory/.ibmswtpm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibmswtpm2" Sun Nov 12 18:10:56 2017 rev:4 rq:541072 version:974 Changes: -------- --- /work/SRC/openSUSE:Factory/ibmswtpm2/ibmswtpm2.changes 2017-06-12 15:32:21.321007124 +0200 +++ /work/SRC/openSUSE:Factory/.ibmswtpm2.new/ibmswtpm2.changes 2017-11-12 18:11:08.769590043 +0100 @@ -1,0 +2,6 @@ +Wed Nov 8 15:04:35 UTC 2017 - msucha...@suse.com + +- Update to upstream version 974 + - deal with openssl 1.0 vs 1.1 split (bsc#1066916) + +------------------------------------------------------------------- @@ -4 +10 @@ -- fic build with gcc7: fix_unreferenced_macro-gcc7.patch +- fix build with gcc7: fix_unreferenced_macro-gcc7.patch Old: ---- ibmtpm832.tar New: ---- ibmtpm974.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibmswtpm2.spec ++++++ --- /var/tmp/diff_new_pack.Vzc5T7/_old 2017-11-12 18:11:10.397530821 +0100 +++ /var/tmp/diff_new_pack.Vzc5T7/_new 2017-11-12 18:11:10.401530675 +0100 @@ -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 ++++++ bits.patch ++++++ --- /var/tmp/diff_new_pack.Vzc5T7/_old 2017-11-12 18:11:10.425529802 +0100 +++ /var/tmp/diff_new_pack.Vzc5T7/_new 2017-11-12 18:11:10.425529802 +0100 @@ -13,16 +13,3 @@ #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 -
