diff --git a/Config.in.legacy b/Config.in.legacy index 325457afb5..34fa5e71c8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -153,6 +153,12 @@ config BR2_sh2a The SuperH 2A (SH2A) architecture was not maintained, and broken, so its support was dropped. +config BR2_PACKAGE_LIBCURL_LIBNSS + bool "libcurl NSS removed" + select BR2_LEGACY + help + NSS was deprecated in libcurl 7.82.0. + config BR2_PACKAGE_WESTON_DEFAULT_FBDEV bool "weston fbdev removed" select BR2_LEGACY diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in index e7bdb8cae0..3381decca8 100644 --- a/package/libcurl/Config.in +++ b/package/libcurl/Config.in @@ -61,10 +61,6 @@ config BR2_PACKAGE_LIBCURL_GNUTLS bool "GnuTLS" depends on BR2_PACKAGE_GNUTLS -config BR2_PACKAGE_LIBCURL_LIBNSS - bool "NSS" - depends on BR2_PACKAGE_LIBNSS - config BR2_PACKAGE_LIBCURL_MBEDTLS bool "mbed TLS" depends on BR2_PACKAGE_MBEDTLS diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 63d6ba306c..4be245041c 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-7.81.0.tar.xz.asc +# https://curl.se/download/curl-7.82.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz -sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING +sha256 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c curl-7.82.0.tar.xz +sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 4b2e52829c..97857954db 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.81.0 +LIBCURL_VERSION = 7.82.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -68,14 +68,6 @@ else LIBCURL_CONF_OPTS += --without-gnutls endif -ifeq ($(BR2_PACKAGE_LIBCURL_LIBNSS),y) -LIBCURL_CONF_OPTS += --with-nss=$(STAGING_DIR)/usr -LIBCURL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) nspr nss --cflags`" -LIBCURL_DEPENDENCIES += libnss -else -LIBCURL_CONF_OPTS += --without-nss -endif - ifeq ($(BR2_PACKAGE_LIBCURL_MBEDTLS),y) LIBCURL_CONF_OPTS += --with-mbedtls=$(STAGING_DIR)/usr LIBCURL_DEPENDENCIES += mbedtls