diff options
Diffstat (limited to 'package/network/utils/curl')
| -rw-r--r-- | package/network/utils/curl/Config.in | 11 | ||||
| -rw-r--r-- | package/network/utils/curl/Makefile | 8 | ||||
| -rw-r--r-- | package/network/utils/curl/patches/100-check_long_long.patch | 2 | ||||
| -rw-r--r-- | package/network/utils/curl/patches/200-no_docs_tests.patch | 6 |
4 files changed, 10 insertions, 17 deletions
diff --git a/package/network/utils/curl/Config.in b/package/network/utils/curl/Config.in index 026dcd6804..87e5f99f57 100644 --- a/package/network/utils/curl/Config.in +++ b/package/network/utils/curl/Config.in @@ -1,5 +1,4 @@ -menu "Configuration" - depends on PACKAGE_libcurl +if PACKAGE_libcurl choice prompt "SSL library" @@ -53,10 +52,6 @@ config LIBCURL_HTTP bool "Enable HTTP support" default y -config LIBCURL_HTTPS - bool "Enable HTTPS support" - default n - config LIBCURL_IMAP bool "Enable IMAP support" default n @@ -79,7 +74,7 @@ config LIBCURL_POP3 config LIBCURL_PROXY bool "Enable proxy support" - default n + default y config LIBCURL_RTSP bool "Enable RTSP support" @@ -113,4 +108,4 @@ config LIBCURL_ZLIB bool "Use zlib" default n -endmenu +endif diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index 1a374951c1..08e2f1d1e9 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl -PKG_VERSION:=7.38.0 +PKG_VERSION:=7.40.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -18,7 +18,7 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ ftp://ftp.planetmirror.com/pub/curl/ \ http://www.mirrormonster.com/curl/download/ \ http://curl.mirrors.cyberservers.net/download/ -PKG_MD5SUM:=af6b3c299bd891f43cb5f76c4091b7b4 +PKG_MD5SUM:=8d30594212e65657a5c32030f0998fa9 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING @@ -37,7 +37,6 @@ PKG_CONFIG_DEPENDS := \ LIBCURL_GNUTLS \ LIBCURL_GOPHER \ LIBCURL_HTTP \ - LIBCURL_HTTPS \ LIBCURL_IMAP \ LIBCURL_LDAP \ LIBCURL_LDAPS \ @@ -98,7 +97,7 @@ CONFIGURE_ARGS += \ --disable-manual \ --disable-verbose \ --without-ca-bundle \ - $(if $(CONFIG_LIBCURL_OPENSSL),--with-ca-path=/etc/ssl/certs/) \ + $(if $(CONFIG_LIBCURL_NOSSL),,--with-ca-path=/etc/ssl/certs/) \ --without-krb4 \ --without-libidn \ --without-nss \ @@ -114,7 +113,6 @@ CONFIGURE_ARGS += \ $(if $(CONFIG_LIBCURL_GOPHER),--enable,--disable)-gopher \ $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr",--without-gnutls) \ $(if $(CONFIG_LIBCURL_HTTP),--enable,--disable)-http \ - $(if $(CONFIG_LIBCURL_HTTPS),--enable,--disable)-https \ $(if $(CONFIG_LIBCURL_IMAP),--enable,--disable)-imap \ $(if $(CONFIG_LIBCURL_LDAP),--enable,--disable)-ldap \ $(if $(CONFIG_LIBCURL_LDAPS),--enable,--disable)-ldaps \ diff --git a/package/network/utils/curl/patches/100-check_long_long.patch b/package/network/utils/curl/patches/100-check_long_long.patch index 05fb1bfb97..2dd8cc72d8 100644 --- a/package/network/utils/curl/patches/100-check_long_long.patch +++ b/package/network/utils/curl/patches/100-check_long_long.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -2877,6 +2877,7 @@ CURL_VERIFY_RUNTIMELIBS +@@ -2885,6 +2885,7 @@ CURL_VERIFY_RUNTIMELIBS AC_CHECK_SIZEOF(size_t) AC_CHECK_SIZEOF(long) 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 42619a3840..6a1fdf5b6b 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 -@@ -128,7 +128,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) +@@ -129,7 +129,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \ bin_SCRIPTS = curl-config SUBDIRS = lib src include @@ -11,7 +11,7 @@ pkgconfig_DATA = libcurl.pc --- a/Makefile.in +++ b/Makefile.in -@@ -574,7 +574,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) +@@ -577,7 +577,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \ bin_SCRIPTS = curl-config SUBDIRS = lib src include @@ -19,4 +19,4 @@ +DIST_SUBDIRS = $(SUBDIRS) packages pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcurl.pc - LIB_VTLS_CFILES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c \ + LIB_VTLS_CFILES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c \ |