[PATCH] gnu: ruby: Update to 2.1.4.

[PATCH] gnu: ruby: Update to 2.1.4.

[David Thompson]

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

This patch updates Ruby to 2.1.4, which includes security fixes for 2
vulnerabilities.

More details here:
https://www.ruby-lang.org/en/news/2014/10/27/ruby-2-1-4-released/

Okay to push?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-ruby-Update-to-2.1.4.patch --]
[-- Type: text/x-diff, Size: 3025 bytes --]

From 12d39eb5145e42669748f172f9433ea8e6ead020 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Fri, 31 Oct 2014 18:57:30 -0400
Subject: [PATCH] gnu: ruby: Update to 2.1.4.

* gnu/packages/ruby.scm: Update.  Remove the now redundant readline patch.
---
 gnu/packages/ruby.scm | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index a33daba..5cdd722 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -36,44 +36,37 @@
 (define-public ruby
   (package
     (name "ruby")
-    (version "2.1.3")
+    (version "2.1.4")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
                            (version-major+minor version)
-                           "/ruby-" version ".tar.bz2"))
+                           "/ruby-" version ".tar.xz"))
        (sha256
         (base32
-         "1mkndw0by11n6lyvq7dzly702yyqg5x0fcvfqrn9y4p49bw75kin"))))
+         "1ksgx1rn4wp80290399q6d26zpbx0nb3sxh45wl4wr58raxmrk71"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
        #:parallel-tests? #f
        #:phases
-       (alist-cons-after
-        ;; Minor patch:
-        ;; https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/45225/diff/
-        'unpack 'patch-readline
+       (alist-cons-before
+        'configure 'replace-bin-sh
         (lambda _
-          (substitute* '("ext/readline/readline.c")
-            (("Function ") "rl_hook_func_t ")))
-        (alist-cons-before
-         'configure 'replace-bin-sh
-         (lambda _
-           (substitute* '("Makefile.in"
-                          "ext/pty/pty.c"
-                          "io.c"
-                          "lib/mkmf.rb"
-                          "process.c"
-                          "test/rubygems/test_gem_ext_configure_builder.rb"
-                          "test/rdoc/test_rdoc_parser.rb"
-                          "test/ruby/test_rubyoptions.rb"
-                          "test/ruby/test_process.rb"
-                          "test/ruby/test_system.rb"
-                          "tool/rbinstall.rb")
-             (("/bin/sh") (which "sh"))))
-         %standard-phases))))
+          (substitute* '("Makefile.in"
+                         "ext/pty/pty.c"
+                         "io.c"
+                         "lib/mkmf.rb"
+                         "process.c"
+                         "test/rubygems/test_gem_ext_configure_builder.rb"
+                         "test/rdoc/test_rdoc_parser.rb"
+                         "test/ruby/test_rubyoptions.rb"
+                         "test/ruby/test_process.rb"
+                         "test/ruby/test_system.rb"
+                         "tool/rbinstall.rb")
+            (("/bin/sh") (which "sh"))))
+        %standard-phases)))
     (inputs
      `(("readline" ,readline)
        ("openssl" ,openssl)
-- 
2.1.1


[-- Attachment #3: Type: text/plain, Size: 136 bytes --]


-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH] gnu: ruby: Update to 2.1.4.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> This patch updates Ruby to 2.1.4, which includes security fixes for 2
> vulnerabilities.
>
> More details here:
> https://www.ruby-lang.org/en/news/2014/10/27/ruby-2-1-4-released/
>
> Okay to push?

LGTM!

> From 12d39eb5145e42669748f172f9433ea8e6ead020 Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Fri, 31 Oct 2014 18:57:30 -0400
> Subject: [PATCH] gnu: ruby: Update to 2.1.4.
>
> * gnu/packages/ruby.scm: Update.  Remove the now redundant readline patch.
                         ^
This should mention the variable name.

Ludo’.

Re: [PATCH] gnu: ruby: Update to 2.1.4.

[David Thompson]

Ludovic Courtès <ludo@gnu.org> writes:

> David Thompson <dthompson2@worcester.edu> skribis:
>
>> From 12d39eb5145e42669748f172f9433ea8e6ead020 Mon Sep 17 00:00:00 2001
>> From: David Thompson <dthompson2@worcester.edu>
>> Date: Fri, 31 Oct 2014 18:57:30 -0400
>> Subject: [PATCH] gnu: ruby: Update to 2.1.4.
>>
>> * gnu/packages/ruby.scm: Update.  Remove the now redundant readline patch.
>                          ^
> This should mention the variable name.

Ugh. Of course I would forget something so basic.  Sorry for pushing
before you had a chance to review.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate