[Box Backup-commit] [boxbackup/boxbackup] 73f43c: Normalize all the line endings

Sun Jan 21 20:59:55 GMT 2018

  Branch: refs/heads/s3_support_merge
  Home:   https://github.com/boxbackup/boxbackup
  Commit: 73f43c98d0e734b2309fd49a6587171af3296471
      https://github.com/boxbackup/boxbackup/commit/73f43c98d0e734b2309fd49a6587171af3296471
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M infrastructure/cmake/build/bin_bbackupd.vcxproj.user
    M infrastructure/cmake/build/bin_bbstored.vcxproj.user
    M infrastructure/cmake/build/test_backupstore.vcxproj.user
    M infrastructure/cmake/build/test_backupstorefix.vcxproj.user
    M infrastructure/cmake/build/test_bbackupd.vcxproj.user
    M infrastructure/cmake/build/test_common.vcxproj.user
    M infrastructure/cmake/build/test_httpserver.vcxproj.user
    M infrastructure/cmake/build/test_raidfile.vcxproj.user
    M lib/win32/bsd_getopt.h
    M lib/win32/messages.h

  Log Message:
  -----------
  Normalize all the line endings

  Commit: 7b8a668f00e61c742146cf7b944f3f3b900ea331
      https://github.com/boxbackup/boxbackup/commit/7b8a668f00e61c742146cf7b944f3f3b900ea331
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M .gitattributes

  Log Message:
  -----------
  Tell Git to treat .cpp files as text too.

  Commit: c7c2b9345dd6a4d8805fd097361736a3746f7392
      https://github.com/boxbackup/boxbackup/commit/c7c2b9345dd6a4d8805fd097361736a3746f7392
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Tell Git to ignore some more generated files

  Commit: a3e328ef8f83d81f74b6a334ff6ad66d7dcbd534
      https://github.com/boxbackup/boxbackup/commit/a3e328ef8f83d81f74b6a334ff6ad66d7dcbd534
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-06-18 (Sun, 18 Jun 2017)

  Changed paths:
    M appveyor.yml
    M infrastructure/cmake/windows/CMakeLists.txt

  Log Message:
  -----------
  Update versions of dependencies for Windows unibuild, add Boost

* Add a variable in appveyor.yml for the CMake out-of-source build tree.
* Update the directory name in commands in appveyor.yml to match new CMake unibuild tree structure.
* Increase build verbosity slightly.
* Disable GUI crash dialogs that cause test hangs.
* Disable the AppVeyor cache that we don't use.

  Commit: 14e48b9851920cb2beb000610b36391879dcb201
      https://github.com/boxbackup/boxbackup/commit/14e48b9851920cb2beb000610b36391879dcb201
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-06-18 (Sun, 18 Jun 2017)

  Changed paths:
    M .travis.yml
    M infrastructure/travis-build.sh

  Log Message:
  -----------
  Add Boost to Travis build environment, and OSX builds

  Commit: ab617bdce7280a59333da695f44507cc36c35d25
      https://github.com/boxbackup/boxbackup/commit/ab617bdce7280a59333da695f44507cc36c35d25
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-06-18 (Sun, 18 Jun 2017)

  Changed paths:
    M infrastructure/cmake/CMakeLists.txt

  Log Message:
  -----------
  Install executables in test tree after building, not during "make install"

Build buildenv-testmain-template.cpp in-place, instead of copying, modifying
and compiling it.

Increase timeouts for some tests that sometimes run out of time on AppVeyor.

  Commit: 910840de529d1566924ea938883969307b91c209
      https://github.com/boxbackup/boxbackup/commit/910840de529d1566924ea938883969307b91c209
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-06-18 (Sun, 18 Jun 2017)

  Changed paths:
    M infrastructure/BoxPlatform.pm.in

  Log Message:
  -----------
  Fix build on SmartOS by switching back to GNU Make

