unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / Atom feed
* [bug#50428] [PATCH] gnu: Add cryfs
@ 2021-09-06 13:34 Brendan Tildesley
  2021-09-14  9:50 ` bug#50428: " Ludovic Courtès
  2021-09-16  9:42 ` bug#50428: " Ludovic Courtès
  0 siblings, 2 replies; 5+ messages in thread
From: Brendan Tildesley @ 2021-09-06 13:34 UTC (permalink / raw)
  To: 50428

* gnu/packages/crypto.scm (cryfs): New variable.
---
 gnu/packages/crypto.scm | 75 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index c511d0a711..7f4f8590f5 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
 ;;; Copyright © 2021 Ellis Kenyő <me@elken.dev>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -46,8 +47,10 @@
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages cpp)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages cryptsetup)
+  #:use-module (gnu packages curl)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gnupg)
@@ -58,6 +61,7 @@
   #:use-module (gnu packages libbsd)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages logging)
   #:use-module (gnu packages lsof)
   #:use-module (gnu packages man)
   #:use-module (gnu packages multiprecision)
@@ -1385,3 +1389,74 @@ them out.  The process will degrade gracefully, so even people without your
 encryption password can safely commit changes to the repository's
 non-encrypted files.")
     (license license:expat)))
+
+(define-public cryfs
+  (package
+    (name "cryfs")
+    (version "0.11.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/cryfs/cryfs/releases/download/"
+             version "/cryfs-" version ".tar.xz"))
+       (sha256
+        (base32 "0dxphbj5sssm82rkkdb71algrcki16qlpzlvrjyvvm6b7x7zi0sm"))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:configure-flags
+       `("-DCRYFS_UPDATE_CHECKS=OFF" ;; Note: This also disables checking for security issues.
+         "-DCMAKE_BUILD_TYPE=Release" ;; Build man pages.
+         ;; This helps us use some dependencies from Guix instead of conan.
+         ;; crypto++ is still bundled: https://github.com/cryfs/cryfs/issues/369
+         ,(string-append "-DDEPENDENCY_CONFIG=" (getcwd)
+                         "/cmake-utils/DependenciesFromLocalSystem.cmake"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'fix-configure
+           (lambda* (#:key tests? #:allow-other-keys)
+             (chdir "..")
+             (delete-file-recursively ".circleci")
+             (when tests?
+               (substitute* "CMakeLists.txt"
+                 (("option.BUILD_TESTING .build test cases. OFF.")
+                  "option(BUILD_TESTING \"build test cases\" ON)")))))
+         (replace 'check
+           (lambda* (#:key tests? outputs #:allow-other-keys)
+             (use-modules (srfi srfi-1))
+             (when tests?
+               (with-directory-excursion "/tmp/build/test"
+                 (let ((tests (find-files "." "-test$"))
+                       (tests-output (assoc-ref outputs "tests")))
+                   ;; Install tests to a separate output so users can run them.
+                   (copy-recursively "." tests-output)
+                   ;; XXX: Disable failing tests. Unfortunately there are a
+                   ;; few. Some only fail in the build environment. ;; build
+                   ;; environment.
+                   (for-each invoke
+                             (lset-difference string-contains
+                                              tests
+                                              '("cpp-utils-test"
+                                                "cryfs-cli-test"
+                                                "blobstore-test"
+                                                "fspp-test"))))))
+             #t)))))
+    (outputs '("out" "tests"))
+    (native-inputs
+     `(("python" ,python-wrapper)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("boost" ,boost)
+       ("curl" ,curl)
+       ("fuse" ,fuse)
+       ("range-v3" ,range-v3)
+       ("spdlog" ,spdlog)))
+    (home-page "https://www.cryfs.org/")
+    (synopsis "Encrypted FUSE filesystem for the cloud")
+    (description "CryFS encrypts your files, so you can safely store them anywhere.
+ It works well together with cloud services like Dropbox, iCloud, OneDrive and
+others.  CryFS creates an encrypted userspace filesystem that can be mounted
+via FUSE without root permissions.  It is similar to EncFS, but provides
+additional security and privacy measures such as hiding file sizes and directory
+structure.  However CryFS is not considered stable yet by the developers.")
+    (license license:lgpl3+)))
-- 
2.33.0





