Browse Source

lftp: Update from 4.8.1 to 4.8.2

android-5
Fredrik Fornwall 7 years ago
parent
commit
870c9ae37d
  1. 4
      packages/lftp/build.sh
  2. 23
      packages/lftp/src-PollVec.cc.patch

4
packages/lftp/build.sh

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://lftp.tech/ TERMUX_PKG_HOMEPAGE=https://lftp.tech/
TERMUX_PKG_DESCRIPTION="FTP/HTTP client and file transfer program" TERMUX_PKG_DESCRIPTION="FTP/HTTP client and file transfer program"
TERMUX_PKG_VERSION=4.8.1 TERMUX_PKG_VERSION=4.8.2
TERMUX_PKG_SHA256=e770daa5592ad21bd0b8a8915a0f4fdc2e15dec6c69e754a870ad9c18be57b27 TERMUX_PKG_SHA256=5c875b8476e05e856ebc8eec458e43317b2bebd6ed5f7725a733d4591548cd9c
TERMUX_PKG_SRCURL=https://lftp.tech/ftp/lftp-${TERMUX_PKG_VERSION}.tar.xz 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. # (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. # (2) Use --with-openssl to use openssl instead of gnutls.

23
packages/lftp/src-PollVec.cc.patch

@ -1,23 +0,0 @@
From ee60a0f71fde2de9d124ef287034d4d170544b17 Mon Sep 17 00:00:00 2001
From: Ganael Laplanche <ganael.laplanche@martymac.org>
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<time_t>(t/1000000),static_cast<suseconds_t>(t%1000000)};
if(tv_timeout.tv_sec<0 || new_timeout<tv_timeout)
SetTimeout(new_timeout);
}
Loading…
Cancel
Save