I have no idea where I got the idea that there was a "bmake" command on SmartOS
that is BSD make, or why that would be better than gmake (GNU make). I can't
find any reference to the existence of such a thing. So I've just switched back
to using gmake unconditionally.

  Commit: 81e9aa6545f7f19124c9f5e88982b867d8732965
      https://github.com/boxbackup/boxbackup/commit/81e9aa6545f7f19124c9f5e88982b867d8732965
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-06-18 (Sun, 18 Jun 2017)

  Changed paths:
    M lib/intercept/intercept.cpp

  Log Message:
  -----------
  Hopefully fix test/raidfile on Solaris.

64-bit Solaris has _FILE_OFFSET_BITS defined (to 64), which was wrongly causing
the substitute lseek in lib/intercept to enter the 32-bit branch.

  Commit: 3a3fc72cd3b3c98870028f6d968b9cde64341ccd
      https://github.com/boxbackup/boxbackup/commit/3a3fc72cd3b3c98870028f6d968b9cde64341ccd
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-06-18 (Sun, 18 Jun 2017)

  Changed paths:
    M test/bbackupd/testbbackupd.cpp

  Log Message:
  -----------
  Relax timings on test_changing_client_store_marker_pauses_daemon

Also increase test verbosity to help debug the test if it fails again.

(cherry picked from commit 00c2127e9832591c248fa6eea05dfaf785b8380d)

  Commit: 25e445a6848a870aabd89a3b8a013265aa3cf17b
      https://github.com/boxbackup/boxbackup/commit/25e445a6848a870aabd89a3b8a013265aa3cf17b
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M .gitattributes

  Log Message:
  -----------
  Stop Git from normalising line endings

Although recommended, "text" mode causes constant and unfixable conficts
that I give up fighting with.

  Commit: d8422a8b053b62c67e5fe2e861a09d2c792b657a
      https://github.com/boxbackup/boxbackup/commit/d8422a8b053b62c67e5fe2e861a09d2c792b657a
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    A infrastructure/m4/ax_check_compile_flag.m4
    M infrastructure/m4/boxbackup_tests.m4

  Log Message:
  -----------
  Use AX_CHECK_COMPILE_FLAG, add more checks

Disable pointless deprecation warnings for std::auto_ptr.

  Commit: 6a04b0abd728da5211e6702b1d42aef95c02d8da
      https://github.com/boxbackup/boxbackup/commit/6a04b0abd728da5211e6702b1d42aef95c02d8da
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M infrastructure/m4/boxbackup_tests.m4
    M lib/intercept/intercept.cpp
    M lib/intercept/intercept.h
    M test/raidfile/testraidfile.cpp

  Log Message:
  -----------
  Fix intercept of SYS_open on platforms that only have SYS_openat (e.g. arm64)

  Commit: 105f2620b98bfd4e5d7ed576b5cc4b2317dcf634
      https://github.com/boxbackup/boxbackup/commit/105f2620b98bfd4e5d7ed576b5cc4b2317dcf634
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M lib/common/Logging.h
    M test/common/testcommon.cpp

  Log Message:
  -----------
  Reduce precision of common timer test

Ideally timers would be perfectly accurate and we could sleep for 1.0 seconds,
but on OSX in particular they could fire 50-100 ms late (I've seen 4 ms in
practice) and we don't want the tests to fail because of this, because we don't
really need that kind of precision in practice. So we reduce the timer
intervals by 100ms to be safe.

Increase logging level and add timestamps in testcommon.  Should help to debug
frequent test failures such as Condition [t2.HasExpired()] on OSX hosts on
Travis.

Add a SettingsGuard to the Console logger for its specific settings, such as
showing times and microseconds.

