aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Engberg <daniel.engberg.lists@pyret.net>2018-04-15 10:01:31 +0200
committerHans Dedecker <dedeckeh@gmail.com>2018-04-16 22:01:09 +0200
commited4ac0ed65175230d6a7d3196974e6967b31a074 (patch)
treeb812ce4a0bf69bbde6916f9d7b60b93ebf6ddf51
parente8f8d6cde4f31fa52af8ca05cdef509b3d8a44d4 (diff)
downloadupstream-ed4ac0ed65175230d6a7d3196974e6967b31a074.tar.gz
upstream-ed4ac0ed65175230d6a7d3196974e6967b31a074.tar.bz2
upstream-ed4ac0ed65175230d6a7d3196974e6967b31a074.zip
curl: Deprecate idn(1) support and switch to xz tarball
libidn(1) is deprecated, add libidn2 support Switch to xz tarball (smaller size) Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
-rw-r--r--package/network/utils/curl/Config.in4
-rw-r--r--package/network/utils/curl/Makefile13
2 files changed, 9 insertions, 8 deletions
diff --git a/package/network/utils/curl/Config.in b/package/network/utils/curl/Config.in
index 973da3d964..9afeb00bc7 100644
--- a/package/network/utils/curl/Config.in
+++ b/package/network/utils/curl/Config.in
@@ -119,8 +119,8 @@ config LIBCURL_TLS_SRP
bool "Enable TLS-SRP authentication"
default n
-config LIBCURL_LIBIDN
- bool "Enable IDN support"
+config LIBCURL_LIBIDN2
+ bool "Enable IDN2 support"
default n
config LIBCURL_THREADED_RESOLVER
diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile
index 77af54fae8..307ca99957 100644
--- a/package/network/utils/curl/Makefile
+++ b/package/network/utils/curl/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=curl
PKG_VERSION:=7.59.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
http://curl.mirror.anstey.ca/ \
http://curl.askapache.com/download/ \
https://curl.haxx.se/download/
-PKG_HASH:=b5920ffd6a8c95585fb95070e0ced38322790cb335c39d0dab852d12e157b5a0
+PKG_HASH:=e44eaabdf916407585bf5c7939ff1161e6242b6b015d3f2f5b758b2a330461fc
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
@@ -34,7 +34,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_LIBCURL_MBEDTLS \
CONFIG_LIBCURL_NOSSL \
\
- CONFIG_LIBCURL_LIBIDN \
+ CONFIG_LIBCURL_LIBIDN2 \
CONFIG_LIBCURL_SSH2 \
CONFIG_LIBCURL_ZLIB \
\
@@ -87,7 +87,7 @@ define Package/libcurl
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:= +LIBCURL_WOLFSSL:libwolfssl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls
- DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap +LIBCURL_LIBIDN:libidn
+ DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap +LIBCURL_LIBIDN2:libidn2
DEPENDS += +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2
TITLE:=A client-side URL transfer library
MENU:=1
@@ -111,6 +111,7 @@ CONFIGURE_ARGS += \
--without-nss \
--without-libmetalink \
--without-librtmp \
+ --without-libidn \
\
$(call autoconf_bool,CONFIG_IPV6,ipv6) \
\
@@ -119,7 +120,7 @@ CONFIGURE_ARGS += \
$(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-ssl) \
$(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) \
+ $(if $(CONFIG_LIBCURL_LIBIDN2),--with-libidn2="$(STAGING_DIR)/usr",--without-libidn2) \
$(if $(CONFIG_LIBCURL_SSH2),--with-libssh2="$(STAGING_DIR)/usr",--without-libssh2) \
$(if $(CONFIG_LIBCURL_ZLIB),--with-zlib="$(STAGING_DIR)/usr",--without-zlib) \
$(if $(CONFIG_LIBCURL_NGHTTP2),--with-nghttp2="$(STAGING_DIR)/usr",--without-nghttp2) \