* [PR PATCH] cryfs: update to 0.11.4.
@ 2023-07-22 4:24 atweiden
2023-07-22 4:57 ` [PR PATCH] [Updated] " atweiden
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: atweiden @ 2023-07-22 4:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 474 bytes --]
There is a new pull request by atweiden against master on the void-packages repository
https://github.com/atweiden/void-packages cryfs
https://github.com/void-linux/void-packages/pull/45187
cryfs: update to 0.11.4.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/45187.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cryfs-45187.patch --]
[-- Type: text/x-diff, Size: 19472 bytes --]
From 489926fdd028400ddfc9d6fa4eef9f31d5db5c45 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
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 | 17 +-
6 files changed, 222 insertions(+), 216 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 <atweiden@ioiojo.com>
+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 <atweiden@ioiojo.com>
+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 <vendor_cryptopp/gzip.h>
++#include <cryptopp/gzip.h>
+
+ 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 <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 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 <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 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 <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 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 <vendor_cryptopp/gcm.h>
++#include <cryptopp/gcm.h>
+
+ 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 <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 <vendor_cryptopp/chachapoly.h>
++#include <cryptopp/aes.h>
++#include <cryptopp/twofish.h>
++#include <cryptopp/serpent.h>
++#include <cryptopp/cast.h>
++#include <cryptopp/mars.h>
++#include <cryptopp/chachapoly.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 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 <stdexcept>
+-#include <vendor_cryptopp/hex.h>
++#include <cryptopp/hex.h>
+
+ 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 <vendor_cryptopp/hex.h>
++#include <cryptopp/hex.h>
+ #include <string>
+ #include <array>
+ #include <cstring>
+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 <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 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 <vendor_cryptopp/osrng.h>
++#include <cryptopp/osrng.h>
+
+ 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 <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"
+ #include <cpp-utils/logging/logging.h>
+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 <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/impl/config/CryConfigFile.h>
+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 <vendor_cryptopp/gzip.h>
-+#include <cryptopp/gzip.h>
-
- 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 <cpp-utils/random/Random.h>
--#include <vendor_cryptopp/sha.h>
-+#include <cryptopp/sha.h>
-
- 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 <vendor_cryptopp/scrypt.h>
-+#include <cryptopp/scrypt.h>
-
- 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 <boost/optional.hpp>
--#include <vendor_cryptopp/modes.h>
-+#include <cryptopp/modes.h>
- #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 <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 <vendor_cryptopp/chachapoly.h>
-+#include <cryptopp/aes.h>
-+#include <cryptopp/twofish.h>
-+#include <cryptopp/serpent.h>
-+#include <cryptopp/cast.h>
-+#include <cryptopp/mars.h>
-+#include <cryptopp/chachapoly.h>
- #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 <vendor_cryptopp/gcm.h>
-+#include <cryptopp/gcm.h>
-
- 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 <stdexcept>
--#include <vendor_cryptopp/hex.h>
-+#include <cryptopp/hex.h>
-
- 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 <vendor_cryptopp/hex.h>
-+#include <cryptopp/hex.h>
- #include <string>
- #include <array>
- #include <cstring>
---- 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 <vendor_cryptopp/osrng.h>
-+#include <cryptopp/osrng.h>
-
- 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 <vendor_cryptopp/osrng.h>
-+#include <cryptopp/osrng.h>
-
- 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 <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"
- #include <cpp-utils/logging/logging.h>
---- 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 <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/impl/config/CryConfigFile.h>
---- 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 <bero@lindev.ch>
-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 <smessmer@users.noreply.github.com>
----
- 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..fb8be5c94816f 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,23 +1,22 @@
# Template file for 'cryfs'
pkgname=cryfs
-version=0.11.2
-revision=4
+version=0.11.4
+revision=1
create_wrksrc=yes
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"
+hostmakedepends="pkg-config python3 range-v3"
+makedepends="boost-devel crypto++-devel fmt-devel fuse-devel libcurl-devel
+ libgomp-devel spdlog"
depends="fuse"
short_desc="Cryptographic filesystem for the cloud"
maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
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"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] cryfs: update to 0.11.4.
2023-07-22 4:24 [PR PATCH] cryfs: update to 0.11.4 atweiden
@ 2023-07-22 4:57 ` atweiden
2023-07-22 15:17 ` [PR REVIEW] " sgn
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: atweiden @ 2023-07-22 4:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 479 bytes --]
There is an updated pull request by atweiden against master on the void-packages repository
https://github.com/atweiden/void-packages cryfs
https://github.com/void-linux/void-packages/pull/45187
cryfs: update to 0.11.4.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/45187.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cryfs-45187.patch --]
[-- Type: text/x-diff, Size: 19434 bytes --]
From b67c5e1d1c97815c4d1210a4db5cad035cc22832 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
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 | 15 +-
6 files changed, 221 insertions(+), 215 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 <atweiden@ioiojo.com>
+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 <atweiden@ioiojo.com>
+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 <vendor_cryptopp/gzip.h>
++#include <cryptopp/gzip.h>
+
+ 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 <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 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 <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 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 <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 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 <vendor_cryptopp/gcm.h>
++#include <cryptopp/gcm.h>
+
+ 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 <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 <vendor_cryptopp/chachapoly.h>
++#include <cryptopp/aes.h>
++#include <cryptopp/twofish.h>
++#include <cryptopp/serpent.h>
++#include <cryptopp/cast.h>
++#include <cryptopp/mars.h>
++#include <cryptopp/chachapoly.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 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 <stdexcept>
+-#include <vendor_cryptopp/hex.h>
++#include <cryptopp/hex.h>
+
+ 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 <vendor_cryptopp/hex.h>
++#include <cryptopp/hex.h>
+ #include <string>
+ #include <array>
+ #include <cstring>
+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 <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 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 <vendor_cryptopp/osrng.h>
++#include <cryptopp/osrng.h>
+
+ 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 <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"
+ #include <cpp-utils/logging/logging.h>
+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 <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/impl/config/CryConfigFile.h>
+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 <vendor_cryptopp/gzip.h>
-+#include <cryptopp/gzip.h>
-
- 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 <cpp-utils/random/Random.h>
--#include <vendor_cryptopp/sha.h>
-+#include <cryptopp/sha.h>
-
- 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 <vendor_cryptopp/scrypt.h>
-+#include <cryptopp/scrypt.h>
-
- 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 <boost/optional.hpp>
--#include <vendor_cryptopp/modes.h>
-+#include <cryptopp/modes.h>
- #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 <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 <vendor_cryptopp/chachapoly.h>
-+#include <cryptopp/aes.h>
-+#include <cryptopp/twofish.h>
-+#include <cryptopp/serpent.h>
-+#include <cryptopp/cast.h>
-+#include <cryptopp/mars.h>
-+#include <cryptopp/chachapoly.h>
- #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 <vendor_cryptopp/gcm.h>
-+#include <cryptopp/gcm.h>
-
- 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 <stdexcept>
--#include <vendor_cryptopp/hex.h>
-+#include <cryptopp/hex.h>
-
- 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 <vendor_cryptopp/hex.h>
-+#include <cryptopp/hex.h>
- #include <string>
- #include <array>
- #include <cstring>
---- 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 <vendor_cryptopp/osrng.h>
-+#include <cryptopp/osrng.h>
-
- 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 <vendor_cryptopp/osrng.h>
-+#include <cryptopp/osrng.h>
-
- 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 <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"
- #include <cpp-utils/logging/logging.h>
---- 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 <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/impl/config/CryConfigFile.h>
---- 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 <bero@lindev.ch>
-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 <smessmer@users.noreply.github.com>
----
- 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..85ec221946446 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,23 +1,22 @@
# Template file for 'cryfs'
pkgname=cryfs
-version=0.11.2
-revision=4
+version=0.11.4
+revision=1
create_wrksrc=yes
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 <atweiden@tutanota.de>"
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"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR REVIEW] cryfs: update to 0.11.4.
2023-07-22 4:24 [PR PATCH] cryfs: update to 0.11.4 atweiden
2023-07-22 4:57 ` [PR PATCH] [Updated] " atweiden
@ 2023-07-22 15:17 ` sgn
2023-07-23 3:00 ` [PR PATCH] [Updated] " atweiden
2023-07-24 2:44 ` [PR PATCH] [Merged]: " sgn
3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2023-07-22 15:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/45187#discussion_r1271307890
Comment:
May need to remove this line, too?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] cryfs: update to 0.11.4.
2023-07-22 4:24 [PR PATCH] cryfs: update to 0.11.4 atweiden
2023-07-22 4:57 ` [PR PATCH] [Updated] " atweiden
2023-07-22 15:17 ` [PR REVIEW] " sgn
@ 2023-07-23 3:00 ` atweiden
2023-07-24 2:44 ` [PR PATCH] [Merged]: " sgn
3 siblings, 0 replies; 5+ messages in thread
From: atweiden @ 2023-07-23 3:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 479 bytes --]
There is an updated pull request by atweiden against master on the void-packages repository
https://github.com/atweiden/void-packages cryfs
https://github.com/void-linux/void-packages/pull/45187
cryfs: update to 0.11.4.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/45187.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cryfs-45187.patch --]
[-- Type: text/x-diff, Size: 19900 bytes --]
From 97d533320e10e6fe54158dab2ab48ebe0d4b3a42 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
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 <atweiden@ioiojo.com>
+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 <atweiden@ioiojo.com>
+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 <vendor_cryptopp/gzip.h>
++#include <cryptopp/gzip.h>
+
+ 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 <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 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 <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 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 <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 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 <vendor_cryptopp/gcm.h>
++#include <cryptopp/gcm.h>
+
+ 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 <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 <vendor_cryptopp/chachapoly.h>
++#include <cryptopp/aes.h>
++#include <cryptopp/twofish.h>
++#include <cryptopp/serpent.h>
++#include <cryptopp/cast.h>
++#include <cryptopp/mars.h>
++#include <cryptopp/chachapoly.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 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 <stdexcept>
+-#include <vendor_cryptopp/hex.h>
++#include <cryptopp/hex.h>
+
+ 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 <vendor_cryptopp/hex.h>
++#include <cryptopp/hex.h>
+ #include <string>
+ #include <array>
+ #include <cstring>
+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 <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 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 <vendor_cryptopp/osrng.h>
++#include <cryptopp/osrng.h>
+
+ 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 <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"
+ #include <cpp-utils/logging/logging.h>
+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 <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/impl/config/CryConfigFile.h>
+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 <vendor_cryptopp/gzip.h>
-+#include <cryptopp/gzip.h>
-
- 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 <cpp-utils/random/Random.h>
--#include <vendor_cryptopp/sha.h>
-+#include <cryptopp/sha.h>
-
- 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 <vendor_cryptopp/scrypt.h>
-+#include <cryptopp/scrypt.h>
-
- 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 <boost/optional.hpp>
--#include <vendor_cryptopp/modes.h>
-+#include <cryptopp/modes.h>
- #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 <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 <vendor_cryptopp/chachapoly.h>
-+#include <cryptopp/aes.h>
-+#include <cryptopp/twofish.h>
-+#include <cryptopp/serpent.h>
-+#include <cryptopp/cast.h>
-+#include <cryptopp/mars.h>
-+#include <cryptopp/chachapoly.h>
- #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 <vendor_cryptopp/gcm.h>
-+#include <cryptopp/gcm.h>
-
- 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 <stdexcept>
--#include <vendor_cryptopp/hex.h>
-+#include <cryptopp/hex.h>
-
- 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 <vendor_cryptopp/hex.h>
-+#include <cryptopp/hex.h>
- #include <string>
- #include <array>
- #include <cstring>
---- 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 <vendor_cryptopp/osrng.h>
-+#include <cryptopp/osrng.h>
-
- 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 <vendor_cryptopp/osrng.h>
-+#include <cryptopp/osrng.h>
-
- 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 <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"
- #include <cpp-utils/logging/logging.h>
---- 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 <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/impl/config/CryConfigFile.h>
---- 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 <bero@lindev.ch>
-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 <smessmer@users.noreply.github.com>
----
- 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 <atweiden@tutanota.de>"
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: cryfs: update to 0.11.4.
2023-07-22 4:24 [PR PATCH] cryfs: update to 0.11.4 atweiden
` (2 preceding siblings ...)
2023-07-23 3:00 ` [PR PATCH] [Updated] " atweiden
@ 2023-07-24 2:44 ` sgn
3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2023-07-24 2:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
There's a merged pull request on the void-packages repository
cryfs: update to 0.11.4.
https://github.com/void-linux/void-packages/pull/45187
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-24 2:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-22 4:24 [PR PATCH] cryfs: update to 0.11.4 atweiden
2023-07-22 4:57 ` [PR PATCH] [Updated] " atweiden
2023-07-22 15:17 ` [PR REVIEW] " sgn
2023-07-23 3:00 ` [PR PATCH] [Updated] " atweiden
2023-07-24 2:44 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).