[android-5] zlib: add package (#3499)

* zlib: add package * add zlib to dependencies where needed * aapt: fix compilation error after adding own zlib * fossil: specify zlib installation * fossil: specify CPPFLAGS * exa: fix build error where zlib.h was not found * bat: fix build error where zlib.h was not found * lftp: specify correct zlib location * zlib-dev: breaks and replaces old ndk-sysroot also bump toolchain version for z{lib,conf}.h removal * texlive-bin: fix compilation errors
6 years ago · e3eb5d6b6b
115 changed files with 251 additions and 178 deletions
--- a/packages/aapt/build.sh
+++ b/packages/aapt/build.sh
@ -4,9 +4,9 @@ TERMUX_PKG_LICENSE="Apache-2.0"
 _TAG_VERSION=7.1.2
 _TAG_REVISION=33
 TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli"
+TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli, zlib"

 termux_step_make_install() {
 	# FIXME: We would like to enable checksums when downloading
@ -222,7 +222,7 @@ termux_step_make_install() {
 		zip_archive_stream_entry.cc \
 		zip_writer.cc"
 	patch -p0 < $TERMUX_PKG_BUILDER_DIR/libziparchive.patch.txt
-	$CXX $CXXFLAGS $LDFLAGS -std=c++11 \
+	$CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -std=c++11 \
 		-DZLIB_CONST \
 		-isystem $AOSP_INCLUDE_DIR \
 		$libziparchive_source_files \
--- a/packages/abuild/build.sh
+++ b/packages/abuild/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/alpinelinux/abuild
 TERMUX_PKG_DESCRIPTION="Build script to build Alpine packages"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=3.2.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=45b26674ca416e71612ff7924169a890a2cc45e945ecca33bc382f98e9ec3eb7
 TERMUX_PKG_SRCURL=https://github.com/alpinelinux/abuild/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_DEPENDS="apk-tools, autoconf, automake, bash, clang, curl, libtool, make, openssl-tool, pkg-config, tar"
+TERMUX_PKG_DEPENDS="apk-tools, autoconf, automake, bash, clang, curl, libtool, make, openssl-tool, pkg-config, tar, zlib"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_MAKE_ARGS="sysconfdir=$TERMUX_PREFIX/etc"
 TERMUX_PKG_CONFFILES="etc/abuild.conf"
--- a/packages/apache2/build.sh
+++ b/packages/apache2/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://httpd.apache.org
 TERMUX_PKG_DESCRIPTION="Apache Web Server"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=2.4.39
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2
 TERMUX_PKG_SRCURL=https://www.apache.org/dist/httpd/httpd-$TERMUX_PKG_VERSION.tar.bz2
-TERMUX_PKG_DEPENDS="apr, apr-util, pcre, openssl, libcrypt, libandroid-support, libnghttp2, libexpat, libuuid"
+TERMUX_PKG_DEPENDS="apr, apr-util, pcre, openssl, libcrypt, libandroid-support, libnghttp2, libexpat, libuuid, zlib"
 TERMUX_PKG_CONFFILES="
 etc/apache2/httpd.conf
 etc/apache2/extra/httpd-autoindex.conf
--- a/packages/apk-tools/build.sh
+++ b/packages/apk-tools/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://wiki.alpinelinux.org/wiki/Alpine_Linux_package_manag
 TERMUX_PKG_DESCRIPTION="Alpine Linux package management tools"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.10.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=f91861ed981d0a2912d5d860a33795ec40d16021ab03f6561a3849b9c0bcf77e
 TERMUX_PKG_SRCURL=https://github.com/alpinelinux/apk-tools/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="openssl"
+TERMUX_PKG_DEPENDS="openssl, zlib"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_MAKE_ARGS="LUAAPK="
 TERMUX_PKG_CONFFILES="etc/apk/repositories"
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@ -1,11 +1,11 @@
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_DEPENDS="libcurl, liblzma, dpkg, gpgv, libc++, termux-exec"
+TERMUX_PKG_DEPENDS="libcurl, liblzma, dpkg, gpgv, libc++, termux-exec, zlib"
 TERMUX_PKG_RECOMMENDS="game-repo, science-repo"
 TERMUX_PKG_SUGGESTS="unstable-repo"
 TERMUX_PKG_VERSION=1.4.9
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=d4d65e7c84da86f3e6dcc933bba46a08db429c9d933b667c864f5c0e880bac0d
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--- a/packages/aria2/build.sh
+++ b/packages/aria2/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://aria2.github.io
 TERMUX_PKG_DESCRIPTION="Download utility supporting HTTP/HTTPS, FTP, BitTorrent and Metalink"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.34.0
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SHA256=3a44a802631606e138a9e172a3e9f5bcbaac43ce2895c1d8e2b46f30487e77a3
 TERMUX_PKG_SRCURL=https://github.com/aria2/aria2/releases/download/release-${TERMUX_PKG_VERSION}/aria2-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_DEPENDS="c-ares, openssl, libxml2"
+TERMUX_PKG_DEPENDS="c-ares, openssl, libxml2, zlib"
 # sqlite3 is only used for loading cookies from firefox or chrome:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-openssl
--- a/packages/atomicparsley/build.sh
+++ b/packages/atomicparsley/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://bitbucket.org/wez/atomicparsley
 TERMUX_PKG_DESCRIPTION="Read, parse and set metadata of MPEG-4 and 3gp files"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.9.6
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://bitbucket.org/wez/atomicparsley/get/${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=e28d46728be86219e6ce48695ea637d831ca0170ca6bdac99810996a8291ee50
+TERMUX_PKG_DEPENDS="zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_lroundf=yes"

 termux_step_pre_configure() {
--- a/packages/bat/build.sh
+++ b/packages/bat/build.sh
@ -2,11 +2,16 @@ TERMUX_PKG_HOMEPAGE=https://github.com/sharkdp/bat
 TERMUX_PKG_DESCRIPTION="A cat(1) clone with wings"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=0.10.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=54dd396e8f20d44c6032a32339f45eab46a69b6134e74a704f8d4a27c18ddc3e
 TERMUX_PKG_SRCURL=https://github.com/sharkdp/bat/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_BUILD_IN_SRC=yes
 # bat calls less with '--RAW-CONTROL-CHARS' which busybox less does not support:
-TERMUX_PKG_DEPENDS="less"
+TERMUX_PKG_DEPENDS="less, zlib"
+TERMUX_PKG_BUILD_IN_SRC=yes
+
+termux_step_pre_configure() {
+	CFLAGS="$CFLAGS $CPPFLAGS"
+}

 termux_step_post_make_install() {
 	mkdir -p $TERMUX_PREFIX/share/man/man1
--- a/packages/binutils/build.sh
+++ b/packages/binutils/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/binutils/
 TERMUX_PKG_DESCRIPTION="Collection of binary tools, the main ones being ld, the GNU linker, and as, the GNU assembler"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.32
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=9b0d97b3d30df184d302bced12f976aa1e5fbf4b0be696cdebc6cca30411a46e
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/binutils/binutils-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_DEPENDS="zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gold --enable-plugins --disable-werror --with-system-zlib --enable-new-dtags"
 TERMUX_PKG_EXTRA_MAKE_ARGS="tooldir=$TERMUX_PREFIX"
 TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/windmc.1 share/man/man1/windres.1 bin/ld.bfd"
--- a/packages/boost/build.sh
+++ b/packages/boost/build.sh
@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://boost.org
 TERMUX_PKG_DESCRIPTION="Free peer-reviewed portable C++ source libraries"
 TERMUX_PKG_LICENSE="BSL-1.0"
 TERMUX_PKG_VERSION=1.69.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406
 TERMUX_PKG_SRCURL=https://dl.bintray.com/boostorg/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_DEPENDS="libbz2, liblzma"
+TERMUX_PKG_DEPENDS="libbz2, liblzma, zlib"
 TERMUX_PKG_BUILD_DEPENDS="python, python2"
 TERMUX_PKG_BREAKS="libboost-python (<= 1.65.1-2)"
 TERMUX_PKG_REPLACES="libboost-python (<= 1.65.1-2)"
--- a/packages/ccache/build.sh
+++ b/packages/ccache/build.sh
@ -3,5 +3,7 @@ TERMUX_PKG_DESCRIPTION="Compiler cache for fast recompilation of C/C++ code"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_VERSION=3.6
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=a6b129576328fcefad00cb72035bc87bc98b6a76aec0f4b59bed76d67a399b1f
 TERMUX_PKG_SRCURL=https://www.samba.org/ftp/ccache/ccache-$TERMUX_PKG_VERSION.tar.xz
+TERMUX_PKG_DEPENDS="zlib"
--- a/packages/cmake/build.sh
+++ b/packages/cmake/build.sh
@ -2,8 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://cmake.org/
 TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=3.14.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=a3cbf562b99270c0ff192f692139e98c605f292bfdbc04d70da0309a5358e71e
 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang"
+TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib"
 TERMUX_PKG_FORCE_CMAKE=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DKWSYS_LFS_WORKS=ON -DBUILD_CursesDialog=ON"
--- a/packages/cvs/build.sh
+++ b/packages/cvs/build.sh
@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.nongnu.org/cvs/
 TERMUX_PKG_DESCRIPTION="Concurrent Versions System"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION="1.12.13+real-26"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=0eda91f5e8091b676c90b2a171f24f9293acb552f4e4f77b590ae8d92a547256
 TERMUX_PKG_SRCURL="https://dl.bintray.com/termux/upstream/cvs-$TERMUX_PKG_VERSION.tar.xz"
+TERMUX_PKG_DEPENDS="zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 cvs_cv_func_printf_ptr=yes
 ac_cv_header_syslog_h=no
--- a/packages/dnsutils/build.sh
+++ b/packages/dnsutils/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.isc.org/downloads/bind/
 TERMUX_PKG_DESCRIPTION="Clients provided with BIND"
 TERMUX_PKG_LICENSE="MPL-2.0"
 TERMUX_PKG_VERSION=9.13.6
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=ae771f209fd807d6cb9db20e16ee96ec4ba44b2052cda8c4487ddacae124870e
 TERMUX_PKG_SRCURL="ftp://ftp.isc.org/isc/bind9/${TERMUX_PKG_VERSION}/bind-${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_DEPENDS="openssl, readline, resolv-conf"
+TERMUX_PKG_DEPENDS="openssl, readline, resolv-conf, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-linux-caps
 --without-python
--- a/packages/dpkg/build.sh
+++ b/packages/dpkg/build.sh
@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/dpkg
 TERMUX_PKG_DESCRIPTION="Debian package management system"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.19.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=c15234e98655689586bff2d517a6fdc6135d139c54d52ae9cfa6a90007fee0ae
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@ -62,7 +63,7 @@ share/man/man5
 share/perl5
 "
 # with the extract.c.patch we remove the -p and --warning=no-timestamp tar options so we can use busybox tar
-TERMUX_PKG_DEPENDS="busybox, liblzma"
+TERMUX_PKG_DEPENDS="busybox, liblzma, zlib"
 TERMUX_PKG_ESSENTIAL=yes

 termux_step_pre_configure() {
--- a/packages/elinks/build.sh
+++ b/packages/elinks/build.sh
@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Full-Featured Text WWW Browser"
 TERMUX_PKG_LICENSE="GPL-2.0"
 _COMMIT=f86be659718c0cd0a67f88b42f07044c23d0d028
 TERMUX_PKG_VERSION=0.13.GIT
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/xeffyr/elinks/archive/${_COMMIT}.zip
 TERMUX_PKG_SHA256=3e65aaabcc4f6b2418643cf965786c00e3f196330f3e7863ca83f9e546d5e609
-TERMUX_PKG_DEPENDS="libexpat, libidn, openssl, libbz2"
+TERMUX_PKG_DEPENDS="libexpat, libidn, openssl, libbz2, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-256-colors
 --enable-true-color
--- a/packages/erlang/build.sh
+++ b/packages/erlang/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.erlang.org/
 TERMUX_PKG_DESCRIPTION="General-purpose concurrent functional programming language"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=21.3.5
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=1223b367f1f165fcbaaeea23e7dbc0fec2d2877d0c1b6bbeefef5ac3b1e528b6
 TERMUX_PKG_SRCURL=https://github.com/erlang/otp/archive/OTP-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_DEPENDS="openssl, ncurses, libutil"
+TERMUX_PKG_DEPENDS="openssl, ncurses, libutil, zlib"
 TERMUX_PKG_HOSTBUILD="yes"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-javac --with-ssl=${TERMUX_PREFIX} --with-termcap"
--- a/packages/exa/build.sh
+++ b/packages/exa/build.sh
@ -2,14 +2,18 @@ TERMUX_PKG_HOMEPAGE=https://the.exa.website
 TERMUX_PKG_DESCRIPTION="A modern replacement for ls"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=0.9~pre3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=9931ad1c593096e69a1f0f7615e3857b1d422b7e74f63408385c663aeb2c12db
 TERMUX_PKG_SRCURL=https://github.com/ogham/exa/archive/058b4a57bdb1e25cbdacc0fbd1eefc09bc5f1e95.zip
+TERMUX_PKG_DEPENDS="zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--no-default-features --features default"
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_pre_configure() {
 	rm $TERMUX_PKG_SRCDIR/Makefile
 	termux_setup_rust
+
+	CFLAGS="$CFLAGS $CPPFLAGS"
 	cargo update
 }

--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@ -3,12 +3,13 @@ TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multim
 TERMUX_PKG_LICENSE="GPL-3.0"
 # NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg.
 TERMUX_PKG_VERSION=4.1.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=0c3020452880581a8face91595b239198078645e7d7184273b8bcc7758beb63d
 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
 # libbz2 is used by matroska decoder:
 # libvpx is the VP8 & VP9 video encoder for WebM, see
 # https://trac.ffmpeg.org/wiki/Encode/VP8 and https://trac.ffmpeg.org/wiki/Encode/VP9
-TERMUX_PKG_DEPENDS="libbz2, libsoxr, libx264, libx265, xvidcore, libvorbis, libmp3lame, libopus, libvpx, libgnutls, libandroid-glob, freetype"
+TERMUX_PKG_DEPENDS="libbz2, libsoxr, libx264, libx265, xvidcore, libvorbis, libmp3lame, libopus, libvpx, libgnutls, libandroid-glob, freetype, zlib"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
 TERMUX_PKG_CONFLICTS="libav"

--- a/packages/file/build.sh
+++ b/packages/file/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://darwinsys.com/file/
 TERMUX_PKG_DESCRIPTION="Command-line tool that tells you in words what kind of data a file contains"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_VERSION=5.36
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=fb608290c0fd2405a8f63e5717abf6d03e22e183fb21884413d1edd918184379
 TERMUX_PKG_SRCURL=ftp://ftp.astron.com/pub/file/file-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_DEPENDS="zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_mmap_fixed_mapped=yes"
 TERMUX_PKG_EXTRA_MAKE_ARGS="FILE_COMPILE=$TERMUX_PKG_HOSTBUILD_DIR/src/file"
 TERMUX_PKG_HOSTBUILD="yes"
--- a/packages/fontconfig/build.sh
+++ b/packages/fontconfig/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/fontconfig/
 TERMUX_PKG_DESCRIPTION="Library for configuring and customizing font access"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_VERSION=2.13.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741
 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/fontconfig/release/fontconfig-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_DEPENDS="freetype, libxml2, libpng, libuuid"
+TERMUX_PKG_DEPENDS="freetype, libxml2, libpng, libuuid, zlib"
 TERMUX_PKG_DEVPACKAGE_DEPENDS="freetype-dev, libxml2-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-libxml2
--- a/packages/fossil/build.sh
+++ b/packages/fossil/build.sh
@ -3,15 +3,15 @@ TERMUX_PKG_DESCRIPTION="DSCM with built-in wiki, http interface and server, tick
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_VERSION=2.8
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=6a32bec73de26ff5cc8bbb0b7b45360f4e4145931fd215ed91414ed190b3715d
 TERMUX_PKG_SRCURL=https://www.fossil-scm.org/index.html/uv/fossil-src-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libsqlite, openssl"
+TERMUX_PKG_DEPENDS="libsqlite, openssl, zlib"

 termux_step_pre_configure() {
 	# Avoid mixup of flags between cross compilation
 	# and native build.
-	CC="$CC $CFLAGS $LDFLAGS"
+	CC="$CC $CPPFLAGS $CFLAGS $LDFLAGS"
 	unset CFLAGS LDFLAGS
 }

@ -22,6 +22,6 @@ termux_step_configure() {
 		--json \
 		--disable-internal-sqlite \
 		--with-openssl=$TERMUX_PREFIX \
-		--with-zlib=auto
+		--with-zlib=$TERMUX_PREFIX
 }

--- a/packages/freetype/build.sh
+++ b/packages/freetype/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.freetype.org
 TERMUX_PKG_DESCRIPTION="Software font engine capable of producing high-quality output"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.10.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=fccc62928c65192fff6c98847233b28eb7ce05f12d2fea3f6cc90e8b4e5fbe06
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/freetype/freetype2/${TERMUX_PKG_VERSION}/freetype-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_DEPENDS="libbz2, libpng"
+TERMUX_PKG_DEPENDS="libbz2, libpng, zlib"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/freetype-config share/man/man1/freetype-config.1"
 # Use with-harfbuzz=no to avoid circular dependency between freetype and harfbuzz:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-harfbuzz=no"
--- a/packages/gdb/build.sh
+++ b/packages/gdb/build.sh
@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gdb/
 TERMUX_PKG_DESCRIPTION="The standard GNU Debugger that runs on many Unix-like systems and works for many programming languages"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_DEPENDS="liblzma, libexpat, readline, ncurses, libmpfr"
+TERMUX_PKG_DEPENDS="liblzma, libexpat, readline, ncurses, libmpfr, zlib"
 TERMUX_PKG_VERSION=8.2.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gdb/gdb-${TERMUX_PKG_VERSION}.tar.xz
 # gdb can not build with our normal --disable-static: https://sourceware.org/bugzilla/show_bug.cgi?id=15916
--- a/packages/gegl/build.sh
+++ b/packages/gegl/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://gegl.org/
 TERMUX_PKG_DESCRIPTION="Data flow based image processing framework"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=0.4.14
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=4c01d58599d8ddb3714effd2675ea1863272cf2d7d9ed3d32aee80c89f859901
 TERMUX_PKG_SRCURL=https://download.gimp.org/pub/gegl/${TERMUX_PKG_VERSION:0:3}/gegl-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_DEPENDS="libandroid-support, ffmpeg, babl, json-glib, libjpeg-turbo, libpng, libjasper, littlecms, libtiff, librsvg"
+TERMUX_PKG_DEPENDS="libandroid-support, ffmpeg, babl, json-glib, libjpeg-turbo, libpng, libjasper, littlecms, libtiff, librsvg, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --without-gdk-pixbuf
 "
--- a/packages/gettext/build.sh
+++ b/packages/gettext/build.sh
@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gettext/
 TERMUX_PKG_DESCRIPTION="GNU Internationalization utilities"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.19.8.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gettext/gettext-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_DEPENDS="pcre, liblzma, libxml2, libcroco, ncurses, libunistring"
+TERMUX_PKG_DEPENDS="pcre, liblzma, libxml2, libcroco, ncurses, libunistring, zlib"
+
 termux_step_pre_configure() {
 	autoreconf
 }
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@ -2,8 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://git-scm.com/
 TERMUX_PKG_DESCRIPTION="Fast, scalable, distributed revision control system"
 TERMUX_PKG_LICENSE="GPL-2.0"
 # less is required as a pager for git log, and the busybox less does not handle used escape sequences.
-TERMUX_PKG_DEPENDS="libcurl, less, openssl, pcre2"
+TERMUX_PKG_DEPENDS="libcurl, less, openssl, pcre2, zlib"
 TERMUX_PKG_VERSION=2.21.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=8ccb1ce743ee991d91697e163c47c11be4bf81efbdd9fb0b4a7ad77cc0020d28
 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
 ## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
--- a/packages/glib/build.sh
+++ b/packages/glib/build.sh
@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/glib/
 TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and applications written in C"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_VERSION=2.58.3
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${TERMUX_PKG_VERSION:0:4}/glib-${TERMUX_PKG_VERSION}.tar.xz
 # libandroid-support to get langinfo.h in include path.
-TERMUX_PKG_DEPENDS="libffi, pcre, libandroid-support"
+TERMUX_PKG_DEPENDS="libffi, pcre, libandroid-support, zlib"
 TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc lib/locale share/glib-2.0/gettext share/gdb/auto-load share/glib-2.0/codegen share/glib-2.0/gdb bin/gtester-report bin/glib-gettextize bin/gdbus-codegen"
 # Needed by pkg-config for glib-2.0:
 TERMUX_PKG_DEVPACKAGE_DEPENDS="pcre-dev"
--- a/packages/gmic/build.sh
+++ b/packages/gmic/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://gmic.eu
 TERMUX_PKG_DESCRIPTION="Full-featured framework for image processing"
 TERMUX_PKG_LICENSE="CeCILL-2.1"
 TERMUX_PKG_VERSION=2.5.7
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=1cc71b48c1c3da928031b7f32cf3fe4757a07b4f21c3af4167389d54cf2dee5f
 TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_DEPENDS="graphicsmagick++, libcurl, fftw, libpng, libjpeg-turbo, libtiff"
+TERMUX_PKG_DEPENDS="graphicsmagick++, libcurl, fftw, libpng, libjpeg-turbo, libtiff, zlib"
 TERMUX_PKG_BUILD_DEPENDS="graphicsmagick-dev"
 TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/gnupg/build.sh
+++ b/packages/gnupg/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/
 TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.2.15
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=cb8ce298d7b36558ffc48aec961b14c830ff1783eef7a623411188b5e0f5d454
 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libsqlite,libnpth,readline,pinentry,libgpg-error"
+TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libsqlite,libnpth,readline,pinentry,libgpg-error,zlib"
 TERMUX_PKG_CONFLICTS="gnupg2 (<< 2.2.9-1)"
 TERMUX_PKG_REPLACES="gnupg2 (<< 2.2.9-1)"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--- a/packages/gnuplot/build.sh
+++ b/packages/gnuplot/build.sh
@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://gnuplot.info/
 TERMUX_PKG_DESCRIPTION="Command-line driven graphing utility"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_VERSION=5.2.6
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=35dd8f013139e31b3028fac280ee12d4b1346d9bb5c501586d1b5a04ae7a94ee
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/gnuplot/gnuplot/${TERMUX_PKG_VERSION}/gnuplot-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-lua=no --with-bitmap-terminals"
-TERMUX_PKG_DEPENDS="libandroid-support, readline, pango, libgd"
+TERMUX_PKG_DEPENDS="libandroid-support, readline, pango, libgd, zlib"
 TERMUX_PKG_HOSTBUILD=yes

 termux_step_host_build() {
--- a/packages/graphicsmagick/build.sh
+++ b/packages/graphicsmagick/build.sh
@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=096bbb59d6f3abd32b562fc3b34ea90d88741dc5dd888731d61d17e100394278
 # Bandwith limited on main ftp site, so it's asked to use sourceforge instead:
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${TERMUX_PKG_VERSION}/GraphicsMagick-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_DEPENDS="littlecms, libtiff, freetype, libjasper, libjpeg-turbo, libpng, libbz2, libxml2, liblzma, zstd"
+TERMUX_PKG_DEPENDS="littlecms, libtiff, freetype, libjasper, libjpeg-turbo, libpng, libbz2, libxml2, liblzma, zstd, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_func_ftime=no
 --with-fontpath=/system/fonts
--- a/packages/graphviz/build.sh
+++ b/packages/graphviz/build.sh
@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Rich set of graph drawing tools"
 TERMUX_PKG_LICENSE="EPL-2.0"
 TERMUX_PKG_MAINTAINER="Dustin DeWeese @HackerFoo"
 TERMUX_PKG_VERSION=2.40.1
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/graphviz-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421
-TERMUX_PKG_DEPENDS="libandroid-glob,libcairo,pango,libexpat,libltdl,librsvg,libgd"
+TERMUX_PKG_DEPENDS="libandroid-glob,libcairo,pango,libexpat,libltdl,librsvg,libgd,zlib"
 TERMUX_PKG_BUILD_DEPENDS="libtool"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--- a/packages/gst-plugins-base/build.sh
+++ b/packages/gst-plugins-base/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="GStreamer base plug-ins"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.14.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=ca6139490e48863e7706d870ff4e8ac9f417b56f3b9e4b3ce490c13b09a77461
 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_DEPENDS="gstreamer, libjpeg-turbo, libopus, libpng, libvorbis"
+TERMUX_PKG_DEPENDS="gstreamer, libjpeg-turbo, libopus, libpng, libvorbis, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-tests
 --disable-examples
@ -13,7 +14,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

 termux_step_post_make_install() {
 	for BINARY in gst-play-1.0 gst-discoverer-1.0 gst-device-monitor-1.0
-	    do	
+	    do
 		echo $BINARY
 		local LIBEXEC_BINARY=$TERMUX_PREFIX/libexec/$BINARY
 		local BIN_BINARY=$TERMUX_PREFIX/bin/$BINARY
@ -24,7 +25,7 @@ termux_step_post_make_install() {
 			LIB_PATH+=64
 			VENDOR_LIB_PATH+=64
 		fi
-			
+
 		mv $BIN_BINARY $LIBEXEC_BINARY
 		local FFMPEG_LIBS="" lib
 	for lib in avcodec avfilter avformat avutil postproc swresample swscale; do
--- a/packages/gst-plugins-good/build.sh
+++ b/packages/gst-plugins-good/build.sh
@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="GStreamer Good Plug-ins"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.14.4
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=5f8b553260cb0aac56890053d8511db1528d53cae10f0287cfce2cb2acc70979
 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_DEPENDS="gst-plugins-base, libcaca, libsoup, libjpeg-turbo, libpng, libflac, libbz2, libvpx, libpulseaudio, libmp3lame, gstreamer, libogg"
+TERMUX_PKG_DEPENDS="gst-plugins-base, libcaca, libsoup, libjpeg-turbo, libpng, libflac, libbz2, libvpx, libpulseaudio, libmp3lame, gstreamer, libogg, zlib"
 # pcre needed by glib. libxml2 needed by libsoup
 TERMUX_PKG_BUILD_DEPENDS="glib, pcre, libxml2"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--- a/packages/imgflo/build.sh
+++ b/packages/imgflo/build.sh
@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.imgflo.org/
 TERMUX_PKG_DESCRIPTION="HTTP image processing server & Flowhub.io compatible runtime"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=0.4.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/imgflo/imgflo/archive/$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=4dd5fc9d34f3cfc294fd69a14d50ed5401abeb829132f1b1ac316e28223fc393
-TERMUX_PKG_DEPENDS="gegl, libsoup"
+TERMUX_PKG_DEPENDS="gegl, libsoup, zlib"
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/isync/build.sh
+++ b/packages/isync/build.sh
@ -2,8 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://isync.sourceforge.net
 TERMUX_PKG_DESCRIPTION="IMAP and MailDir mailbox synchronizer"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.3.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/isync/isync/${TERMUX_PKG_VERSION}/isync-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=8d5f583976e3119705bdba27fa4fc962e807ff5996f24f354957178ffa697c9c
+TERMUX_PKG_DEPENDS="zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-sasl ac_cv_header_db=no ac_cv_berkdb4=no"
 TERMUX_PKG_DEPENDS="openssl"
--- a/packages/ldc/build.sh
+++ b/packages/ldc/build.sh
@ -6,6 +6,7 @@ TERMUX_PKG_VERSION+=(1.13.0)
 TERMUX_PKG_VERSION+=(7.0.1)   # LLVM version
 TERMUX_PKG_VERSION+=(2.083.1) # TOOLS version
 TERMUX_PKG_VERSION+=(1.12.1)  # DUB version
+TERMUX_PKG_REVISION=1

 TERMUX_PKG_SRCURL=(https://github.com/ldc-developers/ldc/releases/download/v${TERMUX_PKG_VERSION}/ldc-${TERMUX_PKG_VERSION}-src.tar.gz
 		   https://github.com/ldc-developers/llvm/releases/download/ldc-v${TERMUX_PKG_VERSION[1]}/llvm-${TERMUX_PKG_VERSION[1]}.src.tar.xz
@ -17,7 +18,7 @@ TERMUX_PKG_SHA256=(4b2fd3eb90fb6debc0ae6d70406bc78fcb531a0f20806640e626d4822e87b
 		   78d90dcda6b82d3eda69c30fa2308a8c8f1a3bce574d637806ca1af3c7f65888
 		   bd17cf67784f2ea0a2e0298761c662c80fddf6700c065f6689eb353e2144c987
 		   3692974b6dc6c81280c0321371b400101006f28bafb890f089b1d357dadbcbf1)
-TERMUX_PKG_DEPENDS="clang"
+TERMUX_PKG_DEPENDS="clang, zlib"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_FORCE_CMAKE=yes
 #These CMake args are only used to configure a patched LLVM
--- a/packages/leptonica/build.sh
+++ b/packages/leptonica/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://www.leptonica.com/
 TERMUX_PKG_DESCRIPTION="Library for image processing and image analysis"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_VERSION=1.78.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=f8ac4d93cc76b524c2c81d27850bfc342e68b91368aa7a1f7d69e34ce13adbb4
 TERMUX_PKG_SRCURL=https://github.com/DanBloomberg/leptonica/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libjpeg-turbo, libpng, libtiff"
+TERMUX_PKG_DEPENDS="libjpeg-turbo, libpng, libtiff, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-giflib --without-libwebp --without-libopenjpeg"

 termux_step_pre_configure() {
--- a/packages/lftp/build.sh
+++ b/packages/lftp/build.sh
@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://lftp.tech/
 TERMUX_PKG_DESCRIPTION="FTP/HTTP client and file transfer program"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=4.8.4
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SHA256=4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62
 TERMUX_PKG_SRCURL=https://lftp.tech/ftp/lftp-${TERMUX_PKG_VERSION}.tar.xz
 # (1) Android has dn_expand, but lftp assumes that dn_skipname then exists, which it does not on android.
@ -12,12 +12,12 @@ ac_cv_func_dn_expand=no
 --with-openssl
 --with-expat=$TERMUX_PREFIX
 --with-readline=$TERMUX_PREFIX
+--with-zlib=$TERMUX_PREFIX
 "
-TERMUX_PKG_DEPENDS="libexpat, openssl, readline, libutil, libidn2"
+TERMUX_PKG_DEPENDS="libexpat, openssl, readline, libutil, libidn2, zlib"
 TERMUX_PKG_BUILD_DEPENDS="ncurses-dev"

 termux_step_pre_configure() {
-	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-zlib=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr"
 	if [ "$TERMUX_DEBUG" == "true" ]; then
 		# When doing debug build, -D_FORTIFY_SOURCE=2 gives this error:
 		# /home/builder/.termux-build/_lib/16-aarch64-21-v3/bin/../sysroot/usr/include/bits/fortify/string.h:79:26: error: use of undeclared identifier '__USE_FORTIFY_LEVEL'
--- a/packages/libarchive/build.sh
+++ b/packages/libarchive/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.libarchive.org/
 TERMUX_PKG_DESCRIPTION="Multi-format archive and compression library"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_VERSION=3.3.3
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e
 TERMUX_PKG_SRCURL=https://www.libarchive.org/downloads/libarchive-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libbz2, liblzma, libxml2, openssl"
+TERMUX_PKG_DEPENDS="libbz2, liblzma, libxml2, openssl, zlib"
 # --without-nettle to use openssl instead:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --without-nettle
--- a/packages/libcaca/build.sh
+++ b/packages/libcaca/build.sh
@ -2,12 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://caca.zoy.org/wiki/libcaca
 TERMUX_PKG_DESCRIPTION="Graphics library that outputs text instead of pixels"
 TERMUX_PKG_LICENSE="WTFPL"
 TERMUX_PKG_VERSION=0.99.beta19
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 # Switched to mirror on 2014-12-22 since master was down:
 TERMUX_PKG_SRCURL=http://fossies.org/linux/privat/libcaca-${TERMUX_PKG_VERSION}.tar.gz
 #		      http://caca.zoy.org/files/libcaca/libcaca-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4
-TERMUX_PKG_DEPENDS="ncurses"
+TERMUX_PKG_DEPENDS="ncurses, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-python --disable-java --disable-ruby --disable-doc"

 termux_step_post_configure() {
--- a/packages/libcurl/build.sh
+++ b/packages/libcurl/build.sh
@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://curl.haxx.se/
 TERMUX_PKG_DESCRIPTION="Easy-to-use client-side URL transfer library"
 TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_DEPENDS="openssl (>= 1.1.1), libnghttp2"
+TERMUX_PKG_DEPENDS="openssl (>= 1.1.1), libnghttp2, zlib"
 TERMUX_PKG_VERSION=7.64.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=4cc7c738b35250d0680f29e93e0820c4cb40035f43514ea3ec8d60322d41a45d
 TERMUX_PKG_SRCURL=https://curl.haxx.se/download/curl-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--- a/packages/libelf/build.sh
+++ b/packages/libelf/build.sh
@ -4,10 +4,11 @@ TERMUX_PKG_LICENSE="GPL-2.0"
 # NOTE: We only build the libelf part of elfutils for now,
 # as other parts are not clang compatible.
 TERMUX_PKG_VERSION=0.175
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=f7ef925541ee32c6d15ae5cb27da5f119e01a5ccdbe9fe57bf836730d7b7a65b
 TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/elfutils/${TERMUX_PKG_VERSION}/elfutils-${TERMUX_PKG_VERSION}.tar.bz2
 # libandroid-support for langinfo.
-TERMUX_PKG_DEPENDS="libandroid-support"
+TERMUX_PKG_DEPENDS="libandroid-support, zlib"
 TERMUX_PKG_BUILD_DEPENDS="argp"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_c99=yes --disable-symbol-versioning"
 TERMUX_PKG_CONFLICTS=elfutils
--- a/packages/libgd/build.sh
+++ b/packages/libgd/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://libgd.github.io/
 TERMUX_PKG_DESCRIPTION="GD is an open source code library for the dynamic creation of images by programmers"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_VERSION=2.2.5
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=a66111c9b4a04e818e9e2a37d7ae8d4aae0939a100a36b0ffb52c706a09074b5
 TERMUX_PKG_SRCURL=https://github.com/libgd/libgd/releases/download/gd-${TERMUX_PKG_VERSION}/libgd-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="freetype, fontconfig, libjpeg-turbo, libpng, libtiff, libwebp"
+TERMUX_PKG_DEPENDS="freetype, fontconfig, libjpeg-turbo, libpng, libtiff, libwebp, zlib"
 # Disable vpx support for now, look at https://github.com/gagern/libgd/commit/d41eb72cd4545c394578332e5c102dee69e02ee8
 # for enabling:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-vpx --without-x"
--- a/packages/libgit2/build.sh
+++ b/packages/libgit2/build.sh
@ -2,7 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://libgit2.github.com/
 TERMUX_PKG_DESCRIPTION="C library implementing Git core methods"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.28.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=0ca11048795b0d6338f2e57717370208c2c97ad66c6d5eac0c97a8827d13936b
 TERMUX_PKG_SRCURL=https://github.com/libgit2/libgit2/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libcurl, openssl, libssh2"
+TERMUX_PKG_DEPENDS="libcurl, openssl, libssh2, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_CLAR=OFF"
--- a/packages/libgmime/build.sh
+++ b/packages/libgmime/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://spruce.sourceforge.net/gmime/
 TERMUX_PKG_DESCRIPTION="MIME message parser and creator"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=3.2.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=6a0875eeb552ab447dd54853a68ced62217d863631048737dd97eaa2713e7311
 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gmime/${TERMUX_PKG_VERSION:0:3}/gmime-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_DEPENDS="glib, libidn2"
+TERMUX_PKG_DEPENDS="glib, libidn2, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_have_iconv_detect_h=yes
 --disable-glibtest
--- a/packages/libgrpc/build.sh
+++ b/packages/libgrpc/build.sh
@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="High performance, open source, general RPC framework tha
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_VERSION=1.17.2
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_DEPENDS="openssl, protobuf, c-ares"
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_DEPENDS="openssl, protobuf, c-ares, zlib"
 TERMUX_PKG_BUILD_DEPENDS="libprotobuf"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/libid3tag/build.sh
+++ b/packages/libid3tag/build.sh
@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.underbit.com/products/mad/
 TERMUX_PKG_DESCRIPTION="MAD ID3 tag manipulation library"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.15.1b
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=ftp://ftp.mars.org/pub/mpeg/libid3tag-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
+TERMUX_PKG_DEPENDS="zlib"
--- a/packages/libllvm/build.sh
+++ b/packages/libllvm/build.sh
@ -21,7 +21,7 @@ bin/macho-dump
 lib/libgomp.a
 lib/libiomp5.a
 "
-TERMUX_PKG_DEPENDS="binutils, ncurses, ndk-sysroot, libffi"
+TERMUX_PKG_DEPENDS="binutils, ncurses, ndk-sysroot, libffi, zlib"
 # Replace gcc since gcc is deprecated by google on android and is not maintained upstream.
 # Conflict with clang versions earlier than 3.9.1-3 since they bundled llvm.
 TERMUX_PKG_CONFLICTS="gcc, clang (<< 3.9.1-3)"
--- a/packages/libpng/build.sh
+++ b/packages/libpng/build.sh
@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www.libpng.org/pub/png/libpng.html
 TERMUX_PKG_DESCRIPTION="Official PNG reference library"
 TERMUX_PKG_LICENSE="Libpng"
 TERMUX_PKG_VERSION=1.6.37
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/libpng-$TERMUX_PKG_VERSION.tar.xz
+TERMUX_PKG_DEPENDS="zlib"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/libpng-config bin/libpng16-config"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/png-fix-itxt bin/pngfix"
--- a/packages/libprotobuf/build.sh
+++ b/packages/libprotobuf/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/google/protobuf
 TERMUX_PKG_DESCRIPTION="Protocol buffers C++ library"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=3.6.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=3d4e589d81b2006ca603c1ab712c9715a76227293032d05b26fca603f90b3f5b
 TERMUX_PKG_SRCURL=https://github.com/google/protobuf/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_DEPENDS="zlib"
 TERMUX_PKG_HOSTBUILD=yes
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-protoc=$TERMUX_PKG_HOSTBUILD_DIR/src/protoc"
--- a/packages/libqrencode/build.sh
+++ b/packages/libqrencode/build.sh
@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="Libqrencode is a fast and compact library for encoding d
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 TERMUX_PKG_VERSION=4.0.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=43091fea4752101f0fe61a957310ead10a7cb4b81e170ce61e5baa73a6291ac2
 TERMUX_PKG_SRCURL=https://github.com/fukuchi/libqrencode/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_DEPENDS="libandroid-support, libpng"
+TERMUX_PKG_DEPENDS="libandroid-support, libpng, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_SHARED_LIBS=ON"
--- a/packages/librsvg/build.sh
+++ b/packages/librsvg/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/action/show/Projects/LibRsvg
 TERMUX_PKG_DESCRIPTION="Library to render SVG files using cairo"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=2.45.5
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=600872dc608fe5e01bfd8d5b3046d01b53b99121bc5ab9663531b53630843700
 TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/GNOME/sources/librsvg/${TERMUX_PKG_VERSION:0:4}/librsvg-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_DEPENDS="libcroco,pango,gdk-pixbuf,libcairo-gobject"
+TERMUX_PKG_DEPENDS="libcroco,pango,gdk-pixbuf,libcairo-gobject,zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-introspection --disable-pixbuf-loader"

 termux_step_pre_configure() {
--- a/packages/libsqlite/build.sh
+++ b/packages/libsqlite/build.sh
@ -5,9 +5,11 @@ TERMUX_PKG_LICENSE="Public Domain"
 _SQLITE_MAJOR=3
 _SQLITE_MINOR=27
 _SQLITE_PATCH=2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=50c39e85ea28b5ecfdb3f9e860afe9ba606381e21836b2849efca6a0bfe6ef6e
 TERMUX_PKG_VERSION=${_SQLITE_MAJOR}.${_SQLITE_MINOR}.${_SQLITE_PATCH}
 TERMUX_PKG_SRCURL=https://www.sqlite.org/2019/sqlite-autoconf-${_SQLITE_MAJOR}${_SQLITE_MINOR}0${_SQLITE_PATCH}00.tar.gz
+TERMUX_PKG_DEPENDS="zlib"
 # ac_cv_func_strerror_r=no as strerror_r() with the
 # GNU signature is only # available in android-23:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--- a/packages/libssh/build.sh
+++ b/packages/libssh/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.libssh.org/
 TERMUX_PKG_DESCRIPTION="Tiny C SSH library"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=0.8.7
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=43304ca22f0ba0b654e14b574a39816bc70212fdea5858a6637cc26cade3d592
 TERMUX_PKG_SRCURL=https://www.libssh.org/files/${TERMUX_PKG_VERSION:0:3}/libssh-$TERMUX_PKG_VERSION.tar.xz
-TERMUX_PKG_DEPENDS="openssl"
+TERMUX_PKG_DEPENDS="openssl, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DHAVE_ARGP_H=OFF
 -DWITH_GSSAPI=OFF
--- a/packages/libssh2/build.sh
+++ b/packages/libssh2/build.sh
@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.libssh2.org
 TERMUX_PKG_DESCRIPTION="Client-side library implementing the SSH2 protocol"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=1.8.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=088307d9f6b6c4b8c13f34602e8ff65d21c2dc4d55284dfe15d502c4ee190d67
 TERMUX_PKG_SRCURL=https://www.libssh2.org/download/libssh2-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_DEPENDS="openssl"
+TERMUX_PKG_DEPENDS="openssl, zlib"
--- a/packages/libtiff/build.sh
+++ b/packages/libtiff/build.sh
@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=http://www.simplesystems.org/libtiff/ # Note that http://lib
 TERMUX_PKG_DESCRIPTION="Support for the Tag Image File Format (TIFF) for storing image data"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_VERSION=4.0.10
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4
 TERMUX_PKG_SRCURL=http://download.osgeo.org/libtiff/tiff-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libjpeg-turbo, liblzma"
+TERMUX_PKG_DEPENDS="libjpeg-turbo, liblzma, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-webp"
--- a/packages/libxapian/build.sh
+++ b/packages/libxapian/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://xapian.org
 TERMUX_PKG_DESCRIPTION="Xapian search engine library"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.4.11
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=9f16b2f3e2351a24034d7636f73566ab74c3f0729e9e0492934e956b25c5bc07
 TERMUX_PKG_SRCURL=http://oligarchy.co.uk/xapian/${TERMUX_PKG_VERSION}/xapian-core-${TERMUX_PKG_VERSION}.tar.xz
 # Note that we cannot /proc/sys/kernel/random/uuid (permission denied on
 # new android versions) so need libuuid.
-TERMUX_PKG_DEPENDS="libuuid"
+TERMUX_PKG_DEPENDS="libuuid, zlib"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/xapian-config share/man/man1/xapian-config.1"
--- a/packages/libxml2/build.sh
+++ b/packages/libxml2/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://www.xmlsoft.org
 TERMUX_PKG_DESCRIPTION="Library for parsing XML documents"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=2.9.9
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871
 TERMUX_PKG_SRCURL=ftp://xmlsoft.org/libxml2/libxml2-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-python"
 TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/xml2-config share/man/man1/xml2-config.1 lib/cmake lib/xml2Conf.sh"
-TERMUX_PKG_DEPENDS="liblzma"
+TERMUX_PKG_DEPENDS="liblzma, zlib"
--- a/packages/libxslt/build.sh
+++ b/packages/libxslt/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://xmlsoft.org/libxslt/
 TERMUX_PKG_DESCRIPTION="XSLT processing library"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_VERSION=1.1.33
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8
 TERMUX_PKG_SRCURL=ftp://xmlsoft.org/libxslt/libxslt-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-python"
-TERMUX_PKG_DEPENDS="libxml2, libgcrypt, libgpg-error"
+TERMUX_PKG_DEPENDS="libxml2, libgcrypt, libgpg-error, zlib"
 TERMUX_PKG_DEVPACKAGE_DEPENDS="libxml2-dev"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/xslt-config lib/xsltConf.sh"
--- a/packages/lighttpd/build.sh
+++ b/packages/lighttpd/build.sh
@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://www.lighttpd.net
 TERMUX_PKG_DESCRIPTION="Fast webserver with minimal memory footprint"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=1.4.53
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=3bdfce1cf3e9650a556a8c26fb15342c5717c63f530c54693db632b0371dcb78
 TERMUX_PKG_SRCURL=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-bzip2 --with-openssl --with-pcre --with-zlib"
-TERMUX_PKG_DEPENDS="libbz2, openssl, pcre, libcrypt, libandroid-glob"
+TERMUX_PKG_DEPENDS="libbz2, openssl, pcre, libcrypt, libandroid-glob, zlib"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/lighttpd-angel"

 termux_step_pre_configure() {
--- a/packages/lynx/build.sh
+++ b/packages/lynx/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://lynx.browser.org/
 TERMUX_PKG_DESCRIPTION="The text web browser"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.8.9rel.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=387f193d7792f9cfada14c60b0e5c0bff18f227d9257a39483e14fa1aaf79595
 TERMUX_PKG_SRCURL=http://invisible-mirror.net/archives/lynx/tarballs/lynx${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_DEPENDS="ncurses, openssl, libbz2, libidn"
+TERMUX_PKG_DEPENDS="ncurses, openssl, libbz2, libidn, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-screen=ncursesw --enable-widec --enable-scrollbar --enable-nested-tables --enable-htmlized-cfg --with-ssl --with-zlib --with-bzlib --enable-cjk --enable-japanese-utf8 --enable-progressbar --enable-prettysrc --enable-forms-options --enable-8bit-toupper --enable-ascii-ctypes --disable-font-switch --with-mime-libdir=$TERMUX_PREFIX/etc"

 ## set default paths for tools that may be used in runtime by 'lynx' binary
--- a/packages/man/build.sh
+++ b/packages/man/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://mdocml.bsd.lv/
 TERMUX_PKG_DESCRIPTION="Man page viewer from the mandoc toolset"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=1.14.5
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7
 TERMUX_PKG_SRCURL=http://mdocml.bsd.lv/snapshots/mandoc-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="less,libandroid-glob"
+TERMUX_PKG_DEPENDS="less,libandroid-glob,zlib"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_RM_AFTER_INSTALL="share/examples"

--- a/packages/mariadb/build.sh
+++ b/packages/mariadb/build.sh
@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://mariadb.org
 TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=10.3.14
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=ba1c94d92fc8ebdf9b8a1d1b93ed6aeeead33da507efbbd4afcf49f32023e054
 TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@ -47,7 +48,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DINSTALL_SYSCONFDIR=$TERMUX_PREFIX/etc
 "
 TERMUX_PKG_HOSTBUILD=true
-TERMUX_PKG_DEPENDS="liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandroid-support, libandroid-glob"
+TERMUX_PKG_DEPENDS="liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandroid-support, libandroid-glob, zlib"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_CONFLICTS="mysql"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/mysqltest*"
--- a/packages/mc/build.sh
+++ b/packages/mc/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.midnight-commander.org/
 TERMUX_PKG_DESCRIPTION="Midnight Commander - a powerful file manager"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=4.8.22
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=ee7868d7ba0498cf2cccefe107d7efee7f2571098806bba2aed5a159db801318
 TERMUX_PKG_SRCURL=http://ftp.midnight-commander.org/mc-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_DEPENDS="libandroid-support, ncurses, glib, openssl, libssh2"
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, glib, openssl, libssh2, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_lib_util_openpty=no
 ac_cv_path_PERL=$TERMUX_PREFIX/bin/perl
--- a/packages/mpd/build.sh
+++ b/packages/mpd/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.musicpd.org
 TERMUX_PKG_DESCRIPTION="Music player daemon"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.21.7
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=b33b03e813851387e28970536cd8513fad36ad47bde0928be25ca84a30bc8758
 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_DEPENDS="libcurl, libid3tag, libopus, libpulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg"
+TERMUX_PKG_DEPENDS="libcurl, libid3tag, libopus, libpulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib"
 TERMUX_PKG_BUILD_DEPENDS="boost"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dalsa=disabled
--- a/packages/mutt/build.sh
+++ b/packages/mutt/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://www.mutt.org/
 TERMUX_PKG_DESCRIPTION="Mail client with patches from neomutt"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.11.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=b651357ea6c8762178080493991c77ecb111d916d171d422500257ab48be2801
 TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl, mime-support"
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl, mime-support, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 mutt_cv_c99_snprintf=yes
 mutt_cv_c99_vsnprintf=yes
--- a/packages/ncdc/build.sh
+++ b/packages/ncdc/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://dev.yorhel.nl/ncdc
 TERMUX_PKG_DESCRIPTION="Modern and lightweight direct connect client with a friendly ncurses interface"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=1.21
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=22904f93a553e45b84a3e72dc6209e11194087c3244fd08c6489bacdee991982
 TERMUX_PKG_SRCURL=https://dev.yorhel.nl/download/ncdc-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libandroid-support, libgnutls, libsqlite, bzip2, glib, ncurses"
+TERMUX_PKG_DEPENDS="libandroid-support, libgnutls, libsqlite, bzip2, glib, ncurses, zlib"
 TERMUX_PKG_BUILD_DEPENDS="libbz2-dev, libnettle-dev, libidn-dev"
 TERMUX_PKG_BUILD_IN_SRC="yes"

--- a/packages/ncmpcpp/build.sh
+++ b/packages/ncmpcpp/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://rybczak.net/ncmpcpp/
 TERMUX_PKG_DESCRIPTION="NCurses Music Player Client (Plus Plus)"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.8.2
-TERMUX_PKG_REVISION=6
+TERMUX_PKG_REVISION=7
 TERMUX_PKG_SHA256=650ba3e8089624b7ad9e4cc19bc1ac6028edb7523cc111fa1686ea44c0921554
 TERMUX_PKG_SRCURL=https://rybczak.net/ncmpcpp/stable/ncmpcpp-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_DEPENDS="fftw, boost, readline, libcurl, libmpdclient, ncurses"
+TERMUX_PKG_DEPENDS="fftw, boost, readline, libcurl, libmpdclient, ncurses, zlib"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_KEEP_SHARE_DOC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-visualizer --enable-outputs --enable-clock"
--- a/packages/ndk-sysroot/build.sh
+++ b/packages/ndk-sysroot/build.sh
@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
 TERMUX_PKG_DESCRIPTION="System header and library files from the Android NDK needed for compiling C programs"
 TERMUX_PKG_LICENSE="NCSA"
 TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
 # This package has taken over <pty.h> from the previous libutil-dev
@ -11,7 +11,7 @@ TERMUX_PKG_CONFLICTS="libutil-dev, libgcc, libandroid-support-dev"
 TERMUX_PKG_REPLACES="libutil-dev, libgcc, libandroid-support-dev, ndk-stl"

 termux_step_extract_into_massagedir() {
-	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/pkgconfig \
+	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib \
 		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include

 	cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include/* \
@ -22,9 +22,6 @@ termux_step_extract_into_massagedir() {
 	cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/*.o \
 		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib

-	cp "$PKG_CONFIG_LIBDIR/zlib.pc" \
-		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/pkgconfig/zlib.pc
-
 	local LIBATOMIC_PATH=$TERMUX_STANDALONE_TOOLCHAIN/$TERMUX_HOST_PLATFORM/lib
 	if [ $TERMUX_ARCH_BITS = 64 ]; then LIBATOMIC_PATH+="64"; fi
 	if [ $TERMUX_ARCH = "arm" ]; then LIBATOMIC_PATH+="/armv7-a"; fi
--- a/packages/netpbm/build.sh
+++ b/packages/netpbm/build.sh
@ -6,9 +6,10 @@ TERMUX_PKG_LICENSE="LGPL-2.0"
 # Only Super Stable is distributed as a tar ball, but is outdated and does not compile with modern libpng.
 # So use revisions from http://svn.code.sf.net/p/netpbm/code/advanced for packages.
 TERMUX_PKG_VERSION=3094
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=2f4d8c245f174e391a4cf2418075c06532aee8a5fcc8dbbb8f2e7012cd9d52a4
 TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/netpbm-advanced-r${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libpng, libxml2, libjpeg-turbo, libtiff"
+TERMUX_PKG_DEPENDS="libpng, libxml2, libjpeg-turbo, libtiff, zlib"
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_configure() {
--- a/packages/nginx/build.sh
+++ b/packages/nginx/build.sh
@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://www.nginx.org
 TERMUX_PKG_DESCRIPTION="Lightweight HTTP server"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_VERSION=1.15.12
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=3d5b90aa17de1700709ae4ec6c4d73d87c888b06c510391bf7104b006fdb2abe
 TERMUX_PKG_SRCURL=http://nginx.org/download/nginx-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_DEPENDS="libandroid-glob, libcrypt, pcre, openssl"
+TERMUX_PKG_DEPENDS="libandroid-glob, libcrypt, pcre, openssl, zlib"
 TERMUX_PKG_CONFFILES="etc/nginx/fastcgi.conf etc/nginx/fastcgi_params etc/nginx/koi-win etc/nginx/koi-utf
 etc/nginx/mime.types etc/nginx/nginx.conf etc/nginx/scgi_params etc/nginx/uwsgi_params etc/nginx/win-utf"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
--- a/packages/nmap/build.sh
+++ b/packages/nmap/build.sh
@ -2,12 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://nmap.org/
 TERMUX_PKG_DESCRIPTION="Utility for network discovery and security auditing"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=7.70
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SHA256=847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18
 TERMUX_PKG_SRCURL=https://nmap.org/dist/nmap-${TERMUX_PKG_VERSION}.tar.bz2
 # Depend on netcat so that it gets installed automatically when installing
 # nmap, since the ncat program is usually distributed as part of nmap.
-TERMUX_PKG_DEPENDS="libpcap, pcre, openssl, resolv-conf, netcat, liblua, libssh2"
+TERMUX_PKG_DEPENDS="libpcap, pcre, openssl, resolv-conf, netcat, liblua, libssh2, zlib"
 # --without-nmap-update to avoid linking against libsvn_client:
 # --without-zenmap to avoid python scripts for graphical gtk frontend:
 # --without-ndiff to avoid python2-using ndiff utility:
--- a/packages/notmuch/build.sh
+++ b/packages/notmuch/build.sh
@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://notmuchmail.org
 TERMUX_PKG_DESCRIPTION="Thread-based email index, search and tagging system"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=0.28.3
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=4e212d8b4ae30da04edb05d836dcdb569488ff6760706cecb882488eb1710eec
 TERMUX_PKG_SRCURL=https://notmuchmail.org/releases/notmuch-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_DEPENDS="glib, libgmime, libtalloc, libxapian"
+TERMUX_PKG_DEPENDS="glib, libgmime, libtalloc, libxapian, zlib"

 termux_step_configure() {
 	# Use python3 so that the python3-sphinx package is
--- a/packages/nzbget/build.sh
+++ b/packages/nzbget/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://nzbget.net/
 TERMUX_PKG_DESCRIPTION="The most efficient usenet downloader"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=20.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/nzbget/nzbget/releases/download/v${TERMUX_PKG_VERSION}/nzbget-${TERMUX_PKG_VERSION}-src.tar.gz
 TERMUX_PKG_SHA256=04dc36d432549c33d55145ecd95cc4309b3ab4a7731a1a03d954de389eacd06f
-TERMUX_PKG_DEPENDS="libxml2, ncurses, openssl, unrar, p7zip"
+TERMUX_PKG_DEPENDS="libxml2, ncurses, openssl, unrar, p7zip, zlib"
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_create_debscripts() {
--- a/packages/oathtool/build.sh
+++ b/packages/oathtool/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://www.nongnu.org/oath-toolkit/
 TERMUX_PKG_DESCRIPTION="One-time password components"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=2.6.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=http://download.savannah.nongnu.org/releases/oath-toolkit/oath-toolkit-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=b03446fa4b549af5ebe4d35d7aba51163442d255660558cd861ebce536824aa0
-TERMUX_PKG_DEPENDS="xmlsec"
+TERMUX_PKG_DEPENDS="xmlsec, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pam"

 termux_step_pre_configure() {
--- a/packages/openssh/build.sh
+++ b/packages/openssh/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.openssh.com/
 TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_VERSION=8.0p1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68
 TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, libutil, termux-auth, krb5"
+TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, libutil, termux-auth, krb5, zlib"
 TERMUX_PKG_CONFLICTS="dropbear"
 # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--- a/packages/optipng/build.sh
+++ b/packages/optipng/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://optipng.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="PNG optimizer that recompresses image files to a smaller size, without losing any information"
 TERMUX_PKG_LICENSE="ZLIB"
 TERMUX_PKG_VERSION=0.7.7
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/optipng/OptiPNG/optipng-${TERMUX_PKG_VERSION}/optipng-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libpng"
+TERMUX_PKG_DEPENDS="libpng, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-system-zlib --with-system-libpng --mandir=$TERMUX_PREFIX/share/man"
 TERMUX_PKG_BUILD_IN_SRC=yes

--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@ -9,7 +9,7 @@ TERMUX_PKG_REVISION=2
 TERMUX_PKG_HOSTBUILD=true
 # Build the native php without xml support as we only need phar:
 TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="--disable-libxml --disable-dom --disable-simplexml --disable-xml --disable-xmlreader --disable-xmlwriter --without-pear"
-TERMUX_PKG_DEPENDS="libandroid-glob, libxml2, liblzma, openssl, pcre2, libbz2, libcrypt, libcurl, libgd, readline, freetype, libandroid-support"
+TERMUX_PKG_DEPENDS="libandroid-glob, libxml2, liblzma, openssl, pcre2, libbz2, libcrypt, libcurl, libgd, readline, freetype, libandroid-support, zlib"
 # mysql modules were initially shared libs
 TERMUX_PKG_CONFLICTS="php-mysql"
 TERMUX_PKG_REPLACES="php-mysql"
--- a/packages/pngquant/build.sh
+++ b/packages/pngquant/build.sh
@ -2,13 +2,14 @@ TERMUX_PKG_HOMEPAGE=https://pngquant.org
 TERMUX_PKG_DESCRIPTION="PNG image optimising utility"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=2.12.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=(5edf7c5bffd07e5d28fcc6d4d94a187c30b532c52ac986b3e45aff3dce0567dc
 		   34036379d3b68de79b5f180b3fe3989b9d2e81c1909ee3f85acaedb74f46003b)
 # If both archives are .tar.gz then they overwrite eachother since they are the same version and hence the same name.
 # Work around this by using .zip for one of them...
 TERMUX_PKG_SRCURL=(https://github.com/pornel/pngquant/archive/$TERMUX_PKG_VERSION.tar.gz
 		   https://github.com/ImageOptim/libimagequant/archive/$TERMUX_PKG_VERSION.zip)
-TERMUX_PKG_DEPENDS="libpng, littlecms"
+TERMUX_PKG_DEPENDS="libpng, littlecms, zlib"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-sse"
--- a/packages/postgresql/build.sh
+++ b/packages/postgresql/build.sh
@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Object-relational SQL database"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_MAINTAINER='Vishal Biswas @vishalbiswas'
 TERMUX_PKG_VERSION=11.2
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SHA256=2676b9ce09c21978032070b6794696e0aa5a476e3d21d60afc036dc0a9c09405
 TERMUX_PKG_SRCURL=https://ftp.postgresql.org/pub/source/v$TERMUX_PKG_VERSION/postgresql-$TERMUX_PKG_VERSION.tar.bz2
-TERMUX_PKG_DEPENDS="openssl, libcrypt, readline, libandroid-shmem, libuuid, libxml2, libicu"
+TERMUX_PKG_DEPENDS="openssl, libcrypt, readline, libandroid-shmem, libuuid, libxml2, libicu, zlib"
 # - pgac_cv_prog_cc_ldflags__Wl___as_needed: Inform that the linker supports as-needed. It's
 #   not stricly necessary but avoids unnecessary linking of binaries.
 # - USE_UNNAMED_POSIX_SEMAPHORES: Avoid using System V semaphores which are disabled on Android.
--- a/packages/potrace/build.sh
+++ b/packages/potrace/build.sh
@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://potrace.sourceforge.net
 TERMUX_PKG_DESCRIPTION="Tool for transforming a bitmap into a smooth, scalable image"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.15
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=a9b33904ace328340c850a01458199e0064e03ccaaa731bc869a842b1b8d529d
 # TERMUX_PKG_SRCURL=http://potrace.sourceforge.net/download/$TERMUX_PKG_VERSION/potrace-$TERMUX_PKG_VERSION.tar.gz
 # 2018-02-15: Switching to alternative url as above url is down:
 TERMUX_PKG_SRCURL=https://distfiles.macports.org/potrace/potrace-$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_DEPENDS="zlib"
--- a/packages/privoxy/build.sh
+++ b/packages/privoxy/build.sh
@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.privoxy.org
 TERMUX_PKG_DESCRIPTION="Non-caching web proxy with advanced filtering capabilities"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=3.0.28
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=b5d78cc036aaadb3b7cf860e9d598d7332af468926a26e2d56167f1cb6f2824a
 TERMUX_PKG_SRCURL=https://www.privoxy.org/sf-download-mirror/Sources/$TERMUX_PKG_VERSION%20%28stable%29/privoxy-$TERMUX_PKG_VERSION-stable-src.tar.gz
 TERMUX_PKG_CONFFILES='etc/privoxy/config etc/privoxy/match-all.action etc/privoxy/trust etc/privoxy/user.action etc/privoxy/user.filter etc/privoxy/default.action etc/privoxy/default.filter'
@ -9,7 +10,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_lib_pcreposix_regcomp=no
 --sysconfdir=$TERMUX_PREFIX/etc/privoxy
 "
-TERMUX_PKG_DEPENDS="pcre"
+TERMUX_PKG_DEPENDS="pcre, zlib"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_KEEP_SHARE_DOC=yes

--- a/packages/profanity/build.sh
+++ b/packages/profanity/build.sh
@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://profanity.im
 TERMUX_PKG_DESCRIPTION="Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=0.6.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
 TERMUX_PKG_SRCURL=http://profanity.im/profanity-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=f1b2773b79eb294297686f3913e9489c20effae5e3a335c8956db18f6ee2f660
-TERMUX_PKG_DEPENDS="libandroid-support, ncurses, glib, libmesode, libcurl, readline, libuuid, libotr, gpgme, python, libassuan, libgpg-error"
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, glib, libmesode, libcurl, readline, libuuid, libotr, gpgme, python, libassuan, libgpg-error, zlib"
 # openssl, libexpat needed by libmesode, pcre needed by glib:
 TERMUX_PKG_BUILD_DEPENDS="openssl, libexpat, pcre, libgcrypt-dev, libcrypt-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-python-plugins"
--- a/packages/python/build.sh
+++ b/packages/python/build.sh
@ -1,11 +1,12 @@
 TERMUX_PKG_HOMEPAGE=https://python.org/
 TERMUX_PKG_DESCRIPTION="Python 3 programming language intended to enable clear programs"
 TERMUX_PKG_LICENSE="PythonPL"
-TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt, liblzma"
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt, liblzma, zlib"
 # Python.h includes crypt.h:
 TERMUX_PKG_DEVPACKAGE_DEPENDS="libcrypt-dev"
 _MAJOR_VERSION=3.7
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318
 TERMUX_PKG_SRCURL=https://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz

--- a/packages/python2/build.sh
+++ b/packages/python2/build.sh
@ -5,13 +5,14 @@ TERMUX_PKG_LICENSE="PythonPL"
 # openssl for ensurepip.
 # libbz2 for the bz2 module.
 # ncurses-ui-libs for the curses.panel module.
-TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt"
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt, zlib"
 # Python.h includes crypt.h:
 TERMUX_PKG_DEVPACKAGE_DEPENDS="libcrypt-dev"
 TERMUX_PKG_HOSTBUILD=true

 _MAJOR_VERSION=2.7
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.16
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7
 TERMUX_PKG_SRCURL=https://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz

--- a/packages/qalc/build.sh
+++ b/packages/qalc/build.sh
@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://qalculate.github.io/
 TERMUX_PKG_DESCRIPTION="Powerful and easy to use command line calculator"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.8.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=a901be570bbfad80f1fccb1839ef2d03f6f2b7a02b051df35d5b687a08396105
 TERMUX_PKG_SRCURL=https://github.com/Qalculate/libqalculate/releases/download/v$TERMUX_PKG_VERSION/libqalculate-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_DEPENDS="libcurl, libmpfr, libxml2, readline, libgmp"
+TERMUX_PKG_DEPENDS="libcurl, libmpfr, libxml2, readline, libgmp, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-icu"
--- a/packages/qpdf/build.sh
+++ b/packages/qpdf/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://qpdf.sourceforge.net
 TERMUX_PKG_DESCRIPTION="Content-Preserving PDF Transformation System"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=8.4.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=71d9b6c77ac56521d86a481cb9e52c0774de106c1dcf7a0644a05bd1230be87e
 TERMUX_PKG_SRCURL=https://github.com/qpdf/qpdf/archive/release-qpdf-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_DEPENDS="libjpeg-turbo"
+TERMUX_PKG_DEPENDS="libjpeg-turbo, zlib"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-random=/dev/urandom"
 TERMUX_PKG_BUILD_IN_SRC=true
--- a/packages/rgbds/build.sh
+++ b/packages/rgbds/build.sh
@ -2,8 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://rednex.github.io/rgbds/
 TERMUX_PKG_DESCRIPTION="Rednex Game Boy Development System"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=0.3.8
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=ec47b7d7a1b03534ab14b261d13511a18c8b1c3ebddea414e7034496f3423c05
 TERMUX_PKG_SRCURL=https://github.com/rednex/rgbds/releases/download/v${TERMUX_PKG_VERSION}/rgbds-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libpng"
+TERMUX_PKG_DEPENDS="libpng, zlib"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=${TERMUX_PREFIX} Q= STRIP="
--- a/packages/rsync/build.sh
+++ b/packages/rsync/build.sh
@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://rsync.samba.org/
 TERMUX_PKG_DESCRIPTION="Utility that provides fast incremental file transfer"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=3.1.3
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0
 TERMUX_PKG_SRCURL=https://rsync.samba.org/ftp/rsync/src/rsync-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-rsyncd-conf=$TERMUX_PREFIX/etc/rsyncd.conf --with-included-zlib=no --disable-debug"
-TERMUX_PKG_DEPENDS="libpopt, openssh | dropbear"
+TERMUX_PKG_DEPENDS="libpopt, openssh | dropbear, zlib"

 termux_step_pre_configure() {
 	CFLAGS="$CFLAGS -llog" # for syslog
--- a/packages/rtmpdump/build.sh
+++ b/packages/rtmpdump/build.sh
@ -4,9 +4,9 @@ TERMUX_PKG_LICENSE="LGPL-2.1"
 # NOTE: Special handling of unofficial support for openssl 1.1 from
 # https://gitlab.com/JudgeZarbi/RTMPDump-OpenSSL-1.1
 TERMUX_PKG_VERSION=2.4
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://gitlab.com/JudgeZarbi/RTMPDump-OpenSSL-1.1/-/archive/019592918b0f961104eaf71b56c1db0fa26ed497/RTMPDump-OpenSSL-1.1-019592918b0f961104eaf71b56c1db0fa26ed497.tar.bz2
 TERMUX_PKG_SHA256=42978d5b1cfe9fe4e01305f81c183935056a6c1ad46b9cd2e582f9147196fa87
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_DEPENDS="openssl"
+TERMUX_PKG_DEPENDS="openssl, zlib"
 TERMUX_PKG_MAINTAINER="Pierre Rudloff @Rudloff"
--- a/packages/ruby/build.sh
+++ b/packages/ruby/build.sh
@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="Dynamic programming language with a focus on simplicity
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 _MAJOR_VERSION=2.6
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1
 TERMUX_PKG_SRCURL=https://cache.ruby-lang.org/pub/ruby/${_MAJOR_VERSION}/ruby-${TERMUX_PKG_VERSION}.tar.xz
 # libbffi is used by the fiddle extension module:
-TERMUX_PKG_DEPENDS="libandroid-support, libffi, libgmp, readline, openssl, libutil, libyaml"
+TERMUX_PKG_DEPENDS="libandroid-support, libffi, libgmp, readline, openssl, libutil, libyaml, zlib"
 # Needed to fix compilation on android:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_setgroups=no ac_cv_func_setresuid=no ac_cv_func_setreuid=no --enable-rubygems"
 # The gdbm module seems to be very little used:
--- a/packages/rust/build.sh
+++ b/packages/rust/build.sh
@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Systems programming language focused on safety, speed an
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Kevin Cotugno @kcotugno"
 TERMUX_PKG_VERSION=1.33.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=f4b1a72f1a29b23dcc9d7be5f60878f0434560513273906aa93dcd5c0de39b71
 TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz
-TERMUX_PKG_DEPENDS="clang, openssl, lld"
+TERMUX_PKG_DEPENDS="clang, openssl, lld, zlib"

 termux_step_configure() {
 	termux_setup_cmake
--- a/packages/serf/build.sh
+++ b/packages/serf/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://serf.apache.org/
 TERMUX_PKG_DESCRIPTION="High performance C-based HTTP client library"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=1.3.9
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://archive.apache.org/dist/serf/serf-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc
-TERMUX_PKG_DEPENDS="apr, apr-util, openssl, libuuid, libexpat"
+TERMUX_PKG_DEPENDS="apr, apr-util, openssl, libuuid, libexpat, zlib"
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_make_install() {
--- a/packages/silversearcher-ag/build.sh
+++ b/packages/silversearcher-ag/build.sh
@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://geoff.greer.fm/ag/
 TERMUX_PKG_DESCRIPTION="Fast grep-like program, alternative to ack-grep"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=2.2.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=d9621a878542f3733b5c6e71c849b9d1a830ed77cb1a1f6c2ea441d4b0643170
 TERMUX_PKG_SRCURL=http://geoff.greer.fm/ag/releases/the_silver_searcher-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="pcre, liblzma"
+TERMUX_PKG_DEPENDS="pcre, liblzma, zlib"
--- a/packages/sox/build.sh
+++ b/packages/sox/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://sox.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Command line utility for converting between and applying effects to various audio files formats"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_VERSION=14.4.2
-TERMUX_PKG_REVISION=11
+TERMUX_PKG_REVISION=12
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/sox/sox/${TERMUX_PKG_VERSION}/sox-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=81a6956d4330e75b5827316e44ae381e6f1e8928003c6aa45896da9041ea149c
-TERMUX_PKG_DEPENDS="file, libpng, libmp3lame, libvorbis, libandroid-glob, libflac, libid3tag, libmad, libpulseaudio, opusfile, libsndfile"
+TERMUX_PKG_DEPENDS="file, libpng, libmp3lame, libvorbis, libandroid-glob, libflac, libid3tag, libmad, libpulseaudio, opusfile, libsndfile, zlib"

 termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob"
--- a/packages/subversion/build.sh
+++ b/packages/subversion/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://subversion.apache.org
 TERMUX_PKG_DESCRIPTION="Centralized version control system characterized by its simplicity"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=1.11.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=9efd2750ca4d72ec903431a24b9c732b6cbb84aad9b7563f59dd96dea5be60bb
 TERMUX_PKG_SRCURL=https://www.apache.org/dist/subversion/subversion-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_DEPENDS="apr, apr-util, serf, libexpat, libsqlite, liblz4, utf8proc"
+TERMUX_PKG_DEPENDS="apr, apr-util, serf, libexpat, libsqlite, liblz4, utf8proc, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-sasl --without-libmagic"

 termux_step_pre_configure() {
--- a/packages/swi-prolog/build.sh
+++ b/packages/swi-prolog/build.sh
@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://swi-prolog.org/
 TERMUX_PKG_DESCRIPTION="Most popular and complete prolog implementation"
 TERMUX_PKG_LICENSE="ISC"
 TERMUX_PKG_VERSION=8.1.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=82a93274080bcfc00fa674a293cefa18b8ac0f659c78b446476e83b7c95e5567
 TERMUX_PKG_SRCURL=http://www.swi-prolog.org/download/devel/src/swipl-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libarchive, libcrypt, libgmp, libjpeg-turbo, libyaml, ncurses, ncurses-ui-libs, pcre, readline, ossp-uuid"
+TERMUX_PKG_DEPENDS="libarchive, libcrypt, libgmp, libjpeg-turbo, libyaml, ncurses, ncurses-ui-libs, pcre, readline, ossp-uuid, zlib"
 TERMUX_PKG_FORCE_CMAKE=true
 TERMUX_PKG_HOSTBUILD=true

--- a/packages/tcl/build.sh
+++ b/packages/tcl/build.sh
@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://www.tcl.tk/
 TERMUX_PKG_DESCRIPTION="Powerful but easy to learn dynamic programming language"
 TERMUX_PKG_LICENSE="BSD"
-TERMUX_PKG_DEPENDS="libsqlite"
+TERMUX_PKG_DEPENDS="libsqlite, zlib"
 TERMUX_PKG_VERSION=8.6.9
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=ad0cd2de2c87b9ba8086b43957a0de3eb2eb565c7159d5f53ccbba3feb915f4e
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/tcl/Tcl/${TERMUX_PKG_VERSION}/tcl${TERMUX_PKG_VERSION}-src.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="