Merge pull request #3890 from xtraeme/master

curl: update to 7.48.0.
This commit is contained in:
Juan RP 2016-03-23 10:37:21 +01:00
commit 89f3e9c6e4
2 changed files with 19 additions and 2 deletions

View File

@ -0,0 +1,13 @@
--- lib/vtls/openssl.c
+++ lib/vtls/openssl.c
@@ -95,7 +95,9 @@
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
#define HAVE_ERR_REMOVE_THREAD_STATE 1
-#if (OPENSSL_VERSION_NUMBER >= 0x10100004L)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100004L) && \
+ !defined(LIBRESSL_VERSION_NUMBER) && \
+ !defined(OPENSSL_IS_BORINGSSL)
/* OpenSSL 1.1.0-pre4 removed the argument! */
#define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1
#endif

View File

@ -1,6 +1,6 @@
# Template build file for 'curl'.
pkgname=curl
version=7.47.1
version=7.48.0
revision=1
build_style=gnu-configure
configure_args="ac_cv_sizeof_off_t=8 --without-gssapi
@ -19,12 +19,16 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="MIT"
homepage="http://curl.haxx.se"
distfiles="$homepage/download/$pkgname-$version.tar.bz2"
checksum=ddc643ab9382e24bbe4747d43df189a0a6ce38fcb33df041b9cb0b3cd47ae98f
checksum=864e7819210b586d42c674a1fdd577ce75a78b3dda64c63565abe5aefd72c753
build_options="gnutls ldap rtmp ssh ssl"
build_options_default="ssh ssl"
vopt_conflict ssl gnutls
post_install() {
vlicense COPYING
}
libcurl_package() {
short_desc="The multiprotocol file transfer library"
pkg_install() {