Upgrade to boost 1.79

.github/workflows/actions/install_local_dependencies/action.yaml

@@ -58,8 +58,8 @@ runs:
 
         echo Download boost
         cd ~
-        wget -O boost.tar.bz2 https://sourceforge.net/projects/boost/files/boost/1.75.0/boost_1_75_0.tar.bz2/download
+        wget -O boost.tar.bz2 https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2
-        if [ $(sha512sum boost.tar.bz2 | awk '{print $1;}') == "d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a" ]; then
+        if [ $(sha512sum boost.tar.bz2 | awk '{print $1;}') == "70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312" ]; then
           echo Correct sha512sum
         else
           echo Wrong sha512sum
@@ -69,7 +69,7 @@ runs:
         echo Extracting boost
         tar -xf boost.tar.bz2
         rm boost.tar.bz2
-        cd boost_1_75_0
+        cd boost_1_79_0
 
         echo Install boost
         ./bootstrap.sh --with-libraries=filesystem,system,thread,chrono,program_options

.github/workflows/main.yaml

@@ -621,7 +621,7 @@ jobs:
           aws-secret-access-key: qqqE8j/73w2EEJ984rVvxbDzdvnL93hk3X5ba1ac
           aws-region: eu-west-1
           bucket: ci-cache.cryfs
-          key: v3-${{ runner.os }}-${{ matrix.os }}-conancache__${{matrix.compiler.cxx}}__${{matrix.compiler.cc}}__${{matrix.build_type}}__
+          key: v5-${{ runner.os }}-${{ matrix.os }}-conancache__${{matrix.compiler.cxx}}__${{matrix.compiler.cc}}__${{matrix.build_type}}__
       - name: Build
         shell: bash
         run: |
@@ -671,7 +671,7 @@ jobs:
           aws-secret-access-key: ${{ secrets.CACHE_AWS_SECRET_ACCESS_KEY }}
           aws-region: eu-west-1
           bucket: ci-cache.cryfs
-          key: v3-${{ runner.os }}-${{ matrix.os }}-conancache__${{matrix.compiler.cxx}}__${{matrix.compiler.cc}}__${{matrix.build_type}}__
+          key: v5-${{ runner.os }}-${{ matrix.os }}-conancache__${{matrix.compiler.cxx}}__${{matrix.compiler.cc}}__${{matrix.build_type}}__
           artifacts: |
             ${{ env.CONAN_USER_HOME }}
             ${{ env.CONAN_USER_HOME_SHORT }}

ChangeLog.txt

@@ -5,6 +5,7 @@ Version 0.12.0 (unreleased)
 * Updated dependencies to
   * DokanY 1.3.0.1000
   * range-v3/0.12.0
+  * boost 1.79
 
 Version 0.11.4 (unreleased)
 ---------------

cmake-utils/DependenciesFromLocalSystem.cmake

@@ -40,7 +40,7 @@ target_link_libraries(CryfsDependencies_range-v3 INTERFACE range-v3::range-v3)
 
 # Setup boost dependency
 set(Boost_USE_STATIC_LIBS OFF)
-find_package(Boost 1.65.1
+find_package(Boost 1.79.0
         REQUIRED
         COMPONENTS filesystem system thread chrono program_options)
 check_target_is_not_from_conan(Boost::boost)

conanfile.py

@@ -5,7 +5,7 @@ class CryFSConan(ConanFile):
 	requires = [
 		"range-v3/0.12.0",
 		"spdlog/1.8.5",
-		"boost/1.75.0",
+		"boost/1.79.0",
 	]
 	generators = "cmake"
 	default_options = {
@@ -36,6 +36,9 @@ class CryFSConan(ConanFile):
 		"boost/*:without_random": True,
 		"boost/*:without_regex": True,
 		"boost/*:without_serialization": False,  # needed by boost date_time
+		# Stacktrace is needed by CryFS. Stacktrace is a header-only library and linking against its static version actually **disables** stacktraces,
+		# see https://www.boost.org/doc/libs/1_65_0/doc/html/stacktrace/getting_started.html#stacktrace.getting_started.enabling_and_disabling_stacktrac
+		# This is why we need to **not** link against the static version of stacktrace.
 		"boost/*:without_stacktrace": True,
 		"boost/*:without_system": False,  # needed by CryFS
 		"boost/*:without_test": True,

src/cpp-utils/CMakeLists.txt

@@ -65,15 +65,6 @@ if(MSVC)
     target_link_libraries(${PROJECT_NAME} PUBLIC DbgHelp)
 elseif (APPLE)
     target_compile_definitions(${PROJECT_NAME} PRIVATE BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED)
-else()
-    find_program(ADDR2LINE addr2line)
-    if ("${ADDR2LINE}" STREQUAL "ADDR2LINE-NOTFOUND")
-        message(WARNING "addr2line not found. Backtraces will be reduced.")
-    else()
-        message(STATUS "addr2line found. Using it for backtraces.")
-        target_compile_definitions(${PROJECT_NAME} PRIVATE BOOST_STACKTRACE_USE_ADDR2LINE)
-        target_compile_definitions(${PROJECT_NAME} PRIVATE BOOST_STACKTRACE_ADDR2LINE_LOCATION=${ADDR2LINE})
-    endif()
 endif()
 
 if (NOT MSVC)