(cherry picked from commit a5e6cff1d435329b0121417ed9509e315ce0edd5)
(cherry picked from commit 8d02eebce553ed822e0fcd60d6e319384e15ba4b)

  Commit: 809d9ebacc409c4a86edb6077f489da67a2653d4
      https://github.com/boxbackup/boxbackup/commit/809d9ebacc409c4a86edb6077f489da67a2653d4
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M lib/common/BoxTime.cpp
    M test/bbackupd/testbbackupd.cpp

  Log Message:
  -----------
  Increase precision of timing on Windows.

Should hopefully reduce random failures of timing-dependent tests which
rely on subsecond precision for accuracy.

(cherry picked from commit c845b2e39fffeb560983a301d810616a6495469d)

  Commit: 4b7ab2833ebec9c026c10a761d64ada1ce809438
      https://github.com/boxbackup/boxbackup/commit/4b7ab2833ebec9c026c10a761d64ada1ce809438
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M lib/httpserver/cdecode.cpp

  Log Message:
  -----------
  Fix build on ARM64 with unsigned char

Thanks to Reinhard Tartler for pointing out the problem and suggesting the fix!

  Commit: b1f564266c64b48b99cce410e33d8287bf444d2a
      https://github.com/boxbackup/boxbackup/commit/b1f564266c64b48b99cce410e33d8287bf444d2a
  Author: Chris Wilson <qris at users.noreply.github.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M lib/httpserver/cdecode.cpp

  Log Message:
  -----------
  Merge pull request #17 from boxbackup/fix_arm64_unsigned_char

Fix build on ARM64 with unsigned char

  Commit: c0ff77b8a73e0b7804a9eac26b59603e06d1cbc0
      https://github.com/boxbackup/boxbackup/commit/c0ff77b8a73e0b7804a9eac26b59603e06d1cbc0
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-09-16 (Sat, 16 Sep 2017)

  Changed paths:
    M appveyor.yml
    M infrastructure/cmake/CMakeLists.txt
    M infrastructure/cmake/getversion.pl

  Log Message:
  -----------
  Build Win32/64 binary packages automatically

Every AppVeyor build on the specified branches that passes will be packaged
into a ZIP file and installer using CPack and uploaded to GitHub Releases.

Generate version number entirely in AppVeyor config, and build it into the
binary, and use it in the names of the created binary packages, and compile it
into the binaries.

(cherry picked from commit c5d8173bf03ab9fa93d3b3ffd871b378b0819567)

  Commit: 94ec413235f38419bf70a084a37808b6ae8bc09f
      https://github.com/boxbackup/boxbackup/commit/94ec413235f38419bf70a084a37808b6ae8bc09f
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-09-16 (Sat, 16 Sep 2017)

  Changed paths:
    M appveyor.yml

  Log Message:
  -----------
  Remove Xamarin to remove 500 lines of junk from build logs

See
http://help.appveyor.com/discussions/problems/4569-the-target-_convertpdbfiles-listed-in-a-beforetargets-attribute-at-c-does-not-exist-in-the-project-and-will-be-ignored for details.

(cherry picked from commit 019025deceff49485b03593f7a77a570d960546a)

  Commit: 75190f42eac277e5b936c60fde6ed4274a9e740c
      https://github.com/boxbackup/boxbackup/commit/75190f42eac277e5b936c60fde6ed4274a9e740c
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-09-16 (Sat, 16 Sep 2017)

  Changed paths:
    M appveyor.yml

  Log Message:
  -----------
  Reorder lines in appveyor.yml to match actual execution order

(cherry picked from commit ea4f1728b529aff1dfc912d8f51567f8cd58ea77)

  Commit: 796d758eef318c012fde12c8aacac671934fb8e9
      https://github.com/boxbackup/boxbackup/commit/796d758eef318c012fde12c8aacac671934fb8e9
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-09-16 (Sat, 16 Sep 2017)

  Changed paths:
    M appveyor.yml
    M infrastructure/cmake/windows/CMakeLists.txt

  Log Message:
  -----------
  Reduce AppVeyor build verbosity by passing extra args to sub-CMake

