summary refs log tree commit diff
diff options
context:
space:
mode:
authorBen Woodcroft <donttrustben@gmail.com>2017-12-15 13:47:57 +1000
committerBen Woodcroft <donttrustben@gmail.com>2017-12-15 13:56:51 +1000
commit86637f18bec9566973e78bf417a63426b47287b5 (patch)
tree64c293ca818edc99e0a930de6abd441ad098b8e6
parent6098a386a90f63fc8c6f18c5edfce15320789941 (diff)
downloadguix-86637f18bec9566973e78bf417a63426b47287b5.tar.gz
gnu: ruby: Replace with ruby-2.4.3 [fixes CVE-2017-17405].
* gnu/packages/ruby.scm (ruby-2.4.3): New variable.
(ruby)[replacement]: New field.
-rw-r--r--gnu/packages/ruby.scm21
1 files changed, 21 insertions, 0 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 91378ca992..34387e5754 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -49,6 +49,7 @@
 (define-public ruby
   (package
     (name "ruby")
+    (replacement ruby-2.4.3)
     (version "2.4.2")
     (source
      (origin
@@ -102,6 +103,26 @@ a focus on simplicity and productivity.")
     (home-page "https://ruby-lang.org")
     (license license:ruby)))
 
+(define-public ruby-2.4.3
+  (package
+    (inherit ruby)
+    (name "ruby")
+    (version "2.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
+                           (version-major+minor version)
+                           "/ruby-" version ".tar.xz"))
+       (sha256
+        (base32
+         "0l9bv67dgsphk42lmiskhrnh47hbyj6rfg2rcjx22xivpx07srr3"))
+       (modules '((guix build utils)))
+       (snippet `(begin
+                   ;; Remove bundled libffi
+                   (delete-file-recursively "ext/fiddle/libffi-3.2.1")
+                   #t))))))
+
 (define-public ruby-2.3
   (package
     (inherit ruby)