diff options
author | Ben Woodcroft <donttrustben@gmail.com> | 2017-09-17 11:31:49 +1000 |
---|---|---|
committer | Ben Woodcroft <donttrustben@gmail.com> | 2017-09-17 20:08:48 +1000 |
commit | 312e8a9993bfcc85782bc7090b6cb06027dd4449 (patch) | |
tree | 657e95c971c1b8e42480ef4debef4790de38a4f2 /gnu/packages/ruby.scm | |
parent | 0329f6f76c147f84b7de2faf847a62a6db3d7158 (diff) | |
download | guix-312e8a9993bfcc85782bc7090b6cb06027dd4449.tar.gz guix-312e8a9993bfcc85782bc7090b6cb06027dd4449.zip |
ruby: Update replacement to 2.4.2. Fix CVE-2017-{0898,10784,14033,14064}.
* gnu/packages/ruby.scm (ruby): Update replacement to 2.4.2.
(ruby-2.4.1): Rename to ...
(ruby-2.4.2): ... this.
[source]: Remove patches.
* gnu/packages/patches/ruby-rubygems-2612-ruby24.patch,
gnu/packages/patches/ruby-rubygems-2613-ruby24.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/packages/ruby.scm')
-rw-r--r-- | gnu/packages/ruby.scm | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 846860f440..d6ed15d681 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -49,7 +49,7 @@ (define-public ruby (package (name "ruby") - (replacement ruby-2.4.1) + (replacement ruby-2.4.2) (version "2.4.0") (source (origin @@ -103,11 +103,11 @@ a focus on simplicity and productivity.") (home-page "https://ruby-lang.org") (license license:ruby))) -(define-public ruby-2.4.1 +(define-public ruby-2.4.2 (package (inherit ruby) (name "ruby") - (version "2.4.1") + (version "2.4.2") (source (origin (method url-fetch) @@ -116,15 +116,12 @@ a focus on simplicity and productivity.") "/ruby-" version ".tar.xz")) (sha256 (base32 - "0m763zf2v0jhrha3cx21g4dif6vc9gm714invs8h3sg35ncskj2g")) + "0dgp4ypk3smrsbh2c249n5pl6nqhpd2igq9484dbsh81sf08k2kl")) (modules '((guix build utils))) (snippet `(begin ;; Remove bundled libffi (delete-file-recursively "ext/fiddle/libffi-3.2.1") - #t)) - (patches - (search-patches "ruby-rubygems-2612-ruby24.patch" - "ruby-rubygems-2613-ruby24.patch")))))) + #t)))))) (define-public ruby-2.3 (package |