From 2e77bbed719cfaa43d704e555a9007c5c4d52d2f Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 4 Nov 2018 11:48:36 +0200
Subject: gnu: ruby@2.3: Update to 2.3.8.

* gnu/packages/ruby.scm (ruby@2.3): Update to 2.3.8.
---
 gnu/packages/ruby.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/ruby.scm')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 7e8c8be290d..bdcc3214e6b 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
 ;;;
@@ -110,7 +110,7 @@ a focus on simplicity and productivity.")
 (define-public ruby-2.3
   (package
     (inherit ruby)
-    (version "2.3.7")
+    (version "2.3.8")
     (source
      (origin
        (method url-fetch)
@@ -119,7 +119,7 @@ a focus on simplicity and productivity.")
                            "/ruby-" version ".tar.xz"))
        (sha256
         (base32
-         "1nwfaifq5624p1ml56qq5dy5w38z37x22r0qgrbgbzrzklmqy7y6"))
+         "1zhxbjff08pvbnxvn58krns6q0p6g4977q6ykfn823gxhifn63wi"))
        (modules '((guix build utils)))
        (snippet `(begin
                    ;; Remove bundled libffi
-- 
cgit v1.3


From 288d24800d99985a857269ea180d36f3a3a2306e Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 5 Nov 2018 16:11:59 -0500
Subject: gnu: ruby-rack: Update to 2.0.6 [fixes CVE-2018-{16470,16471}].

* gnu/packages/ruby.scm (ruby-rack): Update to 2.0.6.
---
 gnu/packages/ruby.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/ruby.scm')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index bdcc3214e6b..2fde016851b 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3481,7 +3481,7 @@ differences (added or removed nodes) between two XML/HTML documents.")
 (define-public ruby-rack
   (package
     (name "ruby-rack")
-    (version "2.0.5")
+    (version "2.0.6")
     (source
      (origin
        (method url-fetch)
@@ -3493,7 +3493,7 @@ differences (added or removed nodes) between two XML/HTML documents.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1k1k4wk10l6bxx46pw58j2p3nmyzjqnr65hbjjqydd6517fmxgib"))
+         "0pb3g5ymvbf07xaxcn51dpqv3djlxavckp3qkxsjdxiqznb0d9p1"))
        ;; Ignore test which fails inside the build environment but works
        ;; outside.
        (patches (search-patches "ruby-rack-ignore-failing-test.patch"))))
-- 
cgit v1.3


From 17cfb7aeffaaba70e67e9afb50d7100614ffca7f Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Wed, 5 Dec 2018 07:45:47 +0000
Subject: gnu: ruby-json-pure: Fix build.

The version of test-unit used is greater than one of the gemspec files was
specifying. It was already being changed in two places, so this commit changes
the json-java.gemspec file as well.

* gnu/packages/ruby.scm (ruby-json-pure)[arguments]: Add new
fix-json-java.gemspec phase.
---
 gnu/packages/ruby.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/ruby.scm')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 2fde016851b..52832eeeb81 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3010,7 +3010,15 @@ a native C extension.")
            (lambda _
              ;; Regenerate gemspec so loosened dependency constraints are
              ;; propagated.
-             (invoke "rake" "gemspec"))))))
+             (invoke "rake" "gemspec")))
+         (add-after 'regenerate-gemspec 'fix-json-java.gemspec
+           (lambda _
+             ;; This gemspec doesn't look to be generated by the above
+             ;; command, so patch it separately.
+             (substitute* "json-java.gemspec"
+               (("%q<test-unit>\\.freeze, \\[\"~> 2\\.0\"\\]")
+                "%q<test-unit>.freeze, [\">= 2.0\"]"))
+             #t)))))
     (native-inputs
      `(("bundler" ,bundler)
        ("ragel" ,ragel)
-- 
cgit v1.3