libcurl&openssl: Make sure curl is not broken

The updated openssl package now conflicts with "libcurl (<< 7.61.0-1)",
so no one will get openssl 1.1.1 without also getting an updated libcurl
7.61.1-1 linking against it.

From the other direction the new libcurl depends on
"openssl (>= 1.1.1)", so no one will get libcurl 7.61.1-1 without also
getting the updated openssl 1.1.1 which it uses.
This commit is contained in:
Fredrik Fornwall 2018-09-12 00:01:19 +02:00
parent 9c3e786b9d
commit 23774ece51
2 changed files with 2 additions and 1 deletions

View File

@ -1,6 +1,6 @@
TERMUX_PKG_HOMEPAGE=https://curl.haxx.se/
TERMUX_PKG_DESCRIPTION="Easy-to-use client-side URL transfer library"
TERMUX_PKG_DEPENDS="openssl, libnghttp2"
TERMUX_PKG_DEPENDS="openssl (>= 1.1.1), libnghttp2"
TERMUX_PKG_VERSION=7.61.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=a308377dbc9a16b2e994abd55455e5f9edca4e31666f8f8fcfe7a1a4aea419b9

View File

@ -6,6 +6,7 @@ TERMUX_PKG_SHA256=2836875a0f89c03d0fdf483941512613a50cfb421d6fd94b9f41d7279d586a
TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION/\~/-}.tar.gz
TERMUX_PKG_RM_AFTER_INSTALL="bin/c_rehash etc/ssl/misc"
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_CONFLICTS="libcurl (<< 7.61.0-1)"
# Information about compilation and installation of openssl:
# http://wiki.openssl.org/index.php/Compilation_and_Installation