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

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Jul 12 12:54:47 UTC 2021

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

Log Message:
Pullup ticket #6485 - requested by taca
lang/ruby30-base: security fix

Revisions pulled up:
- lang/ruby/rubyversion.mk                                      1.234-1.235
- lang/ruby30-base/PLIST                                        1.3
- lang/ruby30-base/distinfo                                     1.3

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Wed Jul  7 16:10:01 UTC 2021

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

   Log Message:
   lang/ruby30-base: update to 3.0.2

   Ruby 3.0.2 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

   See the commit logs for details:
   <https://github.com/ruby/ruby/compare/v3_0_1...v3_0_2>.

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Wed Jul  7 16:11:57 UTC 2021

   Modified Files:
        pkgsrc/lang/ruby: rubyversion.mk

   Log Message:
   lang/ruby: make sure to update ruby30's version


To generate a diff of this commit:
cvs rdiff -u -r1.231.2.2 -r1.231.2.3 pkgsrc/lang/ruby/rubyversion.mk
cvs rdiff -u -r1.2 -r1.2.2.1 pkgsrc/lang/ruby30-base/PLIST \
    pkgsrc/lang/ruby30-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.2.2 pkgsrc/lang/ruby/rubyversion.mk:1.231.2.3
--- pkgsrc/lang/ruby/rubyversion.mk:1.231.2.2   Mon Jul 12 12:46:55 2021
+++ pkgsrc/lang/ruby/rubyversion.mk     Mon Jul 12 12:54:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.231.2.2 2021/07/12 12:46:55 bsiegert Exp $
+# $NetBSD: rubyversion.mk,v 1.231.2.3 2021/07/12 12:54:46 bsiegert Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -215,7 +215,7 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/rub
 # current supported Ruby's version
 RUBY26_VERSION=                2.6.8
 RUBY27_VERSION=                2.7.4
-RUBY30_VERSION=                3.0.1
+RUBY30_VERSION=                3.0.2
 
 # current API compatible version; used for version of shared library
 RUBY26_API_VERSION=    2.6.0
