diff options
| author | Andreas Enge <andreas@enge.fr> | 2026-05-22 12:45:44 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-07-07 12:57:05 +0200 |
| commit | 6eab5f41ee2795af6ffc10227e2379d34f11594a (patch) | |
| tree | ca0980b73a73452884ebc5b29e665d03d040b53a /gnu | |
| parent | e994ef13bc8060f0754ae739e5071970997599d3 (diff) | |
gnu: Remove cryfs.
* gnu/packages/crypto.scm (cryfs): Delete variable.
* gnu/packages/patches/cryfs-boost-1.88-fix.patch,
gnu/packages/patches/cryfs-boost-1.89-fix.patch: Remove files.
* gnu/packages/crypto.scm (dist_patch_DATA): Unregister patches.
Change-Id: I620d79741af860e811764a29399e75a6c684db61
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 2 | ||||
| -rw-r--r-- | gnu/packages/crypto.scm | 69 | ||||
| -rw-r--r-- | gnu/packages/patches/cryfs-boost-1.88-fix.patch | 32 | ||||
| -rw-r--r-- | gnu/packages/patches/cryfs-boost-1.89-fix.patch | 22 |
4 files changed, 0 insertions, 125 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index f6244a80ac6..bbb4ec1f1d2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -1164,8 +1164,6 @@ dist_patch_DATA = \ | |||
| 1164 | %D%/packages/patches/crc32c-unbundle-googletest.patch \ | 1164 | %D%/packages/patches/crc32c-unbundle-googletest.patch \ |
| 1165 | %D%/packages/patches/crda-optional-gcrypt.patch \ | 1165 | %D%/packages/patches/crda-optional-gcrypt.patch \ |
| 1166 | %D%/packages/patches/clucene-contribs-lib.patch \ | 1166 | %D%/packages/patches/clucene-contribs-lib.patch \ |
| 1167 | %D%/packages/patches/cryfs-boost-1.88-fix.patch \ | ||
| 1168 | %D%/packages/patches/cryfs-boost-1.89-fix.patch \ | ||
| 1169 | %D%/packages/patches/csvkit-set-locale-for-tests.patch \ | 1167 | %D%/packages/patches/csvkit-set-locale-for-tests.patch \ |
| 1170 | %D%/packages/patches/ctranslate2-local-build.patch \ | 1168 | %D%/packages/patches/ctranslate2-local-build.patch \ |
| 1171 | %D%/packages/patches/cube-nocheck.patch \ | 1169 | %D%/packages/patches/cube-nocheck.patch \ |
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 2d9e322c33a..1029168c983 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm | |||
| @@ -1550,75 +1550,6 @@ encryption password can safely commit changes to the repository's | |||
| 1550 | non-encrypted files.") | 1550 | non-encrypted files.") |
| 1551 | (license license:expat))) | 1551 | (license license:expat))) |
| 1552 | 1552 | ||
| 1553 | (define-public cryfs | ||
| 1554 | (package | ||
| 1555 | (name "cryfs") | ||
| 1556 | (version "1.0.1") | ||
| 1557 | (source | ||
| 1558 | (origin | ||
| 1559 | (method url-fetch) | ||
| 1560 | (uri (string-append | ||
| 1561 | "https://github.com/cryfs/cryfs/releases/download/" | ||
| 1562 | version "/cryfs-" version ".tar.xz")) | ||
| 1563 | (sha256 | ||
| 1564 | (base32 "1va8l8yfyi895604i8npq2b5ha0ixiqydlrq2nck2106w52wrm3s")) | ||
| 1565 | (patches (search-patches | ||
| 1566 | ;; https://github.com/cryfs/cryfs/pull/494 | ||
| 1567 | "cryfs-boost-1.88-fix.patch" | ||
| 1568 | ;; https://github.com/cryfs/cryfs/pull/500 | ||
| 1569 | "cryfs-boost-1.89-fix.patch")))) | ||
| 1570 | (build-system cmake-build-system) | ||
| 1571 | (arguments | ||
| 1572 | '(#:modules ((guix build cmake-build-system) | ||
| 1573 | (guix build utils) | ||
| 1574 | (srfi srfi-1)) | ||
| 1575 | #:configure-flags | ||
| 1576 | ;; Note: This also disables checking for security issues. | ||
| 1577 | '("-DCRYFS_UPDATE_CHECKS=OFF" | ||
| 1578 | "-DBUILD_TESTING=ON") | ||
| 1579 | ;; crypto++ is still bundled: https://github.com/cryfs/cryfs/issues/369 | ||
| 1580 | #:phases | ||
| 1581 | (modify-phases %standard-phases | ||
| 1582 | (add-before 'configure 'fix-up | ||
| 1583 | (lambda* (#:key tests? #:allow-other-keys) | ||
| 1584 | (chdir "..") ; We end up in .github somehow | ||
| 1585 | ;; Install documentation with Guix defaults. | ||
| 1586 | (substitute* "doc/CMakeLists.txt" | ||
| 1587 | (("CONFIGURATIONS Release") | ||
| 1588 | "CONFIGURATIONS Release RelWithDebInfo")) | ||
| 1589 | ;; Disable Fuse tests. | ||
| 1590 | (substitute* "test/cryfs-cli/CMakeLists.txt" | ||
| 1591 | (("CliTest_IntegrityCheck.cpp") "") | ||
| 1592 | (("CliTest_Setup.cpp") "") | ||
| 1593 | (("CliTest_WrongEnvironment.cpp") "") | ||
| 1594 | (("CryfsUnmountTest.cpp") "")))) | ||
| 1595 | (replace 'check | ||
| 1596 | (lambda* (#:key tests? #:allow-other-keys) | ||
| 1597 | (when tests? | ||
| 1598 | (setenv "HOME" "/tmp") | ||
| 1599 | (let ((tests (find-files "test/" "-test$"))) | ||
| 1600 | ;; SignalHandler/SignalCatcher tests fails | ||
| 1601 | ;; Fuse tests can't run in build env. | ||
| 1602 | (for-each invoke | ||
| 1603 | (lset-difference string-contains | ||
| 1604 | tests | ||
| 1605 | '("cpp-utils-test" | ||
| 1606 | "fspp-test")))))))))) | ||
| 1607 | (native-inputs | ||
| 1608 | (list googletest pkg-config python-wrapper)) | ||
| 1609 | (inputs | ||
| 1610 | (list boost curl fuse range-v3 spdlog)) | ||
| 1611 | (home-page "https://www.cryfs.org/") | ||
| 1612 | (synopsis "Encrypted FUSE filesystem for the cloud") | ||
| 1613 | (description "CryFS encrypts your files, so you can safely store them anywhere. | ||
| 1614 | It works well together with cloud services like Dropbox, iCloud, OneDrive and | ||
| 1615 | others. CryFS creates an encrypted userspace filesystem that can be mounted | ||
| 1616 | via FUSE without root permissions. It is similar to EncFS, but provides | ||
| 1617 | additional security and privacy measures such as hiding file sizes and directory | ||
| 1618 | structure. However CryFS is not considered stable yet by the developers.") | ||
| 1619 | (license license:lgpl3+) | ||
| 1620 | (properties `((tunable? . #t))))) | ||
| 1621 | |||
| 1622 | (define-public b3sum | 1553 | (define-public b3sum |
| 1623 | (package | 1554 | (package |
| 1624 | (name "b3sum") | 1555 | (name "b3sum") |
diff --git a/gnu/packages/patches/cryfs-boost-1.88-fix.patch b/gnu/packages/patches/cryfs-boost-1.88-fix.patch deleted file mode 100644 index 55a8388ed01..00000000000 --- a/gnu/packages/patches/cryfs-boost-1.88-fix.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From 91e2c9b8fd5f7a1b0e57ad1310534606ce70c338 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Michael Cho <michael@michaelcho.dev> | ||
| 3 | Date: Sun, 13 Apr 2025 10:37:29 -0400 | ||
| 4 | Subject: [PATCH] Fix building with Boost 1.88 | ||
| 5 | |||
| 6 | --- | ||
| 7 | src/cpp-utils/process/subprocess.cpp | 11 +++++++++++ | ||
| 8 | 1 file changed, 11 insertions(+) | ||
| 9 | |||
| 10 | diff --git a/src/cpp-utils/process/subprocess.cpp b/src/cpp-utils/process/subprocess.cpp | ||
| 11 | index 479bfe876..396ae09ec 100644 | ||
| 12 | --- a/src/cpp-utils/process/subprocess.cpp | ||
| 13 | +++ b/src/cpp-utils/process/subprocess.cpp | ||
| 14 | @@ -1,7 +1,18 @@ | ||
| 15 | #include "subprocess.h" | ||
| 16 | #include <array> | ||
| 17 | #include <boost/asio.hpp> | ||
| 18 | +#include <boost/version.hpp> | ||
| 19 | +#if BOOST_VERSION < 108800 | ||
| 20 | #include <boost/process.hpp> | ||
| 21 | +#else | ||
| 22 | +#define BOOST_PROCESS_VERSION 1 | ||
| 23 | +#include <boost/process/v1/args.hpp> | ||
| 24 | +#include <boost/process/v1/async_pipe.hpp> | ||
| 25 | +#include <boost/process/v1/child.hpp> | ||
| 26 | +#include <boost/process/v1/exe.hpp> | ||
| 27 | +#include <boost/process/v1/io.hpp> | ||
| 28 | +#include <boost/process/v1/search_path.hpp> | ||
| 29 | +#endif | ||
| 30 | #include <cerrno> | ||
| 31 | #include <cstddef> | ||
| 32 | #include <cstdio> | ||
diff --git a/gnu/packages/patches/cryfs-boost-1.89-fix.patch b/gnu/packages/patches/cryfs-boost-1.89-fix.patch deleted file mode 100644 index d70f5ff3f52..00000000000 --- a/gnu/packages/patches/cryfs-boost-1.89-fix.patch +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | From f2f3c19979545c4789647e648cc1480ce647f42a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Michael Cho <michael@michaelcho.dev> | ||
| 3 | Date: Tue, 12 Aug 2025 17:01:01 -0400 | ||
| 4 | Subject: [PATCH] Fix build with Boost 1.89.0 | ||
| 5 | |||
| 6 | --- | ||
| 7 | cmake-utils/Dependencies.cmake | 2 +- | ||
| 8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 9 | |||
| 10 | diff --git a/cmake-utils/Dependencies.cmake b/cmake-utils/Dependencies.cmake | ||
| 11 | index e2325e575..55edf924a 100644 | ||
| 12 | --- a/cmake-utils/Dependencies.cmake | ||
| 13 | +++ b/cmake-utils/Dependencies.cmake | ||
| 14 | @@ -7,7 +7,7 @@ target_link_libraries(CryfsDependencies_range-v3 INTERFACE range-v3::range-v3) | ||
| 15 | set(Boost_USE_STATIC_LIBS OFF) | ||
| 16 | find_package(Boost 1.84.0 | ||
| 17 | REQUIRED | ||
| 18 | - COMPONENTS filesystem system thread chrono program_options) | ||
| 19 | + COMPONENTS filesystem thread chrono program_options) | ||
| 20 | add_library(CryfsDependencies_boost INTERFACE) | ||
| 21 | target_link_libraries(CryfsDependencies_boost INTERFACE Boost::boost Boost::filesystem Boost::thread Boost::chrono Boost::program_options) | ||
| 22 | if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") | ||
