Pullup ticket #6166 - requested by taca

lang/ruby25-base: security fix

Revisions pulled up:
- lang/ruby/rubyversion.mk                                      1.220
- lang/ruby25-base/Makefile                                     1.16
- lang/ruby25-base/PLIST                                        1.4
- lang/ruby25-base/distinfo                                     1.13

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed Apr  1 15:25:26 UTC 2020

   Modified Files:
   	pkgsrc/lang/ruby: rubyversion.mk
   	pkgsrc/lang/ruby25-base: Makefile PLIST distinfo

   Log Message:
   lang/ruby25-base: update to 2.5.8

   Update ruby25-base (and ruby25) to 2.5.8.

   2.5.8 (2020-03-31)

   This release includes security fixes. Please check the topics below for
   details.

   * CVE-2020-16255: Unsafe Object Creation Vulnerability in JSON (Additional
     fix)
   * CVE-2020-10933: Heap exposure vulnerability in the socket library

4 files changed, 14 insertions, 11 deletions

diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index 39447885247..afa84466b1c 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.217.2.3 2020/04/28 15:23:32 bsiegert Exp $
+# $NetBSD: rubyversion.mk,v 1.217.2.4 2020/04/28 16:16:23 bsiegert Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -214,7 +214,7 @@ RUBY_VERSION_REQD?=	${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/}
 
 # current supported Ruby's version
 RUBY24_VERSION=		2.4.10
-RUBY25_VERSION=		2.5.7
+RUBY25_VERSION=		2.5.8
 RUBY26_VERSION=		2.6.6
 RUBY27_VERSION=		2.7.1
 
diff --git a/lang/ruby25-base/Makefile b/lang/ruby25-base/Makefile
index 07e5dac63d9..3905f693450 100644
--- a/lang/ruby25-base/Makefile
+++ b/lang/ruby25-base/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2020/03/18 00:34:02 rillig Exp $
+# $NetBSD: Makefile,v 1.15.2.1 2020/04/28 16:16:24 bsiegert Exp $
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
diff --git a/lang/ruby25-base/PLIST b/lang/ruby25-base/PLIST
index f8a82b0c699..f6633675711 100644
--- a/lang/ruby25-base/PLIST
+++ b/lang/ruby25-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/08/28 14:12:21 taca Exp $
+@comment $NetBSD: PLIST,v 1.3.4.1 2020/04/28 16:16:24 bsiegert Exp $
 bin/erb${RUBY_SUFFIX}
 bin/gem${RUBY_SUFFIX}
 bin/irb${RUBY_SUFFIX}
@@ -986,14 +986,18 @@ ${GEM_HOME}/gems/power_assert-${RUBY_POWER_ASSERT_VERSION}/lib/power_assert/insp
 ${GEM_HOME}/gems/power_assert-${RUBY_POWER_ASSERT_VERSION}/lib/power_assert/parser.rb
 ${GEM_HOME}/gems/power_assert-${RUBY_POWER_ASSERT_VERSION}/lib/power_assert/version.rb
 ${GEM_HOME}/gems/power_assert-${RUBY_POWER_ASSERT_VERSION}/power_assert.gemspec
-${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/.gitignore
 ${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/CONTRIBUTING.rdoc
 ${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/Gemfile
 ${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/History.rdoc
 ${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/MIT-LICENSE
 ${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/README.rdoc
 ${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/Rakefile
+${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/azure-pipelines.yml
+${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/bin/bundle
 ${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/bin/console
+${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/bin/rake
+${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/bin/rdoc
+${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/bin/rubocop
 ${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/bin/setup
 ${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/doc/command_line_usage.rdoc
 ${GEM_HOME}/gems/rake-${RUBY_RAKE_VERSION}/doc/example/Rakefile1
diff --git a/lang/ruby25-base/distinfo b/lang/ruby25-base/distinfo
index 9b863a70822..eac242f6210 100644
--- a/lang/ruby25-base/distinfo
+++ b/lang/ruby25-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2019/10/02 13:39:53 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2020/04/28 16:16:24 bsiegert Exp $
 
-SHA1 (ruby-2.5.7.tar.xz) = dd6b2841334ee99250fdf6a29c4eda501df6be97
-RMD160 (ruby-2.5.7.tar.xz) = 6a0311eefcb23902c7e9f1f9a3d253f7c944cb27
-SHA512 (ruby-2.5.7.tar.xz) = 63b7c75fab44cd1bd22f22ddec00c740cf379ac7240da0dfafcec54347766695faef47428ce1c433fd77fa96992e976c984697067fa526236d383b12adc9ce75
-Size (ruby-2.5.7.tar.xz) = 11296440 bytes
+SHA1 (ruby-2.5.8.tar.xz) = d5ef8e8f28c098e6b7ea24924e0b0fee6e2f766c
+RMD160 (ruby-2.5.8.tar.xz) = 885ffaf5c394ff8779bbc4ee5e6cf0976aa3d6cf
+SHA512 (ruby-2.5.8.tar.xz) = 2886be764a454425c5beef2777c64a70ee0d048b07896b327633d904f5077fea4299526689f9e2ac4dcd2fc4811cf9a6c8ce75367ed35d29dfe1a54222872e0d
+Size (ruby-2.5.8.tar.xz) = 11298404 bytes
 SHA1 (patch-configure) = 965f31ec3ae2fb91479f02cb3b19ea7518685718
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e