GNU bug report logs - #64538
[PATCH 0/6] gnu: ruby-net-ssh: Update to 7.1.0.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 64538 in the body.
You can then email your comments to 64538 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: gemmaro <gemmaro.dev <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: gemmaro <gemmaro.dev <at> gmail.com>
Subject: [PATCH 0/6] gnu: ruby-net-ssh: Update to 7.1.0.
Date: Sun,  9 Jul 2023 14:54:26 +0900

Hello,

This patchset updates ruby-net-ssh to 7.1.0.  I also added some packages and
updated ruby-nbnacl on the way to enable ruby-net-ssh's tests with these
optional dependencies.

Best,
gemmaro.

gemmaro (6):
  gnu: Add ruby-bcrypt-pbkdf.
  gnu: Add ruby-ed25519.
  gnu: ruby-rbnacl: Update to 7.1.1.
  gnu: ruby-rbnacl: Use new package style.
  gnu: Add ruby-x25519.
  gnu: ruby-net-ssh: Update to 7.1.0.

 gnu/packages/ruby.scm | 229 +++++++++++++++++++++++++++++++++---------
 1 file changed, 179 insertions(+), 50 deletions(-)


base-commit: 2986ba899f5ee374008c501e26fb653147ed7891
-- 
2.41.0

Message #8 received at 64538 <at> debbugs.gnu.org (full text, mbox):

From: gemmaro <gemmaro.dev <at> gmail.com>
To: 64538 <at> debbugs.gnu.org
Cc: gemmaro <gemmaro.dev <at> gmail.com>
Subject: [PATCH 1/6] gnu: Add ruby-bcrypt-pbkdf.
Date: Sun,  9 Jul 2023 14:57:17 +0900

* gnu/packages/ruby.scm (ruby-bcrypt-pbkdf): New variable.
---
 gnu/packages/ruby.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 60f26bcb05..5165b3d1ea 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -11209,6 +11209,33 @@ (define-public ruby-bcrypt
     (home-page "https://github.com/bcrypt-ruby/bcrypt-ruby")
     (license license:expat)))
 
