From 97d533320e10e6fe54158dab2ab48ebe0d4b3a42 Mon Sep 17 00:00:00 2001 From: Andy Weidenbaum Date: Sat, 22 Jul 2023 04:23:28 +0000 Subject: [PATCH] cryfs: update to 0.11.4. --- ...make-DCMAKE_BUILD_TYPE-None-for-void.patch | 23 +++ .../0002-de-vendor-crypto-for-void.patch | 191 ++++++++++++++++++ .../cryfs/patches/allow-build-type-none.patch | 11 - srcpkgs/cryfs/patches/de-vendor.patch | 142 ------------- srcpkgs/cryfs/patches/fmt-9-fix.patch | 54 ----- srcpkgs/cryfs/template | 21 +- 6 files changed, 225 insertions(+), 217 deletions(-) create mode 100644 srcpkgs/cryfs/patches/0001-allow-cmake-DCMAKE_BUILD_TYPE-None-for-void.patch create mode 100644 srcpkgs/cryfs/patches/0002-de-vendor-crypto-for-void.patch delete mode 100644 srcpkgs/cryfs/patches/allow-build-type-none.patch delete mode 100644 srcpkgs/cryfs/patches/de-vendor.patch delete mode 100644 srcpkgs/cryfs/patches/fmt-9-fix.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 new file mode 100644 index 0000000000000..09892e2a01342 --- /dev/null +++ b/srcpkgs/cryfs/patches/0001-allow-cmake-DCMAKE_BUILD_TYPE-None-for-void.patch @@ -0,0 +1,23 @@ +From 618438ae35737e476f0091f32b0887c4502c7b8a Mon Sep 17 00:00:00 2001 +From: Andy Weidenbaum +Date: Sat, 22 Jul 2023 03:17:41 +0000 +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) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cryfs.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 new file mode 100644 index 0000000000000..b1262dd991e04 --- /dev/null +++ b/srcpkgs/cryfs/patches/0002-de-vendor-crypto-for-void.patch @@ -0,0 +1,191 @@ +From e5caea5fbb2fd1367439eb4b0391c64c0238a40a Mon Sep 17 00:00:00 2001 +From: Andy Weidenbaum +Date: Sat, 22 Jul 2023 03:18:53 +0000 +Subject: [PATCH 2/2] de-vendor crypto++ for void + +--- + .../implementations/compressing/compressors/Gzip.cpp | 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 | 12 ++++++------ + 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/impl/localstate/BasedirMetadata.cpp | 2 +- + test/cryfs/impl/config/CompatibilityTest.cpp | 2 +- + 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 @@ + #include "Gzip.h" +-#include ++#include + + 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 @@ + #include "Hash.h" + #include +-#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 @@ + #include "Scrypt.h" +-#include ++#include + + 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 @@ + #include "../../data/Data.h" + #include "../../random/Random.h" + #include +-#include ++#include + #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 @@ + #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_ + + #include "AEAD_Cipher.h" +-#include ++#include + + 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 @@ + #ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_ + #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_ + +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include + #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 @@ + #include "Data.h" + #include +-#include ++#include + + 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 @@ + #ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_ + #define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_ + +-#include ++#include + #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 @@ + #define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H + + #include "RandomGenerator.h" +-#include ++#include + + 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 @@ + + #include "../thread/LoopThread.h" + #include "ThreadsafeRandomDataBuffer.h" +-#include ++#include + + 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 @@ + #include "BasedirMetadata.h" + #include + #include +-#include ++#include + #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 @@ + #include + #include + #include +-#include ++#include + #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) +-add_subdirectory(cryptopp) +-- +2.41.0 + diff --git a/srcpkgs/cryfs/patches/allow-build-type-none.patch b/srcpkgs/cryfs/patches/allow-build-type-none.patch deleted file mode 100644 index ffcf0ee533201..0000000000000 --- a/srcpkgs/cryfs/patches/allow-build-type-none.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: cryfs-0.10.2/doc/CMakeLists.txt -=================================================================== ---- cryfs-0.10.2.orig/doc/CMakeLists.txt -+++ cryfs-0.10.2/doc/CMakeLists.txt -@@ -15,6 +15,5 @@ ELSE (WIN32) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cryfs.1.gz - DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 -- CONFIGURATIONS Release - ) - ENDIF(WIN32) diff --git a/srcpkgs/cryfs/patches/de-vendor.patch b/srcpkgs/cryfs/patches/de-vendor.patch deleted file mode 100644 index 09e51f0aa7fcf..0000000000000 --- a/srcpkgs/cryfs/patches/de-vendor.patch +++ /dev/null @@ -1,142 +0,0 @@ ---- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:14:05.481898162 +0400 -+++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:17:49.606653292 +0400 -@@ -1,5 +1,5 @@ - #include "Gzip.h" --#include -+#include - - using cpputils::Data; - ---- a/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:14:05.482898159 +0400 -+++ b/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:18:07.131800277 +0400 -@@ -1,6 +1,6 @@ - #include "Hash.h" - #include --#include -+#include - - using cpputils::Random; - using CryptoPP::SHA512; ---- a/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:14:05.482898159 +0400 -+++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:18:17.754889373 +0400 -@@ -1,5 +1,5 @@ - #include "Scrypt.h" --#include -+#include - - using std::string; - ---- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:14:05.482898159 +0400 -+++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:18:28.524979704 +0400 -@@ -6,7 +6,7 @@ - #include "../../data/Data.h" - #include "../../random/Random.h" - #include --#include -+#include - #include "Cipher.h" - #include "EncryptionKey.h" - ---- a/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:14:05.482898159 +0400 -+++ b/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:18:52.181178110 +0400 -@@ -2,12 +2,12 @@ - #ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_ - #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_ - --#include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include -+#include - #include "GCM_Cipher.h" - #include "CFB_Cipher.h" - ---- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:14:05.482898159 +0400 -+++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:18:38.836066183 +0400 -@@ -3,7 +3,7 @@ - #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_ - - #include "AEAD_Cipher.h" --#include -+#include - - namespace cpputils { - ---- a/src/cpp-utils/data/Data.cpp 2022-08-25 22:14:05.482898159 +0400 -+++ b/src/cpp-utils/data/Data.cpp 2022-08-25 22:19:09.349322106 +0400 -@@ -1,6 +1,6 @@ - #include "Data.h" - #include --#include -+#include - - using std::istream; - using std::ofstream; ---- a/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:14:05.482898159 +0400 -+++ b/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:19:19.103403916 +0400 -@@ -2,7 +2,7 @@ - #ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_ - #define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_ - --#include -+#include - #include - #include - #include ---- a/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:14:05.483898156 +0400 -+++ b/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:19:29.602491973 +0400 -@@ -3,7 +3,7 @@ - #define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H - - #include "RandomGenerator.h" --#include -+#include - - namespace cpputils { - class OSRandomGenerator final : public RandomGenerator { ---- a/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:14:05.484898153 +0400 -+++ b/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:19:36.713551613 +0400 -@@ -4,7 +4,7 @@ - - #include "../thread/LoopThread.h" - #include "ThreadsafeRandomDataBuffer.h" --#include -+#include - - namespace cpputils { - //TODO Test -diff -Naurp0 -U3 cryfs-0.11.2/src/cryfs/impl/localstate/BasedirMetadata.cpp cryfs-0.11.2-mine/src/cryfs/impl/localstate/BasedirMetadata.cpp ---- a/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:14:05.487898144 +0400 -+++ b/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:19:46.722635560 +0400 -@@ -1,7 +1,7 @@ - #include "BasedirMetadata.h" - #include - #include --#include -+#include - #include - #include "LocalStateDir.h" - #include ---- a/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:14:05.493898126 +0400 -+++ b/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:19:54.589701542 +0400 -@@ -2,7 +2,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- a/vendor/CMakeLists.txt 2022-08-25 22:14:05.497898115 +0400 -+++ b/vendor/CMakeLists.txt 2022-08-25 22:20:11.176840657 +0400 -@@ -1,2 +1 @@ - add_subdirectory(googletest) --add_subdirectory(cryptopp) diff --git a/srcpkgs/cryfs/patches/fmt-9-fix.patch b/srcpkgs/cryfs/patches/fmt-9-fix.patch deleted file mode 100644 index 6fe97eaeafa4d..0000000000000 --- a/srcpkgs/cryfs/patches/fmt-9-fix.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 27515e0116fd7cb034bd4e9763d1f3bfdc855a5f Mon Sep 17 00:00:00 2001 -From: Bernhard Rosenkraenzer -Date: Fri, 22 Jul 2022 14:13:38 +0200 -Subject: [PATCH] Fix build with fmt 9.0 (#433) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* Fix build with fmt 9.0 - -Co-authored-by: Sebastian Meßmer ---- - ChangeLog.txt | 4 ++++ - src/fspp/fuse/Fuse.cpp | 8 ++++---- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp -index 4e9dbd7f..4b881815 100644 ---- a/src/fspp/fuse/Fuse.cpp -+++ b/src/fspp/fuse/Fuse.cpp -@@ -603,21 +603,21 @@ int Fuse::mknod(const bf::path &path, ::mode_t mode, dev_t rdev) { - UNUSED(mode); - UNUSED(path); - ThreadNameForDebugging _threadName("mknod"); -- LOG(WARN, "Called non-implemented mknod({}, {}, _)", path, mode); -+ LOG(WARN, "Called non-implemented mknod({}, {}, _)", path.string(), mode); - return ENOSYS; - } - - int Fuse::mkdir(const bf::path &path, ::mode_t mode) { - ThreadNameForDebugging _threadName("mkdir"); - #ifdef FSPP_LOG -- LOG(DEBUG, "mkdir({}, {})", path, mode); -+ LOG(DEBUG, "mkdir({}, {})", path.string(), mode); - #endif - try { - ASSERT(is_valid_fspp_path(path), "has to be an absolute path"); - // DokanY seems to call mkdir("/"). Ignore that - if ("/" == path) { - #ifdef FSPP_LOG -- LOG(DEBUG, "mkdir({}, {}): ignored", path, mode); -+ LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode); - #endif - return 0; - } -@@ -766,7 +766,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) { - //TODO - int Fuse::link(const bf::path &from, const bf::path &to) { - ThreadNameForDebugging _threadName("link"); -- LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to); -+ LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string()); - //auto real_from = _impl->RootDir() / from; - //auto real_to = _impl->RootDir() / to; - //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str()); diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template index 58d4fdd5d7d72..80d729d5342ff 100644 --- a/srcpkgs/cryfs/template +++ b/srcpkgs/cryfs/template @@ -1,23 +1,21 @@ # Template file for 'cryfs' pkgname=cryfs -version=0.11.2 -revision=4 -create_wrksrc=yes +version=0.11.4 +revision=1 build_style=cmake -configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF - -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt +configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake" hostmakedepends="pkg-config python3" -makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel - spdlog range-v3 fmt-devel" +makedepends="boost-devel crypto++-devel fmt-devel fuse-devel libcurl-devel + libgomp-devel range-v3 spdlog" depends="fuse" short_desc="Cryptographic filesystem for the cloud" maintainer="Andy Weidenbaum " 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.gz" -checksum=a89ab8fea2d494b496867107ec0a3772fe606ebd71ef12152fcd233f463a2c00 +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" @@ -36,7 +34,6 @@ pre_configure() { do_check() { cd ${wrksrc}/build - # XXX: check their Travis-CI script on update ./test/gitversion/gitversion-test ./test/cpp-utils/cpp-utils-test ./test/parallelaccessstore/parallelaccessstore-test @@ -46,3 +43,7 @@ do_check() { # ./test/cryfs-cli/cryfs-cli-test cd ${wrksrc} } + +# REMARKS: +# On update, check upstream CI script to inform do_check: +# cryfs/cryfs/.github/workflows/actions/run_tests/action.yaml