diff options
| author | Rosen Penev <rosenp@gmail.com> | 2016-12-29 18:53:03 -0800 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-01-03 14:26:41 +0100 |
| commit | 558680012dd79de0289aeeb74a72163916cd9f33 (patch) | |
| tree | b92411697b1a8c3c948a77127c33b57e0cf846b4 /package | |
| parent | cd18ff9ed6e14019455b9f48fa663ee829f311a7 (diff) | |
| download | upstream-558680012dd79de0289aeeb74a72163916cd9f33.tar.gz upstream-558680012dd79de0289aeeb74a72163916cd9f33.tar.bz2 upstream-558680012dd79de0289aeeb74a72163916cd9f33.zip | |
curl: Remove PolarSSL and adjust default to mbedTLS
luci-ssl has already made the switch since mainline support for PolarSSL is
almost over (2016).
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'package')
4 files changed, 14 insertions, 30 deletions
diff --git a/package/network/utils/curl/Config.in b/package/network/utils/curl/Config.in index 1e98b3a598..6fa10b6781 100644 --- a/package/network/utils/curl/Config.in +++ b/package/network/utils/curl/Config.in @@ -4,10 +4,7 @@ comment "SSL support" choice prompt "Selected SSL library" - default LIBCURL_POLARSSL - - config LIBCURL_POLARSSL - bool "PolarSSL" + default LIBCURL_MBEDTLS config LIBCURL_MBEDTLS bool "mbed TLS" diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index ec28a74003..950044a226 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl PKG_VERSION:=7.52.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ @@ -32,7 +32,6 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_LIBCURL_CYASSL \ CONFIG_LIBCURL_GNUTLS \ CONFIG_LIBCURL_OPENSSL \ - CONFIG_LIBCURL_POLARSSL \ CONFIG_LIBCURL_MBEDTLS \ CONFIG_LIBCURL_NOSSL \ \ @@ -87,7 +86,7 @@ define Package/libcurl $(call Package/curl/Default) SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+LIBCURL_POLARSSL:libpolarssl +LIBCURL_CYASSL:libcyassl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls + DEPENDS:= +LIBCURL_CYASSL:libcyassl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap +LIBCURL_LIBIDN:libidn +LIBCURL_SSH2:libssh2 TITLE:=A client-side URL transfer library MENU:=1 @@ -117,7 +116,6 @@ CONFIGURE_ARGS += \ $(if $(CONFIG_LIBCURL_CYASSL),--with-cyassl="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-cyassl) \ $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-gnutls) \ $(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-ssl) \ - $(if $(CONFIG_LIBCURL_POLARSSL),--with-polarssl="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-polarssl) \ $(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-mbedtls) \ \ $(if $(CONFIG_LIBCURL_LIBIDN),--with-libidn="$(STAGING_DIR)/usr",--without-libidn) \ diff --git a/package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch b/package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch new file mode 100644 index 0000000000..22b838daa0 --- /dev/null +++ b/package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch @@ -0,0 +1,11 @@ +--- a/lib/vtls/mbedtls.c ++++ b/lib/vtls/mbedtls.c +@@ -724,7 +724,7 @@ void Curl_mbedtls_session_free(void *ptr + + size_t Curl_mbedtls_version(char *buffer, size_t size) + { +- unsigned int version = mbedtls_version_get_number(); ++ unsigned int version = MBEDTLS_VERSION_NUMBER; + return snprintf(buffer, size, "mbedTLS/%d.%d.%d", version>>24, + (version>>16)&0xff, (version>>8)&0xff); + } diff --git a/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch b/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch deleted file mode 100644 index 95064b12a7..0000000000 --- a/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/lib/vtls/polarssl.c -+++ b/lib/vtls/polarssl.c -@@ -657,7 +657,7 @@ void Curl_polarssl_session_free(void *pt - - size_t Curl_polarssl_version(char *buffer, size_t size) - { -- unsigned int version = version_get_number(); -+ unsigned int version = POLARSSL_VERSION_NUMBER; - return snprintf(buffer, size, "%s/%d.%d.%d", - version >= 0x01030A00?"mbedTLS":"PolarSSL", - version>>24, (version>>16)&0xff, (version>>8)&0xff); ---- a/lib/vtls/mbedtls.c -+++ b/lib/vtls/mbedtls.c -@@ -724,7 +724,7 @@ void Curl_mbedtls_session_free(void *ptr - - size_t Curl_mbedtls_version(char *buffer, size_t size) - { -- unsigned int version = mbedtls_version_get_number(); -+ unsigned int version = MBEDTLS_VERSION_NUMBER; - return snprintf(buffer, size, "mbedTLS/%d.%d.%d", version>>24, - (version>>16)&0xff, (version>>8)&0xff); - } |