forked from pool/optee-client
Accepting request 1151790 from hardware:boot
OBS-URL: https://build.opensuse.org/request/show/1151790 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/optee-client?expand=0&rev=5
This commit is contained in:
Git OBS Bridge
@@ -1,57 +0,0 @@
|
||||
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)
|
||||
@@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 26 14:39:59 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
- Update to 4.1.0
|
||||
- Add libseteec0 and libteeacl0
|
||||
- Drop upstream patch:
|
||||
* optee-client-fix-lib.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 26 12:50:29 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Use %autosetup macro. Allows to eliminate the usage of deprecated
|
||||
PatchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 25 11:59:17 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package optee-client
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -18,17 +18,18 @@
|
||||
|
||||
%define libname libteec1
|
||||
%define libname2 libckteec0
|
||||
%define libname3 libseteec0
|
||||
%define libname4 libteeacl0
|
||||
Name: optee-client
|
||||
Version: 3.9.0
|
||||
Version: 4.1.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
|
||||
BuildRequires: libuuid-devel
|
||||
|
||||
%description
|
||||
This component provides the TEE Client API as defined by the
|
||||
@@ -49,14 +50,48 @@ Summary: Library implementing the PKCS11 API
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %{libname2}
|
||||
This component provides the PKCS11 API using the PKCS11 trusted
|
||||
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 -n %{libname3}
|
||||
Summary: Library implementing the Secure Element control
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %{libname3}
|
||||
When a Secure Element -supported by OP-TEE- enables SCP03, the
|
||||
encryption keys could have been derived from the HUK and therefore not
|
||||
known to the normal world.
|
||||
|
||||
In such circumstances, APDU frames will need to be routed to the
|
||||
secure world for encryption before sending them to the SE and then
|
||||
decrypted when processing the response.
|
||||
|
||||
Secure Elements supporting SCP03 are shipped with predefined keys
|
||||
stored in persistent memory and documented in their data sheets.
|
||||
|
||||
This library provides an interface to enable SCP03 using those
|
||||
non-secure keys. It also provides an interface to rotate these default
|
||||
keys and derive board unique new ones before enabling the SCP03
|
||||
session.
|
||||
|
||||
|
||||
%package -n %{libname4}
|
||||
Summary: ACL helper library
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %{libname4}
|
||||
Helper library libteeacl containing functions that can be used to
|
||||
generate the hashed UUID of the user or group. These can then be
|
||||
configured to PKCS11 tokens provided by libckteec for Access Control
|
||||
List (ACL) based access.
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: Files for Developing with libtee
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{libname4} = %{version}
|
||||
Requires: %{libname3} = %{version}
|
||||
Requires: %{libname2} = %{version}
|
||||
Requires: %{libname} = %{version}
|
||||
|
||||
@@ -67,8 +102,7 @@ TEE standard. For a general overview of OP-TEE, please see the Notice.md file.
|
||||
This package contains the libvisio development files.
|
||||
|
||||
%prep
|
||||
%setup -q -n optee_client-%{version}
|
||||
%patch1 -p1
|
||||
%autosetup -p1 -n optee_client-%{version}
|
||||
|
||||
%build
|
||||
%cmake
|
||||
@@ -92,6 +126,9 @@ make %{?_smp_mflags} V=1
|
||||
%{_includedir}/*.h
|
||||
%{_libdir}/libteec.so
|
||||
%{_libdir}/libckteec.so
|
||||
%{_libdir}/libseteec.so
|
||||
%{_libdir}/libteeacl.so
|
||||
%{_libdir}/pkgconfig/libteec.pc
|
||||
|
||||
%files -n %{libname}
|
||||
%{_libdir}/libteec.so.*
|
||||
@@ -99,4 +136,10 @@ make %{?_smp_mflags} V=1
|
||||
%files -n %{libname2}
|
||||
%{_libdir}/libckteec.so.*
|
||||
|
||||
%files -n %{libname3}
|
||||
%{_libdir}/libseteec.so.*
|
||||
|
||||
%files -n %{libname4}
|
||||
%{_libdir}/libteeacl.so.*
|
||||
|
||||
%changelog
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1b072e6be8a697656e9fe34499789bbd4132b3720f8d1b95c659e8e6c5873654
|
||||
size 74994
|
||||
3
optee_client-4.1.0.tar.gz
Normal file
3
optee_client-4.1.0.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ca3c091b92dbf67615d6117821e131cdd9f4ad353130c54244f3603dfca929c2
|
||||
size 105471
|
||||
Reference in New Issue
Block a user