OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 6... Line 6...
6 # 6 #
Line 7... Line 7...
7   7  
Line 8... Line 8...
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
9   9  
10 PKG_NAME:=curl 10 PKG_NAME:=curl
Line 11... Line 11...
11 PKG_VERSION:=7.64.0 11 PKG_VERSION:=7.60.0
12 PKG_RELEASE:=1 12 PKG_RELEASE:=3
13   13  
14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz 14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
15 PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \ 15 PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
16 https://curl.mirror.anstey.ca/ \ 16 http://curl.mirror.anstey.ca/ \
Line 17... Line 17...
17 https://curl.askapache.com/download/ \ 17 http://curl.askapache.com/download/ \
18 https://curl.haxx.se/download/ 18 https://curl.haxx.se/download/
19 PKG_HASH:=2f2f13fa34d44aa29cb444077ad7dc4dc6d189584ad552e0aaeb06e608af6001 19 PKG_HASH:=8736ff8ded89ddf7e926eec7b16f82597d029fc1469f3a551f1fafaac164e6a0
Line 86... Line 86...
86 $(call Package/curl/Default) 86 $(call Package/curl/Default)
87 SECTION:=libs 87 SECTION:=libs
88 CATEGORY:=Libraries 88 CATEGORY:=Libraries
89 DEPENDS:= +LIBCURL_WOLFSSL:libwolfssl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls 89 DEPENDS:= +LIBCURL_WOLFSSL:libwolfssl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls
90 DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap +LIBCURL_LIBIDN2:libidn2 90 DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap +LIBCURL_LIBIDN2:libidn2
91 DEPENDS += +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 +ca-bundle 91 DEPENDS += +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2
92 TITLE:=A client-side URL transfer library 92 TITLE:=A client-side URL transfer library
93 MENU:=1 93 MENU:=1
94 ABI_VERSION:=4 -  
95 endef 94 endef
Line -... Line 95...
-   95  
96   96  
97 define Package/libcurl/config 97 define Package/libcurl/config
98 source "$(SOURCE)/Config.in" 98 source "$(SOURCE)/Config.in"
Line 99... Line 99...
99 endef 99 endef
Line 110... Line 110...
110 --disable-manual \ 110 --disable-manual \
111 --without-nss \ 111 --without-nss \
112 --without-libmetalink \ 112 --without-libmetalink \
113 --without-librtmp \ 113 --without-librtmp \
114 --without-libidn \ 114 --without-libidn \
115 --without-ca-path \ -  
116 --without-libpsl \ -  
117 --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ -  
118 \ 115 \
119 $(call autoconf_bool,CONFIG_IPV6,ipv6) \ 116 $(call autoconf_bool,CONFIG_IPV6,ipv6) \
120 \ 117 \
121 $(if $(CONFIG_LIBCURL_WOLFSSL),--with-cyassl="$(STAGING_DIR)/usr",--without-cyassl) \ 118 $(if $(CONFIG_LIBCURL_WOLFSSL),--with-cyassl="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-cyassl) \
122 $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr",--without-gnutls) \ 119 $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-gnutls) \
123 $(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr",--without-ssl) \ 120 $(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-ssl) \
124 $(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr",--without-mbedtls) \ 121 $(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-mbedtls) \
125 \ 122 \
126 $(if $(CONFIG_LIBCURL_LIBIDN2),--with-libidn2="$(STAGING_DIR)/usr",--without-libidn2) \ 123 $(if $(CONFIG_LIBCURL_LIBIDN2),--with-libidn2="$(STAGING_DIR)/usr",--without-libidn2) \
127 $(if $(CONFIG_LIBCURL_SSH2),--with-libssh2="$(STAGING_DIR)/usr",--without-libssh2) \ 124 $(if $(CONFIG_LIBCURL_SSH2),--with-libssh2="$(STAGING_DIR)/usr",--without-libssh2) \
128 $(if $(CONFIG_LIBCURL_ZLIB),--with-zlib="$(STAGING_DIR)/usr",--without-zlib) \ 125 $(if $(CONFIG_LIBCURL_ZLIB),--with-zlib="$(STAGING_DIR)/usr",--without-zlib) \
129 $(if $(CONFIG_LIBCURL_NGHTTP2),--with-nghttp2="$(STAGING_DIR)/usr",--without-nghttp2) \ 126 $(if $(CONFIG_LIBCURL_NGHTTP2),--with-nghttp2="$(STAGING_DIR)/usr",--without-nghttp2) \