(cherry picked from commit 4876a5573a8bcd3312e9804c27fe9f30f3369747)

  Commit: 606b42ef0b265098bb107a4a36039c1bc83b2651
      https://github.com/boxbackup/boxbackup/commit/606b42ef0b265098bb107a4a36039c1bc83b2651
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-09-16 (Sat, 16 Sep 2017)

  Changed paths:
    M appveyor.yml

  Log Message:
  -----------
  Disable DEBUG to reduce CMake build verbosity on AppVeyor

(cherry picked from commit 793d5f57f5f99f50bffadea674f58be79f9cb6ff)

  Commit: 69e19233045b484b2378e3568bc7dd711d104122
      https://github.com/boxbackup/boxbackup/commit/69e19233045b484b2378e3568bc7dd711d104122
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-09-16 (Sat, 16 Sep 2017)

  Changed paths:
    M appveyor.yml

  Log Message:
  -----------
  Change branches for which Windows packages are built

  Commit: b7c6a133b8868223bc39084968e0cac332fd4dfe
      https://github.com/boxbackup/boxbackup/commit/b7c6a133b8868223bc39084968e0cac332fd4dfe
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-09-18 (Mon, 18 Sep 2017)

  Changed paths:
    M infrastructure/cmake/windows/CMakeLists.txt

  Log Message:
  -----------
  Install Box Backup in a temporary directory in Windows unibuilds

Otherwise the unibuild fails at the end for non-administrator users when
it tries to write to C:\Program Files\BoxBackup.

  Commit: fea4efbf5648dddb63f51b4b076baceb872be87b
      https://github.com/boxbackup/boxbackup/commit/fea4efbf5648dddb63f51b4b076baceb872be87b
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M bin/bbstored/bbstored-certs.in

  Log Message:
  -----------
  Fix parsing of OpenSSL 1.1 output in bbstored-certs

Thanks to Dean Hamstead (@djzort on GitHub) for the bug report and the patch!

  Commit: a631c82882b039f8467a2ef9abeb343f2ec5b3da
      https://github.com/boxbackup/boxbackup/commit/a631c82882b039f8467a2ef9abeb343f2ec5b3da
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M lib/bbackupd/BackupDaemon.cpp
    M lib/common/Timer.cpp
    M lib/common/Timer.h
    M test/common/testcommon.cpp

  Log Message:
  -----------
  Fix -Wundefined-bool-conversion compile failure of master branch

Master build fails with: lib/common/Timer.cpp:171:10: error: reference cannot
be bound to dereferenced null pointer in well-defined C++ code; pointer may be
assumed to always convert to true [-Werror,-Wundefined-bool-conversion].

Cannot get regtests to pass on this feature branch without fixing this.

Also remove unused code from Timers.

  Commit: 24aca3fc618e36e2feb448bd7b5c05b31a064bd3
      https://github.com/boxbackup/boxbackup/commit/24aca3fc618e36e2feb448bd7b5c05b31a064bd3
  Author: Chris Wilson <qris at users.noreply.github.com>
  Date:   2017-10-17 (Tue, 17 Oct 2017)

  Changed paths:
    M bin/bbstored/bbstored-certs.in
    M lib/bbackupd/BackupDaemon.cpp
    M lib/common/Timer.cpp
    M lib/common/Timer.h
    M test/common/testcommon.cpp

  Log Message:
  -----------
  Merge pull request #19 from boxbackup/bbstored_certs

Fix parsing of OpenSSL 1.1 output in bbstored-certs. Fixes #18. Thanks to Dean Hamstead (@djzort on GitHub) for the bug report and the patch!

  Commit: 447c2cd3d6884b8383884dbbfe65db845ea5c04d
      https://github.com/boxbackup/boxbackup/commit/447c2cd3d6884b8383884dbbfe65db845ea5c04d
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-26 (Sun, 26 Nov 2017)

  Changed paths:
    M lib/common/Timer.cpp
    M test/common/testcommon.cpp

  Log Message:
  -----------
  Remove invalid use of null references (undefined behaviour)

