summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* New upstream version 0.13~~git20180819.g2f5b556Reinhard Tartler2019-03-10
|
* Merge branch 'master' of https://github.com/boxbackup/boxbackup into upstreamReinhard Tartler2018-03-14
|\
| * Merge pull request #26 from boxbackup/fix_raidfile_i386Chris Wilson2018-03-13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix raidfile tests on 32-bit Linux. A recent fix for Solaris (commit 81e9aa6545f7f19124c9f5e88982b867d8732965) broke support for 32-bit Linux (which wasn't spotted at the time, because we didn't have any 32-bit builders). Try a different approach: detect explicitly whether the `lseek` syscall takes a 64-bit integer offset, regardless of the size of `off_t` in user space. CMake: Add support for M4 CXX flag detection in CMakeLists. Reimplement autoconf tests for 64-bit lseek. Fix error in t-gdb when no debugger is detected. Thanks to Reinhard Tartler (our Debian package maintainer) for pointing out the error, and James O'Gorman for setting up i386 builders to ensure that it's fixed and cannot recur.
| | * Merge branch 'master' into fix_raidfile_i386Chris Wilson2018-03-12
| | |\ | | |/ | |/|
| * | Merge pull request #24 from boxbackup/openssl_1_1_testingChris Wilson2018-03-04
| |\ \ | | | | | | | | Fix OpenSSL 1.1 compatibility
| | * | Workaround SourceForget brokenness in AppVeyor buildsChris Wilson2018-03-03
| | | | | | | | | | | | | | | | | | | | | | | | Download NSIS and Boost archives ourselves and install in correct places for Chocolatey and CMake to find and use them, instead of trying to download them from SourceForge.
| | | * Add support for M4 CXX flag detection in CMakeListsChris Wilson2018-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables all flags that are detected by M4 builds to be detected by CMake builds as well (except for -Wall which enables a bunch of junk). (cherry picked from commit 2ea8a9706d79a386729c7b2d814089e90bac6926) (cherry picked from commit c6038419372534dba578da0c1b506bebc64f8f67)
| | | * Fix error in t-gdb when no debugger is detectedChris Wilson2018-03-08
| | | |
| | | * Fix raidfile tests on 32-bit LinuxChris Wilson2018-03-08
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent fix for Solaris (commit 81e9aa6545f7f19124c9f5e88982b867d8732965) broke support for 32-bit Linux (which wasn't spotted because we didn't have any 32-bit builders). Try a different approach: detect whether the lseek syscall takes a 64-bit integer offset, and use that if possible. CMake: reimplement autoconf tests for 64-bit lseek (cherry picked from commit 138ea5d174f146f14d91a16bf5d1ce8e479d2024)
* | | Merge remote-tracking branch 'github/openssl_1_1_testing' into upstreamReinhard Tartler2018-03-03
|\ \ \ | | |/ | |/|
| * | Use OSX builds to test OpenSSL 1.1 compatibility as wellChris Wilson2018-03-03
| | | | | | | | | | | | | | | See https://github.com/alex/pyopenssl/commit/02225c659a1441e5caeca0a327f85b241633f781 for example
| * | Reimplement OpenSSL 1.1 supportChris Wilson2018-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | This time I have made the minimum number of changes necessary to make OpenSSL 1.1 work, and also added more tests which would have caught the issues with the previous attempt. Thanks to Johann Glaser for testing out the new version and reporting the issue with decryption!
| * | Add test for decrypting previously-encrypted directory fixtureChris Wilson2018-03-02
| | |
| * | Add a test that we can setup Blowfish encryption properlyChris Wilson2018-02-27
| | |
| * | Revert "Add support for OpenSSL 1.1 and replace deprecated function calls"Chris Wilson2018-02-25
| |/ | | | | | | | | | | Until shown to be safe. See message from Johann Glaser to the mailing list. This reverts commit 85e7efc3fa0477f60318d2cd2144503a9ea8feb9.
* | Merge tag 'BoxBackup-0.12.master.180102.6d7e956' into upstreamReinhard Tartler2018-02-20
|\|
| * Merge pull request #22 from boxbackup/openssl_1_1Chris Wilson2018-01-02
| |\ | | | | | | Fix compatibility with OpenSSL 1.1
| | * Add support for OpenSSL 1.1 and replace deprecated function callsChris Wilson2018-01-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * Replace RAND_pseudo_bytes with RAND_bytesChris Wilson2018-01-01
| | | | | | | | | | | | | | | | | | RAND_pseudo_bytes is less secure and is now deprecated. (cherry picked from commit f449986b68bd12c18d742c91b625779ae75b11a2)
| | * Fix quoting of CXXFLAGS and LDFLAGS in MakefilesChris Wilson2018-01-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, it was impossible to include an @ sign in these flags (for example, to link to support --with-ssl-headers=/usr/local/opt/openssl@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)
| | * Detect which debugger to use in t-gdb scripts: lldb or gdbChris Wilson2018-01-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * Remove BoxBackup install step from Windows unibuildChris Wilson2018-01-01
| | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * Speed up superbuild rebuild by not extracting Boost againChris Wilson2018-01-01
| |/ | | | | | | (cherry picked from commit 8976906a563ab04eb3d1310c59d4c13cdc3b525e)
| * Merge pull request #20 from boxbackup/windows_binary_packagesChris Wilson2017-11-30
| |\ | | | | | | Build Win32/64 binary packages automatically
| | * Merge branch 'master' into windows_binary_packagesChris Wilson2017-11-28
| | |\ | | |/ | |/|
| * | Merge pull request #19 from boxbackup/bbstored_certsChris Wilson2017-10-17
| |\ \ | | | | | | | | 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!
| | * | Fix -Wundefined-bool-conversion compile failure of master branchChris Wilson2017-10-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Fix parsing of OpenSSL 1.1 output in bbstored-certsChris Wilson2017-10-16
| |/ / | | | | | | | | | Thanks to Dean Hamstead (@djzort on GitHub) for the bug report and the patch!
| | * Remove invalid use of null references (undefined behaviour)Chris Wilson2017-11-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * Install Box Backup in a temporary directory in Windows unibuildsChris Wilson2017-09-18
| | | | | | | | | | | | | | | Otherwise the unibuild fails at the end for non-administrator users when it tries to write to C:\Program Files\BoxBackup.
| | * Change branches for which Windows packages are builtChris Wilson2017-09-16
| | |
| | * Disable DEBUG to reduce CMake build verbosity on AppVeyorChris Wilson2017-09-16
| | | | | | | | | | | | (cherry picked from commit 793d5f57f5f99f50bffadea674f58be79f9cb6ff)
| | * Reduce AppVeyor build verbosity by passing extra args to sub-CMakeChris Wilson2017-09-16
| | | | | | | | | | | | (cherry picked from commit 4876a5573a8bcd3312e9804c27fe9f30f3369747)
| | * Reorder lines in appveyor.yml to match actual execution orderChris Wilson2017-09-16
| | | | | | | | | | | | (cherry picked from commit ea4f1728b529aff1dfc912d8f51567f8cd58ea77)
| | * Remove Xamarin to remove 500 lines of junk from build logsChris Wilson2017-09-16
| | | | | | | | | | | | | | | | | | | | | 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)
| | * Build Win32/64 binary packages automaticallyChris Wilson2017-09-16
| |/ | | | | | | | | | | | | | | | | | | | | 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)
| * Merge pull request #17 from boxbackup/fix_arm64_unsigned_charChris Wilson2017-07-02
| |\ | | | | | | Fix build on ARM64 with unsigned char
| | * Fix build on ARM64 with unsigned charChris Wilson2017-06-26
| |/ | | | | | | Thanks to Reinhard Tartler for pointing out the problem and suggesting the fix!
| * Increase precision of timing on Windows.Chris Wilson2017-06-22
| | | | | | | | | | | | | | Should hopefully reduce random failures of timing-dependent tests which rely on subsecond precision for accuracy. (cherry picked from commit c845b2e39fffeb560983a301d810616a6495469d)
| * Reduce precision of common timer testChris Wilson2017-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * Fix intercept of SYS_open on platforms that only have SYS_openat (e.g. arm64)Chris Wilson2017-06-22
| |
| * Use AX_CHECK_COMPILE_FLAG, add more checksChris Wilson2017-06-22
| | | | | | | | Disable pointless deprecation warnings for std::auto_ptr.
| * Stop Git from normalising line endingsChris Wilson2017-06-22
| | | | | | | | | | Although recommended, "text" mode causes constant and unfixable conficts that I give up fighting with.
| * Relax timings on test_changing_client_store_marker_pauses_daemonChris Wilson2017-06-18
| | | | | | | | | | | | Also increase test verbosity to help debug the test if it fails again. (cherry picked from commit 00c2127e9832591c248fa6eea05dfaf785b8380d)
| * Hopefully fix test/raidfile on Solaris.Chris Wilson2017-06-18
| | | | | | | | | | 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.
| * Fix build on SmartOS by switching back to GNU MakeChris Wilson2017-06-18
| | | | | | | | | | | | | | 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.
| * Install executables in test tree after building, not during "make install"Chris Wilson2017-06-18
| | | | | | | | | | | | | | 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.
| * Add Boost to Travis build environment, and OSX buildsChris Wilson2017-06-18
| |
| * Update versions of dependencies for Windows unibuild, add BoostChris Wilson2017-06-18
| | | | | | | | | | | | | | | | * 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.
| * Tell Git to ignore some more generated filesChris Wilson2017-05-15
| |