From 19f9716b4601c1ae750ce69c82d67652024ccb00 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 11 Aug 2019 19:19:41 +0300
Subject: [PATCH] attempt to fix problem with upgrading libbz2, libcurl,
 liblzma

---
 packages/libbz2/build.sh  | 4 ++--
 packages/libcurl/build.sh | 9 ++-------
 packages/liblzma/build.sh | 4 ++--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/libbz2/build.sh b/packages/libbz2/build.sh
index ec1bbee2b..b167fea6c 100644
--- a/packages/libbz2/build.sh
+++ b/packages/libbz2/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://www.bzip.org/
 TERMUX_PKG_DESCRIPTION="BZ2 format compression library"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_VERSION=1.0.8
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/bzip2-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=47fd74b2ff83effad0ddf62074e6fad1f6b4a77a96e121ab421c20a216371a1f
-TERMUX_PKG_BREAKS="bzip2, libbz2-dev"
+TERMUX_PKG_CONFLICTS="bzip2, libbz2-dev"
 TERMUX_PKG_REPLACES="bzip2, libbz2-dev"
 TERMUX_PKG_PROVIDES="bzip2"
 TERMUX_PKG_ESSENTIAL=yes
diff --git a/packages/libcurl/build.sh b/packages/libcurl/build.sh
index 4025d2f88..a9ada3243 100644
--- a/packages/libcurl/build.sh
+++ b/packages/libcurl/build.sh
@@ -2,20 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://curl.haxx.se/
 TERMUX_PKG_DESCRIPTION="Easy-to-use client-side URL transfer library"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=7.65.3
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://curl.haxx.se/download/curl-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=0a855e83be482d7bc9ea00e05bdb1551a44966076762f9650959179c89fce509
 TERMUX_PKG_DEPENDS="libnghttp2, openssl (>= 1.1.1), zlib"
-TERMUX_PKG_BREAKS="curl, libcurl-dev"
+TERMUX_PKG_CONFLICTS="apt (<< 1.4.8-8), curl, libcurl-dev"
 TERMUX_PKG_REPLACES="curl, libcurl-dev"
 TERMUX_PKG_PROVIDES="curl"
 TERMUX_PKG_ESSENTIAL=yes
 
-# 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)"
-
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-ntlm-wb=$TERMUX_PREFIX/bin/ntlm_auth
 --with-ca-bundle=$TERMUX_PREFIX/etc/tls/cert.pem
diff --git a/packages/liblzma/build.sh b/packages/liblzma/build.sh
index b5d5023e3..4c9c48fda 100644
--- a/packages/liblzma/build.sh
+++ b/packages/liblzma/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://tukaani.org/xz/
 TERMUX_PKG_DESCRIPTION="XZ-format compression library"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=5.2.4
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/xz-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b
-TERMUX_PKG_BREAKS="liblzma-dev, xz-utils"
+TERMUX_PKG_CONFLICTS="liblzma-dev, xz-utils"
 TERMUX_PKG_REPLACES="liblzma-dev, xz-utils"
 TERMUX_PKG_PROVIDES="xz-utils"
 TERMUX_PKG_ESSENTIAL=yes