diff options
author | bsiegert <bsiegert@pkgsrc.org> | 2022-11-30 17:19:02 +0000 |
---|---|---|
committer | bsiegert <bsiegert@pkgsrc.org> | 2022-11-30 17:19:02 +0000 |
commit | 974c9cf9b69234c9cec7b686cc227b360c30d946 (patch) | |
tree | 0c96ffd0a574f26049ef76303e556080320a1732 | |
parent | 53ba7c5cfc64e9b8e417ff23d73271f7435a0cbd (diff) | |
download | pkgsrc-974c9cf9b69234c9cec7b686cc227b360c30d946.tar.gz |
Pullup ticket #6706 - requested by taca
lang/ruby31-base: security fix
Revisions pulled up:
- lang/ruby/rubyversion.mk 1.256
- lang/ruby31-base/Makefile 1.7
- lang/ruby31-base/PLIST 1.3
- lang/ruby31-base/distinfo 1.8
- lang/ruby31-base/patches/patch-configure 1.3
- lang/ruby31-base/patches/patch-lib_rubygems.rb 1.2
- lang/ruby31-base/patches/patch-lib_rubygems_commands_setup__command.rb 1.2
- lang/ruby31-base/patches/patch-lib_rubygems_install__update__options.rb 1.2
- lang/ruby31-base/patches/patch-lib_rubygems_installer.rb 1.2
- lang/ruby31-base/patches/patch-lib_rubygems_platform.rb 1.3
- lang/ruby31-base/patches/patch-test_rubygems_test__gem.rb 1.2
---
Module Name: pkgsrc
Committed By: taca
Date: Sat Nov 26 13:02:49 UTC 2022
Modified Files:
pkgsrc/lang/ruby: rubyversion.mk
pkgsrc/lang/ruby31-base: Makefile PLIST distinfo
pkgsrc/lang/ruby31-base/patches: patch-configure patch-lib_rubygems.rb
patch-lib_rubygems_commands_setup__command.rb
patch-lib_rubygems_install__update__options.rb
patch-lib_rubygems_installer.rb patch-lib_rubygems_platform.rb
patch-test_rubygems_test__gem.rb
Log Message:
lang/ruby31-base: update to 3.1.3
Ruby 3.1.3 Released (2022-11-24)
Ruby 3.1.3 has been released.
This release includes a security fix. Please check the topics below for
details.
* CVE-2021-33621: HTTP response splitting in CGI
This release also includes a fix for build failure with Xcode 14 and macOS
13 (Ventura). See the related ticket for more details.
-rw-r--r-- | lang/ruby/rubyversion.mk | 30 | ||||
-rw-r--r-- | lang/ruby31-base/Makefile | 3 | ||||
-rw-r--r-- | lang/ruby31-base/PLIST | 135 | ||||
-rw-r--r-- | lang/ruby31-base/distinfo | 22 | ||||
-rw-r--r-- | lang/ruby31-base/patches/patch-configure | 98 | ||||
-rw-r--r-- | lang/ruby31-base/patches/patch-lib_rubygems.rb | 26 | ||||
-rw-r--r-- | lang/ruby31-base/patches/patch-lib_rubygems_commands_setup__command.rb | 20 | ||||
-rw-r--r-- | lang/ruby31-base/patches/patch-lib_rubygems_install__update__options.rb | 14 | ||||
-rw-r--r-- | lang/ruby31-base/patches/patch-lib_rubygems_installer.rb | 10 | ||||
-rw-r--r-- | lang/ruby31-base/patches/patch-lib_rubygems_platform.rb | 24 | ||||
-rw-r--r-- | lang/ruby31-base/patches/patch-test_rubygems_test__gem.rb | 16 |
11 files changed, 227 insertions, 171 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index ef0247c2c61..e224fba1f14 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.252 2022/05/17 00:42:33 gutteridge Exp $ +# $NetBSD: rubyversion.mk,v 1.252.4.1 2022/11/30 17:19:02 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/} RUBY26_VERSION= 2.6.10 RUBY27_VERSION= 2.7.6 RUBY30_VERSION= 3.0.4 -RUBY31_VERSION= 3.1.2 +RUBY31_VERSION= 3.1.3 # current API compatible version; used for version of shared library RUBY26_API_VERSION= 2.6.0 @@ -481,16 +481,16 @@ RUBY_ABI_VERSION= ${RUBY_VERSION} RUBY_SUFFIX= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR} # bundled gems -RUBY_RUBYGEMS_VER= 3.3.3 +RUBY_RUBYGEMS_VER= 3.3.26 RUBY_ABBREV_VER= 0.1.0 RUBY_BASE64_VER= 0.1.1 RUBY_BENCHMARK_VER= 0.2.0 RUBY_BIGDECIMAL_VER= 3.1.1 -RUBY_BUNDLER_VER= 2.3.7 -RUBY_CGI_VER= 0.3.1 -RUBY_CSV_VER= 3.2.2 +RUBY_BUNDLER_VER= 2.3.26 +RUBY_CGI_VER= 0.3.5 +RUBY_CSV_VER= 3.2.5 RUBY_DATE_VER= 3.2.2 -RUBY_DEBUG_VER= 1.4.0 +RUBY_DEBUG_VER= 1.6.3 RUBY_DELEGATE_VER= 0.2.0 RUBY_DID_YOU_MEAN_VER= 1.6.1 RUBY_DIGEST_VER= 3.1.0 @@ -516,7 +516,7 @@ RUBY_MATRIX_VER= 0.4.2 RUBY_MINITEST_VER= 5.15.0 RUBY_MUTEX_M_VER= 0.1.1 RUBY_NET_FTP_VER= 0.1.3 -RUBY_NET_HTTP_VER= 0.2.0 +RUBY_NET_HTTP_VER= 0.3.0 RUBY_NET_IMAP_VER= 0.2.3 RUBY_NET_POP_VER= 0.1.1 RUBY_NET_PROTOCOL_VER= 0.1.2 @@ -525,7 +525,7 @@ RUBY_NKF_VER= 0.1.1 RUBY_OBSERVER_VER= 0.1.1 RUBY_OPEN_URI_VER= 0.2.0 RUBY_OPEN3_VER= 0.1.1 -RUBY_OPENSSL_VER= 3.0.0 +RUBY_OPENSSL_VER= 3.0.1 RUBY_OPTPARSE_VER= 0.2.0 RUBY_OSTRUCT_VER= 0.5.2 RUBY_PATHNAME_VER= 0.2.0 @@ -534,20 +534,20 @@ RUBY_PP_VER= 0.3.0 RUBY_PRETTYPRINT_VER= 0.1.1 RUBY_PRIME_VER= 0.1.2 RUBY_PSTORE_VER= 0.1.1 -RUBY_PSYCH_VER= 4.0.3 +RUBY_PSYCH_VER= 4.0.4 RUBY_RACC_VER= 1.6.0 RUBY_RAKE_VER= 13.0.6 -RUBY_RBS_VER= 2.1.0 +RUBY_RBS_VER= 2.7.0 RUBY_RDOC_VER= 6.4.0 RUBY_READLINE_VER= 0.0.3 -RUBY_RELINE_VER= 0.3.0 -RUBY_RESOLV_VER= 0.2.1 +RUBY_RELINE_VER= 0.3.1 RUBY_RESOLV_REPLACE_VER= 0.1.0 +RUBY_RESOLV_VER= 0.2.1 RUBY_REXML_VER= 3.2.5 RUBY_RINDA_VER= 0.1.1 RUBY_RSS_VER= 0.2.9 RUBY_RUBY2_KEYWORDS_VER= 0.0.5 -RUBY_SECURERANDOM_VER= 0.1.1 +RUBY_SECURERANDOM_VER= 0.2.0 RUBY_SET_VER= 1.0.2 RUBY_SHELLWORDS_VER= 0.1.0 RUBY_SINGLETON_VER= 0.1.1 @@ -561,7 +561,7 @@ RUBY_TIMEOUT_VER= 0.2.0 RUBY_TMPDIR_VER= 0.1.2 RUBY_TRACER_VER= 0.1.1 RUBY_TSORT_VER= 0.1.0 -RUBY_TYPEPROF_VER= 0.21.2 +RUBY_TYPEPROF_VER= 0.21.3 RUBY_UN_VER= 0.2.0 RUBY_URI_VER= 0.11.0 RUBY_WEAKREF_VER= 0.1.1 diff --git a/lang/ruby31-base/Makefile b/lang/ruby31-base/Makefile index 7402d8687f6..1e18d5331f0 100644 --- a/lang/ruby31-base/Makefile +++ b/lang/ruby31-base/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2022/07/18 12:48:38 jperkin Exp $ +# $NetBSD: Makefile,v 1.6.2.1 2022/11/30 17:19:02 bsiegert Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} -PKGREVISION= 3 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby31-base/PLIST b/lang/ruby31-base/PLIST index dde59e1fc5a..f763b06e9fc 100644 --- a/lang/ruby31-base/PLIST +++ b/lang/ruby31-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2022/02/20 15:59:09 taca Exp $ +@comment $NetBSD: PLIST,v 1.2.6.1 2022/11/30 17:19:02 bsiegert Exp $ bin/bundle${RUBY_SUFFIX} bin/bundler${RUBY_SUFFIX} bin/erb${RUBY_SUFFIX} @@ -260,7 +260,6 @@ ${RUBY_LIB}/bundler/compact_index_client/updater.rb ${RUBY_LIB}/bundler/constants.rb ${RUBY_LIB}/bundler/current_ruby.rb ${RUBY_LIB}/bundler/definition.rb -${RUBY_LIB}/bundler/dep_proxy.rb ${RUBY_LIB}/bundler/dependency.rb ${RUBY_LIB}/bundler/deployment.rb ${RUBY_LIB}/bundler/deprecate.rb @@ -305,12 +304,16 @@ ${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-console.1 +${RUBY_LIB}/bundler/man/bundle-console.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-help.1 +${RUBY_LIB}/bundler/man/bundle-help.1.ronn ${RUBY_LIB}/bundler/man/bundle-info.1 ${RUBY_LIB}/bundler/man/bundle-info.1.ronn ${RUBY_LIB}/bundler/man/bundle-init.1 @@ -329,6 +332,8 @@ ${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-plugin.1 +${RUBY_LIB}/bundler/man/bundle-plugin.1.ronn ${RUBY_LIB}/bundler/man/bundle-pristine.1 ${RUBY_LIB}/bundler/man/bundle-pristine.1.ronn ${RUBY_LIB}/bundler/man/bundle-remove.1 @@ -337,13 +342,17 @@ ${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-version.1 +${RUBY_LIB}/bundler/man/bundle-version.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_metadata.rb ${RUBY_LIB}/bundler/match_platform.rb +${RUBY_LIB}/bundler/match_remote_metadata.rb ${RUBY_LIB}/bundler/mirror.rb ${RUBY_LIB}/bundler/plugin.rb ${RUBY_LIB}/bundler/plugin/api.rb @@ -358,6 +367,7 @@ ${RUBY_LIB}/bundler/plugin/source_list.rb ${RUBY_LIB}/bundler/process_lock.rb ${RUBY_LIB}/bundler/remote_specification.rb ${RUBY_LIB}/bundler/resolver.rb +${RUBY_LIB}/bundler/resolver/base.rb ${RUBY_LIB}/bundler/resolver/spec_group.rb ${RUBY_LIB}/bundler/retry.rb ${RUBY_LIB}/bundler/ruby_dsl.rb @@ -1035,6 +1045,8 @@ ${RUBY_LIB}/rubygems/exceptions.rb ${RUBY_LIB}/rubygems/ext.rb ${RUBY_LIB}/rubygems/ext/build_error.rb ${RUBY_LIB}/rubygems/ext/builder.rb +${RUBY_LIB}/rubygems/ext/cargo_builder.rb +${RUBY_LIB}/rubygems/ext/cargo_builder/link_flag_converter.rb ${RUBY_LIB}/rubygems/ext/cmake_builder.rb ${RUBY_LIB}/rubygems/ext/configure_builder.rb ${RUBY_LIB}/rubygems/ext/ext_conf_builder.rb @@ -1074,7 +1086,6 @@ ${RUBY_LIB}/rubygems/package/tar_writer.rb ${RUBY_LIB}/rubygems/package_task.rb ${RUBY_LIB}/rubygems/path_support.rb ${RUBY_LIB}/rubygems/platform.rb -${RUBY_LIB}/rubygems/psych_additions.rb ${RUBY_LIB}/rubygems/psych_tree.rb ${RUBY_LIB}/rubygems/query_utils.rb ${RUBY_LIB}/rubygems/rdoc.rb @@ -1339,23 +1350,16 @@ ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/LICENSE.txt ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/README.md ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/Rakefile ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/TODO.md -${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/bin/console -${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/bin/gentest -${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/bin/setup ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/exe/rdbg ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/ext/debug/debug.c -${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/ext/debug/debug.${RUBY_DLEXT} -${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/ext/debug/debug_version.h ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/ext/debug/extconf.rb ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/ext/debug/iseq_collector.c ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug.rb -${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug/bp.vim ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug/breakpoint.rb ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug/client.rb ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug/color.rb ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug/config.rb ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug/console.rb -${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug/debug.${RUBY_DLEXT} ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug/frame_info.rb ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug/local.rb ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug/open.rb @@ -1521,6 +1525,7 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/BSDL ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/CHANGELOG.md ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/COPYING ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/Gemfile +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/Gemfile.lock ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/README.md ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/Rakefile ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/Steepfile @@ -1571,9 +1576,27 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/random.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/range.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rational.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rb_config.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rbs/unnamed/argf.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rbs/unnamed/env_class.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rbs/unnamed/random.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/refinement.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/regexp.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/ruby_vm.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/basic_specification.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/config_file.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/dependency_installer.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/errors.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/installer.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/path_support.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/platform.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/request_set.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/requirement.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/rubygems.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/source_list.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/specification.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/stream_ui.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/uninstaller.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rubygems/version.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/signal.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/string.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/string_io.rbs @@ -1609,7 +1632,6 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/parser.h ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/parserstate.c ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/parserstate.h ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/rbs_extension.h -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/rbs_extension.${RUBY_DLEXT} ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/ruby_objs.c ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/ruby_objs.h ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/unescape.c @@ -1628,7 +1650,6 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/ast/members.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/ast/type_param.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/buffer.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/builtin_names.rb -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/char_scanner.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/cli.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/collection.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/collection/cleaner.rb @@ -1636,6 +1657,7 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/collection/config.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/collection/config/lockfile_generator.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/collection/installer.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/collection/sources.rb +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/collection/sources/base.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/collection/sources/git.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/collection/sources/rubygems.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/collection/sources/stdlib.rb @@ -1664,6 +1686,9 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/prototype/rb.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/prototype/rbi.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/prototype/runtime.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/repository.rb +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/resolver/constant_resolver.rb +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/resolver/type_name_resolver.rb +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/sorter.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/substitution.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/test.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/test/errors.rb @@ -1684,7 +1709,8 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/variance_calculator.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/vendorer.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/version.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/writer.rb -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs_extension.${RUBY_DLEXT} +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rdoc/discover.rb +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rdoc_plugin/parser.rb ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/schema/annotation.json ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/schema/comment.json ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/schema/decls.json @@ -1703,7 +1729,6 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/annotate/rdoc_source.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/annotation.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/buffer.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/builtin_names.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/char_scanner.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/cli.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/collection.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/collection/cleaner.rbs @@ -1720,16 +1745,30 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/environment.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/environment_loader.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/environment_walker.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/errors.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/factory.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/location.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/locator.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/manifest.yaml ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/members.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/method_builder.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/method_types.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/namespace.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/parser.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/polyfill.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/prototype/helpers.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/prototype/rb.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/prototype/rbi.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/rbs.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/rdoc/rbs.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/repository.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/resolver/constant_resolver.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/resolver/context.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/resolver/type_name_resolver.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/shims.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/shims/abstract_syntax_tree.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/shims/enumerable.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/shims/pp.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/shims/ripper.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/sorter.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/substitution.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/type_alias_dependency.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/type_alias_regularity.rbs @@ -1751,15 +1790,18 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/bigdecimal-math/0/big_math.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/bigdecimal-math/0/manifest.yaml ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/bigdecimal/0/big_decimal.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/cgi/0/core.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/cgi/0/manifest.yaml ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/coverage/0/coverage.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/csv/0/csv.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/csv/0/manifest.yaml ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/date/0/date.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/date/0/date_time.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/date/0/time.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/dbm/0/dbm.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/did_you_mean/0/did_you_mean.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/digest/0/digest.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/erb/0/erb.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/fiber/0/fiber.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/etc/0/etc.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/fileutils/0/fileutils.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/find/0/find.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/forwardable/0/forwardable.rbs @@ -1772,6 +1814,42 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/logger/0/logger.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/logger/0/manifest.yaml ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/logger/0/period.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/logger/0/severity.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/kernel.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/manifest.yaml +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/abstract_reporter.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/assertion.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/assertions.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/backtrace_filter.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/bench_spec.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/benchmark.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/composite_reporter.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/expectation.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/expectations.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/guard.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/mock.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/parallel.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/parallel/executor.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/parallel/test.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/parallel/test/class_methods.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/pride_io.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/pride_lol.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/progress_reporter.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/reportable.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/reporter.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/result.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/runnable.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/skip.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/spec.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/spec/dsl.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/spec/dsl/instance_methods.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/statistics_reporter.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/summary_reporter.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/test.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/test/lifecycle_hooks.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/unexpected_error.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/unit.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/minitest/0/minitest/unit/test_case.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/monitor/0/monitor.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/mutex_m/0/mutex_m.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/net-http/0/manifest.yaml @@ -1788,22 +1866,9 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/prime/0/manifest.yaml ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/prime/0/prime.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/pstore/0/pstore.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/pty/0/pty.rbs +${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rdoc/0/rdoc.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/resolv/0/manifest.yaml ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/resolv/0/resolv.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/basic_specification.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/config_file.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/dependency_installer.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/installer.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/path_support.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/platform.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/request_set.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/requirement.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/rubygems.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/source_list.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/specification.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/stream_ui.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/uninstaller.rbs -${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/rubygems/0/version.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/securerandom/0/securerandom.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/set/0/set.rbs ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/shellwords/0/shellwords.rbs @@ -2096,16 +2161,6 @@ ${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/lib/typeprof/version.rb ${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/tools/coverage.rb ${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/tools/setup-insns-def.rb ${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/typeprof-lsp -${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/vscode/.gitignore -${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/vscode/.vscode/launch.json -${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/vscode/.vscodeignore -${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/vscode/README.md -${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/vscode/development.md -${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/vscode/package-lock.json -${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/vscode/package.json -${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/vscode/sandbox/test.rb -${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/vscode/src/extension.ts -${GEM_HOME}/gems/typeprof-${RUBY_TYPEPROF_VER}/vscode/tsconfig.json ${GEM_HOME}/specifications/debug-${RUBY_DEBUG_VER}.gemspec ${GEM_HOME}/specifications/default/abbrev-${RUBY_ABBREV_VER}.gemspec ${GEM_HOME}/specifications/default/base64-${RUBY_BASE64_VER}.gemspec diff --git a/lang/ruby31-base/distinfo b/lang/ruby31-base/distinfo index 93eb48b7935..f729657bcee 100644 --- a/lang/ruby31-base/distinfo +++ b/lang/ruby31-base/distinfo @@ -1,23 +1,23 @@ -$NetBSD: distinfo,v 1.7 2022/05/07 09:36:16 taca Exp $ +$NetBSD: distinfo,v 1.7.4.1 2022/11/30 17:19:02 bsiegert Exp $ -BLAKE2s (ruby-3.1.2.tar.xz) = 5384cfebbd466de36f68f554be2c045363e6c074d90a94a4c035ecaadf3c878b -SHA512 (ruby-3.1.2.tar.xz) = 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21 -Size (ruby-3.1.2.tar.xz) = 15101588 bytes +BLAKE2s (ruby-3.1.3.tar.xz) = ed377b463a7602520d5f2dda4f172f3846b1d817eb9a4bbfd27c8449d983997c +SHA512 (ruby-3.1.3.tar.xz) = 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69 +Size (ruby-3.1.3.tar.xz) = 15300224 bytes SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d -SHA1 (patch-configure) = 3da2fffeaf717e241e9e3b12ad627d09375790da +SHA1 (patch-configure) = 90e976f6a8af9f4962587ba0cb404ff38e704fbd SHA1 (patch-ext_openssl_openssl__missing.h) = 3f8d79736fd14806dfaf76e333eec63ff3ff5890 SHA1 (patch-include_ruby_internal_static__assert.h) = 7d5c3ae7ff674b9b34639924fcf08237164de9f8 SHA1 (patch-lib_mkmf.rb) = 4a3cd18548dbdf43a13695d4e76f817c0347e335 SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198 -SHA1 (patch-lib_rubygems.rb) = 5208798483129d1391891ca4af46ed11e072737a -SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 181bb7554d760182588b0e1b0aafb84c317f41ad +SHA1 (patch-lib_rubygems.rb) = 060549c43b84f73c77432a72cdcf22941be4eb17 +SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 66c475a5308deb2ed5096b88cf65549732f87421 SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76 -SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3 -SHA1 (patch-lib_rubygems_installer.rb) = 03fcd57d4e7ea03cf2ffc3d219fd489e30361014 -SHA1 (patch-lib_rubygems_platform.rb) = 7ef0d86c2d84b942db726d293a319d7ea54e56c8 +SHA1 (patch-lib_rubygems_install__update__options.rb) = 0cd0816e1cd7c84c1dab1e091787c4dc38d28273 +SHA1 (patch-lib_rubygems_installer.rb) = 1c94047a24362b3597dac7ea156982a09cb93234 +SHA1 (patch-lib_rubygems_platform.rb) = ea9d0972fb788799d7d8c07b223ac75cbab23158 SHA1 (patch-template_Makefile.in) = a4b94293de165e87021b79a0a7f683ba76e168d9 -SHA1 (patch-test_rubygems_test__gem.rb) = e624da5b9c49f9409160a7b0fdd2efad17986cab +SHA1 (patch-test_rubygems_test__gem.rb) = 32f7c7d7f8a024c045d78c2bce93944fc3113d04 SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca SHA1 (patch-tool_ifchange) = 1814cd41f0b0a93b181799cb117bd1f57068cf33 SHA1 (patch-tool_runruby.rb) = 5dd8a3bea5e9776f7521f85955dddd2127e4c4d0 diff --git a/lang/ruby31-base/patches/patch-configure b/lang/ruby31-base/patches/patch-configure index a93eb62b3f2..af56eb6c73c 100644 --- a/lang/ruby31-base/patches/patch-configure +++ b/lang/ruby31-base/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.2 2022/05/04 15:49:51 jperkin Exp $ +$NetBSD: patch-configure,v 1.2.4.1 2022/11/30 17:19:03 bsiegert Exp $ * Avoid bash specific variable substitution. * Adding Interix support. @@ -9,9 +9,9 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:51 jperkin Exp $ * Fix argument for pthread_self() on NetBSD. * Explictly stop display with color. ---- configure.orig 2022-04-12 11:11:17.000000000 +0000 +--- configure.orig 2022-11-24 10:20:33.000000000 +0000 +++ configure -@@ -3316,12 +3316,12 @@ case "$target_cpu-$target_os" in #( +@@ -3942,12 +3942,12 @@ case "$target_cpu-$target_os" in #( target_cpu=arm64 case "$target_vendor" in #( unknown) : @@ -27,24 +27,24 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:51 jperkin Exp $ ;; #( *) : ;; -@@ -8441,7 +8441,7 @@ else - if test x"$target_alias" = x; then : +@@ -9361,7 +9361,7 @@ else $as_nop + then : case "$target_os" in #( - darwin*) : + nodarwin*) : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 - $as_echo_n "checking for real target cpu... " >&6; } -@@ -10262,6 +10262,7 @@ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 + printf %s "checking for real target cpu... " >&6; } +@@ -11355,6 +11355,7 @@ fi stack_protector=no ;; #( *) : + stack_protector=no ;; esac - if test -z "${stack_protector+set}"; then : -@@ -11981,18 +11982,6 @@ fi + if test -z "${stack_protector+set}" +@@ -13198,18 +13199,6 @@ then : CPPFLAGS="$CPPFLAGS ${rb_opt}" ;; esac done @@ -63,7 +63,7 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:51 jperkin Exp $ fi -@@ -12226,6 +12215,10 @@ esac +@@ -13437,6 +13426,10 @@ esac ac_cv_func___builtin_setjmp=no ;; #( @@ -74,48 +74,48 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:51 jperkin Exp $ *) : ;; esac -@@ -24059,6 +24052,8 @@ else - # ifdef _MSC_VER - # include <malloc.h> - # define alloca _alloca -+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) +@@ -25518,7 +25511,9 @@ else + #include <stdlib.h> + #include <stddef.h> + #ifndef alloca +-# ifdef __GNUC__ ++# if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) +# include <stdlib.h> - # else - # ifdef HAVE_ALLOCA_H - # include <alloca.h> -@@ -29499,7 +29494,9 @@ fi ++# elif defined __GNUC__ + # define alloca __builtin_alloca + # elif defined _MSC_VER + # include <malloc.h> +@@ -30542,6 +30537,8 @@ fi interix*) : : ${LDSHARED='$(CC) -shared'} XLDFLAGS="$XLDFLAGS -Wl,-E" + DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' - LIBPATHFLAG=" -L%1\$-s" + RPATHFLAG=' -Wl,-R%1$-s' rb_cv_dlopen=yes ;; #( freebsd*|dragonfly*) : -@@ -30700,7 +30697,7 @@ fi - ;; #( - freebsd*|dragonfly*) : - -- LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' -+ LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)$(TEENY)' - LIBRUBY_SONAME='$(LIBRUBY_SO)' - if test "$rb_cv_binary_elf" != "yes" ; then : +@@ -30713,7 +30710,7 @@ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $flag is accepted for bundle" >&5 + printf %s "checking whether $flag is accepted for bundle... " >&6; } + : > conftest.c +- if ${LDSHARED/'$(CC)'/$CC} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err && ++ if $(echo ${LDSHARED} | sed -e "s/'$(CC)'/$CC/g") -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err && + test ! -s conftest.err + then : -@@ -30795,9 +30792,10 @@ esac +@@ -31748,8 +31745,10 @@ fi ;; #( - darwin*) : + freebsd*|dragonfly*) : + RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)' - LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' - LIBRUBY_SONAME='$(LIBRUBY_SO)' -- LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)' + LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)' + LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)' - if test "$load_relative" = yes; then : + if test "$rb_cv_binary_elf" != "yes" + then : - libprefix="@executable_path/../${libdir_basename}" -@@ -30818,7 +30816,12 @@ fi +@@ -31872,7 +31871,12 @@ fi ;; #( interix*) : @@ -129,7 +129,7 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:51 jperkin Exp $ ;; #( cygwin*|msys*|mingw*|mswin*) : -@@ -31000,7 +31003,7 @@ if test "$enable_rpath" = yes; then : +@@ -32065,7 +32069,7 @@ then : esac rpathflag=`IFS="$PATH_SEPARATOR" echo x "$rpathflag" | @@ -138,28 +138,30 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:51 jperkin Exp $ ` LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" -@@ -32550,7 +32553,7 @@ guard=INCLUDE_RUBY_CONFIG_H - if test "x$CONFIGURE_TTY" = xyes; then : - color=--color - else -- color= +@@ -33706,7 +33710,7 @@ guard=INCLUDE_RUBY_CONFIG_H + ( + if test "x$CONFIGURE_TTY" = xyes + then : +- color=--color + color=--color=never + else $as_nop + color= fi - exec ${SHELL} ${tooldir}/ifchange $color "${config_h}" - - ) >&6 || as_fn_error $? "failed to create ${config_h}" "$LINENO" 5 -@@ -33773,19 +33776,7 @@ which seems to be undefined. Please mak +@@ -34930,21 +34934,7 @@ which seems to be undefined. Please mak "Makefile":F) tmpmk=confmk$$.tmp { -- if test ${VCS+set}; then : +- if test ${VCS+set} +-then : - - : - --elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then : +-elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null` +-then : - - VCS='$(GIT)' - --else +-else $as_nop - VCS='echo cannot' - diff --git a/lang/ruby31-base/patches/patch-lib_rubygems.rb b/lang/ruby31-base/patches/patch-lib_rubygems.rb index 14a7c193f21..7dd52239741 100644 --- a/lang/ruby31-base/patches/patch-lib_rubygems.rb +++ b/lang/ruby31-base/patches/patch-lib_rubygems.rb @@ -1,22 +1,22 @@ -$NetBSD: patch-lib_rubygems.rb,v 1.1 2022/01/16 13:57:10 taca Exp $ +$NetBSD: patch-lib_rubygems.rb,v 1.1.6.1 2022/11/30 17:19:03 bsiegert Exp $ * Add install_root option for pkgsrc's rubygems support. ---- lib/rubygems.rb.orig 2020-12-08 09:02:31.000000000 +0000 +--- lib/rubygems.rb.orig 2022-11-24 10:20:31.000000000 +0000 +++ lib/rubygems.rb -@@ -315,10 +315,16 @@ module Gem +@@ -299,10 +299,16 @@ module Gem ## # The path where gem executables are to be installed. - def self.bindir(install_dir=Gem.dir) -- return File.join install_dir, 'bin' unless +- return File.join install_dir, "bin" unless - install_dir.to_s == Gem.default_dir.to_s - Gem.default_bindir + def self.bindir(install_dir=Gem.dir, install_root=nil) + if install_dir.to_s == Gem.default_dir.to_s + install_dir = Gem.default_bindir + else -+ install_dir = File.join install_dir, 'bin' ++ install_dir = File.join install_dir, "bin" + end + unless install_root.nil? or install_root.empty? + install_dir = File.join install_root, install_dir @@ -25,20 +25,20 @@ $NetBSD: patch-lib_rubygems.rb,v 1.1 2022/01/16 13:57:10 taca Exp $ end ## -@@ -591,7 +597,7 @@ An Array (#{env.inspect}) was passed in +@@ -576,7 +582,7 @@ An Array (#{env.inspect}) was passed in return i if path.instance_variable_defined?(:@gem_prelude_index) end -- index = $LOAD_PATH.index RbConfig::CONFIG['sitelibdir'] -+ index = $LOAD_PATH.index RbConfig::CONFIG['vendorlibdir'] +- index = $LOAD_PATH.index RbConfig::CONFIG["sitelibdir"] ++ index = $LOAD_PATH.index RbConfig::CONFIG["vendorlibdir"] index || 0 end -@@ -775,6 +781,7 @@ An Array (#{env.inspect}) was passed in +@@ -742,6 +748,7 @@ An Array (#{env.inspect}) was passed in prefix = File.dirname RUBYGEMS_DIR - if prefix != File.expand_path(RbConfig::CONFIG['sitelibdir']) and -+ prefix != File.expand_path(RbConfig::CONFIG['vendorlibdir']) and - prefix != File.expand_path(RbConfig::CONFIG['libdir']) and - 'lib' == File.basename(RUBYGEMS_DIR) + if prefix != File.expand_path(RbConfig::CONFIG["sitelibdir"]) && ++ prefix != File.expand_path(RbConfig::CONFIG["vendorlibdir"]) and + prefix != File.expand_path(RbConfig::CONFIG["libdir"]) && + "lib" == File.basename(RUBYGEMS_DIR) prefix diff --git a/lang/ruby31-base/patches/patch-lib_rubygems_commands_setup__command.rb b/lang/ruby31-base/patches/patch-lib_rubygems_commands_setup__command.rb index 0ca57391818..ec32acde170 100644 --- a/lang/ruby31-base/patches/patch-lib_rubygems_commands_setup__command.rb +++ b/lang/ruby31-base/patches/patch-lib_rubygems_commands_setup__command.rb @@ -1,10 +1,10 @@ -$NetBSD: patch-lib_rubygems_commands_setup__command.rb,v 1.1 2022/01/16 13:57:10 taca Exp $ +$NetBSD: patch-lib_rubygems_commands_setup__command.rb,v 1.1.6.1 2022/11/30 17:19:03 bsiegert Exp $ * Make sure to setup under DESTDIR. ---- lib/rubygems/commands/setup_command.rb.orig 2018-12-23 00:20:49.000000000 +0000 +--- lib/rubygems/commands/setup_command.rb.orig 2022-11-24 10:20:31.000000000 +0000 +++ lib/rubygems/commands/setup_command.rb -@@ -177,7 +177,7 @@ By default, this RubyGems will install g +@@ -185,7 +185,7 @@ By default, this RubyGems will install g uninstall_old_gemcutter @@ -13,13 +13,13 @@ $NetBSD: patch-lib_rubygems_commands_setup__command.rb,v 1.1 2022/01/16 13:57:10 say if @verbose -@@ -341,11 +341,15 @@ By default, this RubyGems will install g +@@ -318,11 +318,15 @@ By default, this RubyGems will install g end end - def install_rdoc + def install_rdoc(install_destdir) - gem_doc_dir = File.join Gem.dir, 'doc' + gem_doc_dir = File.join Gem.dir, "doc" rubygems_name = "rubygems-#{Gem::VERSION}" rubygems_doc_dir = File.join gem_doc_dir, rubygems_name @@ -30,12 +30,12 @@ $NetBSD: patch-lib_rubygems_commands_setup__command.rb,v 1.1 2022/01/16 13:57:10 begin Gem.ensure_gem_subdirectories Gem.dir rescue SystemCallError -@@ -356,7 +360,7 @@ By default, this RubyGems will install g - (not File.exist? rubygems_doc_dir or - File.writable? rubygems_doc_dir) +@@ -333,7 +337,7 @@ By default, this RubyGems will install g + (!File.exist?(rubygems_doc_dir) || + File.writable?(rubygems_doc_dir)) say "Removing old RubyGems RDoc and ri" if @verbose -- Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir| -+ Dir[File.join(gem_doc_dir, 'rubygems-[0-9]*')].each do |dir| +- Dir[File.join(Gem.dir, "doc", "rubygems-[0-9]*")].each do |dir| ++ Dir[File.join(gem_doc_dir, "rubygems-[0-9]*")].each do |dir| rm_rf dir end diff --git a/lang/ruby31-base/patches/patch-lib_rubygems_install__update__options.rb b/lang/ruby31-base/patches/patch-lib_rubygems_install__update__options.rb index a84d89bc1d4..87cf13b68ef 100644 --- a/lang/ruby31-base/patches/patch-lib_rubygems_install__update__options.rb +++ b/lang/ruby31-base/patches/patch-lib_rubygems_install__update__options.rb @@ -1,20 +1,20 @@ -$NetBSD: patch-lib_rubygems_install__update__options.rb,v 1.1 2022/01/16 13:57:10 taca Exp $ +$NetBSD: patch-lib_rubygems_install__update__options.rb,v 1.1.6.1 2022/11/30 17:19:03 bsiegert Exp $ * Add install_root option for pkgsrc's rubygems support. * Tweak build_info directory with destdir to store build_args. ---- lib/rubygems/install_update_options.rb.orig 2017-10-08 01:32:18.000000000 +0000 +--- lib/rubygems/install_update_options.rb.orig 2022-11-24 10:20:31.000000000 +0000 +++ lib/rubygems/install_update_options.rb @@ -18,6 +18,12 @@ module Gem::InstallUpdateOptions # Add the install/update options to the option parser. def add_install_update_options -+ add_option(:"Install/Update", '-B', '--install-root DIR', -+ 'Root directory for gem files on install') do |value, options| ++ add_option(:"Install/Update", "-B", "--install-root DIR", ++ "Root directory for gem files on install") do |value, options| + options[:install_root] = File.expand_path(value) + Gem.ensure_gem_subdirectories File.join options[:install_root], Gem.dir + end + - add_option(:"Install/Update", '-i', '--install-dir DIR', - 'Gem repository directory to get installed', - 'gems') do |value, options| + add_option(:"Install/Update", "-i", "--install-dir DIR", + "Gem repository directory to get installed", + "gems") do |value, options| diff --git a/lang/ruby31-base/patches/patch-lib_rubygems_installer.rb b/lang/ruby31-base/patches/patch-lib_rubygems_installer.rb index e493672aaff..d282bf1ac39 100644 --- a/lang/ruby31-base/patches/patch-lib_rubygems_installer.rb +++ b/lang/ruby31-base/patches/patch-lib_rubygems_installer.rb @@ -1,9 +1,9 @@ -$NetBSD: patch-lib_rubygems_installer.rb,v 1.1 2022/01/16 13:57:10 taca Exp $ +$NetBSD: patch-lib_rubygems_installer.rb,v 1.1.6.1 2022/11/30 17:19:03 bsiegert Exp $ * Add install_root option for pkgsrc's rubygems support. * Tweak build_info directory with destdir to store build_args. ---- lib/rubygems/installer.rb.orig 2021-11-24 11:12:15.000000000 +0000 +--- lib/rubygems/installer.rb.orig 2022-11-24 10:20:31.000000000 +0000 +++ lib/rubygems/installer.rb @@ -166,6 +166,9 @@ class Gem::Installer # foo_exec18. @@ -15,7 +15,7 @@ $NetBSD: patch-lib_rubygems_installer.rb,v 1.1 2022/01/16 13:57:10 taca Exp $ # :security_policy:: Use the specified security policy. See Gem::Security # :user_install:: Indicate that the gem should be unpacked into the users # personal gem directory. -@@ -680,7 +683,13 @@ class Gem::Installer +@@ -669,7 +672,13 @@ class Gem::Installer # If the user has asked for the gem to be installed in a directory that is # the system gem directory, then use the system bin directory, else create # (or use) a new bin dir under the gem_home. @@ -30,10 +30,10 @@ $NetBSD: patch-lib_rubygems_installer.rb,v 1.1 2022/01/16 13:57:10 taca Exp $ @development = options[:development] @build_root = options[:build_root] -@@ -930,6 +939,9 @@ TEXT +@@ -928,6 +937,9 @@ TEXT return if build_args.empty? - build_info_dir = File.join gem_home, 'build_info' + build_info_dir = File.join gem_home, "build_info" + unless @install_root.nil? or @install_root.empty? + build_info_dir = File.join @gem_home, "build_info" + end diff --git a/lang/ruby31-base/patches/patch-lib_rubygems_platform.rb b/lang/ruby31-base/patches/patch-lib_rubygems_platform.rb index dce9f309c49..4b3d6a3a047 100644 --- a/lang/ruby31-base/patches/patch-lib_rubygems_platform.rb +++ b/lang/ruby31-base/patches/patch-lib_rubygems_platform.rb @@ -1,29 +1,29 @@ -$NetBSD: patch-lib_rubygems_platform.rb,v 1.2 2022/02/20 15:59:09 taca Exp $ +$NetBSD: patch-lib_rubygems_platform.rb,v 1.2.6.1 2022/11/30 17:19:03 bsiegert Exp $ * Don't replace "i486" to "x86". * Allow simple "netbsd" as Gem::Platform. ---- lib/rubygems/platform.rb.orig 2022-02-18 09:42:25.000000000 +0000 +--- lib/rubygems/platform.rb.orig 2022-11-24 10:20:31.000000000 +0000 +++ lib/rubygems/platform.rb -@@ -75,12 +75,7 @@ class Gem::Platform +@@ -76,12 +76,7 @@ class Gem::Platform arch.last << "-#{extra}" end - cpu = arch.shift - - @cpu = case cpu -- when /i\d86/ then 'x86' +- when /i\d86/ then "x86" - else cpu - end + @cpu = arch.shift - if arch.length == 2 and arch.last =~ /^\d+(\.\d+)?$/ # for command-line + if arch.length == 2 && arch.last =~ /^\d+(\.\d+)?$/ # for command-line @os, @version = arch -@@ -110,6 +105,7 @@ class Gem::Platform - @cpu = 'x86' if @cpu.nil? and os =~ /32$/ +@@ -111,6 +106,7 @@ class Gem::Platform + @cpu = "x86" if @cpu.nil? && os =~ /32$/ [os, version] - when /netbsdelf/ then [ 'netbsdelf', nil ] -+ when /netbsd/ then [ 'netbsd', nil ] - when /openbsd(\d+\.\d+)?/ then [ 'openbsd', $1 ] - when /bitrig(\d+\.\d+)?/ then [ 'bitrig', $1 ] - when /solaris(\d+\.\d+)?/ then [ 'solaris', $1 ] + when /netbsdelf/ then [ "netbsdelf", nil ] ++ when /netbsd/ then [ "netbsd", nil ] + when /openbsd(\d+\.\d+)?/ then [ "openbsd", $1 ] + when /bitrig(\d+\.\d+)?/ then [ "bitrig", $1 ] + when /solaris(\d+\.\d+)?/ then [ "solaris", $1 ] diff --git a/lang/ruby31-base/patches/patch-test_rubygems_test__gem.rb b/lang/ruby31-base/patches/patch-test_rubygems_test__gem.rb index 86e6bdeb449..ccf6ac814bc 100644 --- a/lang/ruby31-base/patches/patch-test_rubygems_test__gem.rb +++ b/lang/ruby31-base/patches/patch-test_rubygems_test__gem.rb @@ -1,21 +1,21 @@ -$NetBSD: patch-test_rubygems_test__gem.rb,v 1.1 2022/01/16 13:57:10 taca Exp $ +$NetBSD: patch-test_rubygems_test__gem.rb,v 1.1.6.1 2022/11/30 17:19:03 bsiegert Exp $ * Use vendordir instead of sitedir. ---- test/rubygems/test_gem.rb.orig 2019-12-17 15:08:43.000000000 +0000 +--- test/rubygems/test_gem.rb.orig 2022-11-24 10:20:31.000000000 +0000 +++ test/rubygems/test_gem.rb -@@ -957,12 +957,12 @@ class TestGem < Gem::TestCase +@@ -1004,12 +1004,12 @@ class TestGem < Gem::TestCase end def test_self_prefix_sitelibdir -- orig_sitelibdir = RbConfig::CONFIG['sitelibdir'] -+ orig_sitelibdir = RbConfig::CONFIG['vendorlibdir'] - RbConfig::CONFIG['sitelibdir'] = PROJECT_DIR +- orig_sitelibdir = RbConfig::CONFIG["sitelibdir"] ++ orig_sitelibdir = RbConfig::CONFIG["vendorlibdir"] + RbConfig::CONFIG["sitelibdir"] = PROJECT_DIR assert_nil Gem.prefix ensure -- RbConfig::CONFIG['sitelibdir'] = orig_sitelibdir -+ RbConfig::CONFIG['vendorlibdir'] = orig_sitelibdir +- RbConfig::CONFIG["sitelibdir"] = orig_sitelibdir ++ RbConfig::CONFIG["vendorlibdir"] = orig_sitelibdir end def test_self_read_binary |