From 870c9ae37d82166230bc5c59330efaf85aaba83e Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 27 Sep 2017 12:05:20 +0200 Subject: [PATCH] lftp: Update from 4.8.1 to 4.8.2 --- packages/lftp/build.sh | 4 ++-- packages/lftp/src-PollVec.cc.patch | 23 ----------------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 packages/lftp/src-PollVec.cc.patch diff --git a/packages/lftp/build.sh b/packages/lftp/build.sh index 445514f3..97a9ab9b 100644 --- a/packages/lftp/build.sh +++ b/packages/lftp/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://lftp.tech/ TERMUX_PKG_DESCRIPTION="FTP/HTTP client and file transfer program" -TERMUX_PKG_VERSION=4.8.1 -TERMUX_PKG_SHA256=e770daa5592ad21bd0b8a8915a0f4fdc2e15dec6c69e754a870ad9c18be57b27 +TERMUX_PKG_VERSION=4.8.2 +TERMUX_PKG_SHA256=5c875b8476e05e856ebc8eec458e43317b2bebd6ed5f7725a733d4591548cd9c 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. # (2) Use --with-openssl to use openssl instead of gnutls. diff --git a/packages/lftp/src-PollVec.cc.patch b/packages/lftp/src-PollVec.cc.patch deleted file mode 100644 index 604327a1..00000000 --- a/packages/lftp/src-PollVec.cc.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ee60a0f71fde2de9d124ef287034d4d170544b17 Mon Sep 17 00:00:00 2001 -From: Ganael Laplanche -Date: Sun, 17 Sep 2017 13:45:00 +0200 -Subject: [PATCH] Fix build on FreeBSD-i386 [1] (#391) - -[1] https://lists.freebsd.org/pipermail/freebsd-pkg-fallout/Week-of-Mon-20170911/539371.html ---- - src/PollVec.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/PollVec.cc b/src/PollVec.cc -index 64814792..17c49127 100644 ---- a/src/PollVec.cc -+++ b/src/PollVec.cc -@@ -30,7 +30,7 @@ static inline bool operator<(const timeval& a,const timeval& b) - - void PollVec::AddTimeoutU(unsigned t) - { -- struct timeval new_timeout={t/1000000,t%1000000}; -+ struct timeval new_timeout={static_cast(t/1000000),static_cast(t%1000000)}; - if(tv_timeout.tv_sec<0 || new_timeout