Accepting request 566382 from home:vitezslav_cizek:branches:security

- Update to upstream version 1119
  * adds openssl 1.1 support (bsc#1066916)
- drop patches (upstream):
  * bits.patch
  * fix_unreferenced_macro-gcc7.patch

OBS-URL: https://build.opensuse.org/request/show/566382
OBS-URL: https://build.opensuse.org/package/show/security/ibmswtpm2?expand=0&rev=13

bits.patch

@@ -1,15 +0,0 @@
-diff -ur ibmtpm832/src/Implementation.h ibmswtpm2-832/src/Implementation.h
---- ibmtpm832/src/Implementation.h	2016-11-18 22:42:16.000000000 +0100
-+++ ibmswtpm2-832/src/Implementation.h	2017-01-30 17:36:16.279264575 +0100
-@@ -301,7 +301,11 @@
- /* From Vendor-Specific: Table 7 - Defines for Implementation Values */
- #define  FIELD_UPGRADE_IMPLEMENTED      NO
- #ifdef TPM_POSIX
-+#if defined(__LP64__) || defined(_LP64)
- #define  RADIX_BITS                     64	/* kgold */
-+#else
-+#define  RADIX_BITS                     32	/* kgold */
-+#endif
- #endif
- #ifdef TPM_WINDOWS
- #define  RADIX_BITS                     32	/* kgold */

fix_unreferenced_macro-gcc7.patch

@@ -1,13 +0,0 @@
-diff -ur ibmswtpm2-832.org/src/CompilerDependencies.h ibmswtpm2-832/src/CompilerDependencies.h
---- ibmswtpm2-832.org/src/CompilerDependencies.h	2016-11-16 19:31:54.000000000 +0100
-+++ ibmswtpm2-832/src/CompilerDependencies.h	2017-06-05 13:47:16.005232774 +0200
-@@ -142,7 +142,7 @@
- #   define LIB_IMPORT
- #   define _REDUCE_WARNING_LEVEL_(n)
- #   define _NORMAL_WARNING_LEVEL_
--#   define  NOT_REFERENCED(x) (x = x)
-+#   define  NOT_REFERENCED(x) (void)(x)
- #endif	// _MSC_VER
- 
- #ifdef TPM_POSIX
-Only in ibmswtpm2-832/src: CompilerDependencies.h~

ibmswtpm2.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jan 16 11:33:14 UTC 2018 - vcizek@suse.com
+
+- Update to upstream version 1119
+  * adds openssl 1.1 support (bsc#1066916)
+- drop patches (upstream):
+  * bits.patch
+  * fix_unreferenced_macro-gcc7.patch
+
 -------------------------------------------------------------------
 Wed Nov  8 15:04:35 UTC 2017 - msuchanek@suse.com
 

ibmswtpm2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ibmswtpm2
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -19,7 +19,7 @@
 %define suite ibmtss
 
 Name:           ibmswtpm2
-Version:        974
+Version:        1119
 Release:        0
 Summary:        IBM's Software TPM 2.0
 License:        BSD-3-Clause
@@ -27,16 +27,9 @@ Group:          Development/Tools/Other
 Url:            https://sourceforge.net/projects/ibmswtpm2
 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
@@ -53,8 +46,6 @@ implementation because of this specific interface.
 %prep
 %setup -c -q
 %patch1 -p 1
-%patch2 -p 1
-%patch3 -p 1
 
 %build
 cd src

ibmtpm1119.tar.gz

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

ibmtpm974.tar.gz

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

makefile.patch

@@ -1,6 +1,8 @@
---- ibmtpm832/src/makefile~	2017-01-30 16:31:06.903692292 +0100
+Index: ibmswtpm2-1119/src/makefile
-+++ ibmtpm832/src/makefile	2017-01-30 16:31:17.391841670 +0100
+===================================================================
-@@ -41,16 +41,16 @@
+--- ibmswtpm2-1119.orig/src/makefile	2018-01-16 12:46:54.412486803 +0100
++++ ibmswtpm2-1119/src/makefile	2018-01-16 12:48:38.498125716 +0100
+@@ -41,17 +41,17 @@
  
  CC = /usr/bin/gcc
  
@@ -8,16 +10,17 @@
 +CCFLAGS += -fno-strict-aliasing -fno-aggressive-loop-optimizations -Wno-unused-result \
  	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 -	-Werror -Wsign-compare \
-+	-Werror -Wsign-compare -Wno-unused-value -Wno-aggressive-loop-optimizations \
 -	 -c -ggdb -O0 			\
++	-Werror -Wsign-compare -Wno-unused-value -Wno-aggressive-loop-optimizations \
 +	 -c -ggdb -O 			\
  	-DTPM_POSIX			\
  	-D_POSIX_			\
+ 	-DTPM_NUVOTON			\
  	-I../utils			\
  	-I.
  
 -LNFLAGS = -ggdb 			\
 +LNFLAGS += -ggdb 			\
  	-DTPM_POSIX			\
+ 	-DTPM_NUVOTON			\
  	-lcrypto			\
- 	-lpthread			\