From 2fde6bc32234c01b99b0245daa1455cdbcc86271 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 Dec 2021 21:51:11 +0100 Subject: [PATCH] package/libcoap: bump to version 4.3.0 - disable examples source which is enabled by default since https://github.com/obgm/libcoap/commit/feb8c15b4572569716cf1c037092edb4717ca537 - mbedtls is an optional dependency since https://github.com/obgm/libcoap/commit/f601ddbf78720a74f29acb704256bc2655c4aeaa - Add Apache-2.0 for mbedtls to LICENSE: https://github.com/obgm/libcoap/commit/0fccf2e71347af0ef3973ac565fca110ec3d4f40 Since mbedtls is not bundled but comes from the Buildroot package, we don't need to declare the Apache-2.0 license for libcoap. It only applies to mbedtls. https://github.com/obgm/libcoap/blob/v4.3.0/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libcoap/libcoap.hash | 4 ++-- package/libcoap/libcoap.mk | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package/libcoap/libcoap.hash b/package/libcoap/libcoap.hash index 3472006224..4a5bcaa7ff 100644 --- a/package/libcoap/libcoap.hash +++ b/package/libcoap/libcoap.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 29a0394a265d3febee41e5e2dc03d34292a0aede37f5f80334e529ac0dab2321 libcoap-4.2.1.tar.gz +sha256 1a195adacd6188d3b71c476e7b21706fef7f3663ab1fb138652e8da49a9ec556 libcoap-4.3.0.tar.gz sha256 09dd86a017bad210527085008cbf706609c58210897b69845af14099577e7eb7 COPYING -sha256 c51e85271aca3fbdd79bb4ee45dcfd854724538dad83b70afbbdfc62415e3e7f LICENSE +sha256 c5625e704d52deade1c9b2d7931ac8593be147ba63af62b53b8c7e309b7eaeb9 LICENSE diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index 9a5e04d4fd..8a85ff3a2e 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -4,21 +4,28 @@ # ################################################################################ -LIBCOAP_VERSION = 4.2.1 +LIBCOAP_VERSION = 4.3.0 LIBCOAP_SITE = $(call github,obgm,libcoap,v$(LIBCOAP_VERSION)) LIBCOAP_INSTALL_STAGING = YES LIBCOAP_LICENSE = BSD-2-Clause LIBCOAP_LICENSE_FILES = COPYING LICENSE LIBCOAP_DEPENDENCIES = host-pkgconf -LIBCOAP_CONF_OPTS = --disable-examples --without-tinydtls +LIBCOAP_CONF_OPTS = \ + --disable-examples --disable-examples-source --without-tinydtls LIBCOAP_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GNUTLS),y) LIBCOAP_DEPENDENCIES += gnutls -LIBCOAP_CONF_OPTS += --enable-dtls --with-gnutls --without-openssl +LIBCOAP_CONF_OPTS += \ + --enable-dtls --with-gnutls --without-mbedtls --without-openssl else ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBCOAP_DEPENDENCIES += openssl -LIBCOAP_CONF_OPTS += --enable-dtls --without-gnutls --with-openssl +LIBCOAP_CONF_OPTS += \ + --enable-dtls --without-gnutls --without-mbedtls --with-openssl +else ifeq ($(BR2_PACKAGE_MBEDTLS),y) +LIBCOAP_DEPENDENCIES += mbedtls +LIBCOAP_CONF_OPTS += \ + --enable-dtls --without-gnutls --with-mbedtls --without-openssl else LIBCOAP_CONF_OPTS += --disable-dtls endif