Hello community,
here is the log from the commit of package libfilezilla for openSUSE:Factory
checked in at 2020-08-18 15:10:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libfilezilla (Old)
and /work/SRC/openSUSE:Factory/.libfilezilla.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libfilezilla"
Tue Aug 18 15:10:49 2020 rev:32 rq:826977 version:0.23.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libfilezilla/libfilezilla.changes
2020-05-13 22:56:38.567074627 +0200
+++ /work/SRC/openSUSE:Factory/.libfilezilla.new.3399/libfilezilla.changes
2020-08-18 15:10:51.044035692 +0200
@@ -1,0 +2,7 @@
+Sun Aug 16 07:53:20 UTC 2020 - Dirk Mueller <dmuel...@suse.com>
+
+- update to 0.23.0:
+ + Added reader/writer locks
+ - fz::mkdir can now return the the longest created path in case of partial
failures
+
+-------------------------------------------------------------------
Old:
----
libfilezilla-0.22.0.tar.bz2
New:
----
libfilezilla-0.23.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libfilezilla.spec ++++++
--- /var/tmp/diff_new_pack.GDbhP2/_old 2020-08-18 15:10:51.660035947 +0200
+++ /var/tmp/diff_new_pack.GDbhP2/_new 2020-08-18 15:10:51.664035948 +0200
@@ -16,11 +16,11 @@
#
-%define major 7
+%define major 8
%define libname %{name}%{major}
%define develname %{name}-devel
Name: libfilezilla
-Version: 0.22.0
+Version: 0.23.0
Release: 0
Summary: C++ library for filezilla
License: GPL-2.0-or-later
++++++ libfilezilla-0.22.0.tar.bz2 -> libfilezilla-0.23.0.tar.bz2 ++++++
++++ 4950 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/libfilezilla-0.22.0/NEWS new/libfilezilla-0.23.0/NEWS
--- old/libfilezilla-0.22.0/NEWS 2020-05-12 10:21:32.000000000 +0200
+++ new/libfilezilla-0.23.0/NEWS 2020-07-07 14:07:30.000000000 +0200
@@ -1,3 +1,8 @@
+0.23.0 (2020-07-07)
+
++ Added reader/writer locks
+- fz::mkdir can now return the the longest created path in case of partial
failures
+
0.22.0 (2020-05-12)
+ Added a flag to fz::file to allow creation of files with permissions only
granting the current user access
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/libfilezilla-0.22.0/config/compile new/libfilezilla-0.23.0/config/compile
--- old/libfilezilla-0.22.0/config/compile 2015-11-02 14:50:21.000000000
+0100
+++ new/libfilezilla-0.23.0/config/compile 2020-07-07 14:09:22.000000000
+0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
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/libfilezilla-0.22.0/config/config.hpp.in
new/libfilezilla-0.23.0/config/config.hpp.in
--- old/libfilezilla-0.22.0/config/config.hpp.in 1970-01-01
01:00:00.000000000 +0100
+++ new/libfilezilla-0.23.0/config/config.hpp.in 2020-07-07
14:09:22.000000000 +0200
@@ -0,0 +1,138 @@
+/* config/config.hpp.in. Generated from configure.ac by autoheader. */
+
+/* Set to 1 to use ciphers defined in system policy. */
+#undef FZ_USE_GNUTLS_SYSTEM_CIPHERS
+
+/* Define to 1 if you have the `accept4' function. */
+#undef HAVE_ACCEPT4
+
+/* clock_gettime can be used */
+#undef HAVE_CLOCK_GETTIME
+
+/* define if the compiler supports basic C++17 syntax */
+#undef HAVE_CXX17
+
+/* Define to 1 if you have the declaration of `CLOCK_MONOTONIC', and to 0 if
+ you don't. */
+#undef HAVE_DECL_CLOCK_MONOTONIC
+
+/* Define to 1 if you have the declaration of `pthread_condattr_setclock', and
+ to 0 if you don't. */
+#undef HAVE_DECL_PTHREAD_CONDATTR_SETCLOCK
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* eventfd */
+#undef HAVE_EVENTFD
+
+/* Define to 1 if you have the `gmtime_r' function. */
+#undef HAVE_GMTIME_R
+
+/* gmtime_s can be used */
+#undef HAVE_GMTIME_S
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `localtime_r' function. */
+#undef HAVE_LOCALTIME_R
+
+/* localtime_s can be used */
+#undef HAVE_LOCALTIME_S
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define if thread_local isn't supported */
+#undef HAVE_NO_THREAD_LOCAL
+
+/* Define to 1 if you have the `pipe2' function. */
+#undef HAVE_PIPE2
+
+/* Define to 1 if you have the `poll' function. */
+#undef HAVE_POLL
+
+/* Define to 1 if you have the `posix_fadvise' function. */
+#undef HAVE_POSIX_FADVISE
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define if there is a member named d_type in the struct describing directory
+ headers. */
+#undef HAVE_STRUCT_DIRENT_D_TYPE
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the `timegm' function. */
+#undef HAVE_TIMEGM
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Build system under which the program was compiled on. */
+#undef USED_BUILD
+
+/* Define to name and version of used compiler */
+#undef USED_COMPILER
+
+/* Define to the used CXXFLAGS to compile this package. */
+#undef USED_CXXFLAGS
+
+/* Host system under which the program will run. */
+#undef USED_HOST
+
+/* Version number of package */
+#undef VERSION
+
+/* Enable large inode numbers on Mac OS X 10.5. */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
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/libfilezilla-0.22.0/config/missing new/libfilezilla-0.23.0/config/missing
--- old/libfilezilla-0.22.0/config/missing 2015-11-02 14:50:21.000000000
+0100
+++ new/libfilezilla-0.23.0/config/missing 2020-07-07 14:09:22.000000000
+0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
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/libfilezilla-0.22.0/config/test-driver
new/libfilezilla-0.23.0/config/test-driver
--- old/libfilezilla-0.22.0/config/test-driver 2015-11-02 14:50:21.000000000
+0100
+++ new/libfilezilla-0.23.0/config/test-driver 2020-07-07 14:09:22.000000000
+0200
@@ -1,9 +1,9 @@
#! /bin/sh
# test-driver - basic testsuite driver script.
-scriptversion=2013-07-13.22; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2018 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -106,11 +106,14 @@
# Test script is run here.
"$@" >$log_file 2>&1
estatus=$?
+
if test $enable_hard_errors = no && test $estatus -eq 99; then
- estatus=1
+ tweaked_estatus=1
+else
+ tweaked_estatus=$estatus
fi
-case $estatus:$expect_failure in
+case $tweaked_estatus:$expect_failure in
0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
0:*) col=$grn res=PASS recheck=no gcopy=no;;
77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
@@ -119,6 +122,12 @@
*:*) col=$red res=FAIL recheck=yes gcopy=yes;;
esac
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
# Report outcome to console.
echo "${col}${res}${std}: $test_name"
@@ -131,9 +140,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
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/libfilezilla-0.22.0/configure.ac new/libfilezilla-0.23.0/configure.ac
--- old/libfilezilla-0.22.0/configure.ac 2020-05-12 10:21:32.000000000
+0200
+++ new/libfilezilla-0.23.0/configure.ac 2020-07-07 14:08:18.000000000
+0200
@@ -1,4 +1,4 @@
-AC_INIT([libfilezilla],[0.22.0],[tim.ko...@filezilla-project.org],[],[https://lib.filezilla-project.org/])
+AC_INIT([libfilezilla],[0.23.0],[tim.ko...@filezilla-project.org],[],[https://lib.filezilla-project.org/])
# Update the version information only immediately before a public release of
your software
# If the library source code has changed at all since the last update, then
increment revision (‘c:r:a’ becomes ‘c:r+1:a’).
@@ -6,13 +6,13 @@
# If any interfaces have been added since the last public release, then
increment age.
# If any interfaces have been removed or changed since the last public
release, then set age to 0.
# CURRENT:REVISION:AGE
-LIBRARY_VERSION=7:0:0
+LIBRARY_VERSION=8:0:0
-AC_CONFIG_HEADERS([lib/libfilezilla/private/config.hpp])
+AC_CONFIG_HEADERS([config/config.hpp])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip subdir-objects])
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip subdir-objects nostdinc])
AC_CANONICAL_HOST
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/libfilezilla-0.22.0/lib/Makefile.am new/libfilezilla-0.23.0/lib/Makefile.am
--- old/libfilezilla-0.22.0/lib/Makefile.am 2020-04-20 10:34:32.000000000
+0200
+++ new/libfilezilla-0.23.0/lib/Makefile.am 2020-07-07 14:06:31.000000000
+0200
@@ -53,6 +53,7 @@
libfilezilla/rate_limiter.hpp \
libfilezilla/rate_limited_layer.hpp \
libfilezilla/recursive_remove.hpp \
+ libfilezilla/rwmutex.hpp \
libfilezilla/shared.hpp \
libfilezilla/signature.hpp \
libfilezilla/socket.hpp \
@@ -107,11 +108,12 @@
tls_system_trust_store_impl.hpp
libfilezilla_la_CPPFLAGS = $(AM_CPPFLAGS)
+libfilezilla_la_CPPFLAGS += -I$(top_builddir)/config
libfilezilla_la_CPPFLAGS += -DBUILDING_LIBFILEZILLA
libfilezilla_la_CPPFLAGS += $(NETTLE_CFLAGS) $(GNUTLS_CFLAGS)
# Needed for version.hpp in out-of-tree builds
-libfilezilla_la_CPPFLAGS += -I$(srcdir)/libfilezilla
+libfilezilla_la_CPPFLAGS += -I. -I$(srcdir)/libfilezilla
libfilezilla_la_CXXFLAGS = $(AM_CXXFLAGS)
libfilezilla_la_CXXFLAGS += -fvisibility=hidden
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/libfilezilla-0.22.0/lib/libfilezilla/local_filesys.hpp
new/libfilezilla-0.23.0/lib/libfilezilla/local_filesys.hpp
--- old/libfilezilla-0.22.0/lib/libfilezilla/local_filesys.hpp 2020-05-12
10:21:32.000000000 +0200
+++ new/libfilezilla-0.23.0/lib/libfilezilla/local_filesys.hpp 2020-07-07
14:06:31.000000000 +0200
@@ -147,8 +147,17 @@
* the default permissions are used.
*
* This function only works with absolute paths.
+ *
+ * \param absolute_path The directory to create
+ * \param recurse If true, creation is recursive. If false, only the last
segment gets
+ * created, all other components already need to exist.
+ * \param current_user_only If true when creating the last component, its
permissions will be
+ * restricted to the current user. Otherwise default
permissions are used.
+ * Default permissions on MSW this means inheriting
the parent's permissions,
+ * on *nix the current umask is applied.
+ * \param last_created If non-null, receives the longest sub-path that
was created
*/
-result FZ_PUBLIC_SYMBOL mkdir(native_string const& absolute_path, bool
recurse, bool current_user_only = false);
+result FZ_PUBLIC_SYMBOL mkdir(native_string const& absolute_path, bool
recurse, bool current_user_only = false, native_string * last_created =
nullptr);
}
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/libfilezilla-0.22.0/lib/libfilezilla/private/config.hpp.in
new/libfilezilla-0.23.0/lib/libfilezilla/private/config.hpp.in
--- old/libfilezilla-0.22.0/lib/libfilezilla/private/config.hpp.in
2020-05-12 10:21:54.000000000 +0200
+++ new/libfilezilla-0.23.0/lib/libfilezilla/private/config.hpp.in
1970-01-01 01:00:00.000000000 +0100
@@ -1,138 +0,0 @@
-/* lib/libfilezilla/private/config.hpp.in. Generated from configure.ac by
autoheader. */
-
-/* Set to 1 to use ciphers defined in system policy. */
-#undef FZ_USE_GNUTLS_SYSTEM_CIPHERS
-
-/* Define to 1 if you have the `accept4' function. */
-#undef HAVE_ACCEPT4
-
-/* clock_gettime can be used */
-#undef HAVE_CLOCK_GETTIME
-
-/* define if the compiler supports basic C++17 syntax */
-#undef HAVE_CXX17
-
-/* Define to 1 if you have the declaration of `CLOCK_MONOTONIC', and to 0 if
- you don't. */
-#undef HAVE_DECL_CLOCK_MONOTONIC
-
-/* Define to 1 if you have the declaration of `pthread_condattr_setclock', and
- to 0 if you don't. */
-#undef HAVE_DECL_PTHREAD_CONDATTR_SETCLOCK
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* eventfd */
-#undef HAVE_EVENTFD
-
-/* Define to 1 if you have the `gmtime_r' function. */
-#undef HAVE_GMTIME_R
-
-/* gmtime_s can be used */
-#undef HAVE_GMTIME_S
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
-
-/* localtime_s can be used */
-#undef HAVE_LOCALTIME_S
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if thread_local isn't supported */
-#undef HAVE_NO_THREAD_LOCAL
-
-/* Define to 1 if you have the `pipe2' function. */
-#undef HAVE_PIPE2
-
-/* Define to 1 if you have the `poll' function. */
-#undef HAVE_POLL
-
-/* Define to 1 if you have the `posix_fadvise' function. */
-#undef HAVE_POSIX_FADVISE
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define if there is a member named d_type in the struct describing directory
- headers. */
-#undef HAVE_STRUCT_DIRENT_D_TYPE
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the `timegm' function. */
-#undef HAVE_TIMEGM
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Build system under which the program was compiled on. */
-#undef USED_BUILD
-
-/* Define to name and version of used compiler */
-#undef USED_COMPILER
-
-/* Define to the used CXXFLAGS to compile this package. */
-#undef USED_CXXFLAGS
-
-/* Host system under which the program will run. */
-#undef USED_HOST
-
-/* Version number of package */
-#undef VERSION
-
-/* Enable large inode numbers on Mac OS X 10.5. */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
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/libfilezilla-0.22.0/lib/libfilezilla/rwmutex.hpp
new/libfilezilla-0.23.0/lib/libfilezilla/rwmutex.hpp
--- old/libfilezilla-0.22.0/lib/libfilezilla/rwmutex.hpp 1970-01-01
01:00:00.000000000 +0100
+++ new/libfilezilla-0.23.0/lib/libfilezilla/rwmutex.hpp 2020-07-07
14:06:31.000000000 +0200
@@ -0,0 +1,274 @@
+#ifndef LIBFILEZILLA_RWMUTEX_HEADER
+#define LIBFILEZILLA_RWMUTEX_HEADER
+
+/** \file
+ * \brief Thread synchronization primitives: rwmutex, scoped_read_lock and
scoped_write_lock
+ */
+#include "libfilezilla.hpp"
+#include "time.hpp"
+
+#ifdef FZ_WINDOWS
+#include "private/windows.hpp"
+#else
+#include <pthread.h>
+#endif
+
+namespace fz {
+
+/**
+ * \brief Lean rw mutex.
+ *
+ * This mutex is neither recursive, nor can read locks be upgraded to write
locks.
+ */
+class FZ_PUBLIC_SYMBOL rwmutex final
+{
+public:
+#ifdef FZ_WINDOWS
+ explicit rwmutex() = default;
+#else
+ explicit rwmutex()
+ {
+ pthread_rwlock_init(&m_, nullptr);
+ }
+ ~rwmutex()
+ {
+ pthread_rwlock_destroy(&m_);
+ }
+#endif
+
+ rwmutex(rwmutex const&) = delete;
+ rwmutex& operator=(rwmutex const&) = delete;
+
+ /// Beware, manual locking isn't exception safe, use scoped_lock
+ void lock_read()
+ {
+#ifdef FZ_WINDOWS
+ AcquireSRWLockShared(&m_);
+#else
+ pthread_rwlock_rdlock(&m_);
+#endif
+ }
+
+ void lock_write()
+ {
+#ifdef FZ_WINDOWS
+ AcquireSRWLockExclusive(&m_);
+#else
+ pthread_rwlock_wrlock(&m_);
+#endif
+ }
+
+ /// Beware, manual locking isn't exception safe, use scoped_lock
+ void unlock_read()
+ {
+#ifdef FZ_WINDOWS
+ ReleaseSRWLockShared(&m_);
+#else
+ pthread_rwlock_unlock(&m_);
+#endif
+ }
+
+ void unlock_write()
+ {
+#ifdef FZ_WINDOWS
+ ReleaseSRWLockExclusive(&m_);
+#else
+ pthread_rwlock_unlock(&m_);
+#endif
+ }
+
+private:
+ friend class scoped_read_lock;
+ friend class scoped_write_lock;
+
+#ifdef FZ_WINDOWS
+ SRWLOCK m_{};
+#else
+ pthread_rwlock_t m_;
+#endif
+};
+
+/** \brief A simple scoped read lock.
+ *
+ * The lock is aquired on construction and, if still locked, released on
destruction.
+ * You can manually unlock and re-lock if needed.
+ *
+ * There can be multiple readers.
+ * If there is a writer there's no readers and no other writer.
+ */
+class FZ_PUBLIC_SYMBOL scoped_read_lock final
+{
+public:
+ explicit scoped_read_lock(rwmutex& m)
+ : m_(&m.m_)
+ {
+#ifdef FZ_WINDOWS
+ AcquireSRWLockShared(m_);
+#else
+ pthread_rwlock_rdlock(m_);
+#endif
+ }
+
+ ~scoped_read_lock()
+ {
+ if (locked_) {
+#ifdef FZ_WINDOWS
+ ReleaseSRWLockShared(m_);
+#else
+ pthread_rwlock_unlock(m_);
+#endif
+ }
+
+ }
+
+ scoped_read_lock(scoped_read_lock const&) = delete;
+ scoped_read_lock& operator=(scoped_read_lock const&) = delete;
+
+ scoped_read_lock(scoped_read_lock&& op) noexcept
+ {
+ m_ = op.m_;
+ op.m_ = 0;
+ locked_ = op.locked_;
+ op.locked_ = false;
+ }
+
+ scoped_read_lock& operator=(scoped_read_lock&& op) noexcept
+ {
+ if (this != &op) {
+ m_ = op.m_;
+ op.m_ = 0;
+ locked_ = op.locked_;
+ op.locked_ = false;
+ }
+ return *this;
+ }
+
+ /** \brief Obtains the mutex.
+ *
+ * Locking an already locked scoped_read_lock results in undefined
behavior.
+ */
+ void lock()
+ {
+ locked_ = true;
+#ifdef FZ_WINDOWS
+ AcquireSRWLockShared(m_);
+#else
+ pthread_rwlock_rdlock(m_);
+#endif
+ }
+
+ /** \brief Releases the mutex.
+ *
+ * Releasing a scoped_read_lock that isn't locked results in undefined
behavior.
+ */
+ void unlock()
+ {
+ locked_ = false;
+#ifdef FZ_WINDOWS
+ ReleaseSRWLockShared(m_);
+#else
+ pthread_rwlock_unlock(m_);
+#endif
+ }
+
+private:
+#ifdef FZ_WINDOWS
+ SRWLOCK* m_;
+#else
+ pthread_rwlock_t* m_;
+#endif
+ bool locked_{ true };
+};
+
+/** \brief A simple scoped read lock.
+ *
+ * The lock is aquired on construction and, if still locked, released on
destruction.
+ * You can manually unlock and re-lock if needed.
+ */
+class FZ_PUBLIC_SYMBOL scoped_write_lock final
+{
+public:
+ explicit scoped_write_lock(rwmutex& m)
+ : m_(&m.m_)
+ {
+#ifdef FZ_WINDOWS
+ AcquireSRWLockExclusive(m_);
+#else
+ pthread_rwlock_wrlock(m_);
+#endif
+ }
+
+ ~scoped_write_lock()
+ {
+ if (locked_) {
+#ifdef FZ_WINDOWS
+ ReleaseSRWLockExclusive(m_);
+#else
+ pthread_rwlock_unlock(m_);
+#endif
+ }
+
+ }
+
+ scoped_write_lock(scoped_write_lock const&) = delete;
+ scoped_write_lock& operator=(scoped_write_lock const&) = delete;
+
+ scoped_write_lock(scoped_write_lock&& op) noexcept
+ {
+ m_ = op.m_;
+ op.m_ = 0;
+ locked_ = op.locked_;
+ op.locked_ = false;
+ }
+
+ scoped_write_lock& operator=(scoped_write_lock&& op) noexcept
+ {
+ if (this != &op) {
+ m_ = op.m_;
+ op.m_ = 0;
+ locked_ = op.locked_;
+ op.locked_ = false;
+ }
+ return *this;
+ }
+
+ /** \brief Obtains the mutex.
+ *
+ * Locking an alwritey locked scoped_write_lock results in undefined
behavior.
+ */
+ void lock()
+ {
+ locked_ = true;
+#ifdef FZ_WINDOWS
+ AcquireSRWLockExclusive(m_);
+#else
+ pthread_rwlock_wrlock(m_);
+#endif
+ }
+
+ /** \brief Releases the mutex.
+ *
+ * Releasing a scoped_write_lock that isn't locked results in undefined
behavior.
+ */
+ void unlock()
+ {
+ locked_ = false;
+#ifdef FZ_WINDOWS
+ ReleaseSRWLockExclusive(m_);
+#else
+ pthread_rwlock_unlock(m_);
+#endif
+ }
+
+private:
+#ifdef FZ_WINDOWS
+ SRWLOCK* m_;
+#else
+ pthread_rwlock_t* m_;
+#endif
+ bool locked_{ true };
+};
+
+}
+
+#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/libfilezilla-0.22.0/lib/local_filesys.cpp
new/libfilezilla-0.23.0/lib/local_filesys.cpp
--- old/libfilezilla-0.22.0/lib/local_filesys.cpp 2020-05-12
10:21:32.000000000 +0200
+++ new/libfilezilla-0.23.0/lib/local_filesys.cpp 2020-07-07
14:06:31.000000000 +0200
@@ -810,7 +810,7 @@
}
}
-result mkdir(native_string const& absolute_path, bool recurse, bool
current_user_only)
+result mkdir(native_string const& absolute_path, bool recurse, bool
current_user_only, native_string* last_created)
{
// Step 0: Require an absolute path
#ifdef FZ_WINDOWS
@@ -908,13 +908,21 @@
if (!r) {
return r;
}
+ if (last_created) {
+ *last_created = work;
+ }
}
-
- return result{result::ok};
}
else {
- return do_mkdir(absolute_path, current_user_only);
+ result r = do_mkdir(absolute_path, current_user_only);
+ if (!r) {
+ return r;
+ }
+ if (last_created) {
+ *last_created = absolute_path;
+ }
}
-}
+ return result{result::ok};
+}
}
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/libfilezilla-0.22.0/lib/process.cpp new/libfilezilla-0.23.0/lib/process.cpp
--- old/libfilezilla-0.22.0/lib/process.cpp 2020-04-20 10:34:32.000000000
+0200
+++ new/libfilezilla-0.23.0/lib/process.cpp 2020-07-07 14:06:31.000000000
+0200
@@ -263,7 +263,7 @@
#include "libfilezilla/local_filesys.hpp"
#include <CoreFoundation/CFArray.h>
-#include <CoreFoundation/CFUrl.h>
+#include <CoreFoundation/CFURL.h>
#include <CoreFoundation/CFBundle.h>
#include <ApplicationServices/ApplicationServices.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/libfilezilla-0.22.0/locales/ja_JP.po
new/libfilezilla-0.23.0/locales/ja_JP.po
--- old/libfilezilla-0.22.0/locales/ja_JP.po 2020-05-12 10:21:32.000000000
+0200
+++ new/libfilezilla-0.23.0/locales/ja_JP.po 2020-07-07 14:06:31.000000000
+0200
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: libfilezilla 0.21.0\n"
+"Project-Id-Version: libfilezilla 0.22.0\n"
"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n";
-"POT-Creation-Date: 2020-04-27 11:53+0200\n"
-"PO-Revision-Date: 2020-04-21 12:30+0900\n"
+"POT-Creation-Date: 2020-05-18 15:04+0200\n"
+"PO-Revision-Date: 2020-05-12 20:30+0900\n"
"Last-Translator: Rukoto Luther <rukotolucies at hotmail.com>\n"
"Language-Team: Japanese\n"
"Language: ja_JP\n"
@@ -16,11 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../lib/tls_layer_impl.cpp:1371
+#: ../lib/tls_layer_impl.cpp:1384
msgid "A certificate in the chain was signed using an insecure algorithm"
msgstr "チェーンの証明書が安全でないアルゴリズムで署名されています"
-#: ../lib/tls_layer_impl.cpp:1375
+#: ../lib/tls_layer_impl.cpp:1388
msgid "An issuer in the certificate chain is not a certificate authority"
msgstr "証明書チェーンの発行者は認証局ではありません"
@@ -32,7 +32,7 @@
msgid "Bad file descriptor"
msgstr "不正なファイル記述子"
-#: ../lib/tls_layer_impl.cpp:1361
+#: ../lib/tls_layer_impl.cpp:1374
msgid "Beware! Certificate has been revoked"
msgstr "注意! 証明書は失効しています"
@@ -44,11 +44,11 @@
msgid "Certificate file too big."
msgstr "証明書ファイルが大きすぎます。"
-#: ../lib/tls_layer_impl.cpp:1431
+#: ../lib/tls_layer_impl.cpp:1450
msgid "Certificate of connection does not match expected certificate."
msgstr "接続の証明書が予想される証明書と一致しません。"
-#: ../lib/tls_layer_impl.cpp:1367
+#: ../lib/tls_layer_impl.cpp:1380
msgid "Certificate signature verification failed"
msgstr "証明書署名の検証に失敗しました"
@@ -72,22 +72,26 @@
msgid "Connection reset by peer"
msgstr "相手によって接続がリセットされました"
-#: ../lib/tls_layer_impl.cpp:1513
+#: ../lib/tls_layer_impl.cpp:1532
msgid "Could not add certificate to temporary trust list"
msgstr "一時的な信頼リストに証明書を追加できません"
-#: ../lib/tls_layer_impl.cpp:1505
+#: ../lib/tls_layer_impl.cpp:1524
msgid "Could not copy certificate"
msgstr "証明書をコピーできません"
-#: ../lib/tls_layer_impl.cpp:1139
+#: ../lib/tls_layer_impl.cpp:1087
+msgid "Could not extract validity period of certificate"
+msgstr "証明書の有効期間を抽出できません"
+
+#: ../lib/tls_layer_impl.cpp:1144
msgid ""
"Could not get distinguished name of certificate issuer, "
"gnutls_x509_get_issuer_dn failed"
msgstr ""
"証明書発行者の識別名を取得できず、gnutls_x509_get_issuer_dn に失敗しました"
-#: ../lib/tls_layer_impl.cpp:1125
+#: ../lib/tls_layer_impl.cpp:1130
msgid ""
"Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
"failed"
@@ -110,11 +114,11 @@
msgid "Could not read key file."
msgstr "鍵ファイルを読み込めません。"
-#: ../lib/tls_layer_impl.cpp:1344
+#: ../lib/tls_layer_impl.cpp:1357
msgid "Could not sort peer certificates"
msgstr "ピア証明書を並べ替えできません"
-#: ../lib/tls_layer_impl.cpp:1476 ../lib/tls_layer_impl.cpp:1527
+#: ../lib/tls_layer_impl.cpp:1495 ../lib/tls_layer_impl.cpp:1546
msgid "Failed to verify peer certificate"
msgstr "ピア証明書の検証に失敗しました"
@@ -178,7 +182,7 @@
msgid "Local endpoint has been closed"
msgstr "ローカル エンドポイントは閉じられています"
-#: ../lib/tls_layer_impl.cpp:1564
+#: ../lib/tls_layer_impl.cpp:1434 ../lib/tls_layer_impl.cpp:1596
msgid "Man-in-the-Middle attack detected, aborting connection."
msgstr "中間者攻撃が検出されたため、接続が中断されました。"
@@ -263,11 +267,11 @@
msgid "Received TLS alert from the server: %s (%d)"
msgstr "サーバーから TLS アラートを受信しました: %s (%d)"
-#: ../lib/tls_layer_impl.cpp:1390
+#: ../lib/tls_layer_impl.cpp:1403
msgid "Received certificate chain could not be verified."
msgstr "受信した証明書チェーンを検証できません。"
-#: ../lib/tls_layer_impl.cpp:1393
+#: ../lib/tls_layer_impl.cpp:1406
#, c-format
msgid ""
"Received certificate chain could not be verified. Verification status is %d."
@@ -294,7 +298,7 @@
msgid "Server did not properly shut down TLS connection"
msgstr "サーバーは TLS 接続を適切にシャットダウンしませんでした"
-#: ../lib/tls_layer_impl.cpp:1335
+#: ../lib/tls_layer_impl.cpp:1348
msgid ""
"Server sent unsorted certificate chain in violation of the TLS specifications"
msgstr "サーバーは TLS の仕様に違反して未分類の証明書チェーンを送信しました"
@@ -339,7 +343,7 @@
msgid "The ai_socktype member is not supported"
msgstr "ai_socktype メンバーをサポートしていません"
-#: ../lib/tls_layer_impl.cpp:1384
+#: ../lib/tls_layer_impl.cpp:1397
msgid ""
"The certificate requires the server to include an OCSP status in its "
"response, but the OCSP status is missing."
@@ -347,7 +351,7 @@
"証明書はサーバーの応答に OCSP ステータスを含める必要がありますが、OCSP ステー"
"タスが見つかりません。"
-#: ../lib/tls_layer_impl.cpp:1379
+#: ../lib/tls_layer_impl.cpp:1392
msgid "The server's hostname does not match the certificate's hostname"
msgstr "サーバーのホスト名が証明書のホスト名と一致しません"
@@ -363,23 +367,23 @@
msgid "The specified network name is no longer available"
msgstr "指定のネットワーク名は使用できません"
-#: ../lib/tls_layer_impl.cpp:1409
+#: ../lib/tls_layer_impl.cpp:1422
msgid "Unsupported certificate type"
msgstr "サポートされていない証明書タイプ"
-#: ../lib/tls_layer_impl.cpp:1548
+#: ../lib/tls_layer_impl.cpp:1567
msgid "Verifying certificate..."
msgstr "証明書を検証中..."
-#: ../lib/tls_layer_impl.cpp:1298
+#: ../lib/tls_layer_impl.cpp:1311
msgid "gnutls_certificate_get_peers returned no certificates"
msgstr "gnutls_certificate_get_peers が証明書を返しませんでした"
-#: ../lib/tls_layer_impl.cpp:1310
+#: ../lib/tls_layer_impl.cpp:1323
msgid "gnutls_pem_base64_encode2 failed"
msgstr "gnutls_pem_base64_encode2 が失敗しました"
-#: ../lib/tls_layer_impl.cpp:1608 ../lib/tls_layer_impl.cpp:1646
-#: ../lib/tls_layer_impl.cpp:1662 ../lib/tls_layer_impl.cpp:1678
+#: ../lib/tls_layer_impl.cpp:1651 ../lib/tls_layer_impl.cpp:1689
+#: ../lib/tls_layer_impl.cpp:1705 ../lib/tls_layer_impl.cpp:1721
msgid "unknown"
msgstr "不明"
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/libfilezilla-0.22.0/m4/libtool.m4 new/libfilezilla-0.23.0/m4/libtool.m4
--- old/libfilezilla-0.22.0/m4/libtool.m4 2017-07-10 19:43:54.000000000
+0200
+++ new/libfilezilla-0.23.0/m4/libtool.m4 2020-07-07 14:09:20.000000000
+0200
@@ -4063,7 +4063,8 @@
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe"
\> $nlist) && test -s "$nlist"; then
+ $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext |
$lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
+ if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \>
$nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -6438,7 +6439,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 |
$GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 |
$GREP -v "^Configured with:" | $GREP " \-L"'
else
GXX=no
@@ -6813,7 +6814,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v
conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v
conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "$list"'
;;
*)
if test yes = "$GXX"; then
@@ -6878,7 +6879,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v
conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v
conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "$list"'
;;
*)
if test yes = "$GXX"; then
@@ -7217,7 +7218,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext
2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext
2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
# FIXME: insert proper C++ library support
@@ -7301,7 +7302,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v
conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v
conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
# g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
@@ -7312,7 +7313,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext
2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext
2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
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/libfilezilla-0.22.0/m4/ltsugar.m4 new/libfilezilla-0.23.0/m4/ltsugar.m4
--- old/libfilezilla-0.22.0/m4/ltsugar.m4 2015-11-02 14:50:19.000000000
+0100
+++ new/libfilezilla-0.23.0/m4/ltsugar.m4 2020-07-07 14:09:20.000000000
+0200
@@ -1,6 +1,7 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
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/libfilezilla-0.22.0/m4/lt~obsolete.m4
new/libfilezilla-0.23.0/m4/lt~obsolete.m4
--- old/libfilezilla-0.22.0/m4/lt~obsolete.m4 2015-11-02 14:50:19.000000000
+0100
+++ new/libfilezilla-0.23.0/m4/lt~obsolete.m4 2020-07-07 14:09:20.000000000
+0200
@@ -1,6 +1,7 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
@@ -11,7 +12,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
# which have later been changed to m4_define as they aren't part of the
# exported API, or moved to Autoconf or Automake where they belong.
#
@@ -25,7 +26,7 @@
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
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/libfilezilla-0.22.0/tests/socket.cpp
new/libfilezilla-0.23.0/tests/socket.cpp
--- old/libfilezilla-0.22.0/tests/socket.cpp 2019-06-17 15:31:43.000000000
+0200
+++ new/libfilezilla-0.23.0/tests/socket.cpp 2020-07-07 14:06:31.000000000
+0200
@@ -275,15 +275,15 @@
CPPUNIT_ASSERT(!c.si_->connect(ip, port));
{
- fz::scoped_lock l(s.m_);
- s.cond_.wait(l);
- }
- {
fz::scoped_lock l(c.m_);
- c.cond_.wait(l);
+ CPPUNIT_ASSERT(c.cond_.wait(l, fz::duration::from_minutes(10)));
}
ASSERT_EQUAL(std::string(), c.failed_);
+ {
+ fz::scoped_lock l(s.m_);
+ CPPUNIT_ASSERT(s.cond_.wait(l, fz::duration::from_minutes(1)));
+ }
ASSERT_EQUAL(std::string(), s.failed_);
CPPUNIT_ASSERT(c.sent_hash_.digest() == s.received_hash_.digest());
@@ -313,15 +313,15 @@
CPPUNIT_ASSERT(!c.si_->connect(ip, port));
{
- fz::scoped_lock l(s.m_);
- s.cond_.wait(l);
- }
- {
fz::scoped_lock l(c.m_);
- c.cond_.wait(l);
+ CPPUNIT_ASSERT(c.cond_.wait(l, fz::duration::from_minutes(10)));
}
-
ASSERT_EQUAL(std::string(), c.failed_);
+
+ {
+ fz::scoped_lock l(s.m_);
+ CPPUNIT_ASSERT(s.cond_.wait(l, fz::duration::from_minutes(1)));
+ }
ASSERT_EQUAL(std::string(), s.failed_);
CPPUNIT_ASSERT(c.sent_ == s.received_);
