Accepting request 817098 from home:Guillaume_G:branches:hardware:boot

- Update to 3.9.0
- Add libckteec package
- Add upstream patch to fix libckteec soname:
  * optee-client-fix-lib.patch
- Re-enable Werror

OBS-URL: https://build.opensuse.org/request/show/817098
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/optee-client?expand=0&rev=10

optee-client-fix-lib.patch

@@ -0,0 +1,57 @@
+From b9a04bac9799676e1332b0947c69b63bbac4bd0c Mon Sep 17 00:00:00 2001
+From: Jerome Forissier <jerome@forissier.org>
+Date: Thu, 25 Jun 2020 17:51:01 +0200
+Subject: [PATCH] libckteec: fix SONAME to be libckteec.so.<MAJOR_VERSION>
+
+The libckteec CMakeList.txt and Makefile both have the SONAME wrong.
+With the current version (0.1.0), SONAME should be libckteec.so.0, but:
+- CMakeList.txt sets it to libckteec.so.ckteec
+- Makefile sets it to libckteec.so.0.1.0
+
+This commit fixes both build environments.
+
+Reported-by: Guillaume Gardet <guillaume.gardet@opensuse.org>
+Signed-off-by: Jerome Forissier <jerome@forissier.org>
+---
+ libckteec/CMakeLists.txt | 8 ++++++--
+ libckteec/Makefile       | 2 +-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/libckteec/CMakeLists.txt b/libckteec/CMakeLists.txt
+index 1454a283..6e782d06 100644
+--- a/libckteec/CMakeLists.txt
++++ b/libckteec/CMakeLists.txt
+@@ -1,6 +1,10 @@
+ project(ckteec C)
+ 
+-set(PROJECT_VERSION "0.1.0")
++set(MAJOR_VERSION 0)
++set(MINOR_VERSION 1)
++set(PATCH_VERSION 0)
++
++set(PROJECT_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
+ 
+ ################################################################################
+ # Packages
+@@ -30,7 +34,7 @@ add_library (ckteec SHARED ${SRC})
+ 
+ set_target_properties (ckteec PROPERTIES
+ 	VERSION ${PROJECT_VERSION}
+-	SOVERSION ${PROJECT_NAME}
++	SOVERSION ${MAJOR_VERSION}
+ )
+ 
+ ################################################################################
+diff --git a/libckteec/Makefile b/libckteec/Makefile
+index 8c933ca4..bc939d02 100644
+--- a/libckteec/Makefile
++++ b/libckteec/Makefile
+@@ -47,7 +47,7 @@ libckteec: $(OUT_DIR)/$(LIBCKTEEC_SO_LIBRARY)
+ 
+ $(OUT_DIR)/$(LIBCKTEEC_SO_LIBRARY): $(LIBCKTEEC_OBJS)
+ 	@echo "  LINK    $@"
+-	$(VPREFIX)$(CC) -shared -Wl,-soname,$(LIBCKTEEC_SO_LIBRARY) -o $@ $+ $(LIBCKTEEC_LFLAGS)
++	$(VPREFIX)$(CC) -shared -Wl,-soname,$(LIB_MAJOR) -o $@ $+ $(LIBCKTEEC_LFLAGS)
+ 	@echo ""
+ 
+ libckteec: $(OUT_DIR)/$(LIBCKTEEC_AR_LIBRARY)

optee-client.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 25 11:59:17 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update to 3.9.0
+- Add libckteec package
+- Add upstream patch to fix libckteec soname:
+  * optee-client-fix-lib.patch
+- Re-enable Werror
+
 -------------------------------------------------------------------
 Sat May 11 18:39:56 UTC 2019 - Andreas Färber <afaerber@suse.de>
 

optee-client.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package optee-client
 #
-# 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
@@ -12,19 +12,22 @@
 # 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 libname libteec1
+%define libname2 libckteec0
 Name:           optee-client
-Version:        3.5.0
+Version:        3.9.0
 Release:        0
 Summary:        A Trusted Execution Environment client
 License:        BSD-2-Clause
 Group:          System/Boot
 URL:            https://github.com/OP-TEE/optee_client
 Source:         https://github.com/OP-TEE/optee_client/archive/%{version}.tar.gz#/optee_client-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM - https://github.com/OP-TEE/optee_client/issues/213
+Patch1:         optee-client-fix-lib.patch
 BuildRequires:  cmake
 
 %description
@@ -41,9 +44,20 @@ This component provides the TEE Client API as defined by the
 GlobalPlatform TEE standard. For a general overview of OP-TEE, the
 Open Platform Trusted Execution Environment, see the Notice.md file.
 
+%package -n %{libname2}
+Summary:        Library implementing the PKCS11 API
+Group:          System/Libraries
+
+%description -n %{libname2}
+This component provides the PKCS11 API using the PKCS11 trusted 
+application executing in OP-TEE.For a general overview of OP-TEE, the
+Open Platform Trusted Execution Environment, see the Notice.md file.
+
+
 %package devel
 Summary:        Files for Developing with libtee
 Group:          Development/Libraries/C and C++
+Requires:       %{libname2} = %{version}
 Requires:       %{libname} = %{version}
 
 %description devel
@@ -54,10 +68,7 @@ This package contains the libvisio development files.
 
 %prep
 %setup -q -n optee_client-%{version}
-
-sed -i \
-    -e "s:-Werror ::g" \
-    CMakeLists.txt
+%patch1 -p1
 
 %build
 %cmake
@@ -69,6 +80,9 @@ make %{?_smp_mflags} V=1
 %post -n %{libname} -p /sbin/ldconfig
 %postun -n %{libname} -p /sbin/ldconfig
 
+%post -n %{libname2} -p /sbin/ldconfig
+%postun -n %{libname2} -p /sbin/ldconfig
+
 %files
 %license LICENSE
 %doc README.md
@@ -77,8 +91,12 @@ make %{?_smp_mflags} V=1
 %files devel
 %{_includedir}/*.h
 %{_libdir}/libteec.so
+%{_libdir}/libckteec.so
 
 %files -n %{libname}
 %{_libdir}/libteec.so.*
 
+%files -n %{libname2}
+%{_libdir}/libckteec.so.*
+
 %changelog

optee_client-3.5.0.tar.gz

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

optee_client-3.9.0.tar.gz

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