CVS commit: [pkgsrc-2021Q2] pkgsrc/lang

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Jul 12 12:40:18 UTC 2021

Modified Files:
        pkgsrc/lang/ruby [pkgsrc-2021Q2]: rubyversion.mk
        pkgsrc/lang/ruby26-base [pkgsrc-2021Q2]: distinfo

Log Message:
Pullup ticket #6483 - requested by taca
lang/ruby26: security fix

Revisions pulled up:
- lang/ruby/rubyversion.mk                                      1.232
- lang/ruby26-base/distinfo                                     1.11

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Wed Jul  7 15:15:19 UTC 2021

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

   Log Message:
   lang/ruby26-base: update to 2.6.8

   Ruby 2.6.8 has been released.

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

   * CVE-2021-31810: Trusting FTP PASV responses vulnerability in Net::FTP
   * CVE-2021-32066: A StartTLS stripping vulnerability in Net::IMAP
   * CVE-2021-31799: A command injection vulnerability in RDoc

   We ordinally do not fix Ruby 2.6 except security fixes, but this
   release also includes some regressed bugs and build problem fixes.
   See the commit logs for details.

   Ruby 2.6 is now under the state of the security maintenance phase,
   until the end of March of 2022.  After that date, maintenance of Ruby
   2.6 will be ended.  We recommend you start planning the migration to
   newer versions of Ruby, such as 3.0 or 2.7.


To generate a diff of this commit:
cvs rdiff -u -r1.231 -r1.231.2.1 pkgsrc/lang/ruby/rubyversion.mk
cvs rdiff -u -r1.10 -r1.10.2.1 pkgsrc/lang/ruby26-base/distinfo

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.231 pkgsrc/lang/ruby/rubyversion.mk:1.231.2.1
--- pkgsrc/lang/ruby/rubyversion.mk:1.231       Mon Apr 12 14:39:28 2021
+++ pkgsrc/lang/ruby/rubyversion.mk     Mon Jul 12 12:40:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.231 2021/04/12 14:39:28 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.231.2.1 2021/07/12 12:40:18 bsiegert Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -213,7 +213,7 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/rub
 .endif
 
 # current supported Ruby's version
-RUBY26_VERSION=                2.6.7
+RUBY26_VERSION=                2.6.8
 RUBY27_VERSION=                2.7.3
 RUBY30_VERSION=                3.0.1
 
@@ -271,7 +271,7 @@ RUBY_SUFFIX?=       ${_RUBY_VER_MAJOR}${_RUBY_
 RUBY_VERSION=          ${RUBY26_VERSION}
 RUBY_ABI_VERSION=      ${RUBY_VERSION}
 
-RUBY_RDOC_VERSION=     6.1.2
+RUBY_RDOC_VERSION=     6.1.2.1
 
 RUBY_DID_YOU_MEAN_VERSION=     1.3.0
 RUBY_IRB_VERSION=              1.0.0

Index: pkgsrc/lang/ruby26-base/distinfo
diff -u pkgsrc/lang/ruby26-base/distinfo:1.10 pkgsrc/lang/ruby26-base/distinfo:1.10.2.1
--- pkgsrc/lang/ruby26-base/distinfo:1.10       Sun Apr 11 12:28:37 2021
+++ pkgsrc/lang/ruby26-base/distinfo    Mon Jul 12 12:40:18 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2021/04/11 12:28:37 taca Exp $
+$NetBSD: distinfo,v 1.10.2.1 2021/07/12 12:40:18 bsiegert Exp $
 
-SHA1 (ruby-2.6.7.tar.xz) = 1fd1448125a00cd7b9994637b5e561506de6a6d3
-RMD160 (ruby-2.6.7.tar.xz) = 25d606c0338322e96e61a9e7a5821b1a5e543261
-SHA512 (ruby-2.6.7.tar.xz) = ba6fc0a36af2a08cf1b008851e805f59ea1047724fc7b61d4bc674533b8f123cb12fa0969e9a3f57290477c0d75f974ca7e304836e4905bd96a737211df9bd21
-Size (ruby-2.6.7.tar.xz) = 11591404 bytes
+SHA1 (ruby-2.6.8.tar.xz) = fa5ad518ef31bbf5c3386dbcec7b57196a1e618e
+RMD160 (ruby-2.6.8.tar.xz) = d2604765e5d360efa21f55e6eca90a6e026a52c1
+SHA512 (ruby-2.6.8.tar.xz) = d040ad2238523587d8f356fcb796b8b6ad7f8caff7dd6df09e3f7efcbfa0369e33600e78c7f2bc713ae77c040757cce5c4fec223cb9070209f2bf741899c556d
+Size (ruby-2.6.8.tar.xz) = 11599488 bytes
 SHA1 (patch-configure) = ccfad7b5e35e87308e187e6c5fb3ffea57ad763d
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e