From e9022e4ed99939f2d56034d4cfbe7e7f5a86a3b7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 23 Mar 2016 09:55:59 +0100 Subject: [PATCH 1/3] curl: update to 7.48.0. --- srcpkgs/curl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 3afa09bc412..c6d5db56bbb 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -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,7 +19,7 @@ maintainer="Juan RP " 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" From 729e1557a09c19183dad48abccc6173cbbe0b08e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 23 Mar 2016 10:09:25 +0100 Subject: [PATCH 2/3] curl: merge patch from @bagder to fix the build with libressl. --- srcpkgs/curl/patches/240cd84b49.diff | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/curl/patches/240cd84b49.diff diff --git a/srcpkgs/curl/patches/240cd84b49.diff b/srcpkgs/curl/patches/240cd84b49.diff new file mode 100644 index 00000000000..afe8a7c0444 --- /dev/null +++ b/srcpkgs/curl/patches/240cd84b49.diff @@ -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 From 0b5f9fa039e80d21fa6e6cd8373ee1bb96ba4343 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 23 Mar 2016 10:13:43 +0100 Subject: [PATCH 3/3] curl: install license to make xlint happy. --- srcpkgs/curl/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index c6d5db56bbb..a2f72c77ec3 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -25,6 +25,10 @@ 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() {