Enable the relevant compiler warning as an error, if supported
(-Werror=undefined-bool-conversion).

http://www.gotw.ca/conv/002.htm
http://stackoverflow.com/questions/2165078/a-reference-can-not-be-null-or-it-can-be-null

(cherry picked from commit f2911acac0c8375a08ecc0a55f853a5a59c4d511)
(cherry picked from commit 5a50b98401302a5ba89366e4c0f8cccdd88d8722)

  Commit: ed55e2b11107a04ad49950d5cf1b2ba7291d3344
      https://github.com/boxbackup/boxbackup/commit/ed55e2b11107a04ad49950d5cf1b2ba7291d3344
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M bin/bbstored/bbstored-certs.in
    M lib/bbackupd/BackupDaemon.cpp
    M lib/common/Timer.cpp
    M lib/common/Timer.h
    M test/common/testcommon.cpp

  Log Message:
  -----------
  Merge branch 'master' into windows_binary_packages

  Commit: a0fa0c4f5f338335034f172af290025d48d5a1d5
      https://github.com/boxbackup/boxbackup/commit/a0fa0c4f5f338335034f172af290025d48d5a1d5
  Author: Chris Wilson <qris at users.noreply.github.com>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M appveyor.yml
    M infrastructure/cmake/CMakeLists.txt
    M infrastructure/cmake/getversion.pl
    M infrastructure/cmake/windows/CMakeLists.txt
    M test/common/testcommon.cpp

  Log Message:
  -----------
  Merge pull request #20 from boxbackup/windows_binary_packages

Build Win32/64 binary packages automatically

  Commit: 971fbbce13186199b3ac67f35a7fb5acfc777295
      https://github.com/boxbackup/boxbackup/commit/971fbbce13186199b3ac67f35a7fb5acfc777295
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2018-01-01 (Mon, 01 Jan 2018)

  Changed paths:
    M infrastructure/cmake/windows/CMakeLists.txt

  Log Message:
  -----------
  Speed up superbuild rebuild by not extracting Boost again

(cherry picked from commit 8976906a563ab04eb3d1310c59d4c13cdc3b525e)

  Commit: d432128c6f9390a3749af1430c8a76fbc52badf7
      https://github.com/boxbackup/boxbackup/commit/d432128c6f9390a3749af1430c8a76fbc52badf7
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2018-01-01 (Mon, 01 Jan 2018)

  Changed paths:
    M infrastructure/cmake/windows/CMakeLists.txt

  Log Message:
  -----------
  Remove BoxBackup install step from Windows unibuild

We don't need to install anything in C:\Program Files\BoxBackup, and often
don't have permission to do that anyway.

(cherry picked from commit 2d31a3178ba5a39af594c1a0188748f5c8045b18)
(cherry picked from commit dab8ccc4b0b9eef06c9e063fc510f9952a0757f7)

  Commit: d22ea1891f8930b105665d896ad6c7d5034769cf
      https://github.com/boxbackup/boxbackup/commit/d22ea1891f8930b105665d896ad6c7d5034769cf
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2018-01-01 (Mon, 01 Jan 2018)

  Changed paths:
    M infrastructure/m4/boxbackup_tests.m4
    M infrastructure/makebuildenv.pl.in

  Log Message:
  -----------
  Detect which debugger to use in t-gdb scripts: lldb or gdb

Should make debugging on Mac and BSD less painful.

Make t-gdb fail with an error when no debugger was detected.

