sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (8773929f8407bde01bb84b0ce5b92fa568f985f4)
- 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 (8773929f8407bde01bb84b0ce5b92fa568f985f4)
- Date: Thu, 29 May 2025 14:27:35 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
crypto/cryfs/HISTORY | 3 +++
crypto/cryfs/PRE_BUILD | 3 ++-
crypto/cryfs/patches/boost.diff | 23 +++++++++++++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
New commits:
commit 8773929f8407bde01bb84b0ce5b92fa568f985f4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
cryfs - fix build with latest boost
diff --git a/crypto/cryfs/HISTORY b/crypto/cryfs/HISTORY
index 3a8c6e9..c57b3bc 100644
--- a/crypto/cryfs/HISTORY
+++ b/crypto/cryfs/HISTORY
@@ -1,3 +1,6 @@
+2025-05-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD boost.diff: upstream patch, fix boost usage
+
2024-12-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.1
* PRE_BUILD BUILD DEPENDS: adjust
diff --git a/crypto/cryfs/PRE_BUILD b/crypto/cryfs/PRE_BUILD
index 4204de7..bf6b791 100755
--- a/crypto/cryfs/PRE_BUILD
+++ b/crypto/cryfs/PRE_BUILD
@@ -14,4 +14,5 @@ sed -i '/#include/s/vendor_//'\
sed -i '/install/i \
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
+sed -i 's/cryfs_vendor_cryptopp/cryptopp/' src/cpp-utils/CMakeLists.txt &&
+apply_patch_dir patches
diff --git a/crypto/cryfs/patches/boost.diff b/crypto/cryfs/patches/boost.diff
new file mode 100644
index 0000000..41d3843
--- /dev/null
+++ b/crypto/cryfs/patches/boost.diff
@@ -0,0 +1,23 @@
+diff --git a/src/cpp-utils/process/subprocess.cpp
b/src/cpp-utils/process/subprocess.cpp
+index 479bfe876..396ae09ec 100644
+--- a/src/cpp-utils/process/subprocess.cpp
++++ b/src/cpp-utils/process/subprocess.cpp
+@@ -1,7 +1,18 @@
+ #include "subprocess.h"
+ #include <array>
+ #include <boost/asio.hpp>
++#include <boost/version.hpp>
++#if BOOST_VERSION < 108800
+ #include <boost/process.hpp>
++#else
++#define BOOST_PROCESS_VERSION 1
++#include <boost/process/v1/args.hpp>
++#include <boost/process/v1/async_pipe.hpp>
++#include <boost/process/v1/child.hpp>
++#include <boost/process/v1/exe.hpp>
++#include <boost/process/v1/io.hpp>
++#include <boost/process/v1/search_path.hpp>
++#endif
+ #include <cerrno>
+ #include <cstddef>
+ #include <cstdio>
- [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (8773929f8407bde01bb84b0ce5b92fa568f985f4), Treeve Jelbert, 05/29/2025
Archive powered by MHonArc 2.6.24.