Initial commit
This commit is contained in:
160
package/network/utils/curl/Config.in
Normal file
160
package/network/utils/curl/Config.in
Normal file
@@ -0,0 +1,160 @@
|
||||
if PACKAGE_libcurl
|
||||
|
||||
comment "SSL support"
|
||||
|
||||
choice
|
||||
prompt "Selected SSL library"
|
||||
default LIBCURL_MBEDTLS
|
||||
|
||||
config LIBCURL_MBEDTLS
|
||||
bool "mbed TLS"
|
||||
|
||||
config LIBCURL_WOLFSSL
|
||||
bool "wolfSSL"
|
||||
|
||||
config LIBCURL_OPENSSL
|
||||
bool "OpenSSL"
|
||||
|
||||
config LIBCURL_GNUTLS
|
||||
bool "GNUTLS"
|
||||
|
||||
config LIBCURL_NOSSL
|
||||
bool "No SSL support"
|
||||
|
||||
endchoice
|
||||
|
||||
comment "Supported protocols"
|
||||
|
||||
config LIBCURL_DICT
|
||||
bool "DICT protocol"
|
||||
default n
|
||||
|
||||
config LIBCURL_FILE
|
||||
bool "FILE protocol"
|
||||
default y
|
||||
|
||||
config LIBCURL_FTP
|
||||
bool "FTP / FTPS protocol"
|
||||
default y
|
||||
|
||||
config LIBCURL_GOPHER
|
||||
bool "Gopher protocol"
|
||||
default n
|
||||
|
||||
config LIBCURL_HTTP
|
||||
bool "HTTP / HTTPS protocol"
|
||||
default y
|
||||
|
||||
config LIBCURL_COOKIES
|
||||
bool "Enable Cookies support"
|
||||
depends on LIBCURL_HTTP
|
||||
default y
|
||||
|
||||
config LIBCURL_IMAP
|
||||
bool "IMAP / IMAPS protocol"
|
||||
default n
|
||||
|
||||
config LIBCURL_LDAP
|
||||
bool "LDAP protocol"
|
||||
default n
|
||||
|
||||
config LIBCURL_LDAPS
|
||||
bool "Enable LDAPS support"
|
||||
depends on LIBCURL_LDAP && !LIBCURL_NOSSL
|
||||
default y
|
||||
|
||||
config LIBCURL_POP3
|
||||
bool "POP3 / POP3S protocol"
|
||||
default n
|
||||
|
||||
config LIBCURL_RTSP
|
||||
bool "RTSP protocol"
|
||||
depends on LIBCURL_HTTP
|
||||
default n
|
||||
config LIBCURL_NO_RTSP
|
||||
string "RTSP require HTTP protocol"
|
||||
depends on !LIBCURL_HTTP
|
||||
default "!"
|
||||
|
||||
config LIBCURL_SSH2
|
||||
bool "SCP / SFTP protocol"
|
||||
default n
|
||||
|
||||
config LIBCURL_SMB
|
||||
bool "SMB protocol (CIFS)"
|
||||
depends on LIBCURL_CRYPTO_AUTH && (LIBCURL_GNUTLS || LIBCURL_OPENSSL)
|
||||
default n
|
||||
config LIBCURL_NO_SMB
|
||||
string "SMB require 'cryptographic authentication' and either 'GnuTLS' or 'OpenSSL'"
|
||||
depends on !LIBCURL_CRYPTO_AUTH || (!LIBCURL_GNUTLS && !LIBCURL_OPENSSL)
|
||||
default "!"
|
||||
|
||||
config LIBCURL_SMTP
|
||||
bool "SMTP / SMTPS protocol"
|
||||
default n
|
||||
|
||||
config LIBCURL_TELNET
|
||||
bool "TELNET protocol"
|
||||
default n
|
||||
|
||||
config LIBCURL_TFTP
|
||||
bool "TFTP protocol"
|
||||
default n
|
||||
|
||||
config LIBCURL_NGHTTP2
|
||||
bool "HTTP2 protocol"
|
||||
default n
|
||||
|
||||
comment "Miscellaneous"
|
||||
|
||||
config LIBCURL_PROXY
|
||||
bool "Enable proxy support"
|
||||
default y
|
||||
|
||||
config LIBCURL_CRYPTO_AUTH
|
||||
bool "Enable cryptographic authentication"
|
||||
default n
|
||||
|
||||
config LIBCURL_TLS_SRP
|
||||
bool "Enable TLS-SRP authentication"
|
||||
default n
|
||||
|
||||
config LIBCURL_LIBIDN2
|
||||
bool "Enable IDN2 support"
|
||||
default n
|
||||
|
||||
config LIBCURL_THREADED_RESOLVER
|
||||
bool "Enable threaded DNS resolver"
|
||||
default n
|
||||
help
|
||||
Enable POSIX threaded asynchronous DNS resolution
|
||||
|
||||
config LIBCURL_ZLIB
|
||||
bool "Enable zlib support"
|
||||
default n
|
||||
|
||||
config LIBCURL_UNIX_SOCKETS
|
||||
bool "Enable unix domain socket support"
|
||||
default n
|
||||
help
|
||||
Enable HTTP over unix domain sockets.
|
||||
To use this with the curl command line, you specify the socket path to the new --unix-domain option.
|
||||
This feature is actually not limited to HTTP, you can do all the TCP-based protocols
|
||||
except FTP over the unix domain socket, but it is only HTTP that is regularly used this way.
|
||||
The reason FTP isn't supported is of course its use of two connections
|
||||
which would be even weirder to do like this.
|
||||
|
||||
config LIBCURL_LIBCURL_OPTION
|
||||
bool "Enable generation of C code"
|
||||
default n
|
||||
|
||||
config LIBCURL_VERBOSE
|
||||
bool "Enable verbose error strings"
|
||||
default n
|
||||
|
||||
config LIBCURL_NTLM
|
||||
bool "Enable NTLM support"
|
||||
depends on LIBCURL_CRYPTO_AUTH && !LIBCURL_NOSSL
|
||||
default n
|
||||
|
||||
endif
|
||||
184
package/network/utils/curl/Makefile
Normal file
184
package/network/utils/curl/Makefile
Normal file
@@ -0,0 +1,184 @@
|
||||
#
|
||||
# Copyright (C) 2007-2016 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=curl
|
||||
PKG_VERSION:=7.66.0
|
||||
PKG_RELEASE:=3
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
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:=dbb48088193016d079b97c5c3efde8efa56ada2ebf336e8a97d04eb8e2ed98c1
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
PKG_CPE_ID:=cpe:/a:haxx:libcurl
|
||||
|
||||
PKG_FIXUP:=autoreconf
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
|
||||
PKG_CONFIG_DEPENDS:= \
|
||||
CONFIG_IPV6 \
|
||||
\
|
||||
CONFIG_LIBCURL_WOLFSSL \
|
||||
CONFIG_LIBCURL_GNUTLS \
|
||||
CONFIG_LIBCURL_OPENSSL \
|
||||
CONFIG_LIBCURL_MBEDTLS \
|
||||
CONFIG_LIBCURL_NOSSL \
|
||||
\
|
||||
CONFIG_LIBCURL_LIBIDN2 \
|
||||
CONFIG_LIBCURL_SSH2 \
|
||||
CONFIG_LIBCURL_ZLIB \
|
||||
\
|
||||
CONFIG_LIBCURL_DICT \
|
||||
CONFIG_LIBCURL_FILE \
|
||||
CONFIG_LIBCURL_FTP \
|
||||
CONFIG_LIBCURL_GOPHER \
|
||||
CONFIG_LIBCURL_HTTP \
|
||||
CONFIG_LIBCURL_IMAP \
|
||||
CONFIG_LIBCURL_LDAP \
|
||||
CONFIG_LIBCURL_LDAPS \
|
||||
CONFIG_LIBCURL_POP3 \
|
||||
CONFIG_LIBCURL_RTSP \
|
||||
CONFIG_LIBCURL_NO_RTSP \
|
||||
CONFIG_LIBCURL_SMB \
|
||||
CONFIG_LIBCURL_NO_SMB \
|
||||
CONFIG_LIBCURL_SMTP \
|
||||
CONFIG_LIBCURL_TELNET \
|
||||
CONFIG_LIBCURL_TFTP \
|
||||
CONFIG_LIBCURL_NGHTTP2 \
|
||||
\
|
||||
CONFIG_LIBCURL_COOKIES \
|
||||
CONFIG_LIBCURL_CRYPTO_AUTH \
|
||||
CONFIG_LIBCURL_LIBCURL_OPTION \
|
||||
CONFIG_LIBCURL_PROXY \
|
||||
CONFIG_LIBCURL_THREADED_RESOLVER \
|
||||
CONFIG_LIBCURL_TLS_SRP \
|
||||
CONFIG_LIBCURL_UNIX_SOCKETS \
|
||||
CONFIG_LIBCURL_VERBOSE \
|
||||
CONFIG_LIBCURL_NTLM
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/curl/Default
|
||||
SECTION:=net
|
||||
CATEGORY:=Network
|
||||
URL:=http://curl.haxx.se/
|
||||
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
|
||||
endef
|
||||
|
||||
define Package/curl
|
||||
$(call Package/curl/Default)
|
||||
SUBMENU:=File Transfer
|
||||
DEPENDS:=+libcurl
|
||||
TITLE:=A client-side URL transfer utility
|
||||
endef
|
||||
|
||||
define Package/libcurl
|
||||
$(call Package/curl/Default)
|
||||
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
|
||||
TITLE:=A client-side URL transfer library
|
||||
MENU:=1
|
||||
ABI_VERSION:=4
|
||||
endef
|
||||
|
||||
define Package/libcurl/config
|
||||
source "$(SOURCE)/Config.in"
|
||||
endef
|
||||
|
||||
TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections
|
||||
TARGET_CPPFLAGS += $(if $(CONFIG_LIBCURL_NTLM),,-DCURL_DISABLE_NTLM)
|
||||
TARGET_LDFLAGS += -Wl,--gc-sections
|
||||
|
||||
CONFIGURE_ARGS += \
|
||||
--disable-debug \
|
||||
--disable-ares \
|
||||
--enable-shared \
|
||||
--enable-static \
|
||||
--disable-manual \
|
||||
--without-nss \
|
||||
--without-libmetalink \
|
||||
--without-librtmp \
|
||||
--without-libidn \
|
||||
--without-ca-path \
|
||||
--without-libpsl \
|
||||
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
|
||||
\
|
||||
$(call autoconf_bool,CONFIG_IPV6,ipv6) \
|
||||
\
|
||||
$(if $(CONFIG_LIBCURL_WOLFSSL),--with-cyassl="$(STAGING_DIR)/usr",--without-cyassl) \
|
||||
$(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr",--without-gnutls) \
|
||||
$(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr",--without-ssl) \
|
||||
$(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr",--without-mbedtls) \
|
||||
\
|
||||
$(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) \
|
||||
\
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_DICT,dict) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_FILE,file) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_FTP,ftp) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_GOPHER,gopher) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_HTTP,http) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_IMAP,imap) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_LDAP,ldap) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_LDAPS,ldaps) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_POP3,pop3) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_RTSP,rtsp) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_SMB,smb) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_SMTP,smtp) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_TELNET,telnet) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_TFTP,tftp) \
|
||||
\
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_COOKIES,cookies) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_CRYPTO_AUTH,crypto-auth) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_LIBCURL_OPTION,libcurl-option) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_PROXY,proxy) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_THREADED_RESOLVER,threaded-resolver) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_TLS_SRP,tls-srp) \
|
||||
$(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
|
||||
[ -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
|
||||
|
||||
define Package/curl/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl $(1)/usr/bin/
|
||||
endef
|
||||
|
||||
define Package/libcurl/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,curl))
|
||||
$(eval $(call BuildPackage,libcurl))
|
||||
@@ -0,0 +1,44 @@
|
||||
From 1b71bc532bde8621fd3260843f8197182a467ff2 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Stenberg <daniel@haxx.se>
|
||||
Date: Thu, 7 Nov 2019 10:13:01 +0100
|
||||
Subject: [PATCH] file: on Windows, refuse paths that start with \\
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
... as that might cause an unexpected SMB connection to a given host
|
||||
name.
|
||||
|
||||
Reported-by: Fernando Muñoz
|
||||
CVE-2019-15601
|
||||
Bug: https://curl.haxx.se/docs/CVE-2019-15601.html
|
||||
|
||||
Signed-off-by: Petr Štetiar <ynezz@true.cz>
|
||||
---
|
||||
lib/file.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/file.c b/lib/file.c
|
||||
index d349cd9241cd..166931d7f1ba 100644
|
||||
--- a/lib/file.c
|
||||
+++ b/lib/file.c
|
||||
@@ -136,7 +136,7 @@ static CURLcode file_connect(struct connectdata *conn, bool *done)
|
||||
struct Curl_easy *data = conn->data;
|
||||
char *real_path;
|
||||
struct FILEPROTO *file = data->req.protop;
|
||||
- int fd;
|
||||
+ int fd = -1;
|
||||
#ifdef DOS_FILESYSTEM
|
||||
size_t i;
|
||||
char *actual_path;
|
||||
@@ -181,7 +181,9 @@ static CURLcode file_connect(struct connectdata *conn, bool *done)
|
||||
return CURLE_URL_MALFORMAT;
|
||||
}
|
||||
|
||||
- fd = open_readonly(actual_path, O_RDONLY|O_BINARY);
|
||||
+ if(strncmp("\\\\", actual_path, 2))
|
||||
+ /* refuse to open path that starts with two backslashes */
|
||||
+ fd = open_readonly(actual_path, O_RDONLY|O_BINARY);
|
||||
file->path = actual_path;
|
||||
#else
|
||||
if(memchr(real_path, 0, real_path_len)) {
|
||||
38
package/network/utils/curl/patches/101-CVE-2020-8169.patch
Normal file
38
package/network/utils/curl/patches/101-CVE-2020-8169.patch
Normal file
@@ -0,0 +1,38 @@
|
||||
From 600a8cded447cd7118ed50142c576567c0cf5158 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Stenberg <daniel@haxx.se>
|
||||
Date: Thu, 14 May 2020 14:37:12 +0200
|
||||
Subject: [PATCH] url: make the updated credentials URL-encoded in the URL
|
||||
|
||||
Found-by: Gregory Jefferis
|
||||
Reported-by: Jeroen Ooms
|
||||
Added test 1168 to verify. Bug spotted when doing a redirect.
|
||||
Bug: https://github.com/jeroen/curl/issues/224
|
||||
Closes #5400
|
||||
---
|
||||
lib/url.c | 6 ++--
|
||||
tests/data/Makefile.inc | 1 +
|
||||
tests/data/test1168 | 78 +++++++++++++++++++++++++++++++++++++++++
|
||||
3 files changed, 83 insertions(+), 2 deletions(-)
|
||||
create mode 100644 tests/data/test1168
|
||||
|
||||
diff --git a/lib/url.c b/lib/url.c
|
||||
index f250f2ff20a..9b8b2bdde64 100644
|
||||
--- a/lib/url.c
|
||||
+++ b/lib/url.c
|
||||
@@ -2788,12 +2788,14 @@ static CURLcode override_login(struct Curl_easy *data,
|
||||
|
||||
/* for updated strings, we update them in the URL */
|
||||
if(user_changed) {
|
||||
- uc = curl_url_set(data->state.uh, CURLUPART_USER, *userp, 0);
|
||||
+ uc = curl_url_set(data->state.uh, CURLUPART_USER, *userp,
|
||||
+ CURLU_URLENCODE);
|
||||
if(uc)
|
||||
return Curl_uc_to_curlcode(uc);
|
||||
}
|
||||
if(passwd_changed) {
|
||||
- uc = curl_url_set(data->state.uh, CURLUPART_PASSWORD, *passwdp, 0);
|
||||
+ uc = curl_url_set(data->state.uh, CURLUPART_PASSWORD, *passwdp,
|
||||
+ CURLU_URLENCODE);
|
||||
if(uc)
|
||||
return Curl_uc_to_curlcode(uc);
|
||||
}
|
||||
22
package/network/utils/curl/patches/200-no_docs_tests.patch
Normal file
22
package/network/utils/curl/patches/200-no_docs_tests.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -179,7 +179,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP)
|
||||
bin_SCRIPTS = curl-config
|
||||
|
||||
SUBDIRS = lib src
|
||||
-DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs
|
||||
+DIST_SUBDIRS = $(SUBDIRS) packages include
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libcurl.pc
|
||||
@@ -290,8 +290,8 @@ cygwinbin:
|
||||
# We extend the standard install with a custom hook:
|
||||
install-data-hook:
|
||||
cd include && $(MAKE) install
|
||||
- cd docs && $(MAKE) install
|
||||
- cd docs/libcurl && $(MAKE) install
|
||||
+ #cd docs && $(MAKE) install
|
||||
+ #cd docs/libcurl && $(MAKE) install
|
||||
|
||||
# We extend the standard uninstall with a custom hook:
|
||||
uninstall-hook:
|
||||
Reference in New Issue
Block a user