(cherry picked from commit da98a8183737fb1fcb658cebd9612791a4750c4c)
(cherry picked from commit ea6bc722131222d1fad08521e61f552f16941b01)
(cherry picked from commit 38ba7510f2cad9accf445d5633c64e98a637a139)
(cherry picked from commit 02bfd7e5bdd2abc185b12f37e1f536269db6817a)

  Commit: 01755b62f6542d25a885a4fe26ce9fc1ac6decaf
      https://github.com/boxbackup/boxbackup/commit/01755b62f6542d25a885a4fe26ce9fc1ac6decaf
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2018-01-01 (Mon, 01 Jan 2018)

  Changed paths:
    M infrastructure/makebuildenv.pl.in

  Log Message:
  -----------
  Fix quoting of CXXFLAGS and LDFLAGS in Makefiles

Previously, it was impossible to include an @ sign in these flags (for example,
to link to support --with-ssl-headers=/usr/local/opt/openssl at 1.1/include/)
because it was interpreted as a list variable name by Perl. Now the variables
are evaluated single-quoted before being substituted into the Makefile output.

(cherry picked from commit 2e9c90d3f32c69cc89d01fb64ced9fca80aae985)

  Commit: 3db0438644b10370293d9b2f3bd8457561e2c9f8
      https://github.com/boxbackup/boxbackup/commit/3db0438644b10370293d9b2f3bd8457561e2c9f8
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2018-01-01 (Mon, 01 Jan 2018)

  Changed paths:
    M lib/crypto/Random.cpp

  Log Message:
  -----------
  Replace RAND_pseudo_bytes with RAND_bytes

RAND_pseudo_bytes is less secure and is now deprecated.

(cherry picked from commit f449986b68bd12c18d742c91b625779ae75b11a2)

  Commit: 85e7efc3fa0477f60318d2cd2144503a9ea8feb9
      https://github.com/boxbackup/boxbackup/commit/85e7efc3fa0477f60318d2cd2144503a9ea8feb9
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2018-01-01 (Mon, 01 Jan 2018)

  Changed paths:
    M appveyor.yml
    M infrastructure/cmake/CMakeLists.txt
    M infrastructure/cmake/windows/CMakeLists.txt
    M lib/crypto/CipherBlowfish.cpp
    M lib/crypto/CipherContext.cpp
    M lib/crypto/CipherContext.h
    M lib/crypto/CipherException.txt
    M lib/server/TLSContext.cpp
    M test/crypto/testcrypto.cpp

  Log Message:
  -----------
  Add support for OpenSSL 1.1 and replace deprecated function calls

See https://github.com/boxbackup/boxbackup/issues/16 for details. Thanks to
Chris West @FauxFaux for the initial patch!

Use OpenSSL 1.1.0g for Windows superbuild.

Fix Windows build by removing calls to obsolete do_ms.bat
<https://stackoverflow.com/questions/39076244/why-there-is-no-ms-do-ms-bat-after-perl-configure-vc-win64a/39247560#39247560>.

Workaround for incorrect library suffixes searched by FindOpenSSL
<https://gitlab.kitware.com/cmake/cmake/issues/17604>.

Link OpenSSL statically and fix missing dependency on crypt32.lib.

(cherry picked from commit edd3687f067c68b131822e0064cdeff5bf7a3835)
(cherry picked from commit b003e009d1fccadf55a0f59a01c66f7b80f9b3e5)
(cherry picked from commit cc6e20466b857f7e20d816a2c20cb36f112398ab)
(cherry picked from commit 303c6405e3bc1e673dbc691792e0633742c01f4e)
(cherry picked from commit 4e24006f75142a254f1a7db76cf9da1e752d9283)
(cherry picked from commit 448ac48a89538f67f508f8d21931c5e6e90472c0)
(cherry picked from commit 00b3bb0697219ef8c742698dd43d53b538e362b1)

  Commit: 6d7e9562e8485591a4888f1fc2d3c6c657dc7a01
      https://github.com/boxbackup/boxbackup/commit/6d7e9562e8485591a4888f1fc2d3c6c657dc7a01
  Author: Chris Wilson <qris at users.noreply.github.com>
  Date:   2018-01-02 (Tue, 02 Jan 2018)

  Changed paths:
    M appveyor.yml
    M infrastructure/cmake/CMakeLists.txt
    M infrastructure/cmake/windows/CMakeLists.txt
    M infrastructure/m4/boxbackup_tests.m4
    M infrastructure/makebuildenv.pl.in
    M lib/crypto/CipherBlowfish.cpp
    M lib/crypto/CipherContext.cpp
    M lib/crypto/CipherContext.h
    M lib/crypto/CipherException.txt
    M lib/crypto/Random.cpp
    M lib/server/TLSContext.cpp
    M test/crypto/testcrypto.cpp

  Log Message:
  -----------
  Merge pull request #22 from boxbackup/openssl_1_1

