Mention https://github.com/cryfs/cryfs/pull/448 fix in changelog

Signed-off-by: Adam Williamson <awilliam@redhat.com>

.github/workflows/main.yaml

@@ -256,7 +256,7 @@ jobs:
           if [[ "${{matrix.os}}" == "ubuntu-18.04" ]]; then
             python3 -m pip install setuptools
           fi
-          python3 -m pip install conan
+          python3 -m pip install conan==1.59
       - name: Save pip cache
         # note: this access key has write access to the cache. This can't run on PRs.
         if: ${{github.event_name == 'push' }}
@@ -461,7 +461,7 @@ jobs:
         shell: bash
         run: |
           # Using "python3 -m pip" instead of "pip3" to make sure we get the same pip that we queried the cache dir for the Github Cache action
-          python3 -m pip install conan
+          python3 -m pip install conan==1.59
       - name: Save pip cache
         # note: this access key has write access to the cache. This can't run on PRs.
         if: ${{github.event_name == 'push' }}

ChangeLog.txt

@@ -2,6 +2,11 @@ Version 0.12.0 (unreleased)
 ---------------
 * Updated to DokanY 1.3.0.1000
 * Added a man page for `cryfs-unmount`
+* Fixed small inaccuracy in calculation of free space in statvfs
+
+Version 0.11.4 (unreleased)
+---------------
+* Fixed build issue on Fedora (see https://github.com/cryfs/cryfs/pull/448 )
 
 Version 0.11.3
 ---------------

README.md

@@ -88,7 +88,7 @@ Requirements
   - GCC version >= 7 or Clang >= 7
   - CMake version >= 3.10
   - pkg-config (on Unix)
-  - Conan package manager
+  - Conan package manager (version 1.x)
   - libcurl4 (including development headers)
   - SSL development libraries (including development headers, e.g. libssl-dev)
   - libFUSE version >= 2.8.6 (including development headers), on Mac OS X instead install macFUSE from https://osxfuse.github.io/
@@ -99,15 +99,15 @@ You can use the following commands to install these requirements
 
         # Ubuntu
         $ sudo apt install git g++ cmake make pkg-config libcurl4-openssl-dev libssl-dev libfuse-dev python3 python3-pip
-        $ sudo pip3 install conan
+        $ sudo pip3 install conan==1.59
 
         # Fedora
         $ sudo dnf install git gcc-c++ cmake make pkgconf libcurl-devel openssl-devel fuse-devel python3 python3-pip
-        $ sudo pip3 install conan
+        $ sudo pip3 install conan==1.59
 
         # Macintosh
         $ brew install cmake pkg-config openssl libomp macfuse
-        $ sudo pip3 install conan
+        $ sudo pip3 install conan==1.59
 
 Build & Install
 ---------------

src/blobstore/implementations/onblocks/datanodestore/DataNodeStore.cpp

@@ -23,7 +23,7 @@ namespace onblocks {
 namespace datanodestore {
 
 DataNodeStore::DataNodeStore(unique_ref<BlockStore> blockstore, uint64_t physicalBlocksizeBytes)
-: _blockstore(std::move(blockstore)), _layout(_blockstore->blockSizeFromPhysicalBlockSize(physicalBlocksizeBytes)) {
+: _blockstore(std::move(blockstore)), _layout(_blockstore->blockSizeFromPhysicalBlockSize(physicalBlocksizeBytes)), _physicalBlockSizeBytes(physicalBlocksizeBytes) {
 }
 
 DataNodeStore::~DataNodeStore() {
@@ -127,11 +127,11 @@ uint64_t DataNodeStore::numNodes() const {
 }
 
 uint64_t DataNodeStore::estimateSpaceForNumNodesLeft() const {
-  return _blockstore->estimateNumFreeBytes() / _layout.blocksizeBytes();
+  return _blockstore->estimateNumFreeBytes() / _physicalBlockSizeBytes;
 }
 
 uint64_t DataNodeStore::virtualBlocksizeBytes() const {
-  return _layout.blocksizeBytes();
+  return _layout.maxBytesPerLeaf();
 }
 
 DataNodeLayout DataNodeStore::layout() const {

src/blobstore/implementations/onblocks/datanodestore/DataNodeStore.h

@@ -57,6 +57,7 @@ private:
 
   cpputils::unique_ref<blockstore::BlockStore> _blockstore;
   const DataNodeLayout _layout;
+  uint64_t _physicalBlockSizeBytes;
 
   DISALLOW_COPY_AND_ASSIGN(DataNodeStore);
 };

src/cpp-utils/thread/LeftRight.h

@@ -4,6 +4,7 @@
 #include <thread>
 #include <cpp-utils/macros.h>
 #include <array>
+#include <stdexcept>
 
 namespace cpputils {
 

src/cryfs/impl/filesystem/CryNode.cpp

@@ -18,7 +18,6 @@ using cpputils::dynamic_pointer_move;
 using boost::optional;
 using boost::none;
 using std::shared_ptr;
-using std::vector;
 using cryfs::parallelaccessfsblobstore::FsBlobRef;
 using cryfs::parallelaccessfsblobstore::DirBlobRef;
 using namespace cpputils::logging;

src/stats/main.cpp

@@ -125,9 +125,10 @@ std::vector<BlockId> getKnownBlockIds(const path& basedir, const CryConfigLoader
     const uint32_t numNodes = nodeStore->numNodes();
     knownBlockIds.reserve(numNodes);
     cout << "Listing all blocks used by these file system entities..." << endl;
+    auto progress_bar = ProgressBar(numNodes);
     for (const auto& blobId : knownBlobIds) {
         forEachReachableBlockInBlob(nodeStore.get(), blobId, {
-            ProgressBar(numNodes).callback(),
+            progress_bar.callback(),
             knownBlockIds.callback()
         });
     }

test/cryfs/impl/filesystem/CryNodeTest_RenameNested.cpp

@@ -70,6 +70,7 @@ public:
         }
     }
 
+    // NOLINTNEXTLINE(misc-no-recursion)
     void create_path_if_not_exists(const bf::path& path) {
         if (!Exists(path)) {
             if (path.has_parent_path()) {
@@ -124,7 +125,7 @@ TEST_P(CryNodeTest_RenameNested, Rename) {
 
     if (source_path == "/" || dest_path == "/") {
         expect_rename_fails(source_path, dest_path, EBUSY);
-    } else if (source_path == dest_path) {
+    } else if (source_path == dest_path) { // NOLINT(bugprone-branch-clone)
         expect_rename_succeeds(source_path, dest_path);
     } else if (boost::starts_with(source_path, dest_path)) {
         expect_rename_fails(source_path, dest_path, ENOTEMPTY);