Wed Oct 2 13:44:34 2019 UTC ()
lang/ruby26: update to 2.6.5

Update ruby26-base and ruby26 packges to 2.6.5

pkgsrc chagnes

* fix warnings of pkglint.

Quote from release announce:

Ruby 2.6.5 (2019-10-01)

This release includes security fixes. 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


(taca)
diff -r1.210 -r1.211 pkgsrc/lang/ruby/rubyversion.mk
diff -r1.1 -r1.2 pkgsrc/lang/ruby26/Makefile
diff -r1.3 -r1.4 pkgsrc/lang/ruby26-base/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/ruby26-base/distinfo
cvs diff -r1.210 -r1.211 pkgsrc/lang/ruby/rubyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2019/10/02 13:39:52 1.210
+++ pkgsrc/lang/ruby/rubyversion.mk 2019/10/02 13:44:34 1.211
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rubyversion.mk,v 1.210 2019/10/02 13:39:52 taca Exp $ 1# $NetBSD: rubyversion.mk,v 1.211 2019/10/02 13:44:34 taca Exp $
2# 2#
3 3
4# This file determines which Ruby version is used as a dependency for 4# This file determines which Ruby version is used as a dependency for
5# a package. 5# a package.
6# 6#
7# 7#
8# === User-settable variables === 8# === User-settable variables ===
9# 9#
10# RUBY_VERSION_DEFAULT 10# RUBY_VERSION_DEFAULT
11# The preferered Ruby version to use. 11# The preferered Ruby version to use.
12# 12#
13# Possible values: 22 24 25 26 13# Possible values: 22 24 25 26
14# Default: 24 14# Default: 24
@@ -207,27 +207,27 @@ _RUBYVERSION_MK= # defined @@ -207,27 +207,27 @@ _RUBYVERSION_MK= # defined
207.include "../../mk/bsd.prefs.mk" 207.include "../../mk/bsd.prefs.mk"
208 208
209.if defined(PKGNAME_REQD) 209.if defined(PKGNAME_REQD)
210. if !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*) 210. if !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*)
211_RUBY_VERSION_REQD:= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/} 211_RUBY_VERSION_REQD:= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/}
212RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/} 212RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/}
213. endif 213. endif
214.endif 214.endif
215 215
216# current supported Ruby's version 216# current supported Ruby's version
217RUBY22_VERSION= 2.2.10 217RUBY22_VERSION= 2.2.10
218RUBY24_VERSION= 2.4.9 218RUBY24_VERSION= 2.4.9
219RUBY25_VERSION= 2.5.7 219RUBY25_VERSION= 2.5.7
220RUBY26_VERSION= 2.6.4 220RUBY26_VERSION= 2.6.5
221 221
222# current API compatible version; used for version of shared library 222# current API compatible version; used for version of shared library
223RUBY22_API_VERSION= 2.2.0 223RUBY22_API_VERSION= 2.2.0
224RUBY24_API_VERSION= 2.4.0 224RUBY24_API_VERSION= 2.4.0
225RUBY25_API_VERSION= 2.5.0 225RUBY25_API_VERSION= 2.5.0
226RUBY26_API_VERSION= 2.6.0 226RUBY26_API_VERSION= 2.6.0
227 227
228# 228#
229RUBY_VERSION_DEFAULT?= 24 229RUBY_VERSION_DEFAULT?= 24
230 230
231# supported Ruby's version 231# supported Ruby's version
232RUBY_VERSIONS_SUPPORTED= 24 25 26 22 232RUBY_VERSIONS_SUPPORTED= 24 25 26 22
233 233
cvs diff -r1.1 -r1.2 pkgsrc/lang/ruby26/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby26/Attic/Makefile 2019/02/03 13:42:36 1.1
+++ pkgsrc/lang/ruby26/Attic/Makefile 2019/10/02 13:44:34 1.2
@@ -1,26 +1,25 @@ @@ -1,26 +1,25 @@
1# $NetBSD: Makefile,v 1.1 2019/02/03 13:42:36 taca Exp $ 1# $NetBSD: Makefile,v 1.2 2019/10/02 13:44:34 taca Exp $
2# 2#
3 3
4DISTNAME= # empty 4DISTNAME= # empty
5PKGNAME= ${RUBY_PKGPREFIX}-${RUBY_VERSION} 5PKGNAME= ${RUBY_PKGPREFIX}-${RUBY_VERSION}
6CATEGORIES= lang ruby 6CATEGORIES= lang ruby
7MASTER_SITES= # empty 7MASTER_SITES= # empty
8DISTFILES= # empty 8DISTFILES= # empty
9 9
10MAINTAINER= taca@NetBSD.org 10MAINTAINER= taca@NetBSD.org
11HOMEPAGE= http://www.ruby-lang.org/en/ 11HOMEPAGE= http://www.ruby-lang.org/en/
12COMMENT= Ruby programming language ${RUBY_VERSION} meta package 12COMMENT= Ruby programming language ${RUBY_VERSION} meta package
13LICENSE= 2-clause-bsd OR ruby-license 
14 13
15META_PACKAGE= yes 14META_PACKAGE= yes
16 15
17DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} 16DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
18DEPENDS+= ${RUBY_NAME}-gdbm>=${RUBY_VERSION}:../../databases/ruby-gdbm 17DEPENDS+= ${RUBY_NAME}-gdbm>=${RUBY_VERSION}:../../databases/ruby-gdbm
19DEPENDS+= ${RUBY_NAME}-fiddle>=${RUBY_VERSION}:../../devel/ruby-fiddle 18DEPENDS+= ${RUBY_NAME}-fiddle>=${RUBY_VERSION}:../../devel/ruby-fiddle
20DEPENDS+= ${RUBY_NAME}-readline>=${RUBY_VERSION}:../../devel/ruby-readline 19DEPENDS+= ${RUBY_NAME}-readline>=${RUBY_VERSION}:../../devel/ruby-readline
21 20
22RUBY_VERSIONS_ACCEPTED= 26 21RUBY_VERSIONS_ACCEPTED= 26
23 22
24.include "../../lang/ruby/rubyversion.mk" 23.include "../../lang/ruby/rubyversion.mk"
25.include "../../lang/ruby/Makefile.common" 24.include "../../lang/ruby/Makefile.common"
26.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/lang/ruby26-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby26-base/Attic/Makefile 2019/03/16 14:39:35 1.3
+++ pkgsrc/lang/ruby26-base/Attic/Makefile 2019/10/02 13:44:34 1.4
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1# $NetBSD: Makefile,v 1.3 2019/03/16 14:39:35 taca Exp $ 1# $NetBSD: Makefile,v 1.4 2019/10/02 13:44:34 taca Exp $
2 2
3DISTNAME= ${RUBY_DISTNAME} 3DISTNAME= ${RUBY_DISTNAME}
4PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} 4PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
5CATEGORIES= lang ruby 5CATEGORIES= lang ruby
6MASTER_SITES= ${MASTER_SITE_RUBY} 6MASTER_SITES= ${MASTER_SITE_RUBY}
7 7
8MAINTAINER= taca@NetBSD.org 8MAINTAINER= taca@NetBSD.org
9HOMEPAGE= ${RUBY_HOMEPAGE} 9HOMEPAGE= ${RUBY_HOMEPAGE}
10COMMENT= Ruby ${RUBY_VERSION} release minimum base package 10COMMENT= Ruby ${RUBY_VERSION} release minimum base package
11 11
12RUBY_VERSIONS_ACCEPTED= 26 12RUBY_VERSIONS_ACCEPTED= 26
13 13
14MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
15USE_GCC_RUNTIME= yes 15USE_GCC_RUNTIME= yes
16USE_LANGUAGES= c 
17USE_TOOLS+= pax yacc pkg-config 16USE_TOOLS+= pax yacc pkg-config
18GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
19TEST_TARGET= test 18TEST_TARGET= test
20CONFIGURE_ARGS+= --enable-shared --enable-install-static-library 19CONFIGURE_ARGS+= --enable-shared --enable-install-static-library
21WRKSRC= ${RUBY_WRKSRC} 20WRKSRC= ${RUBY_WRKSRC}
22 21
23.include "../../lang/ruby/platform.mk" 22.include "../../lang/ruby/platform.mk"
24 23
25.if !empty(RUBY_SUFFIX) 24.if !empty(RUBY_SUFFIX)
26CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX} 25CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX}
27CONFIGURE_ARGS+= --with-soname=${RUBY_NAME} 26CONFIGURE_ARGS+= --with-soname=${RUBY_NAME}
28CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VER_DIR} 27CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VER_DIR}
29CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc" 28CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc"
cvs diff -r1.6 -r1.7 pkgsrc/lang/ruby26-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby26-base/Attic/distinfo 2019/08/28 14:23:21 1.6
+++ pkgsrc/lang/ruby26-base/Attic/distinfo 2019/10/02 13:44:34 1.7
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.6 2019/08/28 14:23:21 taca Exp $ 1$NetBSD: distinfo,v 1.7 2019/10/02 13:44:34 taca Exp $
2 2
3SHA1 (ruby-2.6.4.tar.xz) = 6ef7d60b8aaa5efb04de2eb4b682f91bc0ab3910 3SHA1 (ruby-2.6.5.tar.xz) = 575d3f68cbfa753fb07b538824711214f859b9c0
4RMD160 (ruby-2.6.4.tar.xz) = f943d3c0c3137b163729c505233a802392837100 4RMD160 (ruby-2.6.5.tar.xz) = b63ae6256356873c5395d81b9cda58134e8d5dc5
5SHA512 (ruby-2.6.4.tar.xz) = 930a4162fdb008d2446247908c14269fd13db4dc80bd2bb201a65a69c03f5933f97b4c5079ccd2a12db4934ff97b2debaa10a6c6f5c3060e55873f4397747eaa 5SHA512 (ruby-2.6.5.tar.xz) = e8ae3b5d4d23a93d0ef6057235ad0e573665a8b4b6544e1c70b4cce9c4d2fb9094e5c8fe8a9ab7b9996efe3ada603f9b4ef1fd08fb5a83253c1ae2b5e3f202db
6Size (ruby-2.6.4.tar.xz) = 11727940 bytes 6Size (ruby-2.6.5.tar.xz) = 11553580 bytes
7SHA1 (patch-configure) = d66204877531fe147361adf843819c3db6d40919 7SHA1 (patch-configure) = d66204877531fe147361adf843819c3db6d40919
8SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b 8SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
9SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e 9SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e
10SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a 10SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a
11SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198 11SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198
12SHA1 (patch-lib_rubygems.rb) = b38f58a852e920bed77a4be281d3703d26515ad0 12SHA1 (patch-lib_rubygems.rb) = b38f58a852e920bed77a4be281d3703d26515ad0
13SHA1 (patch-lib_rubygems_commands_build__command.rb) = be967c5335c7ce6b4e6466f93b4ef2e423fe9058 13SHA1 (patch-lib_rubygems_commands_build__command.rb) = be967c5335c7ce6b4e6466f93b4ef2e423fe9058
14SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 181bb7554d760182588b0e1b0aafb84c317f41ad 14SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 181bb7554d760182588b0e1b0aafb84c317f41ad
15SHA1 (patch-lib_rubygems_defaults.rb) = 79cc5bb308d5ad4ee88f4fbcbb6f40663c05c05d 15SHA1 (patch-lib_rubygems_defaults.rb) = 79cc5bb308d5ad4ee88f4fbcbb6f40663c05c05d
16SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76 16SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76
17SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3 17SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3
18SHA1 (patch-lib_rubygems_installer.rb) = bce2fe5bcc88ba15352c1e3017bdf97e19d0cbfa 18SHA1 (patch-lib_rubygems_installer.rb) = bce2fe5bcc88ba15352c1e3017bdf97e19d0cbfa
19SHA1 (patch-lib_rubygems_platform.rb) = 8608f9e29728101789a990d73b4a6780054dd278 19SHA1 (patch-lib_rubygems_platform.rb) = 8608f9e29728101789a990d73b4a6780054dd278