lftp: Update to 4.9.0

This commit is contained in:
Alexey Pavlov 2020-01-16 10:55:09 +03:00
parent 246f175ff1
commit c558160a17
3 changed files with 20 additions and 31 deletions

View File

@ -2,8 +2,8 @@
# Contributor: Jürgen Pfeifer <juergen@familiepfeifer.de>
pkgname=lftp
pkgver=4.8.4
pkgrel=4
pkgver=4.9.0
pkgrel=1
pkgdesc="Sophisticated command line based FTP client (net-utils)"
arch=('i686' 'x86_64')
license=('GPL3')
@ -39,11 +39,11 @@ source=(https://lftp.yar.ru/ftp/${pkgname}-${pkgver}.tar.xz{,.asc}
lftp-4.7.6-no-undefined.patch
lftp-correct-gettext-macros.patch)
options=('debug' '!strip')
sha256sums=('4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62'
sha256sums=('0b3b659e1969a31827a25861c01ccf71ac6d3f20ee256bdf6999d653e031a24e'
'SKIP'
'a3781d946913a0d39a41d5b86390f255b36f67e9aea502e0117e701e295c7ea0'
'dd23a090834e4509905e8f220ae10324f430692ac4fc6593b72431b1692990ae'
'be33e63d4a12bc7e251451890f5e688e3a51303794b3a597bbe70b52e280615f'
'78371c5fa449a8e48895a54cb9c294d1a48bf894657142f54a31e3d19aea24df'
'e9a289f30d0d7fd9994165b6991a722dbe529f1fdbd738d5b44b48ec9c773bf4'
'd6d74b134385e1c3f824b9a960376a2bcb7c0e39acab2ae1c3c764f9d338e650')
prepare() {

View File

@ -27,7 +27,7 @@ diff -Naur lftp-4.7.7/src/Makefile.am.orig lftp-4.7.7/src/Makefile.am
liblftp_network_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENSSL_CPPFLAGS) $(ZLIB_CPPFLAGS) $(LIBGNUTLS_CFLAGS)
-liblftp_network_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir)
+liblftp_network_la_LDFLAGS = -avoid-version -no-undefined -rpath $(pkgverlibdir)
liblftp_network_la_LIBADD = $(SOCKSLIBS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) $(LIBGNUTLS_LIBS) $(GNULIB) $(ZLIB_LDFLAGS) $(ZLIB)
liblftp_network_la_LIBADD = $(SOCKSLIBS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) $(LIBGNUTLS_LIBS) $(LIBSOCKET) $(GNULIB) $(ZLIB_LDFLAGS) $(ZLIB)
proto_ftp_la_LIBADD = liblftp-network.la
@@ -80,6 +80,8 @@

View File

@ -137,39 +137,28 @@ diff -Naur lftp-4.8.4-orig/m4/malloc.m4 lftp-4.8.4/m4/malloc.m4
@@ -33,7 +33,7 @@
[case "$host_os" in
# Guess yes on platforms where we know the result.
*-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
*-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
- | hpux* | solaris* | cygwin* | mingw*)
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
ac_cv_func_malloc_0_nonnull=yes ;;
ac_cv_func_malloc_0_nonnull="guessing yes" ;;
# If we don't know, assume the worst.
*) ac_cv_func_malloc_0_nonnull=no ;;
*) ac_cv_func_malloc_0_nonnull="guessing no" ;;
diff -Naur lftp-4.8.4-orig/m4/printf.m4 lftp-4.8.4/m4/printf.m4
--- lftp-4.8.4-orig/m4/printf.m4 2018-07-31 14:04:59.000000000 +0300
+++ lftp-4.8.4/m4/printf.m4 2018-08-02 10:36:27.456359900 +0300
@@ -769,7 +769,7 @@
openbsd*) gl_cv_func_printf_directive_ls="guessing no";;
irix*) gl_cv_func_printf_directive_ls="guessing no";;
solaris*) gl_cv_func_printf_directive_ls="guessing no";;
- cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
+ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";;
beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
# Guess yes on native Windows.
mingw*) gl_cv_func_printf_directive_ls="guessing yes";;
@@ -849,7 +849,7 @@
[
changequote(,)dnl
case "$host_os" in
- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
+ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";;
netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
# Guess no on native Windows.
mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
@@ -1524,7 +1524,7 @@
darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
@@ -785,6 +785,7 @@
irix*) gl_cv_func_printf_directive_ls="guessing no";;
solaris*) gl_cv_func_printf_directive_ls="guessing no";;
cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
+ msys*) gl_cv_func_printf_directive_ls="guessing no";;
beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
# Guess no on Android.
linux*-android*) gl_cv_func_printf_directive_ls="guessing no";;
@@ -1524,6 +1524,7 @@
darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# Guess yes on Cygwin.
- cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ cygwin* | msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# Guess yes on Solaris >= 2.6.
solaris2.[0-5] | solaris2.[0-5].*)
gl_cv_func_vsnprintf_zerosize_c99="guessing no";;