^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#50428: [PATCH] gnu: Add cryfs
  2021-09-06 13:34 [bug#50428] [PATCH] gnu: Add cryfs Brendan Tildesley
@ 2021-09-14  9:50 ` Ludovic Courtès
  2021-09-14 12:13   ` [bug#50428] " Brendan Tildesley
  2021-09-16  9:42 ` bug#50428: " Ludovic Courtès
  1 sibling, 1 reply; 5+ messages in thread
From: Ludovic Courtès @ 2021-09-14  9:50 UTC (permalink / raw)
  To: Brendan Tildesley; +Cc: 50428-done

Hi,

Brendan Tildesley <mail@brendan.scot> skribis:

> * gnu/packages/crypto.scm (cryfs): New variable.

Overall LGTM modulo the minor issues below:

> +     '(#:configure-flags
> +       `("-DCRYFS_UPDATE_CHECKS=OFF" ;; Note: This also disables checking for security issues.
> +         "-DCMAKE_BUILD_TYPE=Release" ;; Build man pages.

Normally this is set by #:build-type.  It defaults to “RelWithDebInfo”,
which is nice because then you get debugging symbols if you pass
‘--with-debug-info=cryfs’.  So I’d suggest removing this second flag.

> +         (replace 'check
> +           (lambda* (#:key tests? outputs #:allow-other-keys)
> +             (use-modules (srfi srfi-1))

Please use #:modules ((srfi srfi-1) …) instead of this non-top-level
‘use-modules’ form.

> +             (when tests?
> +               (with-directory-excursion "/tmp/build/test"
> +                 (let ((tests (find-files "." "-test$"))
> +                       (tests-output (assoc-ref outputs "tests")))
> +                   ;; Install tests to a separate output so users can run them.
> +                   (copy-recursively "." tests-output)

Installing tests is unusual.  Do you really think it’s going to be
useful?

> +                   ;; XXX: Disable failing tests. Unfortunately there are a
> +                   ;; few. Some only fail in the build environment. ;; build
> +                   ;; environment.

Typo.

> +    (description "CryFS encrypts your files, so you can safely store them anywhere.
> + It works well together with cloud services like Dropbox, iCloud, OneDrive and
   ^
Extra space.  :-)

Could you send an updated patch?

Thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#50428] [PATCH] gnu: Add cryfs
  2021-09-14  9:50 ` bug#50428: " Ludovic Courtès
@ 2021-09-14 12:13   ` Brendan Tildesley
  2021-09-16 19:56     ` Ludovic Courtès
  0 siblings, 1 reply; 5+ messages in thread
From: Brendan Tildesley @ 2021-09-14 12:13 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 50428

[-- Attachment #1: Type: text/plain, Size: 1751 bytes --]


Update attached.

> On 09/14/2021 11:50 AM Ludovic Courtès <ludo@gnu.org> wrote:
> 
>  
> Hi,
> 
> Brendan Tildesley <mail@brendan.scot> skribis:
> 
> > * gnu/packages/crypto.scm (cryfs): New variable.
> 
> Overall LGTM modulo the minor issues below:
> 
> > +     '(#:configure-flags
> > +       `("-DCRYFS_UPDATE_CHECKS=OFF" ;; Note: This also disables checking for security issues.
> > +         "-DCMAKE_BUILD_TYPE=Release" ;; Build man pages.
> 
> Normally this is set by #:build-type.  It defaults to “RelWithDebInfo”,
> which is nice because then you get debugging symbols if you pass
> ‘--with-debug-info=cryfs’.  So I’d suggest removing this second flag.
> 

I found a way to build man pages without it.

> > +         (replace 'check
> > +           (lambda* (#:key tests? outputs #:allow-other-keys)
> > +             (use-modules (srfi srfi-1))
> 
> Please use #:modules ((srfi srfi-1) …) instead of this non-top-level
> ‘use-modules’ form.
> 

done.

> > +             (when tests?
> > +               (with-directory-excursion "/tmp/build/test"
> > +                 (let ((tests (find-files "." "-test$"))
> > +                       (tests-output (assoc-ref outputs "tests")))
> > +                   ;; Install tests to a separate output so users can run them.
> > +                   (copy-recursively "." tests-output)
> 
> Installing tests is unusual.  Do you really think it’s going to be
> useful?

Not sure. I felt since the cryfs is for encrypting peoples files, they may want to run the tests themselves
to see if there any nasty issues. Most of the tests fail due to FUSE not being available, which works outside
the chroot. Anyways I removed installing them.

[-- Attachment #2: 0001-gnu-Add-cryfs.patch --]
[-- Type: text/x-patch, Size: 5139 bytes --]

From 6604ab84de9a38907ca6d930dcb5c0d79de28d88 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 4 Sep 2021 16:52:23 +1000
Subject: [PATCH] gnu: Add cryfs.

* gnu/packages/crypto.scm (cryfs): New variable.
---
 gnu/packages/crypto.scm | 77 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index c511d0a711..af1412c44e 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
 ;;; Copyright © 2021 Ellis Kenyő <me@elken.dev>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -46,8 +47,10 @@
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages cpp)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages cryptsetup)
+  #:use-module (gnu packages curl)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gnupg)
@@ -58,6 +61,7 @@
   #:use-module (gnu packages libbsd)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages logging)
   #:use-module (gnu packages lsof)
   #:use-module (gnu packages man)
   #:use-module (gnu packages multiprecision)
@@ -1385,3 +1389,76 @@ them out.  The process will degrade gracefully, so even people without your
 encryption password can safely commit changes to the repository's
 non-encrypted files.")
     (license license:expat)))
+
+(define-public cryfs
+  (package
+    (name "cryfs")
+    (version "0.11.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/cryfs/cryfs/releases/download/"
+             version "/cryfs-" version ".tar.xz"))
+       (sha256
+        (base32 "0dxphbj5sssm82rkkdb71algrcki16qlpzlvrjyvvm6b7x7zi0sm"))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:modules ((guix build cmake-build-system)
+                  (guix build utils)
+                  (srfi srfi-1))
+       #:configure-flags
+        ;; Note: This also disables checking for security issues.
+       `("-DCRYFS_UPDATE_CHECKS=OFF"
+         ;; This helps us use some dependencies from Guix instead of conan.
+         ;; crypto++ is still bundled: https://github.com/cryfs/cryfs/issues/369
+         ;; Googletest is also since I wasn't sure how to unbundle that.
+         ,(string-append "-DDEPENDENCY_CONFIG=" (getcwd)
+                         "/cmake-utils/DependenciesFromLocalSystem.cmake"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'fix-configure
+           (lambda* (#:key tests? #:allow-other-keys)
+             ;; Remove junk directory that breaks the build
+             (chdir "..") (delete-file-recursively ".circleci")
+             ;; Install documentation with Guix defaults.
+             (substitute* "doc/CMakeLists.txt"
+               (("CONFIGURATIONS Release")
+                "CONFIGURATIONS Release RelWithDebInfo"))
+             (when tests?
+               (substitute* "CMakeLists.txt"
+                 (("option.BUILD_TESTING .build test cases. OFF.")
+                  "option(BUILD_TESTING \"build test cases\" ON)")))))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (let ((tests (find-files "." "-test$")))
+                 ;; XXX: Disable failing tests. Unfortunately there are a
+                   ;; few. Some only fail in the build environment due to
+                   ;; FUSE not being available.
+                   (for-each invoke
+                             (lset-difference string-contains
+                                              tests
+                                              '("cpp-utils-test"
+                                                "cryfs-cli-test"
+                                                "blobstore-test"
+                                                "fspp-test")))))
+             #t)))))
+    (native-inputs
+     `(("python" ,python-wrapper)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("boost" ,boost)
+       ("curl" ,curl)
+       ("fuse" ,fuse)
+       ("range-v3" ,range-v3)
+       ("spdlog" ,spdlog)))
+    (home-page "https://www.cryfs.org/")
+    (synopsis "Encrypted FUSE filesystem for the cloud")
+    (description "CryFS encrypts your files, so you can safely store them anywhere.
+It works well together with cloud services like Dropbox, iCloud, OneDrive and
+others.  CryFS creates an encrypted userspace filesystem that can be mounted
+via FUSE without root permissions.  It is similar to EncFS, but provides
+additional security and privacy measures such as hiding file sizes and directory
+structure.  However CryFS is not considered stable yet by the developers.")
+    (license license:lgpl3+)))
-- 
2.33.0


^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#50428: [PATCH] gnu: Add cryfs
  2021-09-06 13:34 [bug#50428] [PATCH] gnu: Add cryfs Brendan Tildesley
  2021-09-14  9:50 ` bug#50428: " Ludovic Courtès
@ 2021-09-16  9:42 ` Ludovic Courtès
  1 sibling, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2021-09-16  9:42 UTC (permalink / raw)
  To: Brendan Tildesley; +Cc: 50428-done

Hi,

Brendan Tildesley <mail@brendan.scot> skribis:

> * gnu/packages/crypto.scm (cryfs): New variable.

Overall LGTM modulo the minor issues below:

> +     '(#:configure-flags
> +       `("-DCRYFS_UPDATE_CHECKS=OFF" ;; Note: This also disables checking for security issues.
> +         "-DCMAKE_BUILD_TYPE=Release" ;; Build man pages.

Normally this is set by #:build-type.  It defaults to “RelWithDebInfo”,
which is nice because then you get debugging symbols if you pass
‘--with-debug-info=cryfs’.  So I’d suggest removing this second flag.

> +         (replace 'check
> +           (lambda* (#:key tests? outputs #:allow-other-keys)
> +             (use-modules (srfi srfi-1))

Please use #:modules ((srfi srfi-1) …) instead of this non-top-level
‘use-modules’ form.

> +             (when tests?
> +               (with-directory-excursion "/tmp/build/test"
> +                 (let ((tests (find-files "." "-test$"))
> +                       (tests-output (assoc-ref outputs "tests")))
> +                   ;; Install tests to a separate output so users can run them.
> +                   (copy-recursively "." tests-output)

Installing tests is unusual.  Do you really think it’s going to be
useful?

> +                   ;; XXX: Disable failing tests. Unfortunately there are a
> +                   ;; few. Some only fail in the build environment. ;; build
> +                   ;; environment.

Typo.

> +    (description "CryFS encrypts your files, so you can safely store them anywhere.
> + It works well together with cloud services like Dropbox, iCloud, OneDrive and
   ^
Extra space.  :-)

Could you send an updated patch?

Thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#50428] [PATCH] gnu: Add cryfs
  2021-09-14 12:13   ` [bug#50428] " Brendan Tildesley
@ 2021-09-16 19:56     ` Ludovic Courtès
  0 siblings, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2021-09-16 19:56 UTC (permalink / raw)
  To: Brendan Tildesley; +Cc: 50428@debbugs.gnu.org

Hi,

Brendan Tildesley <mail@brendan.scot> skribis:

> From 6604ab84de9a38907ca6d930dcb5c0d79de28d88 Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <mail@brendan.scot>
> Date: Sat, 4 Sep 2021 16:52:23 +1000
> Subject: [PATCH] gnu: Add cryfs.
>
> * gnu/packages/crypto.scm (cryfs): New variable.

Applied, thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-09-16 19:57 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-06 13:34 [bug#50428] [PATCH] gnu: Add cryfs Brendan Tildesley
2021-09-14  9:50 ` bug#50428: " Ludovic Courtès
2021-09-14 12:13   ` [bug#50428] " Brendan Tildesley
2021-09-16 19:56     ` Ludovic Courtès
2021-09-16  9:42 ` bug#50428: " Ludovic Courtès

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).