CVS commit: pkgsrc/lang

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Apr  9 15:49:50 UTC 2017

Modified Files:
        pkgsrc/lang/ruby: rubyversion.mk
        pkgsrc/lang/ruby/files: update-gemspec.rb
        pkgsrc/lang/ruby22-base: distinfo hacks.mk
Removed Files:
        pkgsrc/lang/ruby22-base/patches: patch-eval.c patch-eval__error.c
            patch-thread.c patch-vm__eval.c patch-vm__trace.c

Log Message:
Update ruby22-base and ruby22 to 2.2.7.

Ruby 2.2.7 Released                                     2017/3/28

Ruby 2.2.7 has been released.

This release includes about 70 bug fixes after the previous release. See the
ChangeLog for details.

After this release, we will end the normal maintenance phase of Ruby 2.2, and
start the security maintenance phase of it.  This means that after the release
of 2.2.7 we will never backport any bug fixes to 2.2 except security fixes.
The term of the security maintenance phase is scheduled for 1 year.  By the
end of this term, official support of Ruby 2.2 will be over.  Therefore, we
recommend that you start planning to upgrade to Ruby 2.4 or 2.3.


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 pkgsrc/lang/ruby/rubyversion.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ruby/files/update-gemspec.rb
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/ruby22-base/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ruby22-base/hacks.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/ruby22-base/patches/patch-eval.c \
    pkgsrc/lang/ruby22-base/patches/patch-eval__error.c \
    pkgsrc/lang/ruby22-base/patches/patch-thread.c \
    pkgsrc/lang/ruby22-base/patches/patch-vm__eval.c \
    pkgsrc/lang/ruby22-base/patches/patch-vm__trace.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby/rubyversion.mk
diff -u pkgsrc/lang/ruby/rubyversion.mk:1.169 pkgsrc/lang/ruby/rubyversion.mk:1.170
--- pkgsrc/lang/ruby/rubyversion.mk:1.169       Mon Mar 20 12:24:22 2017
+++ pkgsrc/lang/ruby/rubyversion.mk     Sun Apr  9 15:49:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.169 2017/03/20 12:24:22 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.170 2017/04/09 15:49:50 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -229,13 +229,13 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/rub
 # current supported Ruby's version
 RUBY18_VERSION=                1.8.7
 RUBY21_VERSION=                2.1.10
-RUBY22_VERSION=                2.2.6
-RUBY23_VERSION=                2.3.3
+RUBY22_VERSION=                2.2.7
+RUBY23_VERSION=                2.3.2
 
 # patch level
 RUBY18_PATCHLEVEL=     pl374
 #RUBY21_PATCHLEVEL=    p492
-#RUBY22_PATCHLEVEL=    p319
+#RUBY22_PATCHLEVEL=    p470
 #RUBY23_PATCHLEVEL=    p112
 
 # current API compatible version; used for version of shared library

Index: pkgsrc/lang/ruby/files/update-gemspec.rb
diff -u pkgsrc/lang/ruby/files/update-gemspec.rb:1.8 pkgsrc/lang/ruby/files/update-gemspec.rb:1.9
--- pkgsrc/lang/ruby/files/update-gemspec.rb:1.8        Sat Nov 19 13:50:19 2016
+++ pkgsrc/lang/ruby/files/update-gemspec.rb    Sun Apr  9 15:49:50 2017
@@ -1,7 +1,7 @@
 #!/usr/pkg/bin/ruby
 # -*- coding: utf-8 -*-
 #
-# $NetBSD: update-gemspec.rb,v 1.8 2016/11/19 13:50:19 taca Exp $
+# $NetBSD: update-gemspec.rb,v 1.9 2017/04/09 15:49:50 taca Exp $
 #
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -131,6 +131,7 @@ class GemSpecUpdater
           if /^([^=]+)=([^=]+)$/ =~ op
             ov = $1
             nv = $2
+            puts "#{ov} => #{nv}"
             if av.include? ov
               av.delete ov
               modified = true

