* [Buildroot] [PATCH 1/1] package/libcoap: bump to version 4.3.0
@ 2021-12-12 20:51 Fabrice Fontaine
2021-12-14 19:52 ` Arnout Vandecappelle
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2021-12-12 20:51 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Joris Lijssens
- 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 licenses:
https://github.com/obgm/libcoap/commit/0fccf2e71347af0ef3973ac565fca110ec3d4f40
https://github.com/obgm/libcoap/blob/v4.3.0/ChangeLog
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/libcoap/libcoap.hash | 4 ++--
package/libcoap/libcoap.mk | 17 ++++++++++++-----
2 files changed, 14 insertions(+), 7 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..528d7d18a5 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 = BSD-2-Clause, Apache-2.0 (mbedtls)
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
--
2.33.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/libcoap: bump to version 4.3.0
2021-12-12 20:51 [Buildroot] [PATCH 1/1] package/libcoap: bump to version 4.3.0 Fabrice Fontaine
@ 2021-12-14 19:52 ` Arnout Vandecappelle
0 siblings, 0 replies; 2+ messages in thread
From: Arnout Vandecappelle @ 2021-12-14 19:52 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot; +Cc: Joris Lijssens
On 12/12/2021 21:51, Fabrice Fontaine wrote:
> - 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 licenses:
> https://github.com/obgm/libcoap/commit/0fccf2e71347af0ef3973ac565fca110ec3d4f40
>
> https://github.com/obgm/libcoap/blob/v4.3.0/ChangeLog
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
> ---
> package/libcoap/libcoap.hash | 4 ++--
> package/libcoap/libcoap.mk | 17 ++++++++++++-----
> 2 files changed, 14 insertions(+), 7 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..528d7d18a5 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 = BSD-2-Clause, Apache-2.0 (mbedtls)
The statement in the license file is
When compiled with Mbed TLS support, this software includes components
that are licensed under the terms of the Apache 2.0 license
I think they only include that statement because it links with mbedtls
statically, or because of the headers or something, because there's no file in
the source that is declared as Apache licensed.
Note that there were already similar statements for GnuTLS (LGPL-2.1) and
OpenSSL, and we don't include those licenses here.
Therefore, I removed the Apache license and updated the commit message.
Regards,
Arnout
> 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
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-14 19:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-12 20:51 [Buildroot] [PATCH 1/1] package/libcoap: bump to version 4.3.0 Fabrice Fontaine
2021-12-14 19:52 ` Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.