sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (b2c06d9d7d411d455b9016bcd7edf6676932f3e4)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (b2c06d9d7d411d455b9016bcd7edf6676932f3e4)
- Date: Fri, 13 Dec 2024 15:58:25 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
crypto/cryfs/BUILD | 5 +----
crypto/cryfs/DEPENDS | 4 ++--
crypto/cryfs/DETAILS | 2 +-
crypto/cryfs/HISTORY | 4 ++++
crypto/cryfs/PRE_BUILD | 8 ++++----
libs/spdlog/DETAILS | 4 ++--
libs/spdlog/HISTORY | 3 +++
7 files changed, 17 insertions(+), 13 deletions(-)
New commits:
commit b2c06d9d7d411d455b9016bcd7edf6676932f3e4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
cryfs: => 1.0.1
commit 16e2508915aabfdca853d568596b4c787e1490a3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
spdlog: => 1.15.0
diff --git a/crypto/cryfs/BUILD b/crypto/cryfs/BUILD
index 48d917d..cdf088e 100755
--- a/crypto/cryfs/BUILD
+++ b/crypto/cryfs/BUILD
@@ -1,6 +1,3 @@
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" &&
+OPTS+=' -DBUILD_SHARED_LIBS=on' &&
cmake_build
diff --git a/crypto/cryfs/DEPENDS b/crypto/cryfs/DEPENDS
index dfe1546..08cb28e 100755
--- a/crypto/cryfs/DEPENDS
+++ b/crypto/cryfs/DEPENDS
@@ -1,10 +1,10 @@
source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub 'CHRONO FILESYSTEM PROGRAM_OPTIONS SYSTEM THREAD' boost '
-DBoost_USE_STATIC_LIBS=off' &&
depends cryptopp &&
-depends curl &&
depends SSL &&
depends fmt &&
depends fuse &&
depends scrypt &&
depends spdlog &&
-depends range-v3
+depends range-v3 &&
+optional_depends curl '' ' -DCRYFS_UPDATE_CHECKS=0' 'check for updates at
runtime'
diff --git a/crypto/cryfs/DETAILS b/crypto/cryfs/DETAILS
index d5b90cc..c819b1a 100755
--- a/crypto/cryfs/DETAILS
+++ b/crypto/cryfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=cryfs
- VERSION=0.11.4
+ VERSION=1.0.1
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 ea87e8f..3a8c6e9 100644
--- a/crypto/cryfs/HISTORY
+++ b/crypto/cryfs/HISTORY
@@ -1,3 +1,7 @@
+2024-12-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.1
+ * PRE_BUILD BUILD DEPENDS: adjust
+
2023-09-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.11.4
* cryfs.gpg: add "CryFS Team <messmer AT cryfs.org>"
diff --git a/crypto/cryfs/PRE_BUILD b/crypto/cryfs/PRE_BUILD
index adf5f91..4204de7 100755
--- a/crypto/cryfs/PRE_BUILD
+++ b/crypto/cryfs/PRE_BUILD
@@ -3,7 +3,6 @@ cd $SOURCE_DIRECTORY &&
unpack_file &&
rm -r vendor &&
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} \
@@ -11,7 +10,8 @@ sed -i '/#include/s/vendor_//'\
src/cpp-utils/*/*/*.{h,cpp} \
src/cpp-utils/*/*/*/*.{h,cpp} \
src/cryfs/impl/localstate/BasedirMetadata.cpp\
- test/cryfs/impl/config/CompatibilityTest.cpp
+ test/cryfs/impl/config/CompatibilityTest.cpp &&
sed -i '/install/i \
-install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-' src/cryfs-cli/CMakeLists.txt src/cryfs-unmount/CMakeLists.txt
+install(TARGETS ${PROJECT_NAME}_lib DESTINATION ${CMAKE_INSTALL_LIBDIR})
+' src/cryfs-cli/CMakeLists.txt src/cryfs-unmount/CMakeLists.txt &&
+sed -i 's/cryfs_vendor_cryptopp/cryptopp/' src/cpp-utils/CMakeLists.txt
diff --git a/libs/spdlog/DETAILS b/libs/spdlog/DETAILS
index 00567fb..bdf81f1 100755
--- a/libs/spdlog/DETAILS
+++ b/libs/spdlog/DETAILS
@@ -1,6 +1,6 @@
SPELL=spdlog
- VERSION=1.14.1
-
SOURCE_HASH=sha512:d8f36a3d65a43d8c64900e46137827aadb05559948b2f5a389bea16ed1bfac07d113ee11cf47970913298d6c37400355fe6895cda8fa6dcf6abd9da0d8f199e9
+ VERSION=1.15.0
+
SOURCE_HASH=sha512:3dd98409f4625ae4d46ef5f59a2fc22a6e151a13dba9d37433363e5d84eab7cca73b379eeb637d8f9b1f0f5a42221c0cc9a2a70414dc2b6af6a162e19fba0647
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 e890517..a6d3da6 100644
--- a/libs/spdlog/HISTORY
+++ b/libs/spdlog/HISTORY
@@ -1,3 +1,6 @@
+2024-12-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.15.0
+
2024-05-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.14.1
- [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (b2c06d9d7d411d455b9016bcd7edf6676932f3e4), Treeve Jelbert, 12/13/2024
Archive powered by MHonArc 2.6.24.