From a36b947d52d289ec6aad50a12b99232fcab3368e Mon Sep 17 00:00:00 2001 From: Aleksandr Makarov Date: Sun, 24 Jul 2022 17:43:17 +0300 Subject: [PATCH] package/libest: auto-select safeclib to avoid use of bundled copy of library Support for libsafec can not be completely disabled - currently, --disable-safec does not exactly allow for compiling libest on systems without libsafec, but instead just uses bundled copy of library from safe_c_stub/ To avoid that, do automatically select the full-featured safeclib package and always use --with-system-libsafec Signed-off-by: Aleksandr Makarov Signed-off-by: Yann E. MORIN --- package/libest/Config.in | 1 + package/libest/libest.mk | 14 +++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package/libest/Config.in b/package/libest/Config.in index 6abe9d2848..bd5f40afae 100644 --- a/package/libest/Config.in +++ b/package/libest/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_LIBEST select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_SAFECLIB help libest is a C implementation of RFC 7030 (Enrollment over Secure Transport). diff --git a/package/libest/libest.mk b/package/libest/libest.mk index d9f3cf87bc..0dd3e7d0e4 100644 --- a/package/libest/libest.mk +++ b/package/libest/libest.mk @@ -12,14 +12,17 @@ LIBEST_LICENSE = BSD-3-Clause, MIT, W3C LIBEST_LICENSE_FILES = LICENSE LIBEST_INSTALL_STAGING = YES LIBEST_AUTORECONF = YES -LIBEST_DEPENDENCIES = openssl host-pkgconf +LIBEST_DEPENDENCIES = openssl host-pkgconf safeclib # libcoap support is explicitly disabled because it breaks the build +# libsafec support is explicitly enabled because we want to avoid +# possible hidden use of bundled copy of library. LIBEST_CONF_OPTS = \ --with-ssl-dir=$(STAGING_DIR)/usr \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-pthreads,--disable-pthreads) \ $(if $(BR2_PACKAGE_LIBEST_BRSKI),--enable-brski,--disable-brski) \ --disable-examples \ - --without-libcoap-dir + --without-libcoap-dir \ + --with-system-libsafec ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) LIBEST_DEPENDENCIES += libexecinfo @@ -55,13 +58,6 @@ else LIBEST_CONF_OPTS += --without-uriparser-dir endif -ifeq ($(BR2_PACKAGE_SAFECLIB),y) -LIBEST_CONF_OPTS += --with-system-libsafec -LIBEST_DEPENDENCIES += safeclib -else -LIBEST_CONF_OPTS += --without-system-libsafec -endif - define LIBEST_INSTALL_PC $(INSTALL) -c -m 0644 $(LIBEST_PKGDIR)/libest.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/libest.pc