From c2c9dab71d620bcdcc0102ff70c89fb3c9797925 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sat, 21 Dec 2019 19:24:10 +0200
Subject: [PATCH] lftp: update to 4.9.0

---
 packages/lftp/build.sh               |  6 +++---
 packages/lftp/lib-vasnprintf.c.patch | 12 ------------
 packages/lftp/src-commands.cc.patch  | 12 ------------
 3 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 packages/lftp/lib-vasnprintf.c.patch
 delete mode 100644 packages/lftp/src-commands.cc.patch

diff --git a/packages/lftp/build.sh b/packages/lftp/build.sh
index 6a541c45d..e42d399f4 100644
--- a/packages/lftp/build.sh
+++ b/packages/lftp/build.sh
@@ -1,15 +1,15 @@
 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=9
+TERMUX_PKG_VERSION=4.9.0
 TERMUX_PKG_SRCURL=https://lftp.tech/ftp/lftp-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62
+TERMUX_PKG_SHA256=0b3b659e1969a31827a25861c01ccf71ac6d3f20ee256bdf6999d653e031a24e
 TERMUX_PKG_DEPENDS="libandroid-support, libc++, libexpat, libiconv, openssl, readline, libidn2, zlib"
 
 # (1) Android has dn_expand, but lftp assumes that dn_skipname then exists, which it does not on android.
 # (2) Use --with-openssl to use openssl instead of gnutls.
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+ac_cv_header_glob_h=no
 ac_cv_func_dn_expand=no
 --with-openssl
 --with-expat=$TERMUX_PREFIX
diff --git a/packages/lftp/lib-vasnprintf.c.patch b/packages/lftp/lib-vasnprintf.c.patch
deleted file mode 100644
index 1504e9ba2..000000000
--- a/packages/lftp/lib-vasnprintf.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr lftp-4.8.4/lib/vasnprintf.c lftp-4.8.4.mod/lib/vasnprintf.c
---- lftp-4.8.4/lib/vasnprintf.c	2018-07-31 14:04:57.000000000 +0300
-+++ lftp-4.8.4.mod/lib/vasnprintf.c	2019-10-27 20:05:33.109405874 +0200
-@@ -4872,7 +4872,7 @@
- # if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))        \
-          && !defined __UCLIBC__)                                            \
-         || (defined __APPLE__ && defined __MACH__)                          \
--        || (defined _WIN32 && ! defined __CYGWIN__))
-+        || (defined _WIN32 && ! defined __CYGWIN__) || defined(__ANDROID__))
-                 fbp[1] = '%';
-                 fbp[2] = 'n';
-                 fbp[3] = '\0';
diff --git a/packages/lftp/src-commands.cc.patch b/packages/lftp/src-commands.cc.patch
deleted file mode 100644
index cb236a4ed..000000000
--- a/packages/lftp/src-commands.cc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr lftp-4.8.3/src/commands.cc lftp-4.8.3.mod/src/commands.cc
---- lftp-4.8.3/src/commands.cc	2017-08-10 13:17:10.000000000 +0300
-+++ lftp-4.8.3.mod/src/commands.cc	2017-12-19 16:59:50.095958249 +0200
-@@ -3006,7 +3006,7 @@
- 
-       xstring cmd0("exec ${EDITOR:-vi} ");
-       cmd0.append(shell_encode(lftp_bookmarks.GetFilePath()));
--      xstring cmd1("/bin/sh -c ");
-+      xstring cmd1("@TERMUX_PREFIX@/bin/sh -c ");
-       cmd1.append(shell_encode(cmd0));
- 
-       parent->PrependCmd(xstring::get_tmp("shell ").append_quoted(cmd1));