Fix compatibility with OpenSSL 1.1

  Commit: 616ad76d22f6360e9b53cc682028c0e87f1ea66c
      https://github.com/boxbackup/boxbackup/commit/616ad76d22f6360e9b53cc682028c0e87f1ea66c
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2018-01-21 (Sun, 21 Jan 2018)

  Changed paths:
    M test/common/testcommon.cpp

  Log Message:
  -----------
  Compile out test_memory_leak_detection if leak detection is disabled

  Commit: edcde8e3271503251946e7eff3ae9ddd7dd3d98d
      https://github.com/boxbackup/boxbackup/commit/edcde8e3271503251946e7eff3ae9ddd7dd3d98d
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2018-01-21 (Sun, 21 Jan 2018)

  Changed paths:
    M lib/common/MainHelper.h

  Log Message:
  -----------
  Remove unnecessary mainhelper catch for BoxException specifically

  Commit: d1a5226ca3b80072e54ae749ca663936adea7c8e
      https://github.com/boxbackup/boxbackup/commit/d1a5226ca3b80072e54ae749ca663936adea7c8e
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2018-01-21 (Sun, 21 Jan 2018)

  Changed paths:
    M lib/common/Utils.h

  Log Message:
  -----------
  Remove MemLeakFindOn/Off #includes from Utils.h

There is no code in this section, so no need to enable/disable memory leak
tracking.

  Commit: 007ec3b87b895fcde7b0ed9f3fdbcf8570a55227
      https://github.com/boxbackup/boxbackup/commit/007ec3b87b895fcde7b0ed9f3fdbcf8570a55227
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2018-01-21 (Sun, 21 Jan 2018)

  Changed paths:
    M modules.txt

  Log Message:
  -----------
  Remove unnecessary dependencies from modules.txt

Sort dependencies into libraries first, then binaries

  Commit: 8ee03a0073b30eee9cd94737f52a989e54a8df69
      https://github.com/boxbackup/boxbackup/commit/8ee03a0073b30eee9cd94737f52a989e54a8df69
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2018-01-21 (Sun, 21 Jan 2018)

  Changed paths:
    M runtest.pl.in

  Log Message:
  -----------
  Actually pass test options (e.g. timing) to test command

  Commit: c12f6912fda9837704951b4afa4fadaf85775f33
      https://github.com/boxbackup/boxbackup/commit/c12f6912fda9837704951b4afa4fadaf85775f33
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2018-01-21 (Sun, 21 Jan 2018)

  Changed paths:
    M appveyor.yml
    M bin/bbstored/bbstored-certs.in
    M infrastructure/cmake/windows/CMakeLists.txt
    M infrastructure/m4/boxbackup_tests.m4
    M lib/bbackupd/BackupDaemon.cpp
    M lib/common/Timer.cpp
    M lib/common/Timer.h
    M lib/intercept/intercept.cpp
    M lib/intercept/intercept.h
    M test/common/testcommon.cpp
    M test/raidfile/testraidfile.cpp

  Log Message:
  -----------
  Merge branch 'master' into s3_support_merge

Compare: https://github.com/boxbackup/boxbackup/compare/24386d968c3f...c12f6912fda9