+(define-public ruby-bcrypt-pbkdf
+  (package
+    (name "ruby-bcrypt-pbkdf")
+    (version "1.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "bcrypt_pbkdf" version))
+              (sha256
+               (base32
+                "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"))))
+    (build-system ruby-build-system)
+    (arguments
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-before 'build 'compile
+                          (lambda _
+                            (invoke "rake" "compile"))))))
+    (native-inputs (list ruby-minitest ruby-rake-compiler
+                         ruby-rake-compiler-dock ruby-rdoc))
+    (synopsis "Reading password encrypted Ed25519 keys in Ruby")
+    (description
+     "This gem implements @samp{bcrypt_pbkdf}, which is a variant of
+PBKDF2 (Password-Based Key Derivation Function 2) with bcrypt-based
+pseudorandom function.  This is currently used by @samp{net-ssh} to
+read password encrypted Ed25519 keys.")
+    (home-page "https://github.com/net-ssh/bcrypt_pbkdf-ruby")
+    (license license:expat)))
+
 (define-public ruby-bio-commandeer
   (package
     (name "ruby-bio-commandeer")
-- 
2.41.0

Message #11 received at 64538 <at> debbugs.gnu.org (full text, mbox):

From: gemmaro <gemmaro.dev <at> gmail.com>
To: 64538 <at> debbugs.gnu.org
Cc: gemmaro <gemmaro.dev <at> gmail.com>
Subject: [PATCH 2/6] gnu: Add ruby-ed25519.
Date: Sun,  9 Jul 2023 14:57:18 +0900

* gnu/packages/ruby.scm (ruby-ed25519): New variable.
---
 gnu/packages/ruby.scm | 50 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 5165b3d1ea..419f7e4d43 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -16320,6 +16320,56 @@ (define-public ruby-citeproc
 engine is available in the @code{citeproc-ruby} gem.")
     (license (list license:agpl3+ license:bsd-2))))
 
+(define-public ruby-ed25519
+  (package
+    (name "ruby-ed25519")
+    (version "1.3.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/RubyCrypto/ed25519")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1jm5w2dyhyrndcx0d02v0gjbzl1abhbx2wkp3gxzwcndghmkz98r"))))
+    (build-system ruby-build-system)
+    (arguments
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-before 'build 'compile
+                          (lambda _
+                            (invoke "rake" "compile")))
+                        (add-after 'unpack 'remove-unnecessary-dependencies
+                          (lambda _
+                            ;; Coveralls relates to a network service, and RuboCop to code
+                            ;; linting and both are unnecessary to run the tests
+                            (substitute* "Gemfile"
+                              ((".*coveralls.*")
+                               "\n")
+                              ((".*rubocop.*")
+                               "\n"))
+                            (substitute* "spec/spec_helper.rb"
+                              (("require \"coveralls\"")
+                               "")
+                              (("Coveralls.wear!")
+                               ""))
+                            (substitute* "Rakefile"
+                              (("require \"rubocop/rake_task\"")
+                               "")
+                              (("RuboCop::RakeTask.new")
+                               ""))
+                            #t)))
+           #:test-target "spec"))
+    (native-inputs (list ruby-rake-compiler ruby-rspec))
+    (synopsis
+     "Ruby binding to the Ed25519 elliptic curve public-key signature system")
+    (description
+     "This package provides a Ruby binding to the Ed25519 elliptic curve
+public-key signature system described in
+@url{https://www.ietf.org/rfc/rfc8032.txt, RFC 8032}.")
+    (home-page "https://github.com/RubyCrypto/ed25519")
+    (license license:expat)))
+
 (define-public ruby-edtf
   (package
     (name "ruby-edtf")
-- 
2.41.0

Message #14 received at 64538 <at> debbugs.gnu.org (full text, mbox):

From: gemmaro <gemmaro.dev <at> gmail.com>
To: 64538 <at> debbugs.gnu.org
Cc: gemmaro <gemmaro.dev <at> gmail.com>
Subject: [PATCH 3/6] gnu: ruby-rbnacl: Update to 7.1.1.
Date: Sun,  9 Jul 2023 14:57:19 +0900

* gnu/packages/ruby.scm (ruby-rbnacl): Update to 7.1.1.
  [home-page]: Update to current home page link.
---
 gnu/packages/ruby.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 419f7e4d43..161218ba14 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3165,14 +3165,14 @@ (define-public ruby-lumberjack
 (define-public ruby-rbnacl
   (package
     (name "ruby-rbnacl")
-    (version "6.0.1")
+    (version "7.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (rubygems-uri "rbnacl" version))
        (sha256
         (base32
-         "0ajxy5kj2jw09wdsla3jmha8w07vj5l14288xr9djpl327g3lzhn"))))
+         "0y8yzianlkc9w6sbqy8iy8l0yym0y6x7p5rjflkfixq76fqmhvzk"))))
     (build-system ruby-build-system)
     (arguments
      `(#:phases
@@ -3215,7 +3215,7 @@ (define-public ruby-rbnacl
      "This package provides Ruby FFI bindings to the Networking and
 Cryptography (NaCl) library, also known as libsodium.  This provides a
 high-level toolkit for building cryptographic systems and protocols.")
-    (home-page "https://github.com/crypto-rb/rbnacl")
+    (home-page "https://github.com/RubyCrypto/rbnacl")
     (license license:expat)))
 
 (define-public ruby-hkdf
-- 
2.41.0

Message #17 received at 64538 <at> debbugs.gnu.org (full text, mbox):

From: gemmaro <gemmaro.dev <at> gmail.com>
To: 64538 <at> debbugs.gnu.org
Cc: gemmaro <gemmaro.dev <at> gmail.com>
Subject: [PATCH 4/6] gnu: ruby-rbnacl: Use new package style.
Date: Sun,  9 Jul 2023 14:57:20 +0900

* gnu/packages/ruby.scm (ruby-rbnacl): Use new package style.
  [arguments]: Use gexp.
  [source, propagated-inputs, inputs, native-inputs]: Restyle format.
---
 gnu/packages/ruby.scm | 81 +++++++++++++++++++++----------------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 161218ba14..dd434efb52 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3166,50 +3166,47 @@ (define-public ruby-rbnacl
   (package
     (name "ruby-rbnacl")
     (version "7.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (rubygems-uri "rbnacl" version))
-       (sha256
-        (base32
-         "0y8yzianlkc9w6sbqy8iy8l0yym0y6x7p5rjflkfixq76fqmhvzk"))))
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "rbnacl" version))
+              (sha256
+               (base32
+                "0y8yzianlkc9w6sbqy8iy8l0yym0y6x7p5rjflkfixq76fqmhvzk"))))
     (build-system ruby-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-unnecessary-dependencies
-           (lambda _
-             ;; Coveralls relates to a network service, and Rubocop to code
-             ;; linting and both are unnecessary to run the tests
-             (substitute* "Gemfile"
-               ((".*rubocop.*") "\n")
-               ((".*guard-rspec.*") "\n")
-               ((".*coveralls.*") "\n"))
-             (substitute* "spec/spec_helper.rb"
-               (("require \"coveralls\"") "")
-               (("Coveralls.wear!") ""))
-             #t))
-         (add-after 'unpack 'use-libsodium-from-store
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* '("lib/rbnacl/init.rb"
-                            "lib/rbnacl/sodium.rb")
-               (("ffi_lib \\[.+\\]")
-                (string-append "ffi_lib [\""
-                               (assoc-ref inputs "libsodium") "/lib/libsodium.so"
-                               "\"]")))
-             #t))
-         ;; Run Rspec directly to avoid the Rubocop dependency in the Rakefile
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "rspec"))
-             #t)))))
-    (propagated-inputs
-     (list ruby-ffi))
-    (inputs
-     (list libsodium))
-    (native-inputs
-     (list bundler ruby-rspec))
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'remove-unnecessary-dependencies
+                          (lambda _
+                            ;; Coveralls relates to a network service, and Rubocop to code
+                            ;; linting and both are unnecessary to run the tests
+                            (substitute* "Gemfile"
+                              ((".*rubocop.*")
+                               "\n")
+                              ((".*guard-rspec.*")
+                               "\n")
+                              ((".*coveralls.*")
+                               "\n"))
+                            (substitute* "spec/spec_helper.rb"
+                              (("require \"coveralls\"")
+                               "")
+                              (("Coveralls.wear!")
+                               "")) #t))
+                        (add-after 'unpack 'use-libsodium-from-store
+                          (lambda* (#:key inputs #:allow-other-keys)
+                            (substitute* '("lib/rbnacl/init.rb"
+                                           "lib/rbnacl/sodium.rb")
+                              (("ffi_lib \\[.+\\]")
+                               (string-append "ffi_lib [\""
+                                              (assoc-ref inputs "libsodium")
+                                              "/lib/libsodium.so" "\"]"))) #t))
+                        ;; Run Rspec directly to avoid the Rubocop dependency in the Rakefile
+                        (replace 'check
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (invoke "rspec")) #t)))))
+    (propagated-inputs (list ruby-ffi))
+    (inputs (list libsodium))
+    (native-inputs (list bundler ruby-rspec))
     (synopsis "Ruby FFI binding to libsodium")
     (description
      "This package provides Ruby FFI bindings to the Networking and
-- 
2.41.0

Message #20 received at 64538 <at> debbugs.gnu.org (full text, mbox):

From: gemmaro <gemmaro.dev <at> gmail.com>
To: 64538 <at> debbugs.gnu.org
Cc: gemmaro <gemmaro.dev <at> gmail.com>
Subject: [PATCH 5/6] gnu: Add ruby-x25519.
Date: Sun,  9 Jul 2023 14:57:21 +0900

* gnu/packages/ruby.scm (ruby-x25519): New variable.
---
 gnu/packages/ruby.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index dd434efb52..2ed6ca543e 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3049,6 +3049,47 @@ (define-public ruby-lino
     (home-page "https://github.com/tobyclemson/lino")
     (license license:expat)))
 
+(define-public ruby-x25519
+  (package
+    (name "ruby-x25519")
+    (version "1.0.10")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/RubyCrypto/x25519")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1g0311ly32f6hfn4q5fvkbjbl2bhv1l9fx6s0kglxfsrwq51926y"))))
+    (build-system ruby-build-system)
+    (arguments
+     (list #:test-target "spec"
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'remove-unnecessary-dependencies
+                          (lambda _
+                            (substitute* "Gemfile"
+                              ((".*rubocop.*")
+                               ""))
+                            (substitute* "Rakefile"
+                              (("require \"rubocop/rake_task\"")
+                               "")
+                              (("RuboCop::RakeTask.new")
+                               ""))))
+                        (add-before 'build 'compile
+                          (lambda _
+                            (invoke "rake" "compile"))))))
+    (native-inputs (list ruby-rake-compiler ruby-rspec))
+    (synopsis "Cryptography library for Ruby providing the X25519
+Diffie-Hellman function")
+    (description
+     "The x25519 gem is an efficient public key cryptography library for
+Ruby providing key exchange/agreement via the X25519 (as known as
+Curve25519) Elliptic Curve Diffie-Hellman function as described in
+@url{https://www.ietf.org/rfc/rfc7748.txt, RFC 7748}.")
+    (home-page "https://github.com/RubyCrypto/x25519")
+    (license license:bsd-3)))
+
 (define-public ruby-xml-simple
   (package
     (name "ruby-xml-simple")
-- 
2.41.0

Message #23 received at 64538 <at> debbugs.gnu.org (full text, mbox):

From: gemmaro <gemmaro.dev <at> gmail.com>
To: 64538 <at> debbugs.gnu.org
Cc: gemmaro <gemmaro.dev <at> gmail.com>
Subject: [PATCH 6/6] gnu: ruby-net-ssh: Update to 7.1.0.
Date: Sun,  9 Jul 2023 14:57:22 +0900

* gnu/packages/ruby.scm (ruby-net-ssh): Update to 7.1.0.
  [source]: Switch to git-fetch for tests.
  [arguments]: Add check-Net::SSH:Test phase.
  [native-inputs]: Add ruby-bcrypt-pbkdf, ruby-ed25519, ruby-rbnacl,
  and ruby-x25519 for tests with optional dependencies.
---
 gnu/packages/ruby.scm | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 2ed6ca543e..fe58f8aede 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -5314,16 +5314,30 @@ (define-public ruby-mocha-on-bacon
 (define-public ruby-net-ssh
   (package
     (name "ruby-net-ssh")
-    (version "4.2.0")
+    (version "7.1.0")
     (source (origin
-              (method url-fetch)
-              (uri (rubygems-uri "net-ssh" version))
+              (method git-fetch) ;for tests
+              (uri (git-reference
+                    (url "https://github.com/net-ssh/net-ssh")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx"))))
+                "1dkbyzpl31jygnnva5sa754vk42q1fih4qz5ipqw5gqiafrrlb91"))))
     (build-system ruby-build-system)
-    (native-inputs
-     (list bundler ruby-mocha ruby-test-unit))
+    (arguments
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-after 'check 'check-Net::SSH::Test
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (invoke "rake" "test_test")))))))
+    (native-inputs (list bundler
+                         ruby-bcrypt-pbkdf
+                         ruby-ed25519
+                         ruby-mocha
+                         ruby-rbnacl
+                         ruby-test-unit
+                         ruby-x25519))
     (synopsis "Ruby implementation of the SSH2 client protocol")
     (description "@code{Net::SSH} is a pure-Ruby implementation of the SSH2
 client protocol.  It allows you to write programs that invoke and interact
-- 
2.41.0

Message #28 received at 64538-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: gemmaro <gemmaro.dev <at> gmail.com>
Cc: 64538-done <at> debbugs.gnu.org
Subject: Re: [bug#64538] [PATCH 0/6] gnu: ruby-net-ssh: Update to 7.1.0.
Date: Mon, 10 Jul 2023 13:53:42 +0100

[Message part 1 (text/plain, inline)]

gemmaro <gemmaro.dev <at> gmail.com> writes:

> Hello,
>
> This patchset updates ruby-net-ssh to 7.1.0.  I also added some packages and
> updated ruby-nbnacl on the way to enable ruby-net-ssh's tests with these
> optional dependencies.
>
> Best,
> gemmaro.
>
> gemmaro (6):
>   gnu: Add ruby-bcrypt-pbkdf.
>   gnu: Add ruby-ed25519.
>   gnu: ruby-rbnacl: Update to 7.1.1.
>   gnu: ruby-rbnacl: Use new package style.
>   gnu: Add ruby-x25519.
>   gnu: ruby-net-ssh: Update to 7.1.0.
>
>  gnu/packages/ruby.scm | 229 +++++++++++++++++++++++++++++++++---------
>  1 file changed, 179 insertions(+), 50 deletions(-)

Thanks, I've made a few tweaks and pushed these changes to master as
83444f2940534910ff10c63c38c8d4da7bc2362e.

In particular, I removed #t from some phases (as this is now
unnecessary) and reduced some indentation in places. I also switched to
using the default test target for ruby-net-ssh since that seemed to run
more tests.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.