git: 01b96e81f6c9 - main - lang/ruby32: Update to 3.2.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 18 Apr 2023 12:31:50 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=01b96e81f6c9a35b9b34654d4061142f9e4dfe3b
commit 01b96e81f6c9a35b9b34654d4061142f9e4dfe3b
Author: Yasuhiro Kimura <yasu@freebsd.org>
AuthorDate: 2023-04-18 12:31:08 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-04-18 12:31:08 +0000
lang/ruby32: Update to 3.2.2
Changes: https://www.ruby-lang.org/en/news/2023/03/30/ruby-3-2-2-released/
PR: 270558
Security: 9b60bba1-cf18-11ed-bd44-080027f5fec9
Security: 6bd2773c-cf1a-11ed-bd44-080027f5fec9
---
Mk/Uses/ruby.mk | 2 +-
lang/ruby32/distinfo | 6 +++---
lang/ruby32/files/patch-tool_rbinstall.rb | 11 +++++++----
lang/ruby32/pkg-plist | 18 ++++++++++++++++++
4 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk
index 42385c5b021f..9aee42814ac0 100644
--- a/Mk/Uses/ruby.mk
+++ b/Mk/Uses/ruby.mk
@@ -161,7 +161,7 @@ RUBY_PORTREVISION= 0
#
# Ruby 3.2
#
-RUBY_DISTVERSION= 3.2.1
+RUBY_DISTVERSION= 3.2.2
RUBY_PORTREVISION= 0
# When adding a version, please keep the comment in
diff --git a/lang/ruby32/distinfo b/lang/ruby32/distinfo
index f27763e4df9e..cfb497258de8 100644
--- a/lang/ruby32/distinfo
+++ b/lang/ruby32/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675914354
-SHA256 (ruby/ruby-3.2.1.tar.xz) = 746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c
-SIZE (ruby/ruby-3.2.1.tar.xz) = 15094384
+TIMESTAMP = 1680205768
+SHA256 (ruby/ruby-3.2.2.tar.xz) = 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23
+SIZE (ruby/ruby-3.2.2.tar.xz) = 15118856
diff --git a/lang/ruby32/files/patch-tool_rbinstall.rb b/lang/ruby32/files/patch-tool_rbinstall.rb
index 36003beb8730..039e80baaed0 100644
--- a/lang/ruby32/files/patch-tool_rbinstall.rb
+++ b/lang/ruby32/files/patch-tool_rbinstall.rb
@@ -1,6 +1,6 @@
---- tool/rbinstall.rb.orig 2022-09-08 21:09:50 UTC
+--- tool/rbinstall.rb.orig 2023-03-30 11:06:29 UTC
+++ tool/rbinstall.rb
-@@ -906,152 +906,6 @@ end
+@@ -909,155 +909,6 @@ end
# :startdoc:
@@ -121,9 +121,12 @@
- next if /^\s*(?:#|$)/ =~ name
- next unless /^(\S+)\s+(\S+).*/ =~ name
- gem_name = "#$1-#$2"
-- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
+- # Try to find the gemspec file for C ext gems
+- # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec
+- # This gemspec keep the original dependencies
+- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec"
- unless File.exist?(path)
-- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec"
+- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
- next unless File.exist?(path)
- end
- spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}")
diff --git a/lang/ruby32/pkg-plist b/lang/ruby32/pkg-plist
index 82c10bf98785..813d9e7a5e24 100644
--- a/lang/ruby32/pkg-plist
+++ b/lang/ruby32/pkg-plist
@@ -800,6 +800,7 @@ lib/libruby%%RUBY_SHLIBVER%%.so.%%RUBY_SHLIBVER%%
%%RUBY_LIBDIR%%/rubygems/commands/contents_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/dependency_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/environment_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/exec_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/fetch_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/generate_index_command.rb
%%RUBY_LIBDIR%%/rubygems/commands/help_command.rb
@@ -3928,6 +3929,18 @@ man/man1/ruby%%RUBY_SUFFIX%%.1.gz
%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/EnvironmentCommand/execute-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/EnvironmentCommand/git_path-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/EnvironmentCommand/new-c.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/ExecCommand/activate%21-i.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/ExecCommand/cdesc-ExecCommand.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/ExecCommand/check_executable-i.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/ExecCommand/execute-i.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/ExecCommand/handle_options-i.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/ExecCommand/install-i.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/ExecCommand/install_if_needed-i.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/ExecCommand/load%21-i.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/ExecCommand/new-c.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/ExecCommand/print_command-i.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/ExecCommand/set_gem_exec_install_paths-i.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/ExecCommand/suppress_always_install-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/FetchCommand/cdesc-FetchCommand.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/FetchCommand/execute-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Commands/FetchCommand/new-c.ri
@@ -4203,6 +4216,7 @@ man/man1/ruby%%RUBY_SUFFIX%%.1.gz
%%RDOC%%%%RUBY_RIDIR%%/Gem/Ext/Builder/class_name-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Ext/Builder/make-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Ext/Builder/new-c.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Ext/Builder/ruby-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Ext/Builder/run-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Ext/CargoBuilder/DylibNotFoundError/cdesc-DylibNotFoundError.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Ext/CargoBuilder/DylibNotFoundError/new-c.ri
@@ -4494,10 +4508,13 @@ man/man1/ruby%%RUBY_SUFFIX%%.1.gz
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/TarReader/Entry/header-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/TarReader/Entry/length-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/TarReader/Entry/new-c.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/TarReader/Entry/open-c.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/TarReader/Entry/pos%3d-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/TarReader/Entry/pos-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/TarReader/Entry/read-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/TarReader/Entry/readpartial-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/TarReader/Entry/rewind-i.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/TarReader/Entry/seek-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/TarReader/Entry/size-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/TarReader/Entry/symlink%3f-i.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/TarReader/UnexpectedEOF/cdesc-UnexpectedEOF.ri
@@ -5370,6 +5387,7 @@ man/man1/ruby%%RUBY_SUFFIX%%.1.gz
%%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/find_all_by_full_name-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/find_all_by_name-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/find_all_satisfiers-i.ri
+%%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/find_by_full_name-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/find_by_name-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/find_by_path-c.ri
%%RDOC%%%%RUBY_RIDIR%%/Gem/Specification/find_in_unresolved-c.ri