From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: [PATCH] gnu: ruby: Update to 2.1.4. Date: Fri, 31 Oct 2014 19:00:57 -0400 Message-ID: <87a94brgie.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkLBs-0006zk-By for guix-devel@gnu.org; Fri, 31 Oct 2014 19:01:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XkLBm-0003Cr-Lu for guix-devel@gnu.org; Fri, 31 Oct 2014 19:01:08 -0400 Received: from na3sys009aog126.obsmtp.com ([74.125.149.155]:46590) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkLBm-0003Cb-As for guix-devel@gnu.org; Fri, 31 Oct 2014 19:01:02 -0400 Received: by mail-qa0-f43.google.com with SMTP id j7so6084482qaq.30 for ; Fri, 31 Oct 2014 16:01:00 -0700 (PDT) Received: from izanagi (209-6-40-86.c3-0.smr-ubr1.sbo-smr.ma.cable.rcn.com. [209.6.40.86]) by mx.google.com with ESMTPSA id z9sm10577238qai.19.2014.10.31.16.00.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Oct 2014 16:00:59 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain 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? --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-ruby-Update-to-2.1.4.patch >From 12d39eb5145e42669748f172f9433ea8e6ead020 Mon Sep 17 00:00:00 2001 From: David Thompson 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 --=-=-= Content-Type: text/plain -- David Thompson Web Developer - Free Software Foundation - http://fsf.org GPG Key: 0FF1D807 Support the FSF: https://fsf.org/donate --=-=-=--