@@ -377,7 +377,7 @@ RUBY_SUFFIX=        ${_RUBY_VER_MAJOR}${_RUBY_V
 RUBY_VERSION=          ${RUBY30_VERSION}
 RUBY_ABI_VERSION=      ${RUBY_VERSION}
 
-RUBY_RDOC_VERSION=     6.3.0
+RUBY_RDOC_VERSION=     6.3.1
 
 # bundled gems
 RUBY_MINITEST_VERSION=         5.14.2
@@ -407,7 +407,7 @@ RUBY_STRSCAN_VERSION=               3.0.0
 RUBY_ZLIB_VERSION=             1.1.0
 
 # bundled libraries
-RUBY_BUNDLER_VERSION=          2.2.15
+RUBY_BUNDLER_VERSION=          2.2.22
 RUBY_CSV_VERSION=              3.1.9
 RUBY_DID_YOU_MEAN_VERSION=     1.5.0
 RUBY_FILEUTILS_VERSION=                1.5.0
@@ -419,6 +419,7 @@ RUBY_IRB_VERSION=           1.3.5
 RUBY_LOGGER_VERSION=           1.4.3
 RUBY_MATRIX_VERSION=           0.3.1
 RUBY_MUTEX_M_VERSION=          0.1.1
+RUBY_NET_FTP_VERSION=          0.1.2
 RUBY_OSTRUCT_VERSION=          0.3.1
 RUBY_PRIME_VERSION=            0.1.2
 RUBY_TRACER_VERSION=           0.1.1
@@ -657,6 +658,7 @@ PLIST_SUBST+=       \
        RUBY_LOGGER_VERSION=${RUBY_LOGGER_VERSION} \
        RUBY_MATRIX_VERSION=${RUBY_MATRIX_VERSION} \
        RUBY_MUTEX_M_VERSION=${RUBY_MUTEX_M_VERSION} \
+       RUBY_NET_FTP_VERSION=${RUBY_NET_FTP_VERSION} \
        RUBY_OPENSSL_VERSION=${RUBY_OPENSSL_VERSION} \
        RUBY_OSTRUCT_VERSION=${RUBY_OSTRUCT_VERSION} \
        RUBY_PRIME_VERSION=${RUBY_PRIME_VERSION} \

Index: pkgsrc/lang/ruby30-base/PLIST
diff -u pkgsrc/lang/ruby30-base/PLIST:1.2 pkgsrc/lang/ruby30-base/PLIST:1.2.2.1
--- pkgsrc/lang/ruby30-base/PLIST:1.2   Sun Apr 11 12:36:28 2021
+++ pkgsrc/lang/ruby30-base/PLIST       Mon Jul 12 12:54:47 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/04/11 12:36:28 taca Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2021/07/12 12:54:47 bsiegert Exp $
 bin/bundle${RUBY_SUFFIX}
 bin/bundler${RUBY_SUFFIX}
 bin/erb${RUBY_SUFFIX}
@@ -370,7 +370,9 @@ ${RUBY_LIB}/bundler/source/path.rb
 ${RUBY_LIB}/bundler/source/path/installer.rb
 ${RUBY_LIB}/bundler/source/rubygems.rb
 ${RUBY_LIB}/bundler/source/rubygems/remote.rb
+${RUBY_LIB}/bundler/source/rubygems_aggregate.rb
 ${RUBY_LIB}/bundler/source_list.rb
+${RUBY_LIB}/bundler/source_map.rb
 ${RUBY_LIB}/bundler/spec_set.rb
 ${RUBY_LIB}/bundler/stub_specification.rb
 ${RUBY_LIB}/bundler/templates/Executable
@@ -860,6 +862,7 @@ ${RUBY_LIB}/rdoc/markup/pre_process.rb
 ${RUBY_LIB}/rdoc/markup/raw.rb
 ${RUBY_LIB}/rdoc/markup/regexp_handling.rb
 ${RUBY_LIB}/rdoc/markup/rule.rb
+${RUBY_LIB}/rdoc/markup/table.rb
 ${RUBY_LIB}/rdoc/markup/to_ansi.rb
 ${RUBY_LIB}/rdoc/markup/to_bs.rb
 ${RUBY_LIB}/rdoc/markup/to_html.rb
@@ -2255,7 +2258,7 @@ ${GEM_HOME}/specifications/default/json-
 ${GEM_HOME}/specifications/default/logger-${RUBY_LOGGER_VERSION}.gemspec
 ${GEM_HOME}/specifications/default/matrix-${RUBY_MATRIX_VERSION}.gemspec
 ${GEM_HOME}/specifications/default/mutex_m-${RUBY_MUTEX_M_VERSION}.gemspec
-${GEM_HOME}/specifications/default/net-ftp-0.1.1.gemspec
+${GEM_HOME}/specifications/default/net-ftp-${RUBY_NET_FTP_VERSION}.gemspec
 ${GEM_HOME}/specifications/default/net-http-0.1.1.gemspec
 ${GEM_HOME}/specifications/default/net-imap-0.1.1.gemspec
 ${GEM_HOME}/specifications/default/net-pop-0.1.1.gemspec
Index: pkgsrc/lang/ruby30-base/distinfo
diff -u pkgsrc/lang/ruby30-base/distinfo:1.2 pkgsrc/lang/ruby30-base/distinfo:1.2.2.1
--- pkgsrc/lang/ruby30-base/distinfo:1.2        Sun Apr 11 12:36:28 2021
+++ pkgsrc/lang/ruby30-base/distinfo    Mon Jul 12 12:54:47 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2021/04/11 12:36:28 taca Exp $
+$NetBSD: distinfo,v 1.2.2.1 2021/07/12 12:54:47 bsiegert Exp $
 
-SHA1 (ruby-3.0.1.tar.xz) = 3c5443960fe860ff7055bc02a4793140b9fb9b28
-RMD160 (ruby-3.0.1.tar.xz) = 0c5823c25117ddec20f9679a5148914fc5c530bb
-SHA512 (ruby-3.0.1.tar.xz) = 97d2e883656060846b304368d9d836e2f3ef39859c36171c9398a0573818e4ed75bfd7460f901a9553f7f53518c505327a66e74f83704a881469f5ac61fe13d7
-Size (ruby-3.0.1.tar.xz) = 14486780 bytes
+SHA1 (ruby-3.0.2.tar.xz) = cd04711ed3adecbe244c3b4391e67430d11fa9f8
+RMD160 (ruby-3.0.2.tar.xz) = c65c329f89e1b26bb92cd24a83b48bb27f4dc8ff
+SHA512 (ruby-3.0.2.tar.xz) = 0f702e2d8ca1342a9d4284dbdd234a3588e057b92566353aa7c21835cf09a3932864b2acf459a976960a1704e9befa562155d36b98b7cda8bd99526e10a374c4
+Size (ruby-3.0.2.tar.xz) = 14746080 bytes
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
 SHA1 (patch-configure) = a56184876caac5c24b2c2925f364d88c3ebc5662
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b