libcryfs: Update to cryfs v0.11.3

Co-authored-by: D Lamb <dlamb.gh@mm.st>

ChangeLog.txt

@@ -1,6 +1,8 @@
-Version 0.12.0 (unreleased)
+Version 0.11.3
 ---------------
-* Updated to DokanY 1.3.0.1000
+* Fixed build issue on systems with libfmt 9.0 (see https://github.com/cryfs/cryfs/issues/432 )
+* Fixed build issue on Apple Silicon Macs (see https://github.com/cryfs/homebrew-tap/issues/10 )
+* Fixed build issue on systems that only have `python3` but no `python` executable (see https://github.com/cryfs/homebrew-tap/issues/12 )
 
 Version 0.11.2
 ---------------

src/fspp/fuse/Fuse.cpp

@@ -190,14 +190,14 @@ int Fuse::readlink(const bf::path &path, char *buf, size_t size) {
 int Fuse::mkdir(const bf::path &path, ::mode_t mode) {
   ThreadNameForDebugging _threadName("mkdir");
 #ifdef FSPP_LOG
-  LOG(DEBUG, "mkdir({}, {})", path, mode);
+  LOG(DEBUG, "mkdir({}, {})", path.string(), mode);
 #endif
   try {
     ASSERT(is_valid_fspp_path(path), "has to be an absolute path");
 	// DokanY seems to call mkdir("/"). Ignore that
 	if ("/" == path) {
 #ifdef FSPP_LOG
-        LOG(DEBUG, "mkdir({}, {}): ignored", path, mode);
+        LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode);
 #endif
 		return 0;
 	}
@@ -344,7 +344,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) {
 //TODO
 int Fuse::link(const bf::path &from, const bf::path &to) {
   ThreadNameForDebugging _threadName("link");
-  LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to);
+  LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string());
   //auto real_from = _impl->RootDir() / from;
   //auto real_to = _impl->RootDir() / to;
   //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str());

vendor/boost/Boost-for-Android

@@ -1 +1 @@
-Subproject commit 4067aed71278e292d1b78d8a13431f01f80012f1
+Subproject commit 53e6c16ea80c7dcb2683fd548e0c7a09ddffbfc1

vendor/cryptopp/vendor_cryptopp/CMakeLists.txt

@@ -1146,7 +1146,7 @@ if (${CMAKE_VERSION} VERSION_GREATER "3.1" AND USE_OPENMP)
       endif()
   endif()
 
-  # If OpenMP wasn't found, try if we can find it in the default Homebrew location
+  # If OpenMP wasn't found, try if we can find it in the default Homebrew location (Intel Macs)
   if((NOT OPENMP_FOUND) AND (NOT OPENMP_CXX_FOUND) AND EXISTS "/usr/local/opt/libomp/lib/libomp.dylib")
       set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I/usr/local/opt/libomp/include")
       set(OpenMP_CXX_LIB_NAMES omp)
@@ -1154,9 +1154,23 @@ if (${CMAKE_VERSION} VERSION_GREATER "3.1" AND USE_OPENMP)
 
       find_package(OpenMP)
       if (OPENMP_FOUND OR OPENMP_CXX_FOUND)
-          message(STATUS "OpenMP: Found libomp in homebrew default location.")
+          message(STATUS "OpenMP: Found libomp in homebrew default location for Intel Macs.")
       else()
-          message(FATAL_ERROR "OpenMP: Didn't find libomp. Tried homebrew default location but also didn't find it.")
+          message(FATAL_ERROR "OpenMP: Didn't find libomp. Tried homebrew default location for Intel Macs but also didn't find it.")
+      endif()
+  endif()
+
+  # If OpenMP wasn't found, try if we can find it in the default Homebrew location (Apple Silicon Macs)
+  if((NOT OPENMP_FOUND) AND (NOT OPENMP_CXX_FOUND) AND EXISTS "/opt/homebrew/opt/libomp/lib/libomp.dylib")
+      set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include")
+      set(OpenMP_CXX_LIB_NAMES omp)
+      set(OpenMP_omp_LIBRARY /opt/homebrew/opt/libomp/lib/libomp.dylib)
+
+      find_package(OpenMP)
+      if (OPENMP_FOUND OR OPENMP_CXX_FOUND)
+          message(STATUS "OpenMP: Found libomp in homebrew default location for Apple Silicon Macs.")
+      else()
+          message(FATAL_ERROR "OpenMP: Didn't find libomp. Tried homebrew default location for Apple Silicon Macs but also didn't find it.")
       endif()
   endif()
 

vendor/cryptopp/vendor_cryptopp/TestScripts/setenv-android.sh

@@ -240,12 +240,12 @@ case "$ANDROID_CPU" in
     # ANDROID_CPPFLAGS="-D__ANDROID__=${ANDROID_API}"
 
     ANDROID_CFLAGS="-target i686-none-linux-android${ANDROID_API}"
-    ANDROID_CFLAGS="${ANDROID_CFLAGS} -mssse3 -mfpmath=sse"
+    ANDROID_CFLAGS="${ANDROID_CFLAGS} -mtune=intel -mssse3 -mfpmath=sse"
     ANDROID_CFLAGS="${ANDROID_CFLAGS} -fstack-protector-strong -funwind-tables -fexceptions -frtti"
     ANDROID_CFLAGS="${ANDROID_CFLAGS} -fno-addrsig -fno-experimental-isel"
 
     ANDROID_CXXFLAGS="-target i686-none-linux-android${ANDROID_API}"
-    ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -mssse3 -mfpmath=sse"
+    ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -mtune=intel -mssse3 -mfpmath=sse"
     ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -std=c++11 -stdlib=libc++"
     ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -fstack-protector-strong -funwind-tables -fexceptions -frtti"
     ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -fno-addrsig -fno-experimental-isel"
@@ -261,12 +261,12 @@ case "$ANDROID_CPU" in
     # ANDROID_CPPFLAGS="-D__ANDROID__=${ANDROID_API}"
 
     ANDROID_CFLAGS="-target x86_64-none-linux-android${ANDROID_API}"
-    ANDROID_CFLAGS="${ANDROID_CFLAGS} -march=x86-64 -msse4.2 -mpopcnt"
+    ANDROID_CFLAGS="${ANDROID_CFLAGS} -march=x86-64 -msse4.2 -mpopcnt -mtune=intel"
     ANDROID_CFLAGS="${ANDROID_CFLAGS} -fstack-protector-strong -funwind-tables -fexceptions -frtti"
     ANDROID_CFLAGS="${ANDROID_CFLAGS} -fno-addrsig -fno-experimental-isel"
 
     ANDROID_CXXFLAGS="-target x86_64-none-linux-android${ANDROID_API}"
-    ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -march=x86-64 -msse4.2 -mpopcnt"
+    ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -march=x86-64 -msse4.2 -mpopcnt -mtune=intel"
     ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -std=c++11 -stdlib=libc++"
     ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -fstack-protector-strong -funwind-tables -fexceptions -frtti"
     ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -fno-addrsig -fno-experimental-isel"

vendor/spdlog

@@ -1 +1 @@
-Subproject commit ab7b325906868855c8dc498dcbdf05f37be242c5
+Subproject commit 927cc29444a294d76e83dfb898e797dc431ce094