From 3da84433bfbe82e6945c87fc9abed2981311102b Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 30 Dec 2018 23:15:51 +0100 Subject: [PATCH] libcurl: Update from 7.61.1 to 7.63.0 --- packages/libcurl/build.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/libcurl/build.sh b/packages/libcurl/build.sh index 327bed285..390b6e5ca 100755 --- a/packages/libcurl/build.sh +++ b/packages/libcurl/build.sh @@ -1,9 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://curl.haxx.se/ TERMUX_PKG_DESCRIPTION="Easy-to-use client-side URL transfer library" TERMUX_PKG_DEPENDS="openssl (>= 1.1.1), libnghttp2" -TERMUX_PKG_VERSION=7.61.1 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=a308377dbc9a16b2e994abd55455e5f9edca4e31666f8f8fcfe7a1a4aea419b9 +TERMUX_PKG_VERSION=7.63.0 +TERMUX_PKG_SHA256=9bab7ed4ecff77020a312d84cc5fb7eb02d58419d218f267477a724a17fd8dd8 TERMUX_PKG_SRCURL=https://curl.haxx.se/download/curl-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-ntlm-wb=$TERMUX_PREFIX/bin/ntlm_auth @@ -16,3 +15,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-ssl " TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/curl-config share/man/man1/curl-config.1" +# Starting with version 7.62 curl started enabling http/2 by default. +# Support for http/2 as added in version 1.4.8-8 of the apt package, so we +# conflict with previous versions to avoid broken installations. +TERMUX_PKG_CONFLICTS="apt (<< 1.4.8-8)"