From e339afb84c2bdad354c3766f76d06c18af035f0cd2eeb669309121b98e90ec0a Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.com>
Date: Fri, 31 Jan 2020 16:21:52 +0000
Subject: [PATCH] Accepting request 769049 from home:michals

- Update to upstream version 1.3.0
- copy tpm device permission handling udev rule from tpm2-0-tss
- depend on user(tss) (boo#1162360).

OBS-URL: https://build.opensuse.org/request/show/769049
OBS-URL: https://build.opensuse.org/package/show/security/ibmtss?expand=0&rev=30
---
 90-tpm-ibmtss.rules |  4 ++++
 ibmtss.changes      |  7 +++++++
 ibmtss.spec         | 23 +++++++++++++----------
 ibmtss1.3.0.tar.gz  |  3 +++
 ibmtss1470.tar.gz   |  3 ---
 5 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 90-tpm-ibmtss.rules
 create mode 100644 ibmtss1.3.0.tar.gz
 delete mode 100644 ibmtss1470.tar.gz

diff --git a/90-tpm-ibmtss.rules b/90-tpm-ibmtss.rules
new file mode 100644
index 0000000..fee2b63
--- /dev/null
+++ b/90-tpm-ibmtss.rules
@@ -0,0 +1,4 @@
+# tpm devices can only be accessed by the tss user but the tss
+# group members can access tpmrm devices
+KERNEL=="tpm[0-9]*", MODE="0660", OWNER="tss"
+KERNEL=="tpmrm[0-9]*", MODE="0660", OWNER="tss", GROUP="tss"
diff --git a/ibmtss.changes b/ibmtss.changes
index 44bd2d2..7443deb 100644
--- a/ibmtss.changes
+++ b/ibmtss.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 31 11:53:40 UTC 2020 - Michal Suchanek <msuchanek@suse.com>
+
+- Update to upstream version 1.3.0
+- copy tpm device permission handling udev rule from tpm2-0-tss
+- depend on user(tss) (boo#1162360).
+
 -------------------------------------------------------------------
 Sat Aug 24 04:36:04 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/ibmtss.spec b/ibmtss.spec
index 62b8313..7f956d4 100644
--- a/ibmtss.spec
+++ b/ibmtss.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ibmtss
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,25 +18,26 @@
 
 #
 %define suite ibmtss
-%define libversion 0
-%define libversion_full 0.0.1
+%define libversion 1
+%define libversion_full 1.3.0
 %define libname libibmtss
 %define libpkgname %{libname}%{libversion}
 
 Name:           ibmtss
-Version:        1470
+Epoch:          1
+Version:        1.3.0
 Release:        0
 Summary:        IBM's TPM 2.0 TSS
 License:        BSD-3-Clause
 Group:          Productivity/Security
 URL:            https://sourceforge.net/projects/ibmtpm20tss
 Source:         https://sourceforge.net/projects/ibmtpm20tss/files/ibmtss%{version}.tar.gz
+Source1:        90-tpm-ibmtss.rules
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  ibmswtpm2
 BuildRequires:  libopenssl-devel
 BuildRequires:  libtool
-Recommends:     %{name}-base = %{version}
 
 %description
 This is a user space TCG Software Stack (TSS) for TPM 2.0. It
@@ -49,6 +50,7 @@ apps, rapid prototyping, education, and debugging.
 %package -n %{libpkgname}
 Summary:        Shared library for IBM's TPM 2.0 TSS
 Group:          System/Libraries
+Recommends:     %{name}-base = %{version}
 
 %description -n %{libpkgname}
 Shared library for IBM's TPM 2.0 TSS tools
@@ -57,6 +59,7 @@ Shared library for IBM's TPM 2.0 TSS tools
 Summary:        IBM's TPM 2.0 TSS shared files
 Group:          Productivity/Security
 BuildArch:      noarch
+Requires(post): user(tss)
 
 %description base
 Includes IBM's TPM 2.0 TSS certificates and policy files.
@@ -85,19 +88,18 @@ kill "$tpm_server" || :
 [ "$testfailed" -eq 0 ]
 
 %install
+install -m 644 -D -t %{buildroot}%{_prefix}/lib/udev/rules.d/ %{SOURCE1}
 cd utils
 %make_install
 
 mkdir -p %{buildroot}/%{_datadir}/%{suite}
 cp -a policies certificates %{buildroot}/%{_datadir}/%{suite}
 
-rm -f  %{buildroot}/%{_libdir}/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
 find %{buildroot} -name .cvsignore | xargs rm -v
 
-for i in %{buildroot}/%{_mandir}/man1/tsstss*.1 ; do
-	mv -v $i $(echo $i | sed -e s,/tsstss,/tss,)
-done
-
+%post base
+%_bindir/udevadm trigger -s tpm -s tpmrm || :
 %post   -n %{libpkgname} -p /sbin/ldconfig
 %postun -n %{libpkgname} -p /sbin/ldconfig
 
@@ -114,6 +116,7 @@ done
 %files base
 %license LICENSE
 %{_datadir}/%{suite}
+%{_prefix}/lib/udev/rules.d/*
 
 %files devel
 %license LICENSE
diff --git a/ibmtss1.3.0.tar.gz b/ibmtss1.3.0.tar.gz
new file mode 100644
index 0000000..7e35628
--- /dev/null
+++ b/ibmtss1.3.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5242ce5ca8f9aff8d7a5c71dc41dbdac472b0827dafc3a1cdb6e32c16cbb95e3
+size 1020543
diff --git a/ibmtss1470.tar.gz b/ibmtss1470.tar.gz
deleted file mode 100644
index 91588f8..0000000
--- a/ibmtss1470.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a446f4d664d9efcd195fafcfe9e387e4a0cce9e508db19433c34e9f0bcea6c9
-size 977556