From f3efbf91f446bce34d58f8f78a25b26d4e5d6fea Mon Sep 17 00:00:00 2001 From: lean Date: Sat, 24 Apr 2021 23:38:25 +0800 Subject: [PATCH] curl: bump version --- package/network/utils/curl/Config.in | 6 +++- package/network/utils/curl/Makefile | 30 +++++++++---------- .../curl/patches/200-no_docs_tests.patch | 4 +-- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/package/network/utils/curl/Config.in b/package/network/utils/curl/Config.in index 9afeb00bc..212275397 100644 --- a/package/network/utils/curl/Config.in +++ b/package/network/utils/curl/Config.in @@ -4,7 +4,7 @@ comment "SSL support" choice prompt "Selected SSL library" - default LIBCURL_MBEDTLS + default LIBCURL_OPENSSL config LIBCURL_MBEDTLS bool "mbed TLS" @@ -133,6 +133,10 @@ config LIBCURL_ZLIB bool "Enable zlib support" default n +config LIBCURL_ZSTD + bool "Enable zstd support" + default n + config LIBCURL_UNIX_SOCKETS bool "Enable unix domain socket support" default n diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index 87430dde8..c92ffcb0d 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2016 OpenWrt.org +# Copyright (C) 2007-2020 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,20 +8,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl -PKG_VERSION:=7.71.0 -PKG_RELEASE:=1 +PKG_VERSION:=7.76.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=https://curl.mirror.anstey.ca/ \ +PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \ + https://curl.mirror.anstey.ca/ \ https://curl.askapache.com/download/ \ https://curl.haxx.se/download/ -PKG_HASH:=cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772 +PKG_HASH:=6302e2d75c59cdc6b35ce3fbe716481dd4301841bbb5fd71854653652a014fc8 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:haxx:libcurl PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 PKG_CONFIG_DEPENDS:= \ @@ -36,6 +38,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_LIBCURL_LIBIDN2 \ CONFIG_LIBCURL_SSH2 \ CONFIG_LIBCURL_ZLIB \ + CONFIG_LIBCURL_ZSTD \ \ CONFIG_LIBCURL_DICT \ CONFIG_LIBCURL_FILE \ @@ -90,8 +93,8 @@ 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_LIBIDN2:libidn2 - DEPENDS += +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 +ca-bundle + DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_ZSTD:libzstd +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap + DEPENDS += +LIBCURL_LIBIDN2:libidn2 +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 +ca-bundle TITLE:=A client-side URL transfer library MENU:=1 ABI_VERSION:=4 @@ -117,6 +120,7 @@ CONFIGURE_ARGS += \ --without-libidn \ --without-ca-path \ --without-libpsl \ + --without-zstd \ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ \ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ @@ -129,6 +133,7 @@ CONFIGURE_ARGS += \ $(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_ZSTD),--with-zstd="$(STAGING_DIR)/usr",--without-zstd) \ $(if $(CONFIG_LIBCURL_NGHTTP2),--with-nghttp2="$(STAGING_DIR)/usr",--without-nghttp2) \ \ $(call autoconf_bool,CONFIG_LIBCURL_DICT,dict) \ @@ -155,20 +160,13 @@ CONFIGURE_ARGS += \ $(call autoconf_bool,CONFIG_LIBCURL_UNIX_SOCKETS,unix-sockets) \ $(call autoconf_bool,CONFIG_LIBCURL_VERBOSE,verbose) \ -define Build/Compile - +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - CC="$(TARGET_CC)" \ - install -endef - define Build/InstallDev $(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/libcurl.pc $(1)/usr/lib/pkgconfig/ - $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/curl-config + $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/curl-config [ -n "$(TARGET_LDFLAGS)" ] && $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/libcurl.pc || true $(LN) $(STAGING_DIR)/usr/bin/curl-config $(2)/bin/ endef @@ -183,5 +181,5 @@ define Package/libcurl/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(1)/usr/lib/ endef -$(eval $(call BuildPackage,curl)) $(eval $(call BuildPackage,libcurl)) +$(eval $(call BuildPackage,curl)) diff --git a/package/network/utils/curl/patches/200-no_docs_tests.patch b/package/network/utils/curl/patches/200-no_docs_tests.patch index b5f92b58c..0ffcb491e 100644 --- a/package/network/utils/curl/patches/200-no_docs_tests.patch +++ b/package/network/utils/curl/patches/200-no_docs_tests.patch @@ -1,6 +1,6 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -192,7 +192,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) +@@ -195,7 +195,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) bin_SCRIPTS = curl-config SUBDIRS = lib src @@ -9,7 +9,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcurl.pc -@@ -303,8 +303,8 @@ cygwinbin: +@@ -306,8 +306,8 @@ cygwinbin: # We extend the standard install with a custom hook: install-data-hook: (cd include && $(MAKE) install)