Merge pull request #8347 from rubygems/release/bundler_2.6.2_rubygems_3.6.2

Prepare RubyGems 3.6.2 and Bundler 2.6.2

Author: deivid-rodriguez

.github/workflows/install-rubygems.yml

@@ -27,7 +27,7 @@ jobs:
           - { name: "3.3", value: 3.3.6 }
           - { name: "3.4", value: 3.4.0-rc1 }
           - { name: jruby, value: jruby-9.4.9.0 }
-          - { name: truffleruby, value: truffleruby-24.0.1 }
+          - { name: truffleruby, value: truffleruby-24.1.1 }
         openssl:
           - { name: "openssl", value: true }
           - { name: "no-openssl", value: false }

.github/workflows/rubygems.yml

@@ -35,7 +35,7 @@ jobs:
           - ruby: { name: jruby, value: jruby-9.4.9.0 }
             os: { name: Ubuntu, value: ubuntu-24.04 }
 
-          - ruby: { name: truffleruby, value: truffleruby-24.0.1 }
+          - ruby: { name: truffleruby, value: truffleruby-24.1.1 }
             os: { name: Ubuntu, value: ubuntu-24.04 }
 
           - ruby: { name: "3.4", value: 3.4.0-rc1 }

.github/workflows/truffleruby-bundler.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
         with:
-          ruby-version: truffleruby-24.0.1
+          ruby-version: truffleruby-24.1.1
           bundler: none
       - name: Prepare dependencies
         run: |

.github/workflows/ubuntu-lint.yml

@@ -23,7 +23,7 @@ jobs:
       matrix:
         ruby:
           - { name: ruby, value: 3.4.0-rc1 }
-          - { name: truffleruby, value: truffleruby-24.0.1 }
+          - { name: truffleruby, value: truffleruby-24.1.1 }
     env:
       RUBYOPT: -Ilib
     steps:

CHANGELOG.md

@@ -1,3 +1,27 @@
+# 3.6.2 / 2024-12-23
+
+## Security:
+
+* Fix Gem::SafeMarshal buffer overrun when given lengths larger than fit
+  into a byte. Pull request
+  [#8305](https://github.com/rubygems/rubygems/pull/8305) by segiddins
+* Improve type checking in marshal_load methods. Pull request
+  [#8306](https://github.com/rubygems/rubygems/pull/8306) by segiddins
+
+## Enhancements:
+
+* Skip rdoc hooks and their tests on newer rdoc versions. Pull request
+  [#8340](https://github.com/rubygems/rubygems/pull/8340) by
+  deivid-rodriguez
+* Installs bundler 2.6.2 as a default gem.
+
+## Bug fixes:
+
+* Fix serialized metadata including an empty `@original_platform`
+  attribute. Pull request
+  [#8355](https://github.com/rubygems/rubygems/pull/8355) by
+  deivid-rodriguez
+
 # 3.6.1 / 2024-12-17
 
 ## Enhancements:

bundler/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 2.6.2 (December 23, 2024)
+
+## Bug fixes:
+
+  - Restart using `Process.argv0` only if `$PROGRAM_NAME` is not a script [#8343](https://github.com/rubygems/rubygems/pull/8343)
+
+## Documentation:
+
+  - Fix typo in `bundle lock` man page synopsis (`--add-checkums` → `--add-checksums`) [#8350](https://github.com/rubygems/rubygems/pull/8350)
+
 # 2.6.1 (December 17, 2024)
 
 ## Bug fixes:

bundler/lib/bundler/man/bundle-lock.1

@@ -4,7 +4,7 @@
 .SH "NAME"
 \fBbundle\-lock\fR \- Creates / Updates a lockfile without installing
 .SH "SYNOPSIS"
-\fBbundle lock\fR [\-\-update] [\-\-bundler[=BUNDLER]] [\-\-local] [\-\-print] [\-\-lockfile=PATH] [\-\-full\-index] [\-\-gemfile=GEMFILE] [\-\-add\-checkums] [\-\-add\-platform] [\-\-remove\-platform] [\-\-normalize\-platforms] [\-\-patch] [\-\-minor] [\-\-major] [\-\-pre] [\-\-strict] [\-\-conservative]
+\fBbundle lock\fR [\-\-update] [\-\-bundler[=BUNDLER]] [\-\-local] [\-\-print] [\-\-lockfile=PATH] [\-\-full\-index] [\-\-gemfile=GEMFILE] [\-\-add\-checksums] [\-\-add\-platform] [\-\-remove\-platform] [\-\-normalize\-platforms] [\-\-patch] [\-\-minor] [\-\-major] [\-\-pre] [\-\-strict] [\-\-conservative]
 .SH "DESCRIPTION"
 Lock the gems specified in Gemfile\.
 .SH "OPTIONS"

bundler/lib/bundler/man/bundle-lock.1.ronn

@@ -10,7 +10,7 @@ bundle-lock(1) -- Creates / Updates a lockfile without installing
               [--lockfile=PATH]
               [--full-index]
               [--gemfile=GEMFILE]
-              [--add-checkums]
+              [--add-checksums]
               [--add-platform]
               [--remove-platform]
               [--normalize-platforms]

bundler/lib/bundler/self_manager.rb

@@ -84,8 +84,9 @@ def restart_with(version)
         require "shellwords"
         cmd = [*Shellwords.shellsplit(bundler_spec_original_cmd), *ARGV]
       else
-        cmd = [Process.argv0, *ARGV]
-        cmd.unshift(Gem.ruby) unless File.executable?(Process.argv0)
+        argv0 = File.exist?($PROGRAM_NAME) ? $PROGRAM_NAME : Process.argv0
+        cmd = [argv0, *ARGV]
+        cmd.unshift(Gem.ruby) unless File.executable?(argv0)
       end
 
       Bundler.with_original_env do

bundler/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.6.1".freeze
+  VERSION = "2.6.2".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i