pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2021Q1]: pkgsrc/lang Pullup ticket #6445 - requested by taca
details: https://anonhg.NetBSD.org/pkgsrc/rev/e6fdcf869835
branches: pkgsrc-2021Q1
changeset: 450366:e6fdcf869835
user: bsiegert <bsiegert%pkgsrc.org@localhost>
date: Thu Apr 15 07:53:24 2021 +0000
description:
Pullup ticket #6445 - requested by taca
lang/ruby30-base: security fix
Revisions pulled up:
- lang/ruby/Makefile 1.69
- lang/ruby/rubyversion.mk 1.230
- lang/ruby30-base/ALTERNATIVES 1.2
- lang/ruby30-base/Makefile 1.2
- lang/ruby30-base/PLIST 1.2
- lang/ruby30-base/distinfo 1.2
---
Module Name: pkgsrc
Committed By: taca
Date: Sun Apr 11 12:36:28 UTC 2021
Modified Files:
pkgsrc/lang/ruby: rubyversion.mk
pkgsrc/lang/ruby30-base: ALTERNATIVES Makefile PLIST distinfo
Log Message:
lang/ruby30-base: update to 3.0.1
Ruby 3.0.1 Released (2021-04-05)
Ruby 3.0.1 has been released.
This release includes security fixes. Please check the topics below
for details.
* CVE-2021-28965: XML round-trip vulnerability in REXML
* CVE-2021-28966: Path traversal in Tempfile on Windows
See the commit logs for details.
---
Module Name: pkgsrc
Committed By: taca
Date: Sun Apr 11 12:43:17 UTC 2021
Modified Files:
pkgsrc/lang/ruby: Makefile
Log Message:
lang/ruby: reset PKGREVISION
Reset PKGREVISION with updates of all ruby{26,27,30}.
diffstat:
lang/ruby/Makefile | 3 +-
lang/ruby/rubyversion.mk | 16 ++++----
lang/ruby30-base/ALTERNATIVES | 3 +
lang/ruby30-base/Makefile | 21 ++++++----
lang/ruby30-base/PLIST | 83 +++++++++++++++++++++++++-----------------
lang/ruby30-base/distinfo | 10 ++--
6 files changed, 79 insertions(+), 57 deletions(-)
diffs (truncated from 348 to 300 lines):
diff -r 7352e3602555 -r e6fdcf869835 lang/ruby/Makefile
--- a/lang/ruby/Makefile Thu Apr 15 07:38:17 2021 +0000
+++ b/lang/ruby/Makefile Thu Apr 15 07:53:24 2021 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2021/02/14 14:41:18 taca Exp $
+# $NetBSD: Makefile,v 1.67.2.1 2021/04/15 07:53:24 bsiegert Exp $
DISTNAME= # empty
PKGNAME= ruby-${RUBY_VERSION}
-PKGREVISION= 1
CATEGORIES= lang ruby
MASTER_SITES= # empty
DISTFILES= # empty
diff -r 7352e3602555 -r e6fdcf869835 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk Thu Apr 15 07:38:17 2021 +0000
+++ b/lang/ruby/rubyversion.mk Thu Apr 15 07:53:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.225.2.3 2021/04/15 07:38:17 bsiegert Exp $
+# $NetBSD: rubyversion.mk,v 1.225.2.4 2021/04/15 07:53:24 bsiegert Exp $
#
# This file determines which Ruby version is used as a dependency for
@@ -216,7 +216,7 @@
RUBY25_VERSION= 2.5.9
RUBY26_VERSION= 2.6.7
RUBY27_VERSION= 2.7.3
-RUBY30_VERSION= 3.0.0
+RUBY30_VERSION= 3.0.1
# current API compatible version; used for version of shared library
RUBY25_API_VERSION= 2.5.0
@@ -409,11 +409,11 @@
RUBY_MINITEST_VERSION= 5.14.2
RUBY_POWER_ASSERT_VERSION= 1.2.0
RUBY_RAKE_VERSION= 13.0.3
-RUBY_RBS_VERSION= 1.0.0
-RUBY_REXML_VERSION= 3.2.4
+RUBY_RBS_VERSION= 1.0.4
+RUBY_REXML_VERSION= 3.2.5
RUBY_RSS_VERSION= 0.2.9
RUBY_TEST_UNIT_VERSION= 3.3.7
-RUBY_TYPEPROF_VERSION= 0.11.0
+RUBY_TYPEPROF_VERSION= 0.12.0
# bundled extensions
RUBY_BIGDECIMAL_VERSION= 3.0.0
@@ -423,7 +423,7 @@
RUBY_ETC_VERSION= 1.2.0
RUBY_FCNTL_VERSION= 1.0.0
RUBY_FIDDLE_VERSION= 1.0.4
-RUBY_IO_CONSOLE_VERSION= 0.5.6
+RUBY_IO_CONSOLE_VERSION= 0.5.7
RUBY_JSON_VERSION= 2.5.1
RUBY_OPENSSL_VERSION= 2.2.0
RUBY_PSYCH_VERSION= 3.3.0
@@ -433,7 +433,7 @@
RUBY_ZLIB_VERSION= 1.1.0
# bundled libraries
-RUBY_BUNDLER_VERSION= 2.2.3
+RUBY_BUNDLER_VERSION= 2.2.15
RUBY_CSV_VERSION= 3.1.9
RUBY_DID_YOU_MEAN_VERSION= 1.5.0
RUBY_FILEUTILS_VERSION= 1.5.0
@@ -441,7 +441,7 @@
RUBY_GETOPTLONG_VERSION= 0.1.1
RUBY_IPADDR_VERSION= 1.2.2
RUBY_ERB_VERSION= 2.2.0
-RUBY_IRB_VERSION= 1.3.0
+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
diff -r 7352e3602555 -r e6fdcf869835 lang/ruby30-base/ALTERNATIVES
--- a/lang/ruby30-base/ALTERNATIVES Thu Apr 15 07:38:17 2021 +0000
+++ b/lang/ruby30-base/ALTERNATIVES Thu Apr 15 07:53:24 2021 +0000
@@ -10,3 +10,6 @@
bin/ri @PREFIX@/bin/ri@RUBY_SUFFIX@
bin/ruby @PREFIX@/bin/@RUBY_NAME@
bin/typeprof @PREFIX@/bin/typeprof@RUBY_SUFFIX@
+man/man1/erb.1 @PREFIX@/man/man1/erb@RUBY_SUFFIX@.1
+man/man1/irb.1 @PREFIX@/man/man1/irb@RUBY_SUFFIX@.1
+man/man1/ruby.1 @PREFIX@/man/man1/ruby@RUBY_SUFFIX@.1
diff -r 7352e3602555 -r e6fdcf869835 lang/ruby30-base/Makefile
--- a/lang/ruby30-base/Makefile Thu Apr 15 07:38:17 2021 +0000
+++ b/lang/ruby30-base/Makefile Thu Apr 15 07:53:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/02/14 14:32:41 taca Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2021/04/15 07:53:24 bsiegert Exp $
DISTNAME= ${RUBY_DISTNAME}
PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
@@ -91,7 +91,7 @@
crlstore.rb echo_cli.rb echo_svr.rb gen_csr.rb \
smime_read.rb smime_write.rb wget.rb
-REPLACE_RUBY= \
+REPLACE_RUBY= \
libexec/bundle libexec/bundler libexec/erb libexec/irb \
libexec/racc libexec/rdoc libexec/ri \
.bundle/gems/power_assert-${RUBY_POWER_ASSERT_VERSION}/bin/console \
@@ -103,16 +103,19 @@
.bundle/gems/rake-${RUBY_RAKE_VERSION}/exe/rake \
.bundle/gems/rbs-${RUBY_RBS_VERSION}/exe/rbs \
.bundle/gems/typeprof-${RUBY_TYPEPROF_VERSION}/exe/typeprof
-REPLACE_SH= \
+REPLACE_SH= \
.bundle/gems/rake-${RUBY_RAKE_VERSION}/bin/setup
REPLACE_RUBY_DIRS= ext lib sample
INSTALLATION_DIRS+= bin libexec ${PKGMANDIR}/man1 \
- ${RUBY_DOC}/csv/arguments ${RUBY_DOC}/csv/options/common \
- ${RUBY_DOC}/csv/options/generating \
- ${RUBY_DOC}/csv/options/parsing ${RUBY_DOC}/csv/recipes \
- ${RUBY_DOC}/images ${RUBY_DOC}/irb ${RUBY_DOC}/pty \
- ${RUBY_DOC}/ripper ${RUBY_DOC}/stringio ${RUBY_DOC}/syntax \
- ${RUBY_EG}/bigdecimal ${RUBY_EG}/pty
+ ${RUBY_DOC}/csv/arguments \
+ ${RUBY_DOC}/csv/options/common \
+ ${RUBY_DOC}/csv/options/generating \
+ ${RUBY_DOC}/csv/options/parsing \
+ ${RUBY_DOC}/csv/recipes \
+ ${RUBY_DOC}/images ${RUBY_DOC}/irb ${RUBY_DOC}/pty \
+ ${RUBY_DOC}/ripper \
+ ${RUBY_DOC}/stringio ${RUBY_DOC}/syntax \
+ ${RUBY_EG}/bigdecimal ${RUBY_EG}/pty
# ${RUBY_ARCHINC} ${RUBY_ARCHLIB}
EMPTY_DIRS= generator/template markup/simple_markup
diff -r 7352e3602555 -r e6fdcf869835 lang/ruby30-base/PLIST
--- a/lang/ruby30-base/PLIST Thu Apr 15 07:38:17 2021 +0000
+++ b/lang/ruby30-base/PLIST Thu Apr 15 07:53:24 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/02/14 14:32:41 taca Exp $
+@comment $NetBSD: PLIST,v 1.1.2.1 2021/04/15 07:53:24 bsiegert Exp $
bin/bundle${RUBY_SUFFIX}
bin/bundler${RUBY_SUFFIX}
bin/erb${RUBY_SUFFIX}
@@ -282,30 +282,55 @@
${RUBY_LIB}/bundler/lazy_specification.rb
${RUBY_LIB}/bundler/lockfile_generator.rb
${RUBY_LIB}/bundler/lockfile_parser.rb
+${RUBY_LIB}/bundler/man/bundle-add.1
${RUBY_LIB}/bundler/man/bundle-add.1.ronn
+${RUBY_LIB}/bundler/man/bundle-binstubs.1
${RUBY_LIB}/bundler/man/bundle-binstubs.1.ronn
+${RUBY_LIB}/bundler/man/bundle-cache.1
${RUBY_LIB}/bundler/man/bundle-cache.1.ronn
+${RUBY_LIB}/bundler/man/bundle-check.1
${RUBY_LIB}/bundler/man/bundle-check.1.ronn
+${RUBY_LIB}/bundler/man/bundle-clean.1
${RUBY_LIB}/bundler/man/bundle-clean.1.ronn
+${RUBY_LIB}/bundler/man/bundle-config.1
${RUBY_LIB}/bundler/man/bundle-config.1.ronn
+${RUBY_LIB}/bundler/man/bundle-doctor.1
${RUBY_LIB}/bundler/man/bundle-doctor.1.ronn
+${RUBY_LIB}/bundler/man/bundle-exec.1
${RUBY_LIB}/bundler/man/bundle-exec.1.ronn
+${RUBY_LIB}/bundler/man/bundle-gem.1
${RUBY_LIB}/bundler/man/bundle-gem.1.ronn
+${RUBY_LIB}/bundler/man/bundle-info.1
${RUBY_LIB}/bundler/man/bundle-info.1.ronn
+${RUBY_LIB}/bundler/man/bundle-init.1
${RUBY_LIB}/bundler/man/bundle-init.1.ronn
+${RUBY_LIB}/bundler/man/bundle-inject.1
${RUBY_LIB}/bundler/man/bundle-inject.1.ronn
+${RUBY_LIB}/bundler/man/bundle-install.1
${RUBY_LIB}/bundler/man/bundle-install.1.ronn
+${RUBY_LIB}/bundler/man/bundle-list.1
${RUBY_LIB}/bundler/man/bundle-list.1.ronn
+${RUBY_LIB}/bundler/man/bundle-lock.1
${RUBY_LIB}/bundler/man/bundle-lock.1.ronn
+${RUBY_LIB}/bundler/man/bundle-open.1
${RUBY_LIB}/bundler/man/bundle-open.1.ronn
+${RUBY_LIB}/bundler/man/bundle-outdated.1
${RUBY_LIB}/bundler/man/bundle-outdated.1.ronn
+${RUBY_LIB}/bundler/man/bundle-platform.1
${RUBY_LIB}/bundler/man/bundle-platform.1.ronn
+${RUBY_LIB}/bundler/man/bundle-pristine.1
${RUBY_LIB}/bundler/man/bundle-pristine.1.ronn
+${RUBY_LIB}/bundler/man/bundle-remove.1
${RUBY_LIB}/bundler/man/bundle-remove.1.ronn
+${RUBY_LIB}/bundler/man/bundle-show.1
${RUBY_LIB}/bundler/man/bundle-show.1.ronn
+${RUBY_LIB}/bundler/man/bundle-update.1
${RUBY_LIB}/bundler/man/bundle-update.1.ronn
+${RUBY_LIB}/bundler/man/bundle-viz.1
${RUBY_LIB}/bundler/man/bundle-viz.1.ronn
+${RUBY_LIB}/bundler/man/bundle.1
${RUBY_LIB}/bundler/man/bundle.1.ronn
+${RUBY_LIB}/bundler/man/gemfile.5
${RUBY_LIB}/bundler/man/gemfile.5.ronn
${RUBY_LIB}/bundler/match_platform.rb
${RUBY_LIB}/bundler/mirror.rb
@@ -353,6 +378,7 @@
${RUBY_LIB}/bundler/templates/Executable.standalone
${RUBY_LIB}/bundler/templates/Gemfile
${RUBY_LIB}/bundler/templates/gems.rb
+${RUBY_LIB}/bundler/templates/newgem/CHANGELOG.md.tt
${RUBY_LIB}/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt
${RUBY_LIB}/bundler/templates/newgem/Gemfile.tt
${RUBY_LIB}/bundler/templates/newgem/LICENSE.txt.tt
@@ -541,11 +567,15 @@
${RUBY_LIB}/irb/cmd/help.rb
${RUBY_LIB}/irb/cmd/info.rb
${RUBY_LIB}/irb/cmd/load.rb
+${RUBY_LIB}/irb/cmd/ls.rb
${RUBY_LIB}/irb/cmd/measure.rb
${RUBY_LIB}/irb/cmd/nop.rb
${RUBY_LIB}/irb/cmd/pushws.rb
+${RUBY_LIB}/irb/cmd/show_source.rb
${RUBY_LIB}/irb/cmd/subirb.rb
+${RUBY_LIB}/irb/cmd/whereami.rb
${RUBY_LIB}/irb/color.rb
+${RUBY_LIB}/irb/color_printer.rb
${RUBY_LIB}/irb/completion.rb
${RUBY_LIB}/irb/context.rb
${RUBY_LIB}/irb/easter-egg.rb
@@ -959,6 +989,7 @@
${RUBY_LIB}/rubygems/core_ext/kernel_gem.rb
${RUBY_LIB}/rubygems/core_ext/kernel_require.rb
${RUBY_LIB}/rubygems/core_ext/kernel_warn.rb
+${RUBY_LIB}/rubygems/core_ext/tcpsocket_init.rb
${RUBY_LIB}/rubygems/defaults.rb
${RUBY_LIB}/rubygems/dependency.rb
${RUBY_LIB}/rubygems/dependency_installer.rb
@@ -1393,7 +1424,6 @@
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/core/comparable.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/core/complex.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/core/constants.rbs
-${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/core/data.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/core/deprecated.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/core/dir.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/core/encoding.rbs
@@ -1549,6 +1579,7 @@
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/dbm/0/dbm.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/erb/0/erb.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/fiber/0/fiber.rbs
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/fileutils/0/fileutils.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/find/0/find.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/forwardable/0/forwardable.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/ipaddr/0/ipaddr.rbs
@@ -1561,6 +1592,7 @@
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/monitor/0/monitor.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/mutex_m/0/mutex_m.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/pathname/0/pathname.rbs
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/prettyprint/0/prettyprint.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/prime/0/integer-extension.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/prime/0/prime.rbs
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/stdlib/pstore/0/pstore.rbs
@@ -1589,12 +1621,22 @@
${GEM_HOME}/gems/rbs-${RUBY_RBS_VERSION}/steep/Gemfile.lock
${GEM_HOME}/gems/rdoc-${RUBY_RDOC_VERSION}/exe/rdoc
${GEM_HOME}/gems/rdoc-${RUBY_RDOC_VERSION}/exe/ri
-${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/.travis.yml
-${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/Gemfile
${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/LICENSE.txt
${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/NEWS.md
${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/README.md
-${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/Rakefile
+${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/doc/rexml/context.rdoc
+${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/doc/rexml/tasks/rdoc/child.rdoc
+${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/doc/rexml/tasks/rdoc/document.rdoc
+${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/doc/rexml/tasks/rdoc/element.rdoc
+${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/doc/rexml/tasks/rdoc/node.rdoc
+${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/doc/rexml/tasks/rdoc/parent.rdoc
+${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/doc/rexml/tasks/tocs/child_toc.rdoc
+${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/doc/rexml/tasks/tocs/document_toc.rdoc
+${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/doc/rexml/tasks/tocs/element_toc.rdoc
+${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/doc/rexml/tasks/tocs/master_toc.rdoc
+${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/doc/rexml/tasks/tocs/node_toc.rdoc
+${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/doc/rexml/tasks/tocs/parent_toc.rdoc
+${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/lib/rexml.rb
${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/lib/rexml/attlistdecl.rb
${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/lib/rexml/attribute.rb
${GEM_HOME}/gems/rexml-${RUBY_REXML_VERSION}/lib/rexml/cdata.rb
@@ -2235,7 +2277,7 @@
${GEM_HOME}/specifications/default/racc-${RUBY_RACC_VERSION}.gemspec
${GEM_HOME}/specifications/default/rdoc-${RUBY_RDOC_VERSION}.gemspec
${GEM_HOME}/specifications/default/readline-0.0.2.gemspec
-${GEM_HOME}/specifications/default/reline-0.2.0.gemspec
+${GEM_HOME}/specifications/default/reline-0.2.5.gemspec
${GEM_HOME}/specifications/default/resolv-0.2.0.gemspec
${GEM_HOME}/specifications/default/resolv-replace-0.1.0.gemspec
${GEM_HOME}/specifications/default/rinda-0.1.0.gemspec
@@ -2249,7 +2291,7 @@
${GEM_HOME}/specifications/default/tempfile-0.1.1.gemspec
${GEM_HOME}/specifications/default/time-0.1.0.gemspec
${GEM_HOME}/specifications/default/timeout-0.1.1.gemspec
-${GEM_HOME}/specifications/default/tmpdir-0.1.1.gemspec
+${GEM_HOME}/specifications/default/tmpdir-0.1.2.gemspec
${GEM_HOME}/specifications/default/tracer-${RUBY_TRACER_VERSION}.gemspec
${GEM_HOME}/specifications/default/tsort-0.1.0.gemspec
${GEM_HOME}/specifications/default/un-0.1.0.gemspec
@@ -2265,35 +2307,10 @@
${GEM_HOME}/specifications/rss-${RUBY_RSS_VERSION}.gemspec
${GEM_HOME}/specifications/test-unit-${RUBY_TEST_UNIT_VERSION}.gemspec
${GEM_HOME}/specifications/typeprof-${RUBY_TYPEPROF_VERSION}.gemspec
-man/man1/bundle-add${RUBY_SUFFIX}.1
-man/man1/bundle-binstubs${RUBY_SUFFIX}.1
-man/man1/bundle-cache${RUBY_SUFFIX}.1
Home |
Main Index |
Thread Index |
Old Index