From 24ef90c9aa4dfeb5065c156631f36e1dfc479447316169284de57f45e0108483 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sun, 7 Jul 2019 13:41:20 +0000
Subject: [PATCH] Accepting request 713487 from home:michals

- Update to upstream version 1332
  * fixes build of ibmtpm v1470
  * add ibmswtpm2-fix-uninitialized.patch
  * run through spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/713487
OBS-URL: https://build.opensuse.org/package/show/security/ibmswtpm2?expand=0&rev=16
---
 ibmswtpm2-fix-uninitialized.patch | 20 ++++++++++++++++++++
 ibmswtpm2.changes                 |  8 ++++++++
 ibmswtpm2.spec                    | 30 +++++++++++++++---------------
 ibmtpm1119.tar.gz                 |  3 ---
 ibmtpm1332.tar.gz                 |  3 +++
 5 files changed, 46 insertions(+), 18 deletions(-)
 create mode 100644 ibmswtpm2-fix-uninitialized.patch
 delete mode 100644 ibmtpm1119.tar.gz
 create mode 100644 ibmtpm1332.tar.gz

diff --git a/ibmswtpm2-fix-uninitialized.patch b/ibmswtpm2-fix-uninitialized.patch
new file mode 100644
index 0000000..692aca1
--- /dev/null
+++ b/ibmswtpm2-fix-uninitialized.patch
@@ -0,0 +1,20 @@
+--- ibmswtpm2-1332/src/TcpServerPosix.c~	2018-09-07 16:20:51.000000000 +0200
++++ ibmswtpm2-1332/src/TcpServerPosix.c	2019-07-04 19:58:14.736607559 +0200
+@@ -292,7 +292,7 @@
+     int                  res, i;
+     int                  nSock = 0;
+     socklen_t            length[2];
+-    BOOL                 continueServing;
++    BOOL                 continueServing = 0;
+ 
+     if (CreateSocket(PortNumber, &listenSocket[nSock], &length[nSock],
+ 		     AF_INET) == 0) {
+@@ -424,7 +424,7 @@
+     int                  res, i;
+     int                  nSock = 0;
+     socklen_t            length[2];
+-    BOOL 		continueServing;
++    BOOL 		continueServing = 0;
+     
+     if (CreateSocket(*PortNumber, &listenSocket[nSock], &length[nSock],
+ 		     AF_INET) == 0) {
diff --git a/ibmswtpm2.changes b/ibmswtpm2.changes
index 084178a..75a2e02 100644
--- a/ibmswtpm2.changes
+++ b/ibmswtpm2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jul  4 17:02:41 UTC 2019 - Michal Suchanek <msuchanek@suse.de>
+
+- Update to upstream version 1332
+  * fixes build of ibmtpm v1470
+  * add ibmswtpm2-fix-uninitialized.patch
+  * run through spec-cleaner
+
 -------------------------------------------------------------------
 Thu Jan 18 08:31:26 UTC 2018 - msuchanek@suse.com
 
diff --git a/ibmswtpm2.spec b/ibmswtpm2.spec
index 5ccc3b6..a62d70d 100644
--- a/ibmswtpm2.spec
+++ b/ibmswtpm2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ibmswtpm2
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,28 +12,29 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %define suite ibmtss
 
-Name:           ibmswtpm2
-Version:        1119
-Release:        0
-Summary:        IBM's Software TPM 2.0
-License:        BSD-3-Clause
-Group:          Development/Tools/Other
-Url:            https://sourceforge.net/projects/ibmswtpm2
-Source:         https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm%{version}.tar.gz
-Patch1:         makefile.patch
 %ifarch    ppc ppc64 s390 s390x
 %define extra_ccflags -DBIG_ENDIAN_TPM=1
 %else
 %define extra_ccflags ""
 %endif
+
+Name:           ibmswtpm2
+Version:        1332
+Release:        0
+Summary:        IBM's Software TPM 2.0
+License:        BSD-3-Clause
+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:         ibmswtpm2-fix-uninitialized.patch
 BuildRequires:  libopenssl-devel >= 1.0
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 An implementation of the TCG TPM 2.0 specification. It is based on
@@ -47,8 +48,8 @@ It is probably not of much use other than testing the IBM TSS
 implementation because of this specific interface.
 
 %prep
-%setup -c -q
-%patch1 -p 1
+%setup -q -c
+%autopatch -p 1
 
 %build
 cd src
@@ -59,7 +60,6 @@ cd src
 install -m 755 -D -t %{buildroot}/%{_libexecdir}/%{suite} tpm_server
 
 %files
-%defattr(-,root,root)
 %dir %{_libexecdir}/%{suite}
 %{_libexecdir}/%{suite}/tpm_server
 %doc ibmtpm.doc
diff --git a/ibmtpm1119.tar.gz b/ibmtpm1119.tar.gz
deleted file mode 100644
index 4f7f7bb..0000000
--- a/ibmtpm1119.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9eef79904e276aeaed2a6b9e4021442ef4d7dfae4adde2473bef1a6a4cd10fb
-size 579899
diff --git a/ibmtpm1332.tar.gz b/ibmtpm1332.tar.gz
new file mode 100644
index 0000000..0616c62
--- /dev/null
+++ b/ibmtpm1332.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e8193af3d11d9ff6a951dda8cd1f4693cb01934a8ad7876b84e92c6148ab0fd
+size 590005