From nobody Tue Apr 18 16:09:09 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q184Q6nncz45HxV; Tue, 18 Apr 2023 16:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q184Q0Njgz3xKt; Tue, 18 Apr 2023 16:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681834150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N6uAYpwsfpYrcSQD7/iLv9TwtBifYf9FcajlJmQG2Yw=; b=a3zohQnQa0vNHlhT/zpH+2mvKiy8eXCNHco+ciDPUZ99UBwRsFh/cNwIwWYfL/5t069cgD MptxEzG841s0Z08vDK4oyXXZwGJefkGqy+mMm/1A8IcrGZsr5/PyFZ55jCUioKJ6EF7FNP xVhwGieRQM+2vUT94AuwEBeU1fE0fPviDc5Q5cOt0LaMErER/Lsy1ML3m+7Y3EAqcyOTbr gcwfIPJ9bKf+wI+AAGuR5vKDWwsDFWNJ3u7bwwoYEPv7Y28XdDik+y5a49X6H+RmfKzZ73 05K7CV8Rs2wYohV5TnRLD+dNwcPjuiFut8ssSxovmW1HzJcJGy8huc3adYOkRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681834150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N6uAYpwsfpYrcSQD7/iLv9TwtBifYf9FcajlJmQG2Yw=; b=WZYNjILeb28gGQtWiqmj98GCYMzdclP0KqfaADZoGvGCSMoSD95u6C8nD+522D4W1Q9WDq nhF/FRimxyQeppmjtE8EpPkooxteIM+0O+7+yosWqiD6qbeJ5f7ZahyB1bT13uLGqfjRTx QUtmGFh7a2ebN4YmwSV7MMr6G6NAZcChgfXDsBkzD90TtKY7K0J0rgzqchY3X1gVGJVhws JgElMXn9l4OW1F5r1OTiR2h4BtKfTeGW9dHXF66JLHqyR5aw1eTj/GZRh7LAiP/qj1p0qk w/+mQWon0k9LNh1X0tBdyGlGs8OlIuYXU12ExK/SQSUFlUY2fib192trr5Jv7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681834150; a=rsa-sha256; cv=none; b=hEZ0TbbdDMVJeK7HlcyyGMCbhzfD6//GOORv+x8ysAW7/2YORQyomh0QAFtYqinOSTJTnA 91CfZYIlo2v0H7xGp+tGlXKLyuRV3zWFAt/tLE8Y0s+vghq44/neLyMtNIfJXY3UOUWrYY DIcYel3i7bMHeTJRygOGY70fcrzOuOdJUdoFGPPW+NpdcrIuK88g8VXVT/wiKMotvNKZP9 GeDxtvm88QPAqgzrHrAFRDkFUyMVGqbGo9eaHV8LWNcb53EYH6P1AXxUaGSL8CSeqUPjsJ SszM7zJCKuxgLRY3IyU+6FgT70ifGYYOLhSA9Id+98Lya5yBKJjki6DqR3aO0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q184P6VC2zJDx; Tue, 18 Apr 2023 16:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33IG99CJ078881; Tue, 18 Apr 2023 16:09:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33IG999Y078880; Tue, 18 Apr 2023 16:09:09 GMT (envelope-from git) Date: Tue, 18 Apr 2023 16:09:09 GMT Message-Id: <202304181609.33IG999Y078880@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Po-Chuan Hsieh Subject: git: eacb8605f733 - 2023Q2 - lang/ruby32: Update to 3.2.2 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: eacb8605f73333b5d5e6b2f10db4a27800be5d55 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=eacb8605f73333b5d5e6b2f10db4a27800be5d55 commit eacb8605f73333b5d5e6b2f10db4a27800be5d55 Author: Yasuhiro Kimura AuthorDate: 2023-04-18 12:31:08 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-04-18 16:08:45 +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 (cherry picked from commit 01b96e81f6c9a35b9b34654d4061142f9e4dfe3b) --- 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 bb4f5a5f971d..895d8b96b92a 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -168,7 +168,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