From f3de7e5edf8b6d0cf34e7b4f24daba23c6d34f20 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 21 Jul 2019 23:46:55 +0300
Subject: [PATCH] coreutils: conflict with older busybox

The utility 'env' was re-added back.
---
 packages/coreutils/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/coreutils/build.sh b/packages/coreutils/build.sh
index 31c697856..b02fa3178 100644
--- a/packages/coreutils/build.sh
+++ b/packages/coreutils/build.sh
@@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="Basic file, shell and text manipulation utilities from t
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_VERSION=8.31
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SHA256=ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="libandroid-support, libiconv"
+TERMUX_PKG_CONFLICTS="busybox (<< 1.30.1-4)"
 
 # pinky has no usage on Android.
 # df does not work either, let system binary prevail.