Pullup ticket #6065 - requested by taca

lang/ruby25-base: security fix

Revisions pulled up:
- lang/ruby/rubyversion.mk                                      1.210
- lang/ruby25-base/Makefile                                     1.10
- lang/ruby25-base/distinfo                                     1.12
- lang/ruby25/Makefile                                          1.2

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed Oct  2 13:39:53 UTC 2019

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

   Log Message:
   lang/ruby25: update to 2.5.7

   Update ruby25-base, ruby25 and ruby25-mode packges to 2.5.7.

   pkgsrc chagnes

   * fix warnings of pkglint.

   Quote from release announce:

   Ruby 2.5.7 (2019-10-01)

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

   * CVE-2019-16255: A code injection vulnerability of Shell#[] and Shell#test
   * CVE-2019-16254: HTTP response splitting in WEBrick (Additional fix)
   * CVE-2019-15845: A NUL injection vulnerability of File.fnmatch and
     File.fnmatch?
   * CVE-2019-16201: Regular Expression Denial of Service vulnerability of
     WEBrick's Digest access authentication

4 files changed, 9 insertions, 11 deletions

diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index 408afd2e216..7b64bef8e91 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.208.2.1 2019/10/05 10:13:20 bsiegert Exp $
+# $NetBSD: rubyversion.mk,v 1.208.2.2 2019/10/05 19:46:44 bsiegert Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -216,7 +216,7 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/}
 # current supported Ruby's version
 RUBY22_VERSION=		2.2.10
 RUBY24_VERSION=		2.4.9
-RUBY25_VERSION=		2.5.6
+RUBY25_VERSION=		2.5.7
 RUBY26_VERSION=		2.6.4
 
 # current API compatible version; used for version of shared library
diff --git a/lang/ruby25-base/Makefile b/lang/ruby25-base/Makefile
index 2feab2cd267..7bec62d28c4 100644
--- a/lang/ruby25-base/Makefile
+++ b/lang/ruby25-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/03/16 14:34:56 taca Exp $
+# $NetBSD: Makefile,v 1.9.6.1 2019/10/05 19:46:45 bsiegert Exp $
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
@@ -12,7 +12,6 @@ COMMENT=	Ruby ${RUBY_VERSION} release minimum base package
 RUBY_VERSIONS_ACCEPTED=	25
 
 USE_GCC_RUNTIME=	yes
-USE_LANGUAGES=		c
 USE_TOOLS+=		pax yacc pkg-config
 GNU_CONFIGURE=		yes
 TEST_TARGET=		test
diff --git a/lang/ruby25-base/distinfo b/lang/ruby25-base/distinfo
index a6cdd47d7b1..c9fc6ea5e31 100644
--- a/lang/ruby25-base/distinfo
+++ b/lang/ruby25-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2019/08/28 14:12:21 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2019/10/05 19:46:45 bsiegert Exp $
 
-SHA1 (ruby-2.5.6.tar.xz) = 5008b35d386c4b663b7956a0790b6aa7ae5dc9a9
-RMD160 (ruby-2.5.6.tar.xz) = ccf857537a9be941f239e939ecee27bab8b6e305
-SHA512 (ruby-2.5.6.tar.xz) = 4fe5f8bad5d320f8f17b02ce15afee341e7b0074efcfd98d8944e0cb7c448e0660c4553dd5c0328ee3b49fea3247642f85c60bdce431ed57f58b6326dfd48ee1
-Size (ruby-2.5.6.tar.xz) = 11323612 bytes
+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 (patch-configure) = 965f31ec3ae2fb91479f02cb3b19ea7518685718
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e
diff --git a/lang/ruby25/Makefile b/lang/ruby25/Makefile
index d153881a412..3921fbcb239 100644
--- a/lang/ruby25/Makefile
+++ b/lang/ruby25/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/01/08 14:20:05 taca Exp $
+# $NetBSD: Makefile,v 1.1.14.1 2019/10/05 19:46:45 bsiegert Exp $
 #
 
 DISTNAME=	# empty
@@ -10,7 +10,6 @@ DISTFILES=	# empty
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.ruby-lang.org/en/
 COMMENT=	Ruby programming language ${RUBY_VERSION} meta package
-LICENSE=	2-clause-bsd OR ruby-license
 
 META_PACKAGE=		yes