From ada0090a7808410957f0beeaa528823dc97c4149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 8 Aug 2025 22:01:12 +0700 Subject: [PATCH] cryfs: update to 1.0.1. --- ...make-DCMAKE_BUILD_TYPE-None-for-void.patch | 9 +-- .../0002-de-vendor-crypto-for-void.patch | 64 +++++++++---------- srcpkgs/cryfs/patches/boost-1.88.patch | 25 ++++++++ srcpkgs/cryfs/template | 17 +++-- 4 files changed, 67 insertions(+), 48 deletions(-) create mode 100644 srcpkgs/cryfs/patches/boost-1.88.patch diff --git a/srcpkgs/cryfs/patches/0001-allow-cmake-DCMAKE_BUILD_TYPE-None-for-void.patch b/srcpkgs/cryfs/patches/0001-allow-cmake-DCMAKE_BUILD_TYPE-None-for-void.patch index 09892e2a013..4d4afd1b18a 100644 --- a/srcpkgs/cryfs/patches/0001-allow-cmake-DCMAKE_BUILD_TYPE-None-for-void.patch +++ b/srcpkgs/cryfs/patches/0001-allow-cmake-DCMAKE_BUILD_TYPE-None-for-void.patch @@ -7,17 +7,12 @@ Subject: [PATCH 1/2] allow cmake -DCMAKE_BUILD_TYPE=None for void doc/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index 491ed801..ca5cd0a3 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt -@@ -15,6 +15,5 @@ ELSE (WIN32) +@@ -21,6 +21,5 @@ ELSE (WIN32) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cryfs.1.gz + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cryfs.1.gz ${CMAKE_CURRENT_BINARY_DIR}/cryfs-unmount.1.gz DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 - CONFIGURATIONS Release ) ENDIF(WIN32) --- -2.41.0 - diff --git a/srcpkgs/cryfs/patches/0002-de-vendor-crypto-for-void.patch b/srcpkgs/cryfs/patches/0002-de-vendor-crypto-for-void.patch index b1262dd991e..e5a153c01bc 100644 --- a/srcpkgs/cryfs/patches/0002-de-vendor-crypto-for-void.patch +++ b/srcpkgs/cryfs/patches/0002-de-vendor-crypto-for-void.patch @@ -19,8 +19,6 @@ Subject: [PATCH 2/2] de-vendor crypto++ for void vendor/CMakeLists.txt | 1 - 13 files changed, 17 insertions(+), 18 deletions(-) -diff --git a/src/blockstore/implementations/compressing/compressors/Gzip.cpp b/src/blockstore/implementations/compressing/compressors/Gzip.cpp -index 5420ebf5..5f169cf6 100644 --- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp +++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp @@ -1,5 +1,5 @@ @@ -30,8 +28,6 @@ index 5420ebf5..5f169cf6 100644 using cpputils::Data; -diff --git a/src/cpp-utils/crypto/hash/Hash.cpp b/src/cpp-utils/crypto/hash/Hash.cpp -index 696cdeaf..e07d28da 100644 --- a/src/cpp-utils/crypto/hash/Hash.cpp +++ b/src/cpp-utils/crypto/hash/Hash.cpp @@ -1,6 +1,6 @@ @@ -40,10 +36,8 @@ index 696cdeaf..e07d28da 100644 -#include +#include - 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 1fec96ce..a12b6369 100644 + --- a/src/cpp-utils/crypto/kdf/Scrypt.cpp +++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp @@ -1,5 +1,5 @@ @@ -53,8 +47,6 @@ index 1fec96ce..a12b6369 100644 using std::string; -diff --git a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h -index c1a8aa1c..c0e3d8c5 100644 --- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h +++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h @@ -6,7 +6,7 @@ @@ -66,8 +58,6 @@ index c1a8aa1c..c0e3d8c5 100644 #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 9cf6d53f..86b2b8e3 100644 --- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h +++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h @@ -3,7 +3,7 @@ @@ -79,8 +69,6 @@ index 9cf6d53f..86b2b8e3 100644 namespace cpputils { -diff --git a/src/cpp-utils/crypto/symmetric/ciphers.h b/src/cpp-utils/crypto/symmetric/ciphers.h -index 0bae6866..eee3111e 100644 --- a/src/cpp-utils/crypto/symmetric/ciphers.h +++ b/src/cpp-utils/crypto/symmetric/ciphers.h @@ -2,12 +2,12 @@ @@ -102,8 +90,6 @@ index 0bae6866..eee3111e 100644 #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 be94cdbe..e283f0eb 100644 --- a/src/cpp-utils/data/Data.cpp +++ b/src/cpp-utils/data/Data.cpp @@ -1,6 +1,6 @@ @@ -114,8 +100,6 @@ index be94cdbe..e283f0eb 100644 using std::istream; using std::ofstream; -diff --git a/src/cpp-utils/data/FixedSizeData.h b/src/cpp-utils/data/FixedSizeData.h -index 58833996..17891c95 100644 --- a/src/cpp-utils/data/FixedSizeData.h +++ b/src/cpp-utils/data/FixedSizeData.h @@ -2,7 +2,7 @@ @@ -127,8 +111,6 @@ index 58833996..17891c95 100644 #include #include #include -diff --git a/src/cpp-utils/random/OSRandomGenerator.h b/src/cpp-utils/random/OSRandomGenerator.h -index f522c617..d99f977d 100644 --- a/src/cpp-utils/random/OSRandomGenerator.h +++ b/src/cpp-utils/random/OSRandomGenerator.h @@ -3,7 +3,7 @@ @@ -140,8 +122,6 @@ index f522c617..d99f977d 100644 namespace cpputils { class OSRandomGenerator final : public RandomGenerator { -diff --git a/src/cpp-utils/random/RandomGeneratorThread.h b/src/cpp-utils/random/RandomGeneratorThread.h -index 593750ed..103c00d7 100644 --- a/src/cpp-utils/random/RandomGeneratorThread.h +++ b/src/cpp-utils/random/RandomGeneratorThread.h @@ -4,7 +4,7 @@ @@ -153,8 +133,6 @@ index 593750ed..103c00d7 100644 namespace cpputils { //TODO Test -diff --git a/src/cryfs/impl/localstate/BasedirMetadata.cpp b/src/cryfs/impl/localstate/BasedirMetadata.cpp -index d32ced93..3de2d3ad 100644 --- a/src/cryfs/impl/localstate/BasedirMetadata.cpp +++ b/src/cryfs/impl/localstate/BasedirMetadata.cpp @@ -1,7 +1,7 @@ @@ -166,8 +144,6 @@ index d32ced93..3de2d3ad 100644 #include #include "LocalStateDir.h" #include -diff --git a/test/cryfs/impl/config/CompatibilityTest.cpp b/test/cryfs/impl/config/CompatibilityTest.cpp -index 07b931b3..a045900f 100644 --- a/test/cryfs/impl/config/CompatibilityTest.cpp +++ b/test/cryfs/impl/config/CompatibilityTest.cpp @@ -2,7 +2,7 @@ @@ -179,13 +155,37 @@ index 07b931b3..a045900f 100644 #include #include #include -diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt -index a4951eec..73deebc3 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt -@@ -1,2 +1 @@ - add_subdirectory(googletest) +@@ -1 +1 @@ -add_subdirectory(cryptopp) --- -2.41.0 - ++# add_subdirectory(cryptopp) +--- a/cmake-utils/Dependencies.cmake ++++ b/cmake-utils/Dependencies.cmake +@@ -25,9 +25,12 @@ find_package(CURL REQUIRED) + add_library(CryfsDependencies_libcurl INTERFACE) + target_link_libraries(CryfsDependencies_libcurl INTERFACE CURL::libcurl) + ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(CryptoPP REQUIRED libcryptopp) ++ + # Setup gtest dependency + if (BUILD_TESTING) + find_package(GTest REQUIRED) + add_library(CryfsDependencies_gtest INTERFACE) + target_link_libraries(CryfsDependencies_gtest INTERFACE GTest::gtest GTest::gmock) +-endif() +\ No newline at end of file ++endif() +--- a/src/cpp-utils/CMakeLists.txt ++++ b/src/cpp-utils/CMakeLists.txt +@@ -71,7 +71,8 @@ target_link_libraries(${PROJECT_NAME} PU + + target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS}) + +-target_link_libraries(${PROJECT_NAME} PUBLIC CryfsDependencies_spdlog cryfs_vendor_cryptopp CryfsDependencies_range-v3) ++target_link_libraries(${PROJECT_NAME} PUBLIC CryfsDependencies_spdlog ++ ${CryptoPP_LIBRARIES} CryfsDependencies_range-v3) + if(CRYFS_UPDATE_CHECKS) + target_compile_definitions(${PROJECT_NAME} PUBLIC -DCRYFS_UPDATE_CHECKS) + target_link_libraries(${PROJECT_NAME} PUBLIC CryfsDependencies_libcurl) diff --git a/srcpkgs/cryfs/patches/boost-1.88.patch b/srcpkgs/cryfs/patches/boost-1.88.patch new file mode 100644 index 00000000000..17713b42522 --- /dev/null +++ b/srcpkgs/cryfs/patches/boost-1.88.patch @@ -0,0 +1,25 @@ +--- a/src/cpp-utils/process/subprocess.cpp ++++ b/src/cpp-utils/process/subprocess.cpp +@@ -1,7 +1,12 @@ + #include "subprocess.h" + #include + #include +-#include ++#include ++#include ++#include ++#include ++#include ++#include + #include + #include + #include +@@ -10,7 +15,7 @@ + using std::string; + using std::vector; + +-namespace bp = boost::process; ++namespace bp = boost::process::v1; + namespace bf = boost::filesystem; + namespace ba = boost::asio; + namespace bs = boost::system; diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template index 3e523766b12..bfb5dfe97b4 100644 --- a/srcpkgs/cryfs/template +++ b/srcpkgs/cryfs/template @@ -1,13 +1,16 @@ # Template file for 'cryfs' pkgname=cryfs -version=0.11.4 -revision=3 +version=1.0.1 +revision=1 build_style=cmake configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off + -DBUILD_TESTING=ON -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake" hostmakedepends="pkg-config python3" -makedepends="boost-devel crypto++-devel fmt-devel fuse-devel libcurl-devel - libgomp-devel range-v3 spdlog" +makedepends="boost-devel-minimal libboost_filesystem libboost_thread + libboost_chrono libboost_program_options + crypto++-devel fmt-devel fuse-devel libcurl-devel + libgomp-devel range-v3 spdlog gtest-devel" depends="fuse" short_desc="Cryptographic filesystem for the cloud" maintainer="Andy Weidenbaum " @@ -15,11 +18,7 @@ license="LGPL-3.0-only" homepage="https://www.cryfs.org" changelog="https://github.com/cryfs/cryfs/raw/master/ChangeLog.txt" distfiles="https://github.com/cryfs/cryfs/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=a71e2d56f9e7a907f4b425b74eeb8bef064ec49fa3a770ad8a02b4ec64c48828 - -if [ "${XBPS_CHECK_PKGS}" ]; then - configure_args+=" -DBUILD_TESTING=on" -fi +checksum=7ad4cc45e1060431991538d3e671ec11285896c0d7a24880290945ef3ca248ed post_patch() { rm -rf vendor/cryptopp