b603d3b58a
Add an --immediate flag to cryfs-unmount that tries to unmount immediately and doesn't wait for processes to release their locks on the file system.
2020-07-13 18:43:50 -07:00
7d48336f8d
Merge branch 'release/0.10' into develop
2020-07-12 20:43:54 -07:00
d32a98602b
Fix Android compilation using patch file https://github.com/termux/termux-root-packages/files/4664745/config.h.patch.txt from https://github.com/cryfs/cryfs/issues/345
2020-07-12 20:43:09 -07:00
be20465f5e
Fixed determining the user's homedir: If $HOME and the /etc/passwd entry for the current user contradict each other, now $HOME takes preference over /etc/passwd.
2020-07-12 15:19:17 -07:00
2793e014d4
Fixed determining the user's homedir: If $HOME and the /etc/passwd entry for the current user contradict each other, now $HOME takes preference over /etc/passwd.
2020-07-12 15:18:21 -07:00
45f85e85fb
Remove FindLibunwind.cmake, we don't use libunwind anymore
2020-07-12 15:16:37 -07:00
fb9c72abe1
Merge branch 'release/0.10' into develop
2020-07-10 17:50:04 -07:00
e27d63f908
Add .vs and .vscode to .gitignore
2020-07-10 17:48:28 -07:00
8895eac279
Add vscode folder to gitignore
2020-07-10 16:54:07 -07:00
192b9decfc
Fix Appveyor and Travis CI
2020-07-10 16:23:55 -07:00
690f94fc83
Update README.md
2020-07-09 01:18:10 -07:00
0e27097462
Allow building with local dependencies instead of using conan
2020-07-09 01:15:25 -07:00
1b064dbb51
Mention requirement to install python3-pip so we can install conan
2020-07-07 23:53:35 -07:00
e7fa2817d2
Remove obsolete dependency
2020-07-02 03:03:00 -07:00
7d02e20f89
Add Clang 10 to CI
2020-07-02 02:20:47 -07:00
d8ce25efce
Allow building with libstdc++ instead of libstdc++11 if people want to use the old GCC ABI
2020-07-02 02:11:26 -07:00
f8c0bb8b97
Use SETTINGS to set compiler.libcxx
2020-06-30 20:18:50 -07:00
3b0d46e01e
Apply https://github.com/conan-io/cmake-conan/pull/258 (commit 3df8d20b401528629d0486e577b6c9b4e22b3ae4): Make "SETTINGS compiler.libcxx=libstdc++11" do the right thing (see https://github.com/conan-io/cmake-conan/issues/255 )
2020-06-30 20:13:12 -07:00
9deca117f5
Mention PR
2020-06-30 20:05:29 -07:00
81f4bf65ee
Undo unwanted changes
2020-06-30 20:03:27 -07:00
8af7b2a910
Set formatting to how the v0.15 tag of cmake-conan is actually formatted
2020-06-30 20:00:43 -07:00
6f94834c90
Fix bug where a comma in the base directory name would make the file system fail to mount, https://github.com/cryfs/cryfs/issues/326
2020-06-30 19:13:28 -07:00
9cbc12fc57
Fix bug where a comma in the base directory name would make the file system fail to mount, https://github.com/cryfs/cryfs/issues/326
2020-06-30 14:25:37 -07:00
873681a3ef
Silence compiler warning about unused httpClient when explicitly building without update checks
2020-06-30 00:09:31 -07:00
7097adb8dc
Merge branch 'feature/ninja0' into develop
2020-06-29 23:42:44 -07:00
12293c0b9e
Better fix for conan libstdc++11 setup
2020-06-29 14:17:01 -07:00
247ef47f94
Upgrade requirement to cmake 3.6 because that's needed to build the range-v3 dependency (if built locally and not with a prebuilt conan package)
2020-06-29 12:51:10 -07:00
b6c640e081
Add comments pointing to conan issues
2020-06-29 01:35:03 -07:00
93b1b3d684
Workaround conan issue that downloads packages built with libstdc++ instead of libstdc++11
2020-06-29 01:13:22 -07:00
38575f258a
In CMakeLists.txt, rename BUILD_TESTING to CRYPTOPP_BUILD_TESTING so it doesn't clash with our BUILD_TESTING
2020-06-28 17:20:02 -07:00
35b44d6e21
In CMakeLists.txt, rename BUILD_TESTING to CRYPTOPP_BUILD_TESTING so it doesn't clash with our BUILD_TESTING
2020-06-28 10:04:12 -07:00
f179b8c4a4
Fix appveyor build
2020-06-27 17:27:16 -07:00
3fdbda832c
Setup conan compiler.libcxx correctly
2020-06-27 11:35:53 -07:00
7f6bbffc40
Show correct unmount command in man page
2020-06-27 00:04:26 -07:00
c038d6a40b
Automatically run conan from cmake
2020-02-24 00:51:48 -08:00
e50eb9016f
Fix Windows build
2020-02-23 12:21:30 -08:00
8373abf216
Merge branch 'develop' of https://github.com/cryfs/cryfs into develop
2020-02-23 19:34:11 -08:00
52345da0de
Update README to Visual Studio 2019
2020-02-23 19:34:02 -08:00
87a253ad0c
Update README.md
2019-12-29 10:13:52 +01:00
b9be5e9c19
Mention MacPorts ( #322 )
2019-12-25 00:20:10 -08:00
ab98bd74e1
Revise package building instructions ( #318 )
...
Do the package building instructions need to be revised?
Seems they are missing the "conan install .. --build=missing" step.
Also, when I built cryfs, I had to include the "-s compiler.libcxx=libstdc++11" flag to get conan to work. (Fedora 31, ppc64le).
2019-12-08 21:48:09 -08:00
470fbd139b
Fix typo
2019-11-29 06:55:19 -08:00
65e82bbd6b
Merge branch 'feature/conan_spdlog' into develop
2019-11-07 20:03:08 -05:00
4329279163
Add spdlog via conan and not via the vendor/ directory
2019-11-07 15:25:30 -05:00
386d5a27ae
Remove unused boost libraries
2019-11-06 19:56:57 -05:00
8e617b1342
Add support for atime mount options (noatime, strictatime, relatime, atime, nodiratime). As before, relatime is the default.
2019-11-05 10:08:04 -05:00
ae09ff98aa
Add range-v3 via conan and not via the vendor/ directory
2019-11-05 10:08:00 -05:00
8376a554cc
Setup conan and get boost dependency through it
2019-11-05 10:02:54 -05:00
b6cff8581d
Retire GCC 5 from CI
2019-11-02 12:12:05 -07:00
20b8a84dfc
Update CI to Visual Studio 2019
2019-11-02 12:12:05 -07:00
Sebastian Messmer