Hello community,
here is the log from the commit of package lftp for openSUSE:Factory checked in
at 2017-11-13 14:06:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lftp (Old)
and /work/SRC/openSUSE:Factory/.lftp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lftp"
Mon Nov 13 14:06:40 2017 rev:69 rq:541157 version:4.8.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/lftp/lftp.changes 2017-10-11
22:56:48.392861848 +0200
+++ /work/SRC/openSUSE:Factory/.lftp.new/lftp.changes 2017-11-13
14:07:12.999382503 +0100
@@ -1,0 +2,7 @@
+Sat Nov 11 04:38:23 UTC 2017 - aavind...@gmail.com
+
+- update to 4.8.3:
+ * fixed 2 other core dumps on exit (incorrect order of deallocation).
+ * fixed compilation with older C++ compilers.
+
+-------------------------------------------------------------------
Old:
----
lftp-4.8.2.tar.xz
lftp-4.8.2.tar.xz.asc
New:
----
lftp-4.8.3.tar.xz
lftp-4.8.3.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lftp.spec ++++++
--- /var/tmp/diff_new_pack.HyYP3d/_old 2017-11-13 14:07:15.099306955 +0100
+++ /var/tmp/diff_new_pack.HyYP3d/_new 2017-11-13 14:07:15.103306812 +0100
@@ -18,7 +18,7 @@
Name: lftp
-Version: 4.8.2
+Version: 4.8.3
Release: 0
Summary: Command Line File Transfer Program
License: GPL-3.0+
++++++ lftp-4.8.2.tar.xz -> lftp-4.8.3.tar.xz ++++++
++++ 2076 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/.tarball-version new/lftp-4.8.3/.tarball-version
--- old/lftp-4.8.2/.tarball-version 2017-09-25 13:29:20.000000000 +0200
+++ new/lftp-4.8.3/.tarball-version 2017-10-09 13:17:40.000000000 +0200
@@ -1 +1 @@
-4.8.2
+4.8.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/.version new/lftp-4.8.3/.version
--- old/lftp-4.8.2/.version 2017-09-25 13:15:37.000000000 +0200
+++ new/lftp-4.8.3/.version 2017-10-09 13:04:40.000000000 +0200
@@ -1 +1 @@
-4.8.2
+4.8.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/NEWS new/lftp-4.8.3/NEWS
--- old/lftp-4.8.2/NEWS 2017-09-25 12:06:56.000000000 +0200
+++ new/lftp-4.8.3/NEWS 2017-10-09 12:05:16.000000000 +0200
@@ -1,3 +1,8 @@
+Version 4.8.3 - 2017-10-09
+
+* fixed compilation with older C++ compilers.
+* fixed 2 other core dumps on exit (incorrect order of deallocation).
+
Version 4.8.2 - 2017-09-25
* fixed compilation on FreeBSD and OS X.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/TODO new/lftp-4.8.3/TODO
--- old/lftp-4.8.2/TODO 2016-11-25 17:29:22.000000000 +0100
+++ new/lftp-4.8.3/TODO 2017-10-09 12:06:27.000000000 +0200
@@ -4,6 +4,8 @@
currently; other work needs to be done. Items marked with + are partially
implemented.
+ * split misc.{cc,h} into thematic files.
+
* OpenStack Swift
* GlusterFS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/lftp.spec new/lftp-4.8.3/lftp.spec
--- old/lftp-4.8.2/lftp.spec 2017-09-25 13:27:59.000000000 +0200
+++ new/lftp-4.8.3/lftp.spec 2017-10-09 13:16:17.000000000 +0200
@@ -1,4 +1,4 @@
-%define version 4.8.2
+%define version 4.8.3
%define release 1
%define use_modules 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/lib/Makefile.am new/lftp-4.8.3/lib/Makefile.am
--- old/lftp-4.8.2/lib/Makefile.am 2017-09-25 13:03:32.000000000 +0200
+++ new/lftp-4.8.3/lib/Makefile.am 2017-10-09 12:09:30.000000000 +0200
@@ -2407,20 +2407,20 @@
-e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \
-e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
-e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
- -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
-e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
-e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
- -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
+ -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
-e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
-e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
- -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
- -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
- -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
-e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
-e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
-e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \
- -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
+ -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
+ -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
-e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \
+ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
+ -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
+ -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
-e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/lib/config.h.in new/lftp-4.8.3/lib/config.h.in
--- old/lftp-4.8.2/lib/config.h.in 2017-09-25 13:17:16.000000000 +0200
+++ new/lftp-4.8.3/lib/config.h.in 2017-10-09 13:04:41.000000000 +0200
@@ -1,5 +1,80 @@
/* lib/config.h.in. Generated from configure.ac by autoheader. */
+/* CPU and C ABI indicator */
+#ifndef __i386__
+#undef __i386__
+#endif
+#ifndef __x86_64_x32__
+#undef __x86_64_x32__
+#endif
+#ifndef __x86_64__
+#undef __x86_64__
+#endif
+#ifndef __alpha__
+#undef __alpha__
+#endif
+#ifndef __arm__
+#undef __arm__
+#endif
+#ifndef __armhf__
+#undef __armhf__
+#endif
+#ifndef __arm64_ilp32__
+#undef __arm64_ilp32__
+#endif
+#ifndef __arm64__
+#undef __arm64__
+#endif
+#ifndef __hppa__
+#undef __hppa__
+#endif
+#ifndef __hppa64__
+#undef __hppa64__
+#endif
+#ifndef __ia64_ilp32__
+#undef __ia64_ilp32__
+#endif
+#ifndef __ia64__
+#undef __ia64__
+#endif
+#ifndef __m68k__
+#undef __m68k__
+#endif
+#ifndef __mips__
+#undef __mips__
+#endif
+#ifndef __mipsn32__
+#undef __mipsn32__
+#endif
+#ifndef __mips64__
+#undef __mips64__
+#endif
+#ifndef __powerpc__
+#undef __powerpc__
+#endif
+#ifndef __powerpc64__
+#undef __powerpc64__
+#endif
+#ifndef __powerpc64_elfv2__
+#undef __powerpc64_elfv2__
+#endif
+#ifndef __s390__
+#undef __s390__
+#endif
+#ifndef __s390x__
+#undef __s390x__
+#endif
+#ifndef __sh__
+#undef __sh__
+#endif
+#ifndef __sparc__
+#undef __sparc__
+#endif
+#ifndef __sparc64__
+#undef __sparc64__
+#endif
+
+
#ifndef CONFIG_H
#define CONFIG_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/lib/getopt-cdefs.in.h new/lftp-4.8.3/lib/getopt-cdefs.in.h
--- old/lftp-4.8.2/lib/getopt-cdefs.in.h 2017-09-25 13:03:22.000000000
+0200
+++ new/lftp-4.8.3/lib/getopt-cdefs.in.h 2017-10-09 12:09:21.000000000
+0200
@@ -4,12 +4,12 @@
Unlike most of the getopt implementation, it is NOT shared
with the GNU C Library.
- gnulib is free software; you can redistribute it and/or modify it
+ This file is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 3 of
the License, or (at your option) any later version.
- gnulib is distributed in the hope that it will be useful, but
+ This file is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/lib/getopt-pfx-core.h new/lftp-4.8.3/lib/getopt-pfx-core.h
--- old/lftp-4.8.2/lib/getopt-pfx-core.h 2017-09-25 13:03:22.000000000
+0200
+++ new/lftp-4.8.3/lib/getopt-pfx-core.h 2017-10-09 12:09:21.000000000
+0200
@@ -4,12 +4,12 @@
Unlike most of the getopt implementation, it is NOT shared
with the GNU C Library.
- gnulib is free software; you can redistribute it and/or modify it
+ This file is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 3 of
the License, or (at your option) any later version.
- gnulib is distributed in the hope that it will be useful, but
+ This file is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/lib/getopt-pfx-ext.h new/lftp-4.8.3/lib/getopt-pfx-ext.h
--- old/lftp-4.8.2/lib/getopt-pfx-ext.h 2017-09-25 13:03:22.000000000 +0200
+++ new/lftp-4.8.3/lib/getopt-pfx-ext.h 2017-10-09 12:09:21.000000000 +0200
@@ -4,12 +4,12 @@
Unlike most of the getopt implementation, it is NOT shared
with the GNU C Library.
- gnulib is free software; you can redistribute it and/or modify it
+ This file is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 3 of
the License, or (at your option) any later version.
- gnulib is distributed in the hope that it will be useful, but
+ This file is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/lib/getopt.in.h new/lftp-4.8.3/lib/getopt.in.h
--- old/lftp-4.8.2/lib/getopt.in.h 2017-09-25 13:03:22.000000000 +0200
+++ new/lftp-4.8.3/lib/getopt.in.h 2017-10-09 12:09:21.000000000 +0200
@@ -5,12 +5,12 @@
with the GNU C Library, which supplies a different version of
this file.
- gnulib is free software; you can redistribute it and/or modify it
+ This file is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 3 of
the License, or (at your option) any later version.
- gnulib is distributed in the hope that it will be useful, but
+ This file is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/lib/glob.c new/lftp-4.8.3/lib/glob.c
--- old/lftp-4.8.2/lib/glob.c 2017-09-25 13:03:22.000000000 +0200
+++ new/lftp-4.8.3/lib/glob.c 2017-10-09 12:09:21.000000000 +0200
@@ -205,9 +205,6 @@
static int glob_in_dir (const char *pattern, const char *directory,
int flags, int (*errfunc) (const char *, int),
glob_t *pglob, size_t alloca_used);
-extern int __glob_pattern_type (const char *pattern, int quote)
- attribute_hidden;
-
static int prefix_array (const char *prefix, char **array, size_t n) __THROWNL;
static int collated_compare (const void *, const void *) __THROWNL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/lib/parse-datetime.c new/lftp-4.8.3/lib/parse-datetime.c
--- old/lftp-4.8.2/lib/parse-datetime.c 2017-09-25 13:07:43.000000000 +0200
+++ new/lftp-4.8.3/lib/parse-datetime.c 2017-10-09 13:01:22.000000000 +0200
@@ -3756,7 +3756,13 @@
if (pc.local_zones_seen)
tm.tm_isdst = pc.local_isdst;
- tm0 = tm;
+ tm0.tm_sec = tm.tm_sec;
+ tm0.tm_min = tm.tm_min;
+ tm0.tm_hour = tm.tm_hour;
+ tm0.tm_mday = tm.tm_mday;
+ tm0.tm_mon = tm.tm_mon;
+ tm0.tm_year = tm.tm_year;
+ tm0.tm_isdst = tm.tm_isdst;
Start = mktime_z (tz, &tm);
@@ -3786,7 +3792,13 @@
dbg_printf (_("error: tzalloc (\"%s\") failed\n"), tz2buf);
goto fail;
}
- tm = tm0;
+ tm.tm_sec = tm0.tm_sec;
+ tm.tm_min = tm0.tm_min;
+ tm.tm_hour = tm0.tm_hour;
+ tm.tm_mday = tm0.tm_mday;
+ tm.tm_mon = tm0.tm_mon;
+ tm.tm_year = tm0.tm_year;
+ tm.tm_isdst = tm0.tm_isdst;
Start = mktime_z (tz2, &tm);
repaired = mktime_ok (tz2, &tm0, &tm, Start);
tzfree (tz2);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/lib/parse-datetime.y new/lftp-4.8.3/lib/parse-datetime.y
--- old/lftp-4.8.2/lib/parse-datetime.y 2017-09-25 13:03:23.000000000 +0200
+++ new/lftp-4.8.3/lib/parse-datetime.y 2017-10-09 12:09:22.000000000 +0200
@@ -2034,7 +2034,13 @@
if (pc.local_zones_seen)
tm.tm_isdst = pc.local_isdst;
- tm0 = tm;
+ tm0.tm_sec = tm.tm_sec;
+ tm0.tm_min = tm.tm_min;
+ tm0.tm_hour = tm.tm_hour;
+ tm0.tm_mday = tm.tm_mday;
+ tm0.tm_mon = tm.tm_mon;
+ tm0.tm_year = tm.tm_year;
+ tm0.tm_isdst = tm.tm_isdst;
Start = mktime_z (tz, &tm);
@@ -2064,7 +2070,13 @@
dbg_printf (_("error: tzalloc (\"%s\") failed\n"), tz2buf);
goto fail;
}
- tm = tm0;
+ tm.tm_sec = tm0.tm_sec;
+ tm.tm_min = tm0.tm_min;
+ tm.tm_hour = tm0.tm_hour;
+ tm.tm_mday = tm0.tm_mday;
+ tm.tm_mon = tm0.tm_mon;
+ tm.tm_year = tm0.tm_year;
+ tm.tm_isdst = tm0.tm_isdst;
Start = mktime_z (tz2, &tm);
repaired = mktime_ok (tz2, &tm0, &tm, Start);
tzfree (tz2);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/lib/wchar.in.h new/lftp-4.8.3/lib/wchar.in.h
--- old/lftp-4.8.2/lib/wchar.in.h 2017-09-25 13:03:24.000000000 +0200
+++ new/lftp-4.8.3/lib/wchar.in.h 2017-10-09 12:09:23.000000000 +0200
@@ -31,7 +31,7 @@
@PRAGMA_COLUMNS@
#if (((defined __need_mbstate_t || defined __need_wint_t) \
- && !defined __MINGW32__ && !defined __KLIBC__) \
+ && !defined __MINGW32__) \
|| (defined __hpux \
&& ((defined _INTTYPES_INCLUDED && !defined strtoimax) \
|| defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \
@@ -452,11 +452,6 @@
# if !@HAVE_DECL_WCWIDTH@
/* wcwidth exists but is not declared. */
_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
-# elif defined __KLIBC__
-/* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a
- static inline function. The implementation of wcwidth in wcwidth.c
- causes a "conflicting types" error. */
-# undef wcwidth
# endif
_GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
# endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/m4/asm-underscore.m4 new/lftp-4.8.3/m4/asm-underscore.m4
--- old/lftp-4.8.2/m4/asm-underscore.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/lftp-4.8.3/m4/asm-underscore.m4 2017-10-09 12:09:20.000000000 +0200
@@ -0,0 +1,71 @@
+# asm-underscore.m4 serial 3
+dnl Copyright (C) 2010-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible. Based on as-underscore.m4 in GNU clisp.
+
+# gl_ASM_SYMBOL_PREFIX
+# Tests for the prefix of C symbols at the assembly language level and the
+# linker level. This prefix is either an underscore or empty. Defines the
+# C macro USER_LABEL_PREFIX to this prefix, and sets ASM_SYMBOL_PREFIX to
+# a stringified variant of this prefix.
+
+AC_DEFUN([gl_ASM_SYMBOL_PREFIX],
+[
+ dnl We don't use GCC's __USER_LABEL_PREFIX__ here, because
+ dnl 1. It works only for GCC.
+ dnl 2. It is incorrectly defined on some platforms, in some GCC versions.
+ AC_REQUIRE([gl_C_ASM])
+ AC_CACHE_CHECK(
+ [whether C symbols are prefixed with underscore at the linker level],
+ [gl_cv_prog_as_underscore],
+ [cat > conftest.c <<EOF
+#ifdef __cplusplus
+extern "C" int foo (void);
+#endif
+int foo(void) { return 0; }
+EOF
+ # Look for the assembly language name in the .s file.
+ AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c)
>/dev/null 2>&1
+ if LC_ALL=C grep -E '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)'
conftest.$gl_asmext >/dev/null; then
+ gl_cv_prog_as_underscore=yes
+ else
+ gl_cv_prog_as_underscore=no
+ fi
+ rm -f conftest*
+ ])
+ if test $gl_cv_prog_as_underscore = yes; then
+ USER_LABEL_PREFIX=_
+ else
+ USER_LABEL_PREFIX=
+ fi
+ AC_DEFINE_UNQUOTED([USER_LABEL_PREFIX], [$USER_LABEL_PREFIX],
+ [Define to the prefix of C symbols at the assembler and linker level,
+ either an underscore or empty.])
+ ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
+ AC_SUBST([ASM_SYMBOL_PREFIX])
+])
+
+# gl_C_ASM
+# Determines how to produce an assembly language file from C source code.
+# Sets the variables:
+# gl_asmext - the extension of assembly language output,
+# gl_c_asm_opt - the C compiler option that produces assembly language
output.
+
+AC_DEFUN([gl_C_ASM],
+[
+ AC_EGREP_CPP([MicrosoftCompiler],
+ [
+#ifdef _MSC_VER
+MicrosoftCompiler
+#endif
+ ],
+ [gl_asmext='asm'
+ gl_c_asm_opt='-c -Fa'
+ ],
+ [gl_asmext='s'
+ gl_c_asm_opt='-S'
+ ])
+])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/m4/gnulib-comp.m4 new/lftp-4.8.3/m4/gnulib-comp.m4
--- old/lftp-4.8.2/m4/gnulib-comp.m4 2017-09-25 13:03:34.000000000 +0200
+++ new/lftp-4.8.3/m4/gnulib-comp.m4 2017-10-09 12:09:32.000000000 +0200
@@ -105,6 +105,7 @@
# Code from module gperf:
# Code from module hard-locale:
# Code from module havelib:
+ # Code from module host-cpu-c-abi:
# Code from module human:
# Code from module iconv:
# Code from module iconv-h:
@@ -419,6 +420,7 @@
gl_PREREQ_GLOB
fi
gl_HARD_LOCALE
+ AC_REQUIRE([gl_HOST_CPU_C_ABI])
gl_HUMAN
AM_ICONV
m4_ifdef([gl_ICONV_MODULE_INDICATOR],
@@ -1212,6 +1214,7 @@
m4/absolute-header.m4
m4/alloca.m4
m4/arpa_inet_h.m4
+ m4/asm-underscore.m4
m4/bison.m4
m4/btowc.m4
m4/builtin-expect.m4
@@ -1261,6 +1264,7 @@
m4/glob.m4
m4/gnulib-common.m4
m4/hard-locale.m4
+ m4/host-cpu-c-abi.m4
m4/human.m4
m4/iconv.m4
m4/iconv_h.m4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/m4/host-cpu-c-abi.m4 new/lftp-4.8.3/m4/host-cpu-c-abi.m4
--- old/lftp-4.8.2/m4/host-cpu-c-abi.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/lftp-4.8.3/m4/host-cpu-c-abi.m4 2017-10-09 12:09:20.000000000 +0200
@@ -0,0 +1,320 @@
+# host-cpu-c-abi.m4 serial 7
+dnl Copyright (C) 2002-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible and Sam Steingold.
+
+dnl Sets the HOST_CPU variable to the canonical name of the CPU.
+dnl Sets the HOST_CPU_C_ABI variable to the canonical name of the CPU with its
+dnl C language ABI (application binary interface).
+dnl Also defines __${HOST_CPU}__ and __${HOST_CPU_C_ABI}__ as C macros in
+dnl config.h.
+dnl
+dnl This canonical name can be used to select a particular assembly language
+dnl source file that will interoperate with C code on the given host.
+dnl
+dnl For example:
+dnl * 'i386' and 'sparc' are different canonical names, because code for i386
+dnl will not run on SPARC CPUs and vice versa. They have different
+dnl instruction sets.
+dnl * 'sparc' and 'sparc64' are different canonical names, because code for
+dnl 'sparc' and code for 'sparc64' cannot be linked together: 'sparc' code
+dnl contains 32-bit instructions, whereas 'sparc64' code contains 64-bit
+dnl instructions. A process on a SPARC CPU can be in 32-bit mode or in 64-bit
+dnl mode, but not both.
+dnl * 'mips' and 'mipsn32' are different canonical names, because they use
+dnl different argument passing and return conventions for C functions, and
+dnl although the instruction set of 'mips' is a large subset of the
+dnl instruction set of 'mipsn32'.
+dnl * 'mipsn32' and 'mips64' are different canonical names, because they use
+dnl different sizes for the C types like 'int' and 'void *', and although
+dnl the instruction sets of 'mipsn32' and 'mips64' are the same.
+dnl * The same canonical name is used for different endiannesses. You can
+dnl determine the endianness through preprocessor symbols:
+dnl - 'arm': test __ARMEL__.
+dnl - 'mips', 'mipsn32', 'mips64': test _MIPSEB vs. _MIPSEL.
+dnl - 'powerpc64': test _BIG_ENDIAN vs. _LITTLE_ENDIAN.
+dnl * The same name 'i386' is used for CPUs of type i386, i486, i586
+dnl (Pentium), AMD K7, Pentium II, Pentium IV, etc., because
+dnl - Instructions that do not exist on all of these CPUs (cmpxchg,
+dnl MMX, SSE, SSE2, 3DNow! etc.) are not frequently used. If your
+dnl assembly language source files use such instructions, you will
+dnl need to make the distinction.
+dnl - Speed of execution of the common instruction set is reasonable across
+dnl the entire family of CPUs. If you have assembly language source files
+dnl that are optimized for particular CPU types (like GNU gmp has), you
+dnl will need to make the distinction.
+dnl See <https://en.wikipedia.org/wiki/X86_instruction_listings>.
+AC_DEFUN([gl_HOST_CPU_C_ABI],
+[
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([gl_C_ASM])
+ AC_CACHE_CHECK([host CPU and C ABI], [gl_cv_host_cpu_c_abi],
+ [case "$host_cpu" in
+
+changequote(,)dnl
+ i[4567]86 )
+changequote([,])dnl
+ gl_cv_host_cpu_c_abi=i386
+ ;;
+
+ x86_64 )
+ # On x86_64 systems, the C compiler may be generating code in one of
+ # these ABIs:
+ # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
+ # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
+ # with native Windows (mingw, MSVC).
+ # - 64-bit instruction set, 32-bit pointers, 32-bit 'long':
x86_64-x32.
+ # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
+ AC_EGREP_CPP([yes],
+ [#if defined __x86_64__ || defined __amd64__ || defined _M_X64 ||
defined _M_AMD64
+ yes
+ #endif],
+ [AC_EGREP_CPP([yes],
+ [#if defined __ILP32__ || defined _ILP32
+ yes
+ #endif],
+ [gl_cv_host_cpu_c_abi=x86_64-x32],
+ [gl_cv_host_cpu_c_abi=x86_64])],
+ [gl_cv_host_cpu_c_abi=i386])
+ ;;
+
+changequote(,)dnl
+ alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] )
+changequote([,])dnl
+ gl_cv_host_cpu_c_abi=alpha
+ ;;
+
+ arm* | aarch64 )
+ # Assume arm with EABI.
+ # On arm64 systems, the C compiler may be generating code in one of
+ # these ABIs:
+ # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
+ # - aarch64 instruction set, 32-bit pointers, 32-bit 'long':
arm64-ilp32.
+ # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or
armhf.
+ AC_EGREP_CPP([yes],
+ [#if defined __aarch64__
+ yes
+ #endif],
+ [AC_EGREP_CPP([yes],
+ [#if defined __ILP32__ || defined _ILP32
+ yes
+ #endif],
+ [gl_cv_host_cpu_c_abi=arm64-ilp32],
+ [gl_cv_host_cpu_c_abi=arm64])],
+ [# Don't distinguish little-endian and big-endian arm, since they
+ # don't require different machine code for simple operations and
+ # since the user can distinguish them through the preprocessor
+ # defines __ARMEL__ vs. __ARMEB__.
+ # But distinguish arm which passes floating-point arguments and
+ # return values in integer registers (r0, r1, ...) - this is
+ # gcc -mfloat-abi=soft or gcc -mfloat-abi=softfp - from arm which
+ # passes them in float registers (s0, s1, ...) and double registers
+ # (d0, d1, ...) - this is gcc -mfloat-abi=hard. GCC 4.6 or newer
+ # sets the preprocessor defines __ARM_PCS (for the first case) and
+ # __ARM_PCS_VFP (for the second case), but older GCC does not.
+ echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c
+ # Look for a reference to the register d0 in the .s file.
+ AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt
conftest.c) >/dev/null 2>&1
+ if LC_ALL=C grep -E 'd0,' conftest.$gl_asmext >/dev/null; then
+ gl_cv_host_cpu_c_abi=armhf
+ else
+ gl_cv_host_cpu_c_abi=arm
+ fi
+ rm -f conftest*
+ ])
+ ;;
+
+ hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
+ # On hppa, the C compiler may be generating 32-bit code or 64-bit
+ # code. In the latter case, it defines _LP64 and __LP64__.
+ AC_EGREP_CPP([yes],
+ [#if defined(__LP64__)
+ yes
+ #endif],
+ [gl_cv_host_cpu_c_abi=hppa64],
+ [gl_cv_host_cpu_c_abi=hppa])
+ ;;
+
+ ia64* )
+ # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
+ # 32-bit code. In the latter case, it defines _ILP32.
+ AC_EGREP_CPP([yes],
+ [#if defined _ILP32
+ yes
+ #endif],
+ [gl_cv_host_cpu_c_abi=ia64-ilp32],
+ [gl_cv_host_cpu_c_abi=ia64])
+ ;;
+
+ mips* )
+ # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
+ # at 32.
+ AC_EGREP_CPP([yes],
+ [#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
+ yes
+ #endif],
+ [gl_cv_host_cpu_c_abi=mips64],
+ [# In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but
+ # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIN32.
+ # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but
+ # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIO32.
+ AC_EGREP_CPP([yes],
+ [#if (_MIPS_SIM == _ABIN32)
+ yes
+ #endif],
+ [gl_cv_host_cpu_c_abi=mipsn32],
+ [gl_cv_host_cpu_c_abi=mips])])
+ ;;
+
+ powerpc* )
+ # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
+ # No need to distinguish them here; the caller may distinguish
+ # them based on the OS.
+ # On powerpc64 systems, the C compiler may still be generating
+ # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
+ # be generating 64-bit code.
+ AC_EGREP_CPP([yes],
+ [#if defined __powerpc64__ || defined _ARCH_PPC64
+ yes
+ #endif],
+ [# On powerpc64, there are two ABIs on Linux: The AIX compatible
+ # one and the ELFv2 one. The latter defines _CALL_ELF=2.
+ AC_EGREP_CPP([yes],
+ [#if defined _CALL_ELF && _CALL_ELF == 2
+ yes
+ #endif],
+ [gl_cv_host_cpu_c_abi=powerpc64-elfv2],
+ [gl_cv_host_cpu_c_abi=powerpc64])
+ ],
+ [gl_cv_host_cpu_c_abi=powerpc])
+ ;;
+
+ rs6000 )
+ gl_cv_host_cpu_c_abi=powerpc
+ ;;
+
+ s390* )
+ # On s390x, the C compiler may be generating 64-bit (= s390x) code
+ # or 31-bit (= s390) code.
+ AC_EGREP_CPP([yes],
+ [#if defined(__LP64__) || defined(__s390x__)
+ yes
+ #endif],
+ [gl_cv_host_cpu_c_abi=s390x],
+ [gl_cv_host_cpu_c_abi=s390])
+ ;;
+
+ sparc | sparc64 )
+ # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
+ # C compiler still generates 32-bit code.
+ AC_EGREP_CPP([yes],
+ [#if defined __sparcv9 || defined __arch64__
+ yes
+ #endif],
+ [gl_cv_host_cpu_c_abi=sparc64],
+ [gl_cv_host_cpu_c_abi=sparc])
+ ;;
+
+ *)
+ gl_cv_host_cpu_c_abi="$host_cpu"
+ ;;
+ esac
+ ])
+
+ dnl In most cases, $HOST_CPU and $HOST_CPU_C_ABI are the same.
+ HOST_CPU=`echo "$gl_cv_host_cpu_c_abi" | sed -e 's/-.*//'`
+ HOST_CPU_C_ABI="$gl_cv_host_cpu_c_abi"
+ AC_SUBST([HOST_CPU])
+ AC_SUBST([HOST_CPU_C_ABI])
+
+ # This was
+ # AC_DEFINE_UNQUOTED([__${HOST_CPU}__])
+ # AC_DEFINE_UNQUOTED([__${HOST_CPU_C_ABI}__])
+ # earlier, but KAI C++ 3.2d doesn't like this.
+ sed -e 's/-/_/g' >> confdefs.h <<EOF
+#ifndef __${HOST_CPU}__
+#define __${HOST_CPU}__ 1
+#endif
+#ifndef __${HOST_CPU_C_ABI}__
+#define __${HOST_CPU_C_ABI}__ 1
+#endif
+EOF
+ AH_TOP([/* CPU and C ABI indicator */
+#ifndef __i386__
+#undef __i386__
+#endif
+#ifndef __x86_64_x32__
+#undef __x86_64_x32__
+#endif
+#ifndef __x86_64__
+#undef __x86_64__
+#endif
+#ifndef __alpha__
+#undef __alpha__
+#endif
+#ifndef __arm__
+#undef __arm__
+#endif
+#ifndef __armhf__
+#undef __armhf__
+#endif
+#ifndef __arm64_ilp32__
+#undef __arm64_ilp32__
+#endif
+#ifndef __arm64__
+#undef __arm64__
+#endif
+#ifndef __hppa__
+#undef __hppa__
+#endif
+#ifndef __hppa64__
+#undef __hppa64__
+#endif
+#ifndef __ia64_ilp32__
+#undef __ia64_ilp32__
+#endif
+#ifndef __ia64__
+#undef __ia64__
+#endif
+#ifndef __m68k__
+#undef __m68k__
+#endif
+#ifndef __mips__
+#undef __mips__
+#endif
+#ifndef __mipsn32__
+#undef __mipsn32__
+#endif
+#ifndef __mips64__
+#undef __mips64__
+#endif
+#ifndef __powerpc__
+#undef __powerpc__
+#endif
+#ifndef __powerpc64__
+#undef __powerpc64__
+#endif
+#ifndef __powerpc64_elfv2__
+#undef __powerpc64_elfv2__
+#endif
+#ifndef __s390__
+#undef __s390__
+#endif
+#ifndef __s390x__
+#undef __s390x__
+#endif
+#ifndef __sh__
+#undef __sh__
+#endif
+#ifndef __sparc__
+#undef __sparc__
+#endif
+#ifndef __sparc64__
+#undef __sparc64__
+#endif
+])
+
+])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/m4/lib-prefix.m4 new/lftp-4.8.3/m4/lib-prefix.m4
--- old/lftp-4.8.2/m4/lib-prefix.m4 2017-09-25 13:16:20.000000000 +0200
+++ new/lftp-4.8.3/m4/lib-prefix.m4 2017-10-09 13:03:45.000000000 +0200
@@ -1,4 +1,4 @@
-# lib-prefix.m4 serial 8
+# lib-prefix.m4 serial 9
dnl Copyright (C) 2001-2005, 2008-2017 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -174,6 +174,7 @@
dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([gl_HOST_CPU_C_ABI])
dnl Allow the user to override the result by setting acl_cv_libdirstems.
AC_CACHE_CHECK([for the common suffixes of directories in the library search
path],
[acl_cv_libdirstems],
@@ -202,34 +203,42 @@
fi
;;
*)
- dnl The result is a property of the system. However, non-system
- dnl compilers sometimes have odd library search paths. Therefore
- dnl prefer asking /usr/bin/gcc, if available, rather than $CC.
- searchpath=`(if test -f /usr/bin/gcc \
- && LC_ALL=C /usr/bin/gcc -print-search-dirs
>/dev/null 2>/dev/null; then \
- LC_ALL=C /usr/bin/gcc -print-search-dirs; \
- else \
- LC_ALL=C $CC -print-search-dirs; \
- fi) 2>/dev/null \
- | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
- if test -n "$searchpath"; then
- acl_save_IFS="${IFS= }"; IFS=":"
- for searchdir in $searchpath; do
- if test -d "$searchdir"; then
- case "$searchdir" in
- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
- */../ | */.. )
- # Better ignore directories of this form. They are
misleading.
- ;;
- *) searchdir=`cd "$searchdir" && pwd`
- case "$searchdir" in
- */lib64 ) acl_libdirstem=lib64 ;;
- esac ;;
- esac
+ dnl If $CC generates code for a 32-bit ABI, the libraries are
+ dnl surely under $prefix/lib, not $prefix/lib64.
+ case "$gl_cv_host_cpu_c_abi" in
+ i386 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips |
mipsn32 | powerpc | s390 | sparc)
+ ;;
+ *) # x86_64 | arm64 | hppa64 | ia64 | mips64 | powerpc64* | s390x |
sparc64 | ...
+ dnl The result is a property of the system. However, non-system
+ dnl compilers sometimes have odd library search paths. Therefore
+ dnl prefer asking /usr/bin/gcc, if available, rather than $CC.
+ searchpath=`(if test -f /usr/bin/gcc \
+ && LC_ALL=C /usr/bin/gcc -print-search-dirs
>/dev/null 2>/dev/null; then \
+ LC_ALL=C /usr/bin/gcc -print-search-dirs; \
+ else \
+ LC_ALL=C $CC -print-search-dirs; \
+ fi) 2>/dev/null \
+ | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= }"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ */../ | */.. )
+ # Better ignore directories of this form. They are
misleading.
+ ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
fi
- done
- IFS="$acl_save_IFS"
- fi
+ ;;
+ esac
;;
esac
test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/m4/string_h.m4 new/lftp-4.8.3/m4/string_h.m4
--- old/lftp-4.8.2/m4/string_h.m4 2017-09-12 16:13:31.000000000 +0200
+++ new/lftp-4.8.3/m4/string_h.m4 2017-10-09 12:09:24.000000000 +0200
@@ -5,7 +5,7 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 21
+# serial 22
# Written by Paul Eggert.
@@ -107,16 +107,16 @@
REPLACE_MEMCHR=0; AC_SUBST([REPLACE_MEMCHR])
REPLACE_MEMMEM=0; AC_SUBST([REPLACE_MEMMEM])
REPLACE_STPNCPY=0; AC_SUBST([REPLACE_STPNCPY])
+ REPLACE_STRCHRNUL=0; AC_SUBST([REPLACE_STRCHRNUL])
REPLACE_STRDUP=0; AC_SUBST([REPLACE_STRDUP])
+ REPLACE_STRNCAT=0; AC_SUBST([REPLACE_STRNCAT])
+ REPLACE_STRNDUP=0; AC_SUBST([REPLACE_STRNDUP])
+ REPLACE_STRNLEN=0; AC_SUBST([REPLACE_STRNLEN])
REPLACE_STRSTR=0; AC_SUBST([REPLACE_STRSTR])
REPLACE_STRCASESTR=0; AC_SUBST([REPLACE_STRCASESTR])
- REPLACE_STRCHRNUL=0; AC_SUBST([REPLACE_STRCHRNUL])
+ REPLACE_STRTOK_R=0; AC_SUBST([REPLACE_STRTOK_R])
REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR])
REPLACE_STRERROR_R=0; AC_SUBST([REPLACE_STRERROR_R])
- REPLACE_STRNCAT=0; AC_SUBST([REPLACE_STRNCAT])
- REPLACE_STRNDUP=0; AC_SUBST([REPLACE_STRNDUP])
- REPLACE_STRNLEN=0; AC_SUBST([REPLACE_STRNLEN])
REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL])
- REPLACE_STRTOK_R=0; AC_SUBST([REPLACE_STRTOK_R])
UNDEFINE_STRTOK_R=0; AC_SUBST([UNDEFINE_STRTOK_R])
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/m4/sys_types_h.m4 new/lftp-4.8.3/m4/sys_types_h.m4
--- old/lftp-4.8.2/m4/sys_types_h.m4 2017-09-25 13:03:26.000000000 +0200
+++ new/lftp-4.8.3/m4/sys_types_h.m4 2017-10-09 12:09:24.000000000 +0200
@@ -1,4 +1,4 @@
-# sys_types_h.m4 serial 8
+# sys_types_h.m4 serial 9
dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -40,7 +40,7 @@
m4_version_prereq([2.70], [], [
# This is taken from the following Autoconf patch:
-#
http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=e17a30e987d7ee695fb4294a82d987ec3dc9b974
+#
https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=e17a30e987d7ee695fb4294a82d987ec3dc9b974
m4_undefine([AC_HEADER_MAJOR])
AC_DEFUN([AC_HEADER_MAJOR],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/m4/wcwidth.m4 new/lftp-4.8.3/m4/wcwidth.m4
--- old/lftp-4.8.2/m4/wcwidth.m4 2017-04-21 22:47:53.000000000 +0200
+++ new/lftp-4.8.3/m4/wcwidth.m4 2017-10-09 12:09:24.000000000 +0200
@@ -1,4 +1,4 @@
-# wcwidth.m4 serial 23
+# wcwidth.m4 serial 24
dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -34,7 +34,20 @@
HAVE_DECL_WCWIDTH=0
fi
- if test $ac_cv_func_wcwidth = yes; then
+ if test $ac_cv_func_wcwidth != yes; then
+ AC_CACHE_CHECK([whether wcwidth is a macro],
+ [gl_cv_func_wcwidth_macro],
+ [AC_EGREP_CPP([wchar_header_defines_wcwidth], [
+#include <wchar.h>
+#ifdef wcwidth
+ wchar_header_defines_wcwidth
+#endif],
+ [gl_cv_func_wcwidth_macro=yes],
+ [gl_cv_func_wcwidth_macro=no])
+ ])
+ fi
+
+ if test $ac_cv_func_wcwidth = yes -o "$gl_cv_func_wcwidth_macro" = yes; then
HAVE_WCWIDTH=1
dnl On Mac OS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
dnl On OpenBSD 5.0, wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1.
Binary files old/lftp-4.8.2/po/cs.gmo and new/lftp-4.8.3/po/cs.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/cs.po new/lftp-4.8.3/po/cs.po
--- old/lftp-4.8.2/po/cs.po 2017-09-25 13:29:20.000000000 +0200
+++ new/lftp-4.8.3/po/cs.po 2017-10-09 13:17:39.000000000 +0200
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: lftp 4.8.0\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 2017-07-10 21:40+02:00\n"
"Last-Translator: Petr Pisar <petr.pi...@atlas.cz>\n"
"Language-Team: Czech <translation-team...@lists.sourceforge.net>\n"
Binary files old/lftp-4.8.2/po/de.gmo and new/lftp-4.8.3/po/de.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/de.po new/lftp-4.8.3/po/de.po
--- old/lftp-4.8.2/po/de.po 2017-09-25 13:29:19.000000000 +0200
+++ new/lftp-4.8.3/po/de.po 2017-10-09 13:17:38.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 2008-03-29 14:27+0100\n"
"Last-Translator: Moritz Moeller-Herrmann <moritz-l...@moeller-herrmann.de>\n"
"Language-Team: German <kde-i18n...@lists.kde.org>\n"
Binary files old/lftp-4.8.2/po/es.gmo and new/lftp-4.8.3/po/es.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/es.po new/lftp-4.8.3/po/es.po
--- old/lftp-4.8.2/po/es.po 2017-09-25 13:29:19.000000000 +0200
+++ new/lftp-4.8.3/po/es.po 2017-10-09 13:17:39.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: lftp 2.6.0\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 2002-08-08 19:01+0000\n"
"Last-Translator: Nicolás Lichtmaier <n...@debian.org>\n"
"Language-Team: Spanish <e...@li.org>\n"
Binary files old/lftp-4.8.2/po/fr.gmo and new/lftp-4.8.3/po/fr.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/fr.po new/lftp-4.8.3/po/fr.po
--- old/lftp-4.8.2/po/fr.po 2017-09-25 13:29:19.000000000 +0200
+++ new/lftp-4.8.3/po/fr.po 2017-10-09 13:17:39.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 2008-04-12 12:40+0200\n"
"Last-Translator: Alain PORTAL <apor...@univ-montp2.fr>\n"
"Language-Team: Français <tra...@traduc.org>\n"
Binary files old/lftp-4.8.2/po/it.gmo and new/lftp-4.8.3/po/it.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/it.po new/lftp-4.8.3/po/it.po
--- old/lftp-4.8.2/po/it.po 2017-09-25 13:29:19.000000000 +0200
+++ new/lftp-4.8.3/po/it.po 2017-10-09 13:17:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: lftp 2.2.3\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 2000-06-18 10:46+02:00\n"
"Last-Translator: Giovanni Bortolozzo <bo...@pluto.linux.it>\n"
"Language-Team: Italian <i...@li.org>\n"
Binary files old/lftp-4.8.2/po/ja.gmo and new/lftp-4.8.3/po/ja.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/ja.po new/lftp-4.8.3/po/ja.po
--- old/lftp-4.8.2/po/ja.po 2017-09-25 13:29:19.000000000 +0200
+++ new/lftp-4.8.3/po/ja.po 2017-10-09 13:17:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: lftp 2.3.0\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 2002-04-12 00:06+0900\n"
"Last-Translator: Masayuki Hatta <mha...@gnu.org>\n"
"Language-Team: Japanese <j...@li.org>\n"
Binary files old/lftp-4.8.2/po/ko.gmo and new/lftp-4.8.3/po/ko.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/ko.po new/lftp-4.8.3/po/ko.po
--- old/lftp-4.8.2/po/ko.po 2017-09-25 13:29:19.000000000 +0200
+++ new/lftp-4.8.3/po/ko.po 2017-10-09 13:17:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: lftp 2.1.1\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 2001-05-27 KST\n"
"Last-Translator: Dojip Kim <green...@greendrm.com>\n"
"Language-Team: \n"
Binary files old/lftp-4.8.2/po/pl.gmo and new/lftp-4.8.3/po/pl.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/pl.po new/lftp-4.8.3/po/pl.po
--- old/lftp-4.8.2/po/pl.po 2017-09-25 13:29:19.000000000 +0200
+++ new/lftp-4.8.3/po/pl.po 2017-10-09 13:17:39.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: lftp 4.7.2\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 2016-05-20 15:00+0200\n"
"Last-Translator: Jakub Bogusz <qbo...@pld-linux.org>\n"
"Language-Team: Polish <translation-team...@lists.sourceforge.net>\n"
Binary files old/lftp-4.8.2/po/pt_BR.gmo and new/lftp-4.8.3/po/pt_BR.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/pt_BR.po new/lftp-4.8.3/po/pt_BR.po
--- old/lftp-4.8.2/po/pt_BR.po 2017-09-25 13:29:19.000000000 +0200
+++ new/lftp-4.8.3/po/pt_BR.po 2017-10-09 13:17:39.000000000 +0200
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: lftp 1.0\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 1999-07-12 00:00+0400\n"
"Last-Translator: Arnaldo Carvalho de Melo <a...@conectiva.com.br>\n"
"Language-Team: pt_BR <p...@li.org>\n"
Binary files old/lftp-4.8.2/po/ru.gmo and new/lftp-4.8.3/po/ru.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/ru.po new/lftp-4.8.3/po/ru.po
--- old/lftp-4.8.2/po/ru.po 2017-09-25 13:29:19.000000000 +0200
+++ new/lftp-4.8.3/po/ru.po 2017-10-09 13:17:39.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: lftp 4.7.5\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 2016-11-30 13:40+0300\n"
"Last-Translator: Alexander V. Lukyanov <l...@yars.free.net>\n"
"Language-Team: Russian <r...@li.org>\n"
Binary files old/lftp-4.8.2/po/uk.gmo and new/lftp-4.8.3/po/uk.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/uk.po new/lftp-4.8.3/po/uk.po
--- old/lftp-4.8.2/po/uk.po 2017-09-25 13:29:20.000000000 +0200
+++ new/lftp-4.8.3/po/uk.po 2017-10-09 13:17:39.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: lftp 4.4.8\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 2015-08-18 12:36+0300\n"
"Last-Translator: Yuri Chornoivan <yurc...@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n...@kde.org>\n"
Binary files old/lftp-4.8.2/po/zh_CN.gmo and new/lftp-4.8.3/po/zh_CN.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/zh_CN.po new/lftp-4.8.3/po/zh_CN.po
--- old/lftp-4.8.2/po/zh_CN.po 2017-09-25 13:29:20.000000000 +0200
+++ new/lftp-4.8.3/po/zh_CN.po 2017-10-09 13:17:39.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: lftp-2.0.4\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 1999-09-10 00:50+0800\n"
"Last-Translator: Wang Jian <l...@linux.net.cn>\n"
"Language-Team: zh <z...@li.org>\n"
Binary files old/lftp-4.8.2/po/zh_HK.gmo and new/lftp-4.8.3/po/zh_HK.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/zh_HK.po new/lftp-4.8.3/po/zh_HK.po
--- old/lftp-4.8.2/po/zh_HK.po 2017-09-25 13:29:20.000000000 +0200
+++ new/lftp-4.8.3/po/zh_HK.po 2017-10-09 13:17:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: lftp 3.5.11\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 2007-05-13 20:18+0800\n"
"Last-Translator: Abel Cheung <abelche...@gmail.com>\n"
"Language-Team: Chinese (Hong Kong) <commun...@linuxhall.org>\n"
Binary files old/lftp-4.8.2/po/zh_TW.gmo and new/lftp-4.8.3/po/zh_TW.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/po/zh_TW.po new/lftp-4.8.3/po/zh_TW.po
--- old/lftp-4.8.2/po/zh_TW.po 2017-09-25 13:29:20.000000000 +0200
+++ new/lftp-4.8.3/po/zh_TW.po 2017-10-09 13:17:39.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: lftp 4.6.4\n"
"Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
-"POT-Creation-Date: 2017-09-25 14:29+0300\n"
+"POT-Creation-Date: 2017-10-09 14:17+0300\n"
"PO-Revision-Date: 2017-07-12 11:26+0800\n"
"Last-Translator: Jeff Huang <s8321...@gmail.com>\n"
"Language-Team: Chinese <chinese-l...@googlegroups.com>\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/src/FileAccess.cc new/lftp-4.8.3/src/FileAccess.cc
--- old/lftp-4.8.2/src/FileAccess.cc 2017-09-21 14:42:25.000000000 +0200
+++ new/lftp-4.8.3/src/FileAccess.cc 2017-10-05 09:55:29.000000000 +0200
@@ -1071,7 +1071,7 @@
void FileAccess::ClassCleanup()
{
Protocol::ClassCleanup();
- call_dynamic_hook("lftp_RateLimit_cleanup");
+ call_dynamic_hook("lftp_network_cleanup");
DirColors::DeleteInstance();
delete cache;
cache=0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/src/NetAccess.cc new/lftp-4.8.3/src/NetAccess.cc
--- old/lftp-4.8.2/src/NetAccess.cc 2017-09-20 12:26:55.000000000 +0200
+++ new/lftp-4.8.3/src/NetAccess.cc 2017-10-05 09:54:27.000000000 +0200
@@ -687,3 +687,9 @@
session->CurrentStatus());
return "";
}
+
+CDECL void lftp_network_cleanup()
+{
+ NetAccess::ClassCleanup();
+ RateLimit::ClassCleanup();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/src/NetAccess.h new/lftp-4.8.3/src/NetAccess.h
--- old/lftp-4.8.2/src/NetAccess.h 2017-09-20 12:26:55.000000000 +0200
+++ new/lftp-4.8.3/src/NetAccess.h 2017-10-09 09:47:46.000000000 +0200
@@ -154,12 +154,15 @@
void Close();
- void Cleanup() override;
- void CleanupThis() override;
+ void Cleanup();
+ void CleanupThis();
int CountConnections();
static void ClassInit();
+ static void ClassCleanup() {
+ site_data.empty();
+ }
};
class GenericParseListInfo : public ListInfo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/src/RateLimit.cc new/lftp-4.8.3/src/RateLimit.cc
--- old/lftp-4.8.2/src/RateLimit.cc 2017-09-21 14:45:41.000000000 +0200
+++ new/lftp-4.8.3/src/RateLimit.cc 2017-10-05 09:54:35.000000000 +0200
@@ -193,8 +193,6 @@
if(!total)
return;
for(RateLimit *t=total->each_begin(); t; t=total->each_next())
- t->parent=nullptr;
+ t->parent=0;
delete total; total=0;
}
-
-CDECL void lftp_RateLimit_cleanup() { RateLimit::ClassCleanup(); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/lftp-4.8.2/src/SSH_Access.cc new/lftp-4.8.3/src/SSH_Access.cc
--- old/lftp-4.8.2/src/SSH_Access.cc 2017-03-16 14:34:44.000000000 +0100
+++ new/lftp-4.8.3/src/SSH_Access.cc 2017-10-03 10:10:51.000000000 +0200
@@ -161,6 +161,7 @@
{
if(send_buf)
LogNote(9,_("Disconnecting"));
+ rate_limit=0;
send_buf=0;
recv_buf=0;
pty_send_buf=0;
