Hello community, here is the log from the commit of package optee-client for openSUSE:Factory checked in at 2020-08-05 20:29:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/optee-client (Old) and /work/SRC/openSUSE:Factory/.optee-client.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "optee-client" Wed Aug 5 20:29:15 2020 rev:4 rq:824488 version:3.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/optee-client/optee-client.changes 2019-06-12 13:14:40.540792991 +0200 +++ /work/SRC/openSUSE:Factory/.optee-client.new.3592/optee-client.changes 2020-08-05 20:29:26.387099891 +0200 @@ -1,0 +2,9 @@ +Thu Jun 25 11:59:17 UTC 2020 - Guillaume GARDET <[email protected]> + +- Update to 3.9.0 +- Add libckteec package +- Add upstream patch to fix libckteec soname: + * optee-client-fix-lib.patch +- Re-enable Werror + +------------------------------------------------------------------- Old: ---- optee_client-3.5.0.tar.gz New: ---- optee-client-fix-lib.patch optee_client-3.9.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ optee-client.spec ++++++ --- /var/tmp/diff_new_pack.MhyhlM/_old 2020-08-05 20:29:27.111100268 +0200 +++ /var/tmp/diff_new_pack.MhyhlM/_new 2020-08-05 20:29:27.115100271 +0200 @@ -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 @@ 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 @@ %prep %setup -q -n optee_client-%{version} - -sed -i \ - -e "s:-Werror ::g" \ - CMakeLists.txt +%patch1 -p1 %build %cmake @@ -69,6 +80,9 @@ %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 @@ %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-fix-lib.patch ++++++ >From b9a04bac9799676e1332b0947c69b63bbac4bd0c Mon Sep 17 00:00:00 2001 From: Jerome Forissier <[email protected]> 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 <[email protected]> Signed-off-by: Jerome Forissier <[email protected]> --- 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-3.5.0.tar.gz -> optee_client-3.9.0.tar.gz ++++++ ++++ 6915 lines of diff (skipped)
