From a3e404de6b5ca6582170a3d35641b01eaa5e1160 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sat, 7 Jan 2017 01:19:59 -0500 Subject: [PATCH] lftp: Update from 4.7.4 to 4.7.5 --- packages/lftp/build.sh | 4 ++-- packages/lftp/src-Resolver.cc.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 packages/lftp/src-Resolver.cc.patch diff --git a/packages/lftp/build.sh b/packages/lftp/build.sh index c0204572..901adb28 100644 --- a/packages/lftp/build.sh +++ b/packages/lftp/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://lftp.tech/ TERMUX_PKG_DESCRIPTION="FTP/HTTP client and file transfer program" -TERMUX_PKG_VERSION=4.7.4 +TERMUX_PKG_VERSION=4.7.5 TERMUX_PKG_SRCURL=https://lftp.tech/ftp/lftp-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=bf67c4d128b6f769a4082947376a9679c5ee3463a24ab761a0757f75d70bd92c +TERMUX_PKG_SHA256=53b5c5eba2e38b418bcf451776f2df596050dff4db90ab4ea73d872f8b1fd0d8 # (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_func_dn_expand=no --with-openssl --with-expat=$TERMUX_PREFIX" diff --git a/packages/lftp/src-Resolver.cc.patch b/packages/lftp/src-Resolver.cc.patch new file mode 100644 index 00000000..d7765d3f --- /dev/null +++ b/packages/lftp/src-Resolver.cc.patch @@ -0,0 +1,14 @@ +Submitted upstream at https://github.com/lavv17/lftp/pull/307 + +diff -u -r ../lftp-4.7.5/src/Resolver.cc ./src/Resolver.cc +--- ../lftp-4.7.5/src/Resolver.cc 2016-11-25 11:43:16.000000000 -0500 ++++ ./src/Resolver.cc 2017-01-06 05:52:18.318574544 -0500 +@@ -318,7 +318,7 @@ + case AF_INET6: + if(sizeof(add.in6.sin6_addr) != len) + return; +- if(IN6_IS_ADDR_LINKLOCAL(address) && scope==0) { ++ if(IN6_IS_ADDR_LINKLOCAL((const struct in6_addr*)address) && scope==0) { + error=_("Link-local IPv6 address should have a scope"); + return; + } -- 2.11.0