package/optee-client: bump to version 3.21.0
Bumps OP-TEE client package version to OP-TEE release 3.21.0. Removes the 2 local patches that have been integrated into mainline repository before release tag 3.21.0. Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> [yann.morin.1998@free.fr: regenerate .checkpackageignore] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Etienne Carriere
Yann E. MORIN
parent
65647f7b42
commit
8a56e501bb
@ -1189,8 +1189,6 @@ package/openvmtools/0012-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.pa
|
||||
package/openvmtools/shutdown Shellcheck
|
||||
package/openvpn/S60openvpn Indent Shellcheck Variables
|
||||
package/oprofile/0001-musl.patch Upstream
|
||||
package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch Upstream
|
||||
package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch Upstream
|
||||
package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch Upstream
|
||||
package/oracle-mysql/0000-ac_cache_check.patch Upstream
|
||||
package/oracle-mysql/0001-configure-ps-cache-check.patch Upstream
|
||||
|
||||
@ -1,105 +0,0 @@
|
||||
From bbdf665aba39c29a3ce7bd06e4554c62a416ebaa Mon Sep 17 00:00:00 2001
|
||||
From: Etienne Carriere <etienne.carriere@linaro.org>
|
||||
Date: Thu, 10 Nov 2022 12:05:24 +0100
|
||||
Subject: [PATCH] libteeacl: condition libteeacl with WITH_TEEACL
|
||||
|
||||
Build and embed libteeacl upon WITH_TEEACL=1 (default configuration).
|
||||
This configuration switch allows one to build OP-TEE client without
|
||||
dependencies on pkg-config and libuuid when OP-TEE ACL for
|
||||
PKCS11 is not needed:
|
||||
cmake -DWITH_TEEACL=0 ...
|
||||
or
|
||||
make WITH_TEEACL=0 ...
|
||||
|
||||
With the comments below addressed, LGTM.
|
||||
|
||||
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
|
||||
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
|
||||
Reviewed-by: Eero Aaltonen <eero.aaltonen@vaisala.com>
|
||||
[etienne.carriere@linaro.org: backport upstream commit]
|
||||
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
|
||||
[yann.morin.1998@free.fr: actually do a backport of bbdf665]
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
CMakeLists.txt | 9 ++++++---
|
||||
Makefile | 15 ++++++++++++---
|
||||
2 files changed, 18 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0786752..9fb5c6a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -5,6 +5,7 @@ project (optee_client C)
|
||||
set (CMAKE_TOOLCHAIN_FILE CMakeToolchain.txt)
|
||||
|
||||
set (CFG_WERROR 1 CACHE BOOL "Build with -Werror")
|
||||
+option (WITH_TEEACL "Build libteeacl" TRUE)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
||||
@@ -37,7 +38,9 @@ add_subdirectory (libteec)
|
||||
add_subdirectory (tee-supplicant)
|
||||
add_subdirectory (public)
|
||||
add_subdirectory (libckteec)
|
||||
-find_package (PkgConfig REQUIRED)
|
||||
-pkg_check_modules(uuid REQUIRED IMPORTED_TARGET uuid)
|
||||
-add_subdirectory (libteeacl)
|
||||
+if(WITH_TEEACL)
|
||||
+ find_package (PkgConfig REQUIRED)
|
||||
+ pkg_check_modules(uuid REQUIRED IMPORTED_TARGET uuid)
|
||||
+ add_subdirectory (libteeacl)
|
||||
+endif(WITH_TEEACL)
|
||||
add_subdirectory (libseteec)
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 90b487e..2ee5621 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -16,6 +16,8 @@ SBINDIR ?= /usr/sbin
|
||||
LIBDIR ?= /usr/lib
|
||||
INCLUDEDIR ?= /usr/include
|
||||
|
||||
+WITH_TEEACL ?= 1
|
||||
+
|
||||
.PHONY: all build build-libteec build-libckteec build-libseteec \
|
||||
build-libteeacl check-libuuid install copy_export clean cscope \
|
||||
clean-cscope \
|
||||
@@ -35,8 +37,10 @@ build-tee-supplicant: build-libteec
|
||||
@echo "Building tee-supplicant"
|
||||
$(MAKE) --directory=tee-supplicant --no-print-directory --no-builtin-variables CFG_TEE_SUPP_LOG_LEVEL=$(CFG_TEE_SUPP_LOG_LEVEL)
|
||||
|
||||
-build: build-libteec build-tee-supplicant build-libckteec build-libseteec \
|
||||
- build-libteeacl
|
||||
+build: build-libteec build-tee-supplicant build-libckteec build-libseteec
|
||||
+ifeq ($(WITH_TEEACL),1)
|
||||
+build: build-libteeacl
|
||||
+endif
|
||||
|
||||
build-libckteec: build-libteec
|
||||
@echo "Building libckteec.so"
|
||||
@@ -57,7 +61,10 @@ check-libuuid:
|
||||
install: copy_export
|
||||
|
||||
clean: clean-libteec clean-tee-supplicant clean-cscope clean-libckteec \
|
||||
- clean-libseteec clean-libteeacl
|
||||
+ clean-libseteec
|
||||
+ifeq ($(WITH_TEEACL),1)
|
||||
+clean: clean-libteeacl
|
||||
+endif
|
||||
|
||||
clean-libteec:
|
||||
@$(MAKE) --directory=libteec --no-print-directory clean
|
||||
@@ -158,9 +165,11 @@ copy_export: build
|
||||
cp libckteec/include/*.h $(DESTDIR)$(INCLUDEDIR)
|
||||
cp -d ${O}/libckteec/libckteec.so* $(DESTDIR)$(LIBDIR)
|
||||
cp -d ${O}/libckteec/libckteec.a $(DESTDIR)$(LIBDIR)
|
||||
+ifeq ($(WITH_TEEACL),1)
|
||||
cp libteeacl/include/*.h $(DESTDIR)$(INCLUDEDIR)
|
||||
cp -d ${O}/libteeacl/libteeacl.so* $(DESTDIR)$(LIBDIR)
|
||||
cp -d ${O}/libteeacl/libteeacl.a $(DESTDIR)$(LIBDIR)
|
||||
+endif
|
||||
cp libseteec/include/*.h $(DESTDIR)$(INCLUDEDIR)
|
||||
cp -d ${O}/libseteec/libseteec.so* $(DESTDIR)$(LIBDIR)
|
||||
cp -d ${O}/libseteec/libseteec.a $(DESTDIR)$(LIBDIR)
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From dde6306458331371be5df15e3ca953697d2463ef Mon Sep 17 00:00:00 2001
|
||||
From: Eero Aaltonen <eero.aaltonen@vaisala.com>
|
||||
Date: Thu, 2 Feb 2023 17:22:29 +0200
|
||||
Subject: [PATCH] libteeacl: use realloc() instead of reallocarray()
|
||||
|
||||
Use realloc() instead of reallocarray(), since uClibc apparently does
|
||||
not implement reallocarray().
|
||||
|
||||
Fixes: https://github.com/OP-TEE/optee_client/issues/339
|
||||
|
||||
Signed-off-by: Eero Aaltonen <eero.aaltonen@vaisala.com>
|
||||
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/OP-TEE/optee_client/commit/dde6306458331371be5df15e3ca953697d2463ef]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
libteeacl/src/group.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libteeacl/src/group.c b/libteeacl/src/group.c
|
||||
index 10965dd0..bd165a11 100644
|
||||
--- a/libteeacl/src/group.c
|
||||
+++ b/libteeacl/src/group.c
|
||||
@@ -72,7 +72,8 @@ enum rv_groupmember teeacl_user_is_member_of(const char *user, gid_t group)
|
||||
if (ret == -1) {
|
||||
p_groups = groups;
|
||||
|
||||
- groups = reallocarray(groups, grouplistsize, sizeof(gid_t));
|
||||
+ /* we use realloc, since uClibc does not implement reallocarray */
|
||||
+ groups = realloc(groups, grouplistsize * sizeof(gid_t));
|
||||
if (!groups) {
|
||||
free(p_groups);
|
||||
return E_MEMORY;
|
||||
@ -1,4 +1,4 @@
|
||||
# From https://github.com/OP-TEE/optee_client/archive/3.19.0/optee-client-3.19.0.tar.gz
|
||||
sha256 5f0d02efa0e496964e86ca9dd2461ada923d1f9e11a4b9cafb5393bd08337644 optee-client-3.19.0.tar.gz
|
||||
# From https://github.com/OP-TEE/optee_client/archive/3.21.0/optee-client-3.21.0.tar.gz
|
||||
sha256 368164a539b85557d2079fa6cd839ec444869109f96de65d6569e58b0615d026 optee-client-3.21.0.tar.gz
|
||||
# Locally computed
|
||||
sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPTEE_CLIENT_VERSION = 3.19.0
|
||||
OPTEE_CLIENT_VERSION = 3.21.0
|
||||
OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION))
|
||||
OPTEE_CLIENT_LICENSE = BSD-2-Clause
|
||||
OPTEE_CLIENT_LICENSE_FILES = LICENSE
|
||||
|
||||
Loading…
Reference in New Issue
Block a user