Index: pkgsrc/lang/ruby22-base/distinfo
diff -u pkgsrc/lang/ruby22-base/distinfo:1.16 pkgsrc/lang/ruby22-base/distinfo:1.17
--- pkgsrc/lang/ruby22-base/distinfo:1.16       Mon Dec  5 15:02:25 2016
+++ pkgsrc/lang/ruby22-base/distinfo    Sun Apr  9 15:49:50 2017
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.16 2016/12/05 15:02:25 taca Exp $
+$NetBSD: distinfo,v 1.17 2017/04/09 15:49:50 taca Exp $
 
-SHA1 (ruby-2.2.6.tar.bz2) = 67b15fcc394bb1ffb5a7e926dcd6222d8e988188
-RMD160 (ruby-2.2.6.tar.bz2) = f157ece8e73ab9bbc49badb6a5fbb16815ac2af7
-SHA512 (ruby-2.2.6.tar.bz2) = 7a93f72d236521ac28c8a0bc0c73cf805797a8813d22e02f42c5fc05dd39f6e422817272e0db6a24c245f6f97ad4b2b412a9a47ac50156ab186df596918a5f34
-Size (ruby-2.2.6.tar.bz2) = 13378616 bytes
+SHA1 (ruby-2.2.7.tar.bz2) = 0b5b79f55a1e7a7c2f6600e75167c1b9cc435042
+RMD160 (ruby-2.2.7.tar.bz2) = 5aef4d373a0ea7434b7c32098b43ecc6fba542a6
+SHA512 (ruby-2.2.7.tar.bz2) = 83756cd1c91516962b83961e0de59d858618f7ed3e9795f930aab4f199d47a95ed8f867d8aa9b51d508be26d9babf2140117c88241168bac41e6ef702cfadf20
+Size (ruby-2.2.7.tar.bz2) = 13381078 bytes
 SHA1 (patch-configure) = ad3d1862a48d12b793fd0062eb357372caa19abc
-SHA1 (patch-eval.c) = a1e86d4ed1729398393e83d519e991259c6163de
-SHA1 (patch-eval__error.c) = cc313587bb24e16e4702f784b30e64618ae3f5a4
 SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959
 SHA1 (patch-ext_openssl_ossl__ssl.c) = e887a5576959921da116a5cee629c25610169593
 SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d
@@ -25,7 +23,4 @@ SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68
 SHA1 (patch-man_ri.1) = b07be05375977cfac0f88765a95e85db4f858885
 SHA1 (patch-man_ruby.1) = 88ca6703fd58a89726618ca7dfc7912bad312b1c
 SHA1 (patch-test_rubygems_test__gem.rb) = 01a36c32e49d518cc68bea5e76c7640451223b61
-SHA1 (patch-thread.c) = 93bba713014dfb92a59ba9715f50f23c5329de6a
 SHA1 (patch-tool_rbinstall.rb) = 2bb27173a0e08de94391d56ef2b366a71ee2dc50
-SHA1 (patch-vm__eval.c) = b0739a5e64f99ce3adb86d7d676759cbc3aa7b1b
-SHA1 (patch-vm__trace.c) = 8e992c214b69c6237d4c4418aaba892079f9873e

Index: pkgsrc/lang/ruby22-base/hacks.mk
diff -u pkgsrc/lang/ruby22-base/hacks.mk:1.1 pkgsrc/lang/ruby22-base/hacks.mk:1.2
--- pkgsrc/lang/ruby22-base/hacks.mk:1.1        Sun Mar  8 16:24:55 2015
+++ pkgsrc/lang/ruby22-base/hacks.mk    Sun Apr  9 15:49:50 2017
@@ -1,7 +1,7 @@
-# $NetBSD: hacks.mk,v 1.1 2015/03/08 16:24:55 taca Exp $
+# $NetBSD: hacks.mk,v 1.2 2017/04/09 15:49:50 taca Exp $
 
-.if !defined(RUBY21_BASE_HACKS_MK)
-RUBY21_BASE_HACKS_MK=  defined
+.if !defined(RUBY22_BASE_HACKS_MK)
+RUBY22_BASE_HACKS_MK=  defined
 
 .include "../../mk/compiler.mk"
 
@@ -34,4 +34,4 @@ PKG_HACKS+=           optimisation
 BUILDLINK_TRANSFORM+=  opt:-Os:-O1 rm:-freorder-blocks
 .endif
 
-.endif # RUBY21_BASE_HACKS_MK
+.endif # RUBY22_BASE_HACKS_MK