sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4b3ce840f476a2230107fe1dbdb23dea8bafd272)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4b3ce840f476a2230107fe1dbdb23dea8bafd272)
- Date: Fri, 1 Sep 2023 16:14:55 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
crypto/cryfs/BUILD | 1
crypto/cryfs/DEPENDS | 3
crypto/cryfs/DETAILS | 2
crypto/cryfs/HISTORY | 8
crypto/cryfs/PRE_BUILD | 13 +
crypto/cryfs/cryfs.gpg |binary
crypto/cryfs/patches/0001-do-not-ref-vendor.patch | 195 ------------------
crypto/cryfs/patches/0002-fix-logging.patch | 75 -------
crypto/cryfs/patches/0003-cmake-fixes.patch | 232
----------------------
crypto/cryptopp/DETAILS | 4
crypto/cryptopp/HISTORY | 3
libs/range-v3/DETAILS | 4
libs/range-v3/HISTORY | 3
libs/spdlog/DEPENDS | 3
libs/spdlog/DETAILS | 4
libs/spdlog/HISTORY | 5
libs/spdlog/PRE_BUILD | 3
libs/spdlog/patches/fmt10-fix.patch | 39 ---
18 files changed, 42 insertions(+), 555 deletions(-)
New commits:
commit 4b3ce840f476a2230107fe1dbdb23dea8bafd272
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
spdlog - fix for cryfs
commit e2646b0b336adc46fb637e48c5825a588e7bb364
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
cryfs => 0.11.4
commit f2e361981299aeef08f0e443560a1382c8be0d92
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
range-v3: => 0.12.0
commit c745538b80848933b8814478cf5691a993e8845f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
cryfs: => 0.11.4
commit 0c5b7b1764e7b87f765845dd21274bbb2509ea3a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
spdlog - delete patches
commit 228bb08b42261f6b54c0e51af93314264815722d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
spdlog: => 1.12.0
commit 9c2f5c93b3436e01c39ae2bf6dd76093dab642db
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
cryptopp: => 8.8.0
diff --git a/crypto/cryfs/BUILD b/crypto/cryfs/BUILD
index 1eed65b..48d917d 100755
--- a/crypto/cryfs/BUILD
+++ b/crypto/cryfs/BUILD
@@ -2,4 +2,5 @@ CXXFLAGS+=' -fPIC' &&
OPTS+=' -DCRYFS_UPDATE_CHECKS=off' &&
OPTS+=' -DBUILD_SHARED_LIBS=on' &&
OPTS+=' -DBoost_USE_STATIC_LIBS=off' &&
+OPTS+="
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake" &&
cmake_build
diff --git a/crypto/cryfs/DEPENDS b/crypto/cryfs/DEPENDS
index 44d740e..dfe1546 100755
--- a/crypto/cryfs/DEPENDS
+++ b/crypto/cryfs/DEPENDS
@@ -6,4 +6,5 @@ depends SSL &&
depends fmt &&
depends fuse &&
depends scrypt &&
-depends spdlog
+depends spdlog &&
+depends range-v3
diff --git a/crypto/cryfs/DETAILS b/crypto/cryfs/DETAILS
index 9b96e5f..d5b90cc 100755
--- a/crypto/cryfs/DETAILS
+++ b/crypto/cryfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=cryfs
- VERSION=0.10.2
+ VERSION=0.11.4
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://github.com/cryfs/cryfs/releases/download/$VERSION/$SOURCE
diff --git a/crypto/cryfs/HISTORY b/crypto/cryfs/HISTORY
index ef490fb..c261148 100644
--- a/crypto/cryfs/HISTORY
+++ b/crypto/cryfs/HISTORY
@@ -1,3 +1,11 @@
+2023-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.11.4
+ * cryfs.gpg: add "CryFS Team <messmer AT cryfs.org>"
+ * PRE_BUILD: use sed to fix includes
+ * patches/*" deleted
+ * BUILD: tweak
+ * DEPENDS: add range-v3
+
2019-06-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.10.2
diff --git a/crypto/cryfs/PRE_BUILD b/crypto/cryfs/PRE_BUILD
index 9d39330..b23057d 100755
--- a/crypto/cryfs/PRE_BUILD
+++ b/crypto/cryfs/PRE_BUILD
@@ -2,4 +2,15 @@ mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
unpack_file &&
rm -r vendor &&
-apply_patch_dir patches
+sed -i '/add_subdirectory(vendor/D' CMakeLists.txt &&
+sed -i "/^check_target_is_not_from_conan/D"
cmake-utils/DependenciesFromLocalSystem.cmake &&
+sed -i '/#include/s/vendor_//'\
+ src/blockstore/implementations/compressing/compressors/Gzip.cpp \
+ src/cpp-utils/*/*.{h,cpp} \
+ src/cpp-utils/*/*/*.{h,cpp} \
+ src/cpp-utils/*/*/*.{h,cpp} \
+ src/cpp-utils/*/*/*/*.{h,cpp} \
+ src/cryfs/impl/localstate/BasedirMetadata.cpp\
+ test/cryfs/impl/config/CompatibilityTest.cpp
+
+#apply_patch_dir patches
diff --git a/crypto/cryfs/cryfs.gpg b/crypto/cryfs/cryfs.gpg
index 434e3e7..c643ff4 100644
Binary files a/crypto/cryfs/cryfs.gpg and b/crypto/cryfs/cryfs.gpg differ
diff --git a/crypto/cryfs/patches/0001-do-not-ref-vendor.patch
b/crypto/cryfs/patches/0001-do-not-ref-vendor.patch
deleted file mode 100644
index efd003c..0000000
--- a/crypto/cryfs/patches/0001-do-not-ref-vendor.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From d7f2ecd8485f7b972d333c6f80f0191b97cbd90e Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Sat, 13 Apr 2019 20:21:46 +0200
-Subject: [PATCH 1/3] do not ref vendor-
-
----
- .../implementations/compressing/compressors/Gzip.cpp | 2 +-
- src/cpp-utils/crypto/cryptopp_byte.h | 2 +-
- src/cpp-utils/crypto/hash/Hash.cpp | 2 +-
- src/cpp-utils/crypto/kdf/Scrypt.cpp | 2 +-
- src/cpp-utils/crypto/symmetric/CFB_Cipher.h | 2 +-
- src/cpp-utils/crypto/symmetric/GCM_Cipher.h | 2 +-
- src/cpp-utils/crypto/symmetric/ciphers.h | 10 +++++-----
- src/cpp-utils/data/Data.cpp | 2 +-
- src/cpp-utils/data/FixedSizeData.h | 2 +-
- src/cpp-utils/random/OSRandomGenerator.h | 2 +-
- src/cpp-utils/random/RandomGeneratorThread.h | 2 +-
- src/cryfs/localstate/BasedirMetadata.cpp | 2 +-
- test/cryfs/config/CompatibilityTest.cpp | 2 +-
- 13 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/blockstore/implementations/compressing/compressors/Gzip.cpp
b/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-index 67b7f49..64f13e9 100644
---- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-+++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-@@ -1,6 +1,6 @@
- #include "cpp-utils/crypto/cryptopp_byte.h"
- #include "Gzip.h"
--#include <vendor_cryptopp/gzip.h>
-+#include <cryptopp/gzip.h>
-
- using cpputils::Data;
-
-diff --git a/src/cpp-utils/crypto/cryptopp_byte.h
b/src/cpp-utils/crypto/cryptopp_byte.h
-index e00cf7c..363990e 100644
---- a/src/cpp-utils/crypto/cryptopp_byte.h
-+++ b/src/cpp-utils/crypto/cryptopp_byte.h
-@@ -2,7 +2,7 @@
- #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
- #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
-
--#include <vendor_cryptopp/cryptlib.h>
-+#include <cryptopp/cryptlib.h>
-
- // If we're running an older CryptoPP version, CryptoPP::byte isn't defined
yet.
- // Define it. Refer to "byte" type in the global namespace (placed by
CryptoPP).
-diff --git a/src/cpp-utils/crypto/hash/Hash.cpp
b/src/cpp-utils/crypto/hash/Hash.cpp
-index 696cdea..e07d28d 100644
---- a/src/cpp-utils/crypto/hash/Hash.cpp
-+++ b/src/cpp-utils/crypto/hash/Hash.cpp
-@@ -1,6 +1,6 @@
- #include "Hash.h"
- #include <cpp-utils/random/Random.h>
--#include <vendor_cryptopp/sha.h>
-+#include <cryptopp/sha.h>
-
- using cpputils::Random;
- using CryptoPP::SHA512;
-diff --git a/src/cpp-utils/crypto/kdf/Scrypt.cpp
b/src/cpp-utils/crypto/kdf/Scrypt.cpp
-index f97d694..e26db8d 100644
---- a/src/cpp-utils/crypto/kdf/Scrypt.cpp
-+++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp
-@@ -1,5 +1,5 @@
- #include "Scrypt.h"
--#include <vendor_cryptopp/scrypt.h>
-+#include <cryptopp/scrypt.h>
-
- using std::string;
-
-diff --git a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-index 4f91b89..971aa1d 100644
---- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-+++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-@@ -7,7 +7,7 @@
- #include "../../data/Data.h"
- #include "../../random/Random.h"
- #include <boost/optional.hpp>
--#include <vendor_cryptopp/modes.h>
-+#include <cryptopp/modes.h>
- #include "Cipher.h"
- #include "EncryptionKey.h"
-
-diff --git a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-index 21d55fb..bc9a409 100644
---- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-+++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-@@ -6,7 +6,7 @@
- #include "../../data/FixedSizeData.h"
- #include "../../data/Data.h"
- #include "../../random/Random.h"
--#include <vendor_cryptopp/gcm.h>
-+#include <cryptopp/gcm.h>
- #include "Cipher.h"
- #include "EncryptionKey.h"
-
-diff --git a/src/cpp-utils/crypto/symmetric/ciphers.h
b/src/cpp-utils/crypto/symmetric/ciphers.h
-index 7a8f8d4..61a6a25 100644
---- a/src/cpp-utils/crypto/symmetric/ciphers.h
-+++ b/src/cpp-utils/crypto/symmetric/ciphers.h
-@@ -2,11 +2,11 @@
- #ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
- #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
-
--#include <vendor_cryptopp/aes.h>
--#include <vendor_cryptopp/twofish.h>
--#include <vendor_cryptopp/serpent.h>
--#include <vendor_cryptopp/cast.h>
--#include <vendor_cryptopp/mars.h>
-+#include <cryptopp/aes.h>
-+#include <cryptopp/twofish.h>
-+#include <cryptopp/serpent.h>
-+#include <cryptopp/cast.h>
-+#include <cryptopp/mars.h>
- #include "GCM_Cipher.h"
- #include "CFB_Cipher.h"
-
-diff --git a/src/cpp-utils/data/Data.cpp b/src/cpp-utils/data/Data.cpp
-index c8a3a25..3a6d41e 100644
---- a/src/cpp-utils/data/Data.cpp
-+++ b/src/cpp-utils/data/Data.cpp
-@@ -1,6 +1,6 @@
- #include "Data.h"
- #include <stdexcept>
--#include <vendor_cryptopp/hex.h>
-+#include <cryptopp/hex.h>
- #include <cpp-utils/crypto/cryptopp_byte.h>
-
- using std::istream;
-diff --git a/src/cpp-utils/data/FixedSizeData.h
b/src/cpp-utils/data/FixedSizeData.h
-index c4a88d7..a177ab2 100644
---- a/src/cpp-utils/data/FixedSizeData.h
-+++ b/src/cpp-utils/data/FixedSizeData.h
-@@ -2,7 +2,7 @@
- #ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
- #define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
-
--#include <vendor_cryptopp/hex.h>
-+#include <cryptopp/hex.h>
- #include <string>
- #include <cstring>
- #include "../assert/assert.h"
-diff --git a/src/cpp-utils/random/OSRandomGenerator.h
b/src/cpp-utils/random/OSRandomGenerator.h
-index 18a8002..8c8dc6f 100644
---- a/src/cpp-utils/random/OSRandomGenerator.h
-+++ b/src/cpp-utils/random/OSRandomGenerator.h
-@@ -4,7 +4,7 @@
-
- #include "cpp-utils/crypto/cryptopp_byte.h"
- #include "RandomGenerator.h"
--#include <vendor_cryptopp/osrng.h>
-+#include <cryptopp/osrng.h>
-
- namespace cpputils {
- class OSRandomGenerator final : public RandomGenerator {
-diff --git a/src/cpp-utils/random/RandomGeneratorThread.h
b/src/cpp-utils/random/RandomGeneratorThread.h
-index 593750e..103c00d 100644
---- a/src/cpp-utils/random/RandomGeneratorThread.h
-+++ b/src/cpp-utils/random/RandomGeneratorThread.h
-@@ -4,7 +4,7 @@
-
- #include "../thread/LoopThread.h"
- #include "ThreadsafeRandomDataBuffer.h"
--#include <vendor_cryptopp/osrng.h>
-+#include <cryptopp/osrng.h>
-
- namespace cpputils {
- //TODO Test
-diff --git a/src/cryfs/localstate/BasedirMetadata.cpp
b/src/cryfs/localstate/BasedirMetadata.cpp
-index 3477a8f..06d5228 100644
---- a/src/cryfs/localstate/BasedirMetadata.cpp
-+++ b/src/cryfs/localstate/BasedirMetadata.cpp
-@@ -1,7 +1,7 @@
- #include "BasedirMetadata.h"
- #include <boost/property_tree/ptree.hpp>
- #include <boost/property_tree/json_parser.hpp>
--#include <vendor_cryptopp/sha.h>
-+#include <cryptopp/sha.h>
- #include <boost/filesystem/operations.hpp>
- #include "LocalStateDir.h"
-
-diff --git a/test/cryfs/config/CompatibilityTest.cpp
b/test/cryfs/config/CompatibilityTest.cpp
-index 36c1871..a1d5f22 100644
---- a/test/cryfs/config/CompatibilityTest.cpp
-+++ b/test/cryfs/config/CompatibilityTest.cpp
-@@ -3,7 +3,7 @@
- #include <vector>
- #include <boost/filesystem.hpp>
- #include <cpp-utils/data/Data.h>
--#include <vendor_cryptopp/hex.h>
-+#include <cryptopp/hex.h>
- #include <cpp-utils/crypto/symmetric/ciphers.h>
- #include <cpp-utils/tempfile/TempFile.h>
- #include <cryfs/config/CryConfigFile.h>
---
-2.21.0
diff --git a/crypto/cryfs/patches/0002-fix-logging.patch
b/crypto/cryfs/patches/0002-fix-logging.patch
deleted file mode 100644
index 818c27b..0000000
--- a/crypto/cryfs/patches/0002-fix-logging.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 7cac481febcd934ccc4cb8dc86cbe3d387321d3e Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Sat, 13 Apr 2019 13:25:18 +0200
-Subject: [PATCH 2/3] fix logging
-
----
- src/cpp-utils/logging/Logger.h | 2 ++
- src/cpp-utils/logging/logging.h | 4 ++--
- src/cryfs-cli/Cli.cpp | 8 ++++++--
- 3 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/cpp-utils/logging/Logger.h b/src/cpp-utils/logging/Logger.h
-index ceff576..5851e06 100644
---- a/src/cpp-utils/logging/Logger.h
-+++ b/src/cpp-utils/logging/Logger.h
-@@ -7,6 +7,8 @@
- #endif
-
- #include <spdlog/spdlog.h>
-+#include <spdlog/sinks/stdout_sinks.h>
-+#include <spdlog/sinks/syslog_sink.h>
- #include "../macros.h"
-
- namespace cpputils {
-diff --git a/src/cpp-utils/logging/logging.h
b/src/cpp-utils/logging/logging.h
-index aed44db..b4ae276 100644
---- a/src/cpp-utils/logging/logging.h
-+++ b/src/cpp-utils/logging/logging.h
-@@ -4,7 +4,7 @@
-
- #include "Logger.h"
- #include <stdexcept>
--#include <spdlog/fmt/ostr.h>
-+#include <fmt/ostream.h>
-
- #if defined(_MSC_VER)
- #include <spdlog/sinks/msvc_sink.h>
-@@ -75,7 +75,7 @@ namespace cpputils {
- #if defined(_MSC_VER)
- return spdlog::create<spdlog::sinks::msvc_sink_mt>(name);
- #else
-- return spdlog::syslog_logger(name, name, LOG_PID);
-+ return spdlog::syslog_logger_mt(name, name, LOG_PID);
- #endif
- }
- }
-diff --git a/src/cryfs-cli/Cli.cpp b/src/cryfs-cli/Cli.cpp
-index 261459f..abcaa8a 100644
---- a/src/cryfs-cli/Cli.cpp
-+++ b/src/cryfs-cli/Cli.cpp
-@@ -4,6 +4,10 @@
- #include <cmath>
- #include <cstdio>
- #include <cstdlib>
-+
-+#include <spdlog/sinks/syslog_sink.h>
-+#include <spdlog/sinks/basic_file_sink.h>
-+
- #include <cpp-utils/assert/backtrace.h>
-
- #include <fspp/fuse/Fuse.h>
-@@ -310,9 +314,9 @@ namespace cryfs_cli {
- //TODO Test that --logfile parameter works. Should be: file if
specified, otherwise stderr if foreground, else syslog.
- if (options.logFile() != none) {
- cpputils::logging::setLogger(
--
spdlog::create<spdlog::sinks::simple_file_sink<std::mutex>>("cryfs",
options.logFile()->string()));
-+
spdlog::create<spdlog::sinks::basic_file_sink<std::mutex>>("cryfs",
options.logFile()->string()));
- } else if (options.foreground()) {
-- cpputils::logging::setLogger(spdlog::stderr_logger_mt("cryfs"));
-+ cpputils::logging::setLogger(spdlog::stderr_logger_st("cryfs"));
- } else {
-
cpputils::logging::setLogger(cpputils::logging::system_logger("cryfs"));
- }
---
-2.21.0
diff --git a/crypto/cryfs/patches/0003-cmake-fixes.patch
b/crypto/cryfs/patches/0003-cmake-fixes.patch
deleted file mode 100644
index 78e15fb..0000000
--- a/crypto/cryfs/patches/0003-cmake-fixes.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From 11fe130e63197c465bb7863ee6963096d1f566d6 Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Sat, 13 Apr 2019 13:26:15 +0200
-Subject: [PATCH 3/3] cmake fixes
-
-cmake tweaks
-
-clean & fix cmake
----
- CMakeLists.txt | 19 ++++++-------------
- cmake-utils/utils.cmake | 11 ++---------
- src/CMakeLists.txt | 9 +++++++++
- src/cpp-utils/CMakeLists.txt | 2 +-
- src/cryfs-cli/CMakeLists.txt | 14 +++++---------
- src/cryfs-unmount/CMakeLists.txt | 12 ++++--------
- src/cryfs/CMakeLists.txt | 12 ++++++------
- src/fspp/fuse/CMakeLists.txt | 2 +-
- src/stats/CMakeLists.txt | 1 +
- 9 files changed, 35 insertions(+), 47 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fdbff71..330fa54 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
-+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
- cmake_policy(SET CMP0054 NEW)
-
- # TODO Perf test:
-@@ -6,6 +6,8 @@ cmake_policy(SET CMP0054 NEW)
- # -> if yes, offer a cmake option to enable both of these
-
- project(cryfs)
-+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-
- list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake-utils)
- include(utils)
-@@ -24,15 +26,6 @@ option(USE_CLANG_TIDY "build with clang-tidy checks
enabled" OFF)
- option(USE_IWYU "build with iwyu checks enabled" OFF)
- option(CLANG_TIDY_WARNINGS_AS_ERRORS "treat clang-tidy warnings as errors"
OFF)
-
--if(USE_IWYU)
-- # note: for iwyu, we need cmake 3.3
-- cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
--endif()
--if(USE_CLANG_TIDY)
-- # note: for clang-tidy, we need cmake 3.6, or (if the return code
should be handled correctly, e.g. on CI), we need 3.8.
-- cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
--endif()
--
-
- if (MSVC)
- option(DOKAN_PATH "Location of the Dokan library, e.g. C:\\Program
Files\\Dokan\\DokanLibrary-1.1.0" "")
-@@ -48,8 +41,8 @@ if(MSVC)
- add_definitions(/bigobj)
- endif()
-
--add_subdirectory(vendor EXCLUDE_FROM_ALL)
-+#add_subdirectory(vendor EXCLUDE_FROM_ALL)
- add_subdirectory(src)
- add_subdirectory(doc)
--add_subdirectory(test)
--add_subdirectory(cpack)
-+#add_subdirectory(test)
-+#add_subdirectory(cpack)
-diff --git a/cmake-utils/utils.cmake b/cmake-utils/utils.cmake
-index da4dff8..4b227b7 100644
---- a/cmake-utils/utils.cmake
-+++ b/cmake-utils/utils.cmake
-@@ -107,16 +107,9 @@ endfunction(target_enable_style_warnings)
- ##################################################
- function(target_add_boost TARGET)
- # Load boost libraries
-- if(NOT DEFINED Boost_USE_STATIC_LIBS OR Boost_USE_STATIC_LIBS)
-- # Many supported systems don't have boost >= 1.65.1. Better link it
statically.
-- message(STATUS "Boost will be statically linked")
-- set(Boost_USE_STATIC_LIBS ON)
-- else(NOT DEFINED Boost_USE_STATIC_LIBS OR Boost_USE_STATIC_LIBS)
-- message(STATUS "Boost will be dynamically linked")
-- set(Boost_USE_STATIC_LIBS OFF)
-- endif(NOT DEFINED Boost_USE_STATIC_LIBS OR Boost_USE_STATIC_LIBS)
-+ option(Boost_USE_STATIC_LIBS "use static Boost libraries" OFF)
- set(BOOST_THREAD_VERSION 4)
-- find_package(Boost 1.65.1
-+ find_package(Boost 1.70.0
- REQUIRED
- COMPONENTS ${ARGN})
- target_include_directories(${TARGET} SYSTEM PUBLIC
${Boost_INCLUDE_DIRS})
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a803b1c..c18c676 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,5 +1,14 @@
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-+find_package(PkgConfig REQUIRED)
-+find_package(spdlog REQUIRED)
-+find_package(fmt REQUIRED)
-+add_definitions("-DSPDLOG_FMT_EXTERNAL=1")
-+#include_directories(${FMT_INCLUDE_DIR})
-+#include_directories(/usr/include)
-
-+#find_library(SCRYPT NAMES libpercival percival)
-+pkg_search_module(SCRYPT REQUIRED libpercival)
-+#find_package(scrypt REQUIRED)
- add_subdirectory(gitversion)
- add_subdirectory(cpp-utils)
- add_subdirectory(fspp)
-diff --git a/src/cpp-utils/CMakeLists.txt b/src/cpp-utils/CMakeLists.txt
-index f66f99f..079ef18 100644
---- a/src/cpp-utils/CMakeLists.txt
-+++ b/src/cpp-utils/CMakeLists.txt
-@@ -89,7 +89,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
${CMAKE_THREAD_LIBS_INIT})
-
- target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS})
-
--target_link_libraries(${PROJECT_NAME} PUBLIC spdlog cryptopp)
-+target_link_libraries(${PROJECT_NAME} PUBLIC cryptopp fmt)
-
- target_add_boost(${PROJECT_NAME} filesystem system thread chrono)
- target_enable_style_warnings(${PROJECT_NAME})
-diff --git a/src/cryfs-cli/CMakeLists.txt b/src/cryfs-cli/CMakeLists.txt
-index 90edb22..5a5b0dc 100644
---- a/src/cryfs-cli/CMakeLists.txt
-+++ b/src/cryfs-cli/CMakeLists.txt
-@@ -11,8 +11,10 @@ set(SOURCES
- program_options/Parser.cpp
- )
-
--add_library(${PROJECT_NAME} ${SOURCES})
-+add_executable(${PROJECT_NAME} main.cpp ${SOURCES})
-+target_compile_definitions(${PROJECT_NAME} PRIVATE -D_FILE_OFFSET_BITS=64)
- target_link_libraries(${PROJECT_NAME} PUBLIC cryfs cpp-utils gitversion
fspp-fuse)
-+target_link_libraries(${PROJECT_NAME} PUBLIC boost_program_options
boost_filesystem boost_system boost_thread boost_chrono)
- target_enable_style_warnings(${PROJECT_NAME})
- target_activate_cpp14(${PROJECT_NAME})
-
-@@ -20,13 +22,7 @@ if(NOT CRYFS_UPDATE_CHECKS)
- target_compile_definitions(${PROJECT_NAME} PRIVATE
-DCRYFS_NO_UPDATE_CHECKS)
- endif(NOT CRYFS_UPDATE_CHECKS)
-
--add_executable(${PROJECT_NAME}_bin main.cpp)
--set_target_properties(${PROJECT_NAME}_bin PROPERTIES OUTPUT_NAME cryfs)
--target_link_libraries(${PROJECT_NAME}_bin PUBLIC ${PROJECT_NAME})
--target_enable_style_warnings(${PROJECT_NAME}_bin)
--target_activate_cpp14(${PROJECT_NAME}_bin)
--
--install(TARGETS ${PROJECT_NAME}_bin
-+install(TARGETS ${PROJECT_NAME}
- CONFIGURATIONS Debug Release RelWithDebInfo
-- DESTINATION ${CMAKE_INSTALL_BINDIR}
-+ DESTINATION bin
- )
-diff --git a/src/cryfs-unmount/CMakeLists.txt
b/src/cryfs-unmount/CMakeLists.txt
-index 0a246a7..b362807 100644
---- a/src/cryfs-unmount/CMakeLists.txt
-+++ b/src/cryfs-unmount/CMakeLists.txt
-@@ -7,18 +7,14 @@ set(SOURCES
- Cli.cpp
- )
-
--add_library(${PROJECT_NAME} ${SOURCES})
-+add_executable(${PROJECT_NAME} main_unmount.cpp ${SOURCES})
- target_link_libraries(${PROJECT_NAME} PUBLIC cpp-utils cryfs fspp-fuse)
-+target_link_libraries(${PROJECT_NAME} PUBLIC boost_program_options
boost_filesystem boost_thread boost_chrono)
- target_enable_style_warnings(${PROJECT_NAME})
- target_activate_cpp14(${PROJECT_NAME})
-
--add_executable(${PROJECT_NAME}_bin main_unmount.cpp)
--set_target_properties(${PROJECT_NAME}_bin PROPERTIES OUTPUT_NAME
cryfs-unmount)
--target_link_libraries(${PROJECT_NAME}_bin PUBLIC ${PROJECT_NAME})
--target_enable_style_warnings(${PROJECT_NAME}_bin)
--target_activate_cpp14(${PROJECT_NAME}_bin)
-
--install(TARGETS ${PROJECT_NAME}_bin
-+install(TARGETS ${PROJECT_NAME}
- CONFIGURATIONS Debug Release RelWithDebInfo
-- DESTINATION ${CMAKE_INSTALL_BINDIR}
-+ DESTINATION bin
- )
-diff --git a/src/cryfs/CMakeLists.txt b/src/cryfs/CMakeLists.txt
-index 62d358d..45358e9 100644
---- a/src/cryfs/CMakeLists.txt
-+++ b/src/cryfs/CMakeLists.txt
-@@ -49,13 +49,13 @@ set(LIB_SOURCES
- localstate/BasedirMetadata.cpp
- )
-
--add_library(${PROJECT_NAME} STATIC ${LIB_SOURCES})
-+add_library(${PROJECT_NAME} SHARED ${LIB_SOURCES})
- target_link_libraries(${PROJECT_NAME} PUBLIC cpp-utils fspp-interface
blockstore blobstore gitversion)
--target_add_boost(${PROJECT_NAME} program_options chrono) # TODO Check that
dependent projects don't get boost added (use PRIVATE here)
-+target_add_boost(${PROJECT_NAME} filesystem program_options chrono thread)
# TODO Check that dependent projects don't get boost added (use PRIVATE here)
- target_enable_style_warnings(${PROJECT_NAME})
- target_activate_cpp14(${PROJECT_NAME})
-
--#install(TARGETS ${PROJECT_NAME}
--# DESTINATION lib
--# CONFIGURATIONS Release
--#)
-+install(TARGETS ${PROJECT_NAME}
-+ DESTINATION lib
-+ CONFIGURATIONS Release
-+)
-diff --git a/src/fspp/fuse/CMakeLists.txt b/src/fspp/fuse/CMakeLists.txt
-index b991bd7..55197a2 100644
---- a/src/fspp/fuse/CMakeLists.txt
-+++ b/src/fspp/fuse/CMakeLists.txt
-@@ -32,7 +32,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- target_link_libraries(${PROJECT_NAME} PUBLIC
"${DOKAN_LIB_PATH}/lib/dokanfuse1.lib")
-
- install(FILES "${DOKAN_LIB_PATH}/dokan1.dll"
"${DOKAN_LIB_PATH}/dokanfuse1.dll"
-- DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+ DESTINATION bin
- )
-
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-diff --git a/src/stats/CMakeLists.txt b/src/stats/CMakeLists.txt
-index c29f44e..d90bdb6 100644
---- a/src/stats/CMakeLists.txt
-+++ b/src/stats/CMakeLists.txt
-@@ -6,6 +6,7 @@ set(SOURCES
-
- add_executable(${PROJECT_NAME} ${SOURCES})
- target_link_libraries(${PROJECT_NAME} PUBLIC cryfs cpp-utils gitversion)
-+target_link_libraries(${PROJECT_NAME} PUBLIC boost_program_options
boost_filesystem boost_thread boost_chrono)
- target_enable_style_warnings(${PROJECT_NAME})
- target_activate_cpp14(${PROJECT_NAME})
- set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME cryfs-stats)
---
-2.21.0
diff --git a/crypto/cryptopp/DETAILS b/crypto/cryptopp/DETAILS
index f74d7a5..5cf7c57 100755
--- a/crypto/cryptopp/DETAILS
+++ b/crypto/cryptopp/DETAILS
@@ -1,8 +1,8 @@
SPELL=cryptopp
SPELLX=CRYPTOPP
- VERSION=8.6.0
+ VERSION=8.8.0
VERSIONX=`echo ${VERSION} | sed -r "s/\./\_/g"`
-
SOURCE_HASH=sha512:ccb4baa6674cd830cddb779216ce702b3cdba6de8a3d627c218861507c36bddd2861b0d0e8cad35001a1e9f0c3d5020404684c87dd05d85264ac166fa7f70589
+
SOURCE_HASH=sha512:578531fa3f543dde53593e007336f79312c1fb7c4ae05e7367fe11d5f476a7cad3f179c77c9578d2c31efed696bd71abf29452c9ab89c8dc5b8823774c4fbb0b
SECURITY_PATCH=4
SOURCE="${SPELLX}_${VERSIONX}.tar.gz"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${SPELLX}_${VERSIONX}"
diff --git a/crypto/cryptopp/HISTORY b/crypto/cryptopp/HISTORY
index a0fb745..8c7b277 100644
--- a/crypto/cryptopp/HISTORY
+++ b/crypto/cryptopp/HISTORY
@@ -1,3 +1,6 @@
+2023-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 8.8.0
+
2021-09-25 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 8.6.0
diff --git a/libs/range-v3/DETAILS b/libs/range-v3/DETAILS
index cb0ba2b..7820646 100755
--- a/libs/range-v3/DETAILS
+++ b/libs/range-v3/DETAILS
@@ -1,9 +1,9 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=range-v3
- VERSION=0.11.0
+ VERSION=0.12.0
+
SOURCE_HASH=sha512:b8b632b8e0f2a3234ef61813212c237f648cd741e816ca57bd86f82f6459f7d755e2b70361d2aa43847874fb546a31a792ab1c3ba90292818ae7313438dc62d0
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]=https://github.com/ericniebler/$SPELL/archive/refs/tags/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:9d6cdcbc1e50104206ba731c3bdc9aab3acfcf69cd83f0e0b4de18b88df2a9e73d64e55638421768d4433c542b6619f6e5af6b17cccd3090cf8b4d4efe9863e4
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://github.com/ericniebler/$SPELL";
LICENSE[0]=https://github.com/ericniebler/$SPELL/blob/master/LICENSE.txt
diff --git a/libs/range-v3/HISTORY b/libs/range-v3/HISTORY
index 3cd7a3e..84a38be 100644
--- a/libs/range-v3/HISTORY
+++ b/libs/range-v3/HISTORY
@@ -1,3 +1,6 @@
+2023-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.12.0
+
2021-06-04 Florian Franzmann <bwlf AT bandrate.org>
* DEPENDS, DETAILS: spell created
diff --git a/libs/spdlog/DEPENDS b/libs/spdlog/DEPENDS
index dbc7169..4e58793 100755
--- a/libs/spdlog/DEPENDS
+++ b/libs/spdlog/DEPENDS
@@ -1,3 +1,2 @@
source $GRIMOIRE/CMAKE_DEPENDS &&
-#depends fmt ' -DSPDLOG_FMT_EXTERNAL=1'
-depends fmt ' -DCMAKE_CXX_FLAGS="-DSPDLOG_FMT_EXTERNAL=on"'
+depends fmt ' -DSPDLOG_FMT_EXTERNAL=ON'
diff --git a/libs/spdlog/DETAILS b/libs/spdlog/DETAILS
index d08bf03..7c8e467 100755
--- a/libs/spdlog/DETAILS
+++ b/libs/spdlog/DETAILS
@@ -1,6 +1,6 @@
SPELL=spdlog
- VERSION=1.11.0
-
SOURCE_HASH=sha512:210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412
+ VERSION=1.12.0
+
SOURCE_HASH=sha512:db9a4f13b6c39ffde759db99bcdfe5e2dbe4231e73b29eb906a3fa78d6b8ec66920b8bd4371df17ae21b7b562472a236bc4435678f3af92b6496be090074181d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/gabime/spdlog
diff --git a/libs/spdlog/HISTORY b/libs/spdlog/HISTORY
index da0fa91..3e62aea 100644
--- a/libs/spdlog/HISTORY
+++ b/libs/spdlog/HISTORY
@@ -1,3 +1,8 @@
+2023-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.12.0
+ * PRE_BUILD patches/*: deleted
+ * DEPENDS: fix fmt usage flags, else breaks cryfs
+
2023-06-25 Conner Clere <xenanthropy AT sourcemage.org>
* PRE_BUILD: added, apply patch
* patches/fmt10-fix.patch, added, fix building with fmt version 10
diff --git a/libs/spdlog/PRE_BUILD b/libs/spdlog/PRE_BUILD
deleted file mode 100755
index 0cab101..0000000
--- a/libs/spdlog/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-apply_patch_dir patches
diff --git a/libs/spdlog/patches/fmt10-fix.patch
b/libs/spdlog/patches/fmt10-fix.patch
deleted file mode 100644
index 6717370..0000000
--- a/libs/spdlog/patches/fmt10-fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001
-From: H1X4 <10332146+H1X4Dev AT users.noreply.github.com>
-Date: Fri, 31 Mar 2023 20:39:32 +0300
-Subject: [PATCH] fix build for master fmt (non-bundled) (#2694)
-
-* fix build for master fmt (non-bundled)
-
-* update fmt_runtime_string macro
-
-* fix build of updated macro
----
- include/spdlog/common.h | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/include/spdlog/common.h b/include/spdlog/common.h
-index e69201a81..5f671c5c6 100644
---- a/include/spdlog/common.h
-+++ b/include/spdlog/common.h
-@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string<Args...>;
- template<class T>
- using remove_cvref_t = typename std::remove_cv<typename
std::remove_reference<T>::type>::type;
-
-+template <typename Char>
-+#if FMT_VERSION >= 90101
-+using fmt_runtime_string = fmt::runtime_format_string<Char>;
-+#else
-+using fmt_runtime_string = fmt::basic_runtime<Char>;
-+#endif
-+
- // clang doesn't like SFINAE disabled constructor in std::is_convertible<>
so have to repeat the condition from basic_format_string here,
- // in addition, fmt::basic_runtime<Char> is only convertible to
basic_format_string<Char> but not basic_string_view<Char>
- template<class T, class Char = char>
- struct is_convertible_to_basic_format_string
- : std::integral_constant<bool,
-- std::is_convertible<T, fmt::basic_string_view<Char>>::value ||
std::is_same<remove_cvref_t<T>, fmt::basic_runtime<Char>>::value>
-+ std::is_convertible<T, fmt::basic_string_view<Char>>::value ||
std::is_same<remove_cvref_t<T>, fmt_runtime_string<Char>>::value>
- {};
-
- # if defined(SPDLOG_WCHAR_FILENAMES) ||
defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4b3ce840f476a2230107fe1dbdb23dea8bafd272), Treeve Jelbert, 09/01/2023
Archive powered by MHonArc 2.6.24.