From 047030607d7c768825de674b0c368f5043af0c3a Mon Sep 17 00:00:00 2001
From: nmburgan <13688219+nmburgan@users.noreply.github.com>
Date: Sun, 14 Dec 2025 14:45:41 -0800
Subject: [PATCH 01/10] Remove gemspec for default gems we are updating

When we are providing a newer version of a default gem than the one that Ruby ships with, in order to avoid warnings about multiple gem versions being available, we have to remove the gemspec for the older version. Generally, we don't need to ship our own version of a default gem unless it has a CVE and Ruby has not yet fixed it.
---
 configs/components/_base-rubygem.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/configs/components/_base-rubygem.rb b/configs/components/_base-rubygem.rb
index 30494d79..663aa7ab 100644
--- a/configs/components/_base-rubygem.rb
+++ b/configs/components/_base-rubygem.rb
@@ -46,4 +46,10 @@
            else
              "#{settings[:gem_install]} #{name}-#{version}.gem #{gem_install_options}"
            end
+  # If we are installing a newer version of a default gem, we need to remove the existing
+  # specification file so that we don't get warnings.
+  steps << "rm -f #{settings[:gem_home]}/specifications/default/#{name}-*.gemspec"
+  # This dir is usually empty and only there for compatilibity reasons for things requiring
+  # a directory corresponding to a gemspec. Remove it to avoid confusion.
+  steps << "rm -f #{settings[:gem_home]}/gems/#{name}-*[!#{version}]"
 end

From ec172c8e4ed993efbf754088db945af6cafabe1d Mon Sep 17 00:00:00 2001
From: nmburgan <13688219+nmburgan@users.noreply.github.com>
Date: Sun, 14 Dec 2025 14:57:00 -0800
Subject: [PATCH 02/10] Don't add/manage default gems

Unless we have a good reason to, we don't want to include default gems in ones that we ship. It's hacky to replace the version shipped with the Ruby version, and we should only do it to address a CVE that has not yet been addressed by a new Ruby version.
---
 tasks/update_gems.rake | 78 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/tasks/update_gems.rake b/tasks/update_gems.rake
index ec08adc7..62bdca98 100644
--- a/tasks/update_gems.rake
+++ b/tasks/update_gems.rake
@@ -23,6 +23,82 @@ GEM_TYPE       = /^\s*#\s*GEM\s+TYPE:\s*(?<platform>[A-Za-z0-9\-_.]+)\s*$/
 PROJ_COMPONENT = /^\s*proj\.component\s+(?<quote>['"]?)(?<component>rubygem-[^'"\s]+)\k<quote>\s*$/
 
 TARGET_RUBY_VER = ENV['TARGET_RUBY']&.strip || '3.2'
+# Update this list when targeting a new Ruby version
+DEFAULT_GEMS = [
+  'abbrev',
+  'base64',
+  'benchmark',
+  'bigdecimal',
+  'bundler',
+  'cgi',
+  'csv',
+  'date',
+  'delegate',
+  'did_you_mean',
+  'digest',
+  'drb',
+  'english',
+  'erb',
+  'error_highlight',
+  'etc',
+  'fcntl',
+  'fiddle',
+  'fileutils',
+  'find',
+  'forwardable',
+  'getoptlong',
+  'io-console',
+  'io-nonblock',
+  'io-wait',
+  'ipaddr',
+  'irb',
+  'json',
+  'logger',
+  'mutex_m',
+  'net-http',
+  'net-protocol',
+  'nkf',
+  'observer',
+  'open3',
+  'openssl',
+  'open-uri',
+  'optparse',
+  'ostruct',
+  'pathname',
+  'pp',
+  'prettyprint',
+  'pstore',
+  'psych',
+  'racc',
+  'rdoc',
+  'readline',
+  'readline-ext',
+  'reline',
+  'resolv',
+  'resolv-replace',
+  'rinda',
+  'ruby2_keywords',
+  'rubygems',
+  'securerandom',
+  'set',
+  'shellwords',
+  'singleton',
+  'stringio',
+  'strscan',
+  'syslog',
+  'syntax_suggest',
+  'tempfile',
+  'time',
+  'timeout',
+  'tmpdir',
+  'tsort',
+  'un',
+  'uri',
+  'weakref',
+  'win32ole',
+  'yaml',
+  'zlib'
+].freeze
 @versions_cache = {}
 
 @component_deps    = {} # gem_name => [dep gem names]
@@ -100,6 +176,8 @@ def get_metadata(name:, version: nil, platforms: ['ruby'])
 
   shas = platforms.to_h { |platform| [platform, find_sha(name, version, platform)] }
   deps = get_version_details(name, version).dig('dependencies', 'runtime') || []
+  # Remove any default gems as we don't want to manage them unless specifically needed
+  deps.reject! { |d| DEFAULT_GEMS.include?(d['name']) }
   { 'version' => version, 'shas' => shas, 'dependencies' => deps }
 end
 

From 8b55238bf6d5ebbd1a46d64c7b5820ab6b389ee1 Mon Sep 17 00:00:00 2001
From: nmburgan <13688219+nmburgan@users.noreply.github.com>
Date: Sun, 14 Dec 2025 14:57:49 -0800
Subject: [PATCH 03/10] Update rubygem components

Component updates:
- rubygem-aws-partitions: version 1.1190.0 -> 1.1194.0
- rubygem-aws-sdk-ec2: version 1.583.0 -> 1.584.0
- rubygem-concurrent-ruby: version 1.3.5 -> 1.3.6
- rubygem-date: version 3.5.0 -> 3.5.1
- rubygem-io-console: version 0.8.1 -> 0.8.2
- rubygem-json: version 2.17.1 -> 2.18.0
- rubygem-puppet_forge: version 6.0.0 -> 6.1.0
---
 configs/components/rubygem-CFPropertyList.rb   | 2 --
 configs/components/rubygem-aws-partitions.rb   | 4 ++--
 configs/components/rubygem-aws-sdk-core.rb     | 3 ---
 configs/components/rubygem-aws-sdk-ec2.rb      | 4 ++--
 configs/components/rubygem-concurrent-ruby.rb  | 4 ++--
 configs/components/rubygem-date.rb             | 4 ++--
 configs/components/rubygem-em-socksify.rb      | 1 -
 configs/components/rubygem-excon.rb            | 1 -
 configs/components/rubygem-faraday-net_http.rb | 1 -
 configs/components/rubygem-faraday.rb          | 2 --
 configs/components/rubygem-gettext.rb          | 1 -
 configs/components/rubygem-highline.rb         | 1 -
 configs/components/rubygem-httpclient.rb       | 1 -
 configs/components/rubygem-io-console.rb       | 4 ++--
 configs/components/rubygem-json.rb             | 4 ++--
 configs/components/rubygem-jwt.rb              | 1 -
 configs/components/rubygem-net-ftp.rb          | 2 --
 configs/components/rubygem-net-protocol.rb     | 1 -
 configs/components/rubygem-nori.rb             | 1 -
 configs/components/rubygem-openfact.rb         | 2 --
 configs/components/rubygem-openvox.rb          | 5 -----
 configs/components/rubygem-prime.rb            | 2 --
 configs/components/rubygem-puppet_forge.rb     | 4 ++--
 configs/components/rubygem-reline.rb           | 1 -
 configs/components/rubygem-ruby-dbus.rb        | 1 -
 configs/components/rubygem-rubyntlm.rb         | 1 -
 configs/components/rubygem-time.rb             | 1 -
 27 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/configs/components/rubygem-CFPropertyList.rb b/configs/components/rubygem-CFPropertyList.rb
index c85eeda8..795da431 100644
--- a/configs/components/rubygem-CFPropertyList.rb
+++ b/configs/components/rubygem-CFPropertyList.rb
@@ -10,8 +10,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '4.0.0'
   pkg.sha256sum '385e7bbd7c27e176b23415275ca936ca0ece1727e5b890b08e36632076b00aff'
-  pkg.build_requires 'rubygem-base64'
-  pkg.build_requires 'rubygem-nkf'
   pkg.build_requires 'rubygem-rexml'
   ### End automated maintenance section ###
 
diff --git a/configs/components/rubygem-aws-partitions.rb b/configs/components/rubygem-aws-partitions.rb
index 5af2a2f3..29132049 100644
--- a/configs/components/rubygem-aws-partitions.rb
+++ b/configs/components/rubygem-aws-partitions.rb
@@ -5,8 +5,8 @@
 #####
 component 'rubygem-aws-partitions' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '1.1190.0'
-  pkg.sha256sum '3e21ce1c99329a96fb71419a5d92d0cece5b276a9f47bc91d6a1290450fb3669'
+  pkg.version '1.1194.0'
+  pkg.sha256sum 'dcc6c65735f4266b9cb14feee67afd2d345e01e5b87697f91ddc06e7603b0811'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-aws-sdk-core.rb b/configs/components/rubygem-aws-sdk-core.rb
index ea708d36..6f2e561b 100644
--- a/configs/components/rubygem-aws-sdk-core.rb
+++ b/configs/components/rubygem-aws-sdk-core.rb
@@ -10,10 +10,7 @@
   pkg.build_requires 'rubygem-aws-eventstream'
   pkg.build_requires 'rubygem-aws-partitions'
   pkg.build_requires 'rubygem-aws-sigv4'
-  pkg.build_requires 'rubygem-base64'
-  pkg.build_requires 'rubygem-bigdecimal'
   pkg.build_requires 'rubygem-jmespath'
-  pkg.build_requires 'rubygem-logger'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-aws-sdk-ec2.rb b/configs/components/rubygem-aws-sdk-ec2.rb
index 3a817dab..91e99d1b 100644
--- a/configs/components/rubygem-aws-sdk-ec2.rb
+++ b/configs/components/rubygem-aws-sdk-ec2.rb
@@ -5,8 +5,8 @@
 #####
 component 'rubygem-aws-sdk-ec2' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '1.583.0'
-  pkg.sha256sum 'd35d4f58811b7619b27f2919f6b88ad87ef764974dfdf05b506d8bc7a2693e15'
+  pkg.version '1.584.0'
+  pkg.sha256sum 'cf4873be8035d70b6757269f9746249a64a4e845795485f709827fe7284136b6'
   pkg.build_requires 'rubygem-aws-sdk-core'
   pkg.build_requires 'rubygem-aws-sigv4'
   ### End automated maintenance section ###
diff --git a/configs/components/rubygem-concurrent-ruby.rb b/configs/components/rubygem-concurrent-ruby.rb
index 93a447da..cc2f71e3 100644
--- a/configs/components/rubygem-concurrent-ruby.rb
+++ b/configs/components/rubygem-concurrent-ruby.rb
@@ -5,8 +5,8 @@
 #####
 component 'rubygem-concurrent-ruby' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '1.3.5'
-  pkg.sha256sum '813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6'
+  pkg.version '1.3.6'
+  pkg.sha256sum '6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-date.rb b/configs/components/rubygem-date.rb
index e5f4d2bf..cd7c94cb 100644
--- a/configs/components/rubygem-date.rb
+++ b/configs/components/rubygem-date.rb
@@ -4,8 +4,8 @@
 #####
 component 'rubygem-date' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '3.5.0'
-  pkg.sha256sum '5e74fd6c04b0e65d97ad4f3bb5cb2d8efb37f386cc848f46310b4593ffc46ee5'
+  pkg.version '3.5.1'
+  pkg.sha256sum '750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-em-socksify.rb b/configs/components/rubygem-em-socksify.rb
index 52777eb3..aca9fe55 100644
--- a/configs/components/rubygem-em-socksify.rb
+++ b/configs/components/rubygem-em-socksify.rb
@@ -6,7 +6,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '0.3.3'
   pkg.sha256sum '7d8d08a7a8acc1263173433a6b5540edd80a8a36e35a066b650c929a3a3974ed'
-  pkg.build_requires 'rubygem-base64'
   pkg.build_requires 'rubygem-eventmachine'
   ### End automated maintenance section ###
 
diff --git a/configs/components/rubygem-excon.rb b/configs/components/rubygem-excon.rb
index 388ada98..2de8ef85 100644
--- a/configs/components/rubygem-excon.rb
+++ b/configs/components/rubygem-excon.rb
@@ -6,7 +6,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '1.3.2'
   pkg.sha256sum 'a089babe98638e58042a7d542b2bbd183304527e33d612b6dde22fa491a544a5'
-  pkg.build_requires 'rubygem-logger'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-faraday-net_http.rb b/configs/components/rubygem-faraday-net_http.rb
index 3bc80b6e..80a134f2 100644
--- a/configs/components/rubygem-faraday-net_http.rb
+++ b/configs/components/rubygem-faraday-net_http.rb
@@ -7,7 +7,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '3.4.2'
   pkg.sha256sum 'f147758260d3526939bf57ecf911682f94926a3666502e24c69992765875906c'
-  pkg.build_requires 'rubygem-net-http'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-faraday.rb b/configs/components/rubygem-faraday.rb
index 5f62580c..236fc499 100644
--- a/configs/components/rubygem-faraday.rb
+++ b/configs/components/rubygem-faraday.rb
@@ -8,8 +8,6 @@
   pkg.version '2.14.0'
   pkg.sha256sum '8699cfe5d97e55268f2596f9a9d5a43736808a943714e3d9a53e6110593941cd'
   pkg.build_requires 'rubygem-faraday-net_http'
-  pkg.build_requires 'rubygem-json'
-  pkg.build_requires 'rubygem-logger'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-gettext.rb b/configs/components/rubygem-gettext.rb
index e252900d..5b9c5bd7 100644
--- a/configs/components/rubygem-gettext.rb
+++ b/configs/components/rubygem-gettext.rb
@@ -10,7 +10,6 @@
   pkg.build_requires 'rubygem-erubi'
   pkg.build_requires 'rubygem-locale'
   pkg.build_requires 'rubygem-prime'
-  pkg.build_requires 'rubygem-racc'
   pkg.build_requires 'rubygem-text'
   ### End automated maintenance section ###
 
diff --git a/configs/components/rubygem-highline.rb b/configs/components/rubygem-highline.rb
index 8a69bc01..9056b179 100644
--- a/configs/components/rubygem-highline.rb
+++ b/configs/components/rubygem-highline.rb
@@ -7,7 +7,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '3.1.2'
   pkg.sha256sum '67cbd34d19f6ef11a7ee1d82ffab5d36dfd5b3be861f450fc1716c7125f4bb4a'
-  pkg.build_requires 'rubygem-reline'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-httpclient.rb b/configs/components/rubygem-httpclient.rb
index ae231413..7f7cc519 100644
--- a/configs/components/rubygem-httpclient.rb
+++ b/configs/components/rubygem-httpclient.rb
@@ -7,7 +7,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '2.9.0'
   pkg.sha256sum '4b645958e494b2f86c2f8a2f304c959baa273a310e77a2931ddb986d83e498c8'
-  pkg.build_requires 'rubygem-mutex_m'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-io-console.rb b/configs/components/rubygem-io-console.rb
index 92a8fec1..81f0359b 100644
--- a/configs/components/rubygem-io-console.rb
+++ b/configs/components/rubygem-io-console.rb
@@ -4,8 +4,8 @@
 #####
 component 'rubygem-io-console' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '0.8.1'
-  pkg.sha256sum '1e15440a6b2f67b6ea496df7c474ed62c860ad11237f29b3bd187f054b925fcb'
+  pkg.version '0.8.2'
+  pkg.sha256sum 'd6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-json.rb b/configs/components/rubygem-json.rb
index 17510fe7..42eb67a7 100644
--- a/configs/components/rubygem-json.rb
+++ b/configs/components/rubygem-json.rb
@@ -4,8 +4,8 @@
 #####
 component 'rubygem-json' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '2.17.1'
-  pkg.sha256sum 'e0e4824541336a44915436f53e7ea74c687314fb8f88080fa1456f6a34ead92e'
+  pkg.version '2.18.0'
+  pkg.sha256sum 'b10506aee4183f5cf49e0efc48073d7b75843ce3782c68dbeb763351c08fd505'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-jwt.rb b/configs/components/rubygem-jwt.rb
index c1e027c8..bc5e0fbc 100644
--- a/configs/components/rubygem-jwt.rb
+++ b/configs/components/rubygem-jwt.rb
@@ -10,7 +10,6 @@
   # PINNED
   pkg.version '2.10.2'
   pkg.sha256sum '31e1ee46f7359883d5e622446969fe9c118c3da87a0b1dca765ce269c3a0c4f4'
-  pkg.build_requires 'rubygem-base64'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-net-ftp.rb b/configs/components/rubygem-net-ftp.rb
index fbc15bee..d376e8a2 100644
--- a/configs/components/rubygem-net-ftp.rb
+++ b/configs/components/rubygem-net-ftp.rb
@@ -7,8 +7,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '0.3.9'
   pkg.sha256sum '307817ccf7f428f79d083f7e36dbb46a9d1d375e0d23027824de1866f0b13b65'
-  pkg.build_requires 'rubygem-net-protocol'
-  pkg.build_requires 'rubygem-time'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-net-protocol.rb b/configs/components/rubygem-net-protocol.rb
index f9617f65..5ceffd9b 100644
--- a/configs/components/rubygem-net-protocol.rb
+++ b/configs/components/rubygem-net-protocol.rb
@@ -6,7 +6,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '0.2.2'
   pkg.sha256sum 'aa73e0cba6a125369de9837b8d8ef82a61849360eba0521900e2c3713aa162a8'
-  pkg.build_requires 'rubygem-timeout'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-nori.rb b/configs/components/rubygem-nori.rb
index bb0fd3f6..2044eefa 100644
--- a/configs/components/rubygem-nori.rb
+++ b/configs/components/rubygem-nori.rb
@@ -8,7 +8,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '2.7.1'
   pkg.sha256sum '6166cd336959854762073e2fbae888593809cac1b3e904f4fb009313d7226861'
-  pkg.build_requires 'rubygem-bigdecimal'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-openfact.rb b/configs/components/rubygem-openfact.rb
index 6ab9ee81..b877fac2 100644
--- a/configs/components/rubygem-openfact.rb
+++ b/configs/components/rubygem-openfact.rb
@@ -7,9 +7,7 @@
   ### Maintained by update_gems automation ###
   pkg.version '5.2.0'
   pkg.sha256sum 'b044fdbd45b4bb59aab7bf2d2f98065e6a65ecc3cf4cdd91ee32c79c0556d172'
-  pkg.build_requires 'rubygem-base64'
   pkg.build_requires 'rubygem-hocon'
-  pkg.build_requires 'rubygem-logger'
   pkg.build_requires 'rubygem-thor'
   ### End automated maintenance section ###
 
diff --git a/configs/components/rubygem-openvox.rb b/configs/components/rubygem-openvox.rb
index b27ac46f..c2f16c76 100644
--- a/configs/components/rubygem-openvox.rb
+++ b/configs/components/rubygem-openvox.rb
@@ -9,18 +9,13 @@
   ### Maintained by update_gems automation ###
   pkg.version '8.24.1'
   pkg.sha256sum '420366b951972e390435353371d527aadd7c80f082fd5ad7b80cd50626a3d439'
-  pkg.build_requires 'rubygem-base64'
-  pkg.build_requires 'rubygem-benchmark'
   pkg.build_requires 'rubygem-concurrent-ruby'
   pkg.build_requires 'rubygem-deep_merge'
   pkg.build_requires 'rubygem-fast_gettext'
-  pkg.build_requires 'rubygem-getoptlong'
   pkg.build_requires 'rubygem-locale'
   pkg.build_requires 'rubygem-multi_json'
   pkg.build_requires 'rubygem-openfact'
-  pkg.build_requires 'rubygem-ostruct'
   pkg.build_requires 'rubygem-puppet-resource_api'
-  pkg.build_requires 'rubygem-racc'
   pkg.build_requires 'rubygem-scanf'
   pkg.build_requires 'rubygem-semantic_puppet'
   ### End automated maintenance section ###
diff --git a/configs/components/rubygem-prime.rb b/configs/components/rubygem-prime.rb
index 2e023923..88eb911e 100644
--- a/configs/components/rubygem-prime.rb
+++ b/configs/components/rubygem-prime.rb
@@ -7,8 +7,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '0.1.4'
   pkg.sha256sum '4d755ebf7c2994a6f3a3fee0d072063be3fff2d4042ebff6cd5eebd4747a225e'
-  pkg.build_requires 'rubygem-forwardable'
-  pkg.build_requires 'rubygem-singleton'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-puppet_forge.rb b/configs/components/rubygem-puppet_forge.rb
index 9d1ca4a1..41cd1a9d 100644
--- a/configs/components/rubygem-puppet_forge.rb
+++ b/configs/components/rubygem-puppet_forge.rb
@@ -6,8 +6,8 @@
 #####
 component 'rubygem-puppet_forge' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '6.0.0'
-  pkg.sha256sum '0770bed61c9f5b21bd81666b121e086165e34c45691bdefec70438bf412f8ddf'
+  pkg.version '6.1.0'
+  pkg.sha256sum 'e3bfe83282f0136adf0938f52180a53b45434b70464a5a453d6398df6563764b'
   pkg.build_requires 'rubygem-faraday'
   pkg.build_requires 'rubygem-faraday-follow_redirects'
   pkg.build_requires 'rubygem-minitar'
diff --git a/configs/components/rubygem-reline.rb b/configs/components/rubygem-reline.rb
index 92ca4111..aeddbec4 100644
--- a/configs/components/rubygem-reline.rb
+++ b/configs/components/rubygem-reline.rb
@@ -6,7 +6,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '0.6.3'
   pkg.sha256sum '1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835'
-  pkg.build_requires 'rubygem-io-console'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-ruby-dbus.rb b/configs/components/rubygem-ruby-dbus.rb
index 1797b385..33c612fe 100644
--- a/configs/components/rubygem-ruby-dbus.rb
+++ b/configs/components/rubygem-ruby-dbus.rb
@@ -6,7 +6,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '0.25.0'
   pkg.sha256sum 'fe431ca96a61f7c87a5177a43c9fe0a50eafe174c1d108421e38bb5165ea4814'
-  pkg.build_requires 'rubygem-logger'
   pkg.build_requires 'rubygem-rexml'
   ### End automated maintenance section ###
 
diff --git a/configs/components/rubygem-rubyntlm.rb b/configs/components/rubygem-rubyntlm.rb
index 3b85701c..ae0908b9 100644
--- a/configs/components/rubygem-rubyntlm.rb
+++ b/configs/components/rubygem-rubyntlm.rb
@@ -7,7 +7,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '0.6.5'
   pkg.sha256sum '47013402b99ae29ee93f930af51edaec8c6008556f4be25705a422b4430314f5'
-  pkg.build_requires 'rubygem-base64'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-time.rb b/configs/components/rubygem-time.rb
index bb2fd13c..5d540d75 100644
--- a/configs/components/rubygem-time.rb
+++ b/configs/components/rubygem-time.rb
@@ -6,7 +6,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '0.4.1'
   pkg.sha256sum '035f360508a4a4dbabcbbcd3886566b9abd432de89136795d2ff7aec5bcdea61'
-  pkg.build_requires 'rubygem-date'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')

From 9930ec8d980f143b07374f51318ff196695ed7b9 Mon Sep 17 00:00:00 2001
From: nmburgan <13688219+nmburgan@users.noreply.github.com>
Date: Sun, 14 Dec 2025 15:08:09 -0800
Subject: [PATCH 04/10] Remove shipping of default gems

We shouldn't include these unless we have a very good reason to, like addressing a CVE before Ruby has shipped a new version.
---
 configs/components/rubygem-base64.rb         | 13 ---------
 configs/components/rubygem-benchmark.rb      | 12 --------
 configs/components/rubygem-bigdecimal.rb     | 12 --------
 configs/components/rubygem-date.rb           | 12 --------
 configs/components/rubygem-fiddle.rb         | 13 ---------
 configs/components/rubygem-forwardable.rb    | 12 --------
 configs/components/rubygem-getoptlong.rb     | 12 --------
 configs/components/rubygem-io-console.rb     | 12 --------
 configs/components/rubygem-json.rb           | 12 --------
 configs/components/rubygem-logger.rb         | 13 ---------
 configs/components/rubygem-mutex_m.rb        | 12 --------
 configs/components/rubygem-net-http.rb       | 13 ---------
 configs/components/rubygem-net-protocol.rb   | 12 --------
 configs/components/rubygem-nkf.rb            | 12 --------
 configs/components/rubygem-ostruct.rb        | 12 --------
 configs/components/rubygem-racc.rb           | 12 --------
 configs/components/rubygem-reline.rb         | 12 --------
 configs/components/rubygem-ruby2_keywords.rb | 13 ---------
 configs/components/rubygem-singleton.rb      | 12 --------
 configs/components/rubygem-time.rb           | 12 --------
 configs/components/rubygem-timeout.rb        | 12 --------
 configs/components/rubygem-win32ole.rb       | 13 ---------
 configs/projects/agent-runtime-main.rb       | 17 ------------
 configs/projects/openbolt-runtime.rb         | 29 --------------------
 24 files changed, 316 deletions(-)
 delete mode 100644 configs/components/rubygem-base64.rb
 delete mode 100644 configs/components/rubygem-benchmark.rb
 delete mode 100644 configs/components/rubygem-bigdecimal.rb
 delete mode 100644 configs/components/rubygem-date.rb
 delete mode 100644 configs/components/rubygem-fiddle.rb
 delete mode 100644 configs/components/rubygem-forwardable.rb
 delete mode 100644 configs/components/rubygem-getoptlong.rb
 delete mode 100644 configs/components/rubygem-io-console.rb
 delete mode 100644 configs/components/rubygem-json.rb
 delete mode 100644 configs/components/rubygem-logger.rb
 delete mode 100644 configs/components/rubygem-mutex_m.rb
 delete mode 100644 configs/components/rubygem-net-http.rb
 delete mode 100644 configs/components/rubygem-net-protocol.rb
 delete mode 100644 configs/components/rubygem-nkf.rb
 delete mode 100644 configs/components/rubygem-ostruct.rb
 delete mode 100644 configs/components/rubygem-racc.rb
 delete mode 100644 configs/components/rubygem-reline.rb
 delete mode 100644 configs/components/rubygem-ruby2_keywords.rb
 delete mode 100644 configs/components/rubygem-singleton.rb
 delete mode 100644 configs/components/rubygem-time.rb
 delete mode 100644 configs/components/rubygem-timeout.rb
 delete mode 100644 configs/components/rubygem-win32ole.rb

diff --git a/configs/components/rubygem-base64.rb b/configs/components/rubygem-base64.rb
deleted file mode 100644
index 4b1e5019..00000000
--- a/configs/components/rubygem-base64.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/base64
-#   https://github.com/ruby/base64/releases
-#####
-component 'rubygem-base64' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.3.0'
-  pkg.sha256sum '27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-benchmark.rb b/configs/components/rubygem-benchmark.rb
deleted file mode 100644
index d1511e98..00000000
--- a/configs/components/rubygem-benchmark.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/benchmark
-#####
-component 'rubygem-benchmark' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.5.0'
-  pkg.sha256sum '465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-bigdecimal.rb b/configs/components/rubygem-bigdecimal.rb
deleted file mode 100644
index 20596397..00000000
--- a/configs/components/rubygem-bigdecimal.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/bigdecimal
-#####
-component 'rubygem-bigdecimal' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '3.3.1'
-  pkg.sha256sum 'eaa01e228be54c4f9f53bf3cc34fe3d5e845c31963e7fcc5bedb05a4e7d52218'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-date.rb b/configs/components/rubygem-date.rb
deleted file mode 100644
index cd7c94cb..00000000
--- a/configs/components/rubygem-date.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/date
-#####
-component 'rubygem-date' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '3.5.1'
-  pkg.sha256sum '750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-fiddle.rb b/configs/components/rubygem-fiddle.rb
deleted file mode 100644
index bbaf4fd4..00000000
--- a/configs/components/rubygem-fiddle.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/fiddle
-#   https://github.com/ruby/fiddle/releases
-#####
-component 'rubygem-fiddle' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '1.1.8'
-  pkg.sha256sum '7fa8ee3627271497f3add5503acdbc3f40b32f610fc1cf49634f083ef3f32eee'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-forwardable.rb b/configs/components/rubygem-forwardable.rb
deleted file mode 100644
index 9d9a2aee..00000000
--- a/configs/components/rubygem-forwardable.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/forwardable
-#####
-component 'rubygem-forwardable' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '1.3.3'
-  pkg.sha256sum 'f17df4bd6afa6f46a003217023fe5716ef88ce261f5c4cf0edbdeed6470cafac'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-getoptlong.rb b/configs/components/rubygem-getoptlong.rb
deleted file mode 100644
index 563e2cf9..00000000
--- a/configs/components/rubygem-getoptlong.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/getoptlong
-#####
-component 'rubygem-getoptlong' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.2.1'
-  pkg.sha256sum 'fd23f07397b994bf9310d4531cfdb4332629a9b8e8c9c457c32b7edf5bf21ba5'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-io-console.rb b/configs/components/rubygem-io-console.rb
deleted file mode 100644
index 81f0359b..00000000
--- a/configs/components/rubygem-io-console.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/io-console
-#####
-component 'rubygem-io-console' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.8.2'
-  pkg.sha256sum 'd6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-json.rb b/configs/components/rubygem-json.rb
deleted file mode 100644
index 42eb67a7..00000000
--- a/configs/components/rubygem-json.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/json
-#####
-component 'rubygem-json' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '2.18.0'
-  pkg.sha256sum 'b10506aee4183f5cf49e0efc48073d7b75843ce3782c68dbeb763351c08fd505'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-logger.rb b/configs/components/rubygem-logger.rb
deleted file mode 100644
index 07eed31c..00000000
--- a/configs/components/rubygem-logger.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/logger
-#   https://github.com/ruby/logger/releases
-#####
-component 'rubygem-logger' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '1.7.0'
-  pkg.sha256sum '196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-mutex_m.rb b/configs/components/rubygem-mutex_m.rb
deleted file mode 100644
index fef555b8..00000000
--- a/configs/components/rubygem-mutex_m.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/mutex_m
-#####
-component 'rubygem-mutex_m' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.3.0'
-  pkg.sha256sum 'cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-net-http.rb b/configs/components/rubygem-net-http.rb
deleted file mode 100644
index f309dfd2..00000000
--- a/configs/components/rubygem-net-http.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/net-http
-#####
-component 'rubygem-net-http' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.8.0'
-  pkg.sha256sum 'df42c47ce9f9e95ad32a317c97c12f945bc1af365288837ea4ff259876ecb46d'
-  pkg.build_requires 'rubygem-uri'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-net-protocol.rb b/configs/components/rubygem-net-protocol.rb
deleted file mode 100644
index 5ceffd9b..00000000
--- a/configs/components/rubygem-net-protocol.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/net-protocol
-#####
-component 'rubygem-net-protocol' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.2.2'
-  pkg.sha256sum 'aa73e0cba6a125369de9837b8d8ef82a61849360eba0521900e2c3713aa162a8'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-nkf.rb b/configs/components/rubygem-nkf.rb
deleted file mode 100644
index 7ae002b5..00000000
--- a/configs/components/rubygem-nkf.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/nkf
-#####
-component 'rubygem-nkf' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.2.0'
-  pkg.sha256sum 'fbc151bda025451f627fafdfcb3f4f13d0b22ae11f58c6d3a2939c76c5f5f126'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-ostruct.rb b/configs/components/rubygem-ostruct.rb
deleted file mode 100644
index 7f9cefad..00000000
--- a/configs/components/rubygem-ostruct.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/ostruct
-#####
-component 'rubygem-ostruct' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.6.3'
-  pkg.sha256sum '95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-racc.rb b/configs/components/rubygem-racc.rb
deleted file mode 100644
index 3dfb340f..00000000
--- a/configs/components/rubygem-racc.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/racc
-#####
-component 'rubygem-racc' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '1.8.1'
-  pkg.sha256sum '4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-reline.rb b/configs/components/rubygem-reline.rb
deleted file mode 100644
index aeddbec4..00000000
--- a/configs/components/rubygem-reline.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/reline
-#####
-component 'rubygem-reline' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.6.3'
-  pkg.sha256sum '1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-ruby2_keywords.rb b/configs/components/rubygem-ruby2_keywords.rb
deleted file mode 100644
index da494d60..00000000
--- a/configs/components/rubygem-ruby2_keywords.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/ruby2_keywords
-#   https://github.com/ruby/ruby2_keywords/releases
-#####
-component 'rubygem-ruby2_keywords' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.0.5'
-  pkg.sha256sum 'ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3ef'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-singleton.rb b/configs/components/rubygem-singleton.rb
deleted file mode 100644
index 47dc8728..00000000
--- a/configs/components/rubygem-singleton.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/singleton
-#####
-component 'rubygem-singleton' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.3.0'
-  pkg.sha256sum '83ea1bca5f4aa34d00305ab842a7862ea5a8a11c73d362cb52379d94e9615778'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-time.rb b/configs/components/rubygem-time.rb
deleted file mode 100644
index 5d540d75..00000000
--- a/configs/components/rubygem-time.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/time
-#####
-component 'rubygem-time' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.4.1'
-  pkg.sha256sum '035f360508a4a4dbabcbbcd3886566b9abd432de89136795d2ff7aec5bcdea61'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-timeout.rb b/configs/components/rubygem-timeout.rb
deleted file mode 100644
index 71ddb67f..00000000
--- a/configs/components/rubygem-timeout.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/timeout
-#####
-component 'rubygem-timeout' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.5.0'
-  pkg.sha256sum '852aefd13f41d84c2d0d83099b275034c6517395884b58e635acc8847c9190cb'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-win32ole.rb b/configs/components/rubygem-win32ole.rb
deleted file mode 100644
index a7be897d..00000000
--- a/configs/components/rubygem-win32ole.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/win32ole
-#   https://github.com/ruby/win32ole/releases
-#####
-component 'rubygem-win32ole' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '1.9.2'
-  pkg.sha256sum '99612fe2c6cb397c0910680f7d1ba6366f08e37aeac83ebaeab9e72ee823e0f5'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/projects/agent-runtime-main.rb b/configs/projects/agent-runtime-main.rb
index 8dc3778e..7bc728fd 100644
--- a/configs/projects/agent-runtime-main.rb
+++ b/configs/projects/agent-runtime-main.rb
@@ -44,33 +44,21 @@
   proj.component 'puppet-ca-bundle'
   proj.component "ruby-#{proj.ruby_version}"
 
-  proj.component 'rubygem-base64'
   proj.component 'rubygem-concurrent-ruby'
   proj.component 'rubygem-deep_merge'
   proj.component 'rubygem-erubi'
   proj.component 'rubygem-fast_gettext'
   proj.component 'rubygem-ffi'
-  proj.component 'rubygem-fiddle'
   proj.component 'rubygem-gettext'
-  proj.component 'rubygem-racc'
   proj.component 'rubygem-hiera-eyaml'
   proj.component 'rubygem-highline'
-  proj.component 'rubygem-reline'
-  proj.component 'rubygem-io-console'
   proj.component 'rubygem-hocon'
   proj.component 'rubygem-locale'
-  proj.component 'rubygem-logger'
   proj.component 'rubygem-multi_json'
   proj.component 'rubygem-net-ftp'
-  proj.component 'rubygem-time'
-  proj.component 'rubygem-date'
-  proj.component 'rubygem-net-protocol'
-  proj.component 'rubygem-timeout'
   proj.component 'rubygem-net-ssh'
   proj.component 'rubygem-optimist'
   proj.component 'rubygem-prime'
-  proj.component 'rubygem-singleton'
-  proj.component 'rubygem-forwardable'
   proj.component 'rubygem-semantic_puppet'
   proj.component 'rubygem-scanf'
   proj.component 'rubygem-text'
@@ -87,14 +75,9 @@
     proj.component 'rubygem-sys-filesystem'
   end
 
-  if platform.is_windows?
-    proj.component 'rubygem-win32ole'
-  end
-
   if platform.is_macos?
     proj.component 'readline'
     proj.component 'rubygem-CFPropertyList'
-    proj.component 'rubygem-nkf'
   end
 
   unless platform.is_aix? || platform.is_windows?
diff --git a/configs/projects/openbolt-runtime.rb b/configs/projects/openbolt-runtime.rb
index b68ff9c6..a166e1a2 100644
--- a/configs/projects/openbolt-runtime.rb
+++ b/configs/projects/openbolt-runtime.rb
@@ -125,22 +125,13 @@
   proj.component 'rubygem-bcrypt_pbkdf'
   proj.component 'rubygem-ed25519'
 
-  # These gems are still included in Ruby 3.2, but we include them because
-  # OpenFact requires them for Ruby 3.4 support, and Bolt will need to
-  # do the same once we get to Ruby 3.4+ support.
-  proj.component 'rubygem-logger'
-  proj.component 'rubygem-base64'
-
   # Puppet dependencies
   proj.component 'rubygem-hocon'
   proj.component 'rubygem-deep_merge'
   proj.component 'rubygem-text'
   proj.component 'rubygem-locale'
   proj.component 'rubygem-gettext'
-  proj.component 'rubygem-racc'
   proj.component 'rubygem-prime'
-  proj.component 'rubygem-singleton'
-  proj.component 'rubygem-forwardable'
   proj.component 'rubygem-fast_gettext'
   proj.component 'rubygem-scanf'
   proj.component 'rubygem-semantic_puppet'
@@ -150,14 +141,11 @@
 
   # hiera-eyaml and its dependencies
   proj.component 'rubygem-highline'
-  proj.component 'rubygem-reline'
-  proj.component 'rubygem-io-console'
   proj.component 'rubygem-optimist'
   proj.component 'rubygem-hiera-eyaml'
 
   # faraday and its dependencies
   proj.component 'rubygem-faraday'
-  proj.component 'rubygem-json'
   proj.component 'rubygem-faraday-em_http'
   proj.component 'rubygem-em-http-request'
   proj.component 'rubygem-http_parser.rb'
@@ -170,7 +158,6 @@
   proj.component 'rubygem-faraday-httpclient'
   proj.component 'rubygem-faraday-multipart'
   proj.component 'rubygem-faraday-net_http'
-  proj.component 'rubygem-net-http'
   proj.component 'rubygem-uri'
   proj.component 'rubygem-faraday-net_http_persistent'
   proj.component 'rubygem-faraday-patron'
@@ -178,21 +165,18 @@
   proj.component 'rubygem-faraday-rack'
   proj.component 'rubygem-faraday-retry'
   proj.component 'rubygem-faraday-follow_redirects'
-  proj.component 'rubygem-ruby2_keywords'
 
   # Core dependencies
   proj.component 'rubygem-addressable'
   proj.component 'rubygem-aws-eventstream'
   proj.component 'rubygem-aws-partitions'
   proj.component 'rubygem-aws-sdk-core'
-  proj.component 'rubygem-bigdecimal'
   proj.component 'rubygem-aws-sdk-ec2'
   proj.component 'rubygem-aws-sigv4'
   proj.component 'rubygem-bindata'
   proj.component 'rubygem-builder'
   proj.component 'rubygem-CFPropertyList'
   proj.component 'rubygem-rexml'
-  proj.component 'rubygem-nkf'
   proj.component 'rubygem-colored2'
   proj.component 'rubygem-concurrent-ruby'
   proj.component 'rubygem-connection_pool'
@@ -200,12 +184,10 @@
   proj.component 'rubygem-erubi'
   proj.component 'rubygem-openfact'
   proj.component 'rubygem-ffi'
-  proj.component 'rubygem-fiddle'
   proj.component 'rubygem-gssapi'
   proj.component 'rubygem-gyoku'
   proj.component 'rubygem-hiera'
   proj.component 'rubygem-httpclient'
-  proj.component 'rubygem-mutex_m'
   proj.component 'rubygem-jmespath'
   proj.component 'rubygem-jwt'
   proj.component 'rubygem-little-plugger'
@@ -217,10 +199,6 @@
   proj.component 'rubygem-multipart-post'
   proj.component 'rubygem-net-http-persistent'
   proj.component 'rubygem-net-ftp'
-  proj.component 'rubygem-time'
-  proj.component 'rubygem-date'
-  proj.component 'rubygem-net-protocol'
-  proj.component 'rubygem-timeout'
   proj.component 'rubygem-net-scp'
   proj.component 'rubygem-net-ssh'
   proj.component 'rubygem-net-ssh-krb'
@@ -229,9 +207,6 @@
   proj.component 'rubygem-paint'
   proj.component 'rubygem-public_suffix'
   proj.component 'rubygem-openvox'
-  proj.component 'rubygem-ostruct'
-  proj.component 'rubygem-benchmark'
-  proj.component 'rubygem-getoptlong'
   proj.component 'rubygem-openfact'
   proj.component 'rubygem-puppet_forge'
   proj.component 'rubygem-puppet-resource_api'
@@ -261,10 +236,6 @@
     proj.component 'ruby-selinux'
   end
 
-  if platform.is_windows?
-    proj.component 'rubygem-win32ole'
-  end
-
   # Non-windows specific components
   unless platform.is_windows?
     # C Augeas + deps

From 03fb02fd0bcdcca5224c4c98d6086afda35ea0bc Mon Sep 17 00:00:00 2001
From: nmburgan <13688219+nmburgan@users.noreply.github.com>
Date: Sun, 14 Dec 2025 15:19:24 -0800
Subject: [PATCH 05/10] Downgrade uri gem to 0.12.5

This is a default gem, and Ruby 3.2.9 ships 0.12.4. Version 0.12.5 addresses a CVE, so we ship this version until Ruby 3.2.10 is released which should include it.
---
 configs/components/rubygem-uri.rb      | 8 ++++++--
 configs/projects/agent-runtime-main.rb | 3 +++
 configs/projects/openbolt-runtime.rb   | 4 +++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/configs/components/rubygem-uri.rb b/configs/components/rubygem-uri.rb
index e40f71a8..9ef87230 100644
--- a/configs/components/rubygem-uri.rb
+++ b/configs/components/rubygem-uri.rb
@@ -1,11 +1,15 @@
 #####
 # Component release information:
 #   https://rubygems.org/gems/uri
+# Notes:
+#   2025-12-14: This is a default gem, and is only included here to address
+#   CVE-2025-61594. This component should be removed once Ruby 3.2.10 is released.
 #####
 component 'rubygem-uri' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '1.1.1'
-  pkg.sha256sum '379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6'
+  # PINNED
+  pkg.version '0.12.5'
+  pkg.sha256sum '883424e272244f029ad3b9fe0e9ad18d1c33cdadff0a366c301ce737c62eb414'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/projects/agent-runtime-main.rb b/configs/projects/agent-runtime-main.rb
index 7bc728fd..4a26c247 100644
--- a/configs/projects/agent-runtime-main.rb
+++ b/configs/projects/agent-runtime-main.rb
@@ -64,6 +64,9 @@
   proj.component 'rubygem-text'
   proj.component 'rubygem-thor'
 
+  # Remove this once Ruby 3.2.10 is released
+  proj.component 'rubygem-uri'
+
   # We add rexml explicitly in here because even though ruby 3 ships with rexml as its default gem, the version
   # of rexml it ships with can contain CVEs. So, we add it here to update to a higher version free from the CVEs.
   proj.component 'rubygem-rexml'
diff --git a/configs/projects/openbolt-runtime.rb b/configs/projects/openbolt-runtime.rb
index a166e1a2..4e65e99e 100644
--- a/configs/projects/openbolt-runtime.rb
+++ b/configs/projects/openbolt-runtime.rb
@@ -158,7 +158,6 @@
   proj.component 'rubygem-faraday-httpclient'
   proj.component 'rubygem-faraday-multipart'
   proj.component 'rubygem-faraday-net_http'
-  proj.component 'rubygem-uri'
   proj.component 'rubygem-faraday-net_http_persistent'
   proj.component 'rubygem-faraday-patron'
   proj.component 'rubygem-patron'
@@ -225,6 +224,9 @@
   proj.component 'rubygem-webrick'
   proj.component 'rubygem-yard'
 
+  # Remove this once Ruby 3.2.10 is released
+  proj.component 'rubygem-uri'
+
   # Core Windows dependencies
   proj.component 'rubygem-windows_error'
   proj.component 'rubygem-winrm'

From 3bd1ef945e9b23c8d9dafaf3a506db547bfc35d0 Mon Sep 17 00:00:00 2001
From: nmburgan <13688219+nmburgan@users.noreply.github.com>
Date: Sun, 14 Dec 2025 16:15:38 -0800
Subject: [PATCH 06/10] Add bundled gems to list we don't package

There's not really a good reason to update the bundled gems either, unless they have a CVE. This adds them to the list, and the only bundled gem we keep around is rexml, since it currently and often has CVEs.
---
 configs/components/_base-rubygem.rb        | 17 +++++--------
 configs/components/rubygem-fast_gettext.rb |  1 -
 configs/components/rubygem-gettext.rb      |  1 -
 configs/components/rubygem-net-ftp.rb      | 13 ----------
 configs/components/rubygem-prime.rb        | 13 ----------
 configs/projects/agent-runtime-main.rb     |  2 --
 configs/projects/openbolt-runtime.rb       |  2 --
 tasks/update_gems.rake                     | 28 +++++++++++++++++-----
 8 files changed, 28 insertions(+), 49 deletions(-)
 delete mode 100644 configs/components/rubygem-net-ftp.rb
 delete mode 100644 configs/components/rubygem-prime.rb

diff --git a/configs/components/_base-rubygem.rb b/configs/components/_base-rubygem.rb
index 663aa7ab..b775c220 100644
--- a/configs/components/_base-rubygem.rb
+++ b/configs/components/_base-rubygem.rb
@@ -35,21 +35,16 @@
 # If a gem needs more command line options to install set the :gem_install_options
 # in its component file rubygem-<compoment>, before the instance_eval of this file.
 gem_install_options = settings["#{pkg.get_name}_gem_install_options".to_sym]
-remove_older_versions = settings["#{pkg.get_name}_remove_older_versions".to_sym]
 # Set a default gem_uninstall
 gem_uninstall = settings[:gem_uninstall] || "#{settings[:host_gem]} uninstall --all --ignore-dependencies"
 pkg.install do
   steps = []
-  steps << "#{gem_uninstall} #{name}" if remove_older_versions
-  steps << if gem_install_options.nil?
-             "#{settings[:gem_install]} #{name}-#{version}.gem"
-           else
-             "#{settings[:gem_install]} #{name}-#{version}.gem #{gem_install_options}"
-           end
+  # Attempting to uninstall a default gem this way will fail, so ignore failures
+  steps << "#{gem_uninstall} --force #{name} || true"
+  steps << "#{settings[:gem_install]} #{name}-#{version}.gem #{gem_install_options || ''}"
   # If we are installing a newer version of a default gem, we need to remove the existing
-  # specification file so that we don't get warnings.
+  # specification file so that we don't get warnings. The corresponding gem directory is
+  # usually empty and only there for compatibility reasons, so we remove that too to avoid confusion.
   steps << "rm -f #{settings[:gem_home]}/specifications/default/#{name}-*.gemspec"
-  # This dir is usually empty and only there for compatilibity reasons for things requiring
-  # a directory corresponding to a gemspec. Remove it to avoid confusion.
-  steps << "rm -f #{settings[:gem_home]}/gems/#{name}-*[!#{version}]"
+  steps << "rm -rf #{settings[:gem_home]}/gems/#{name}-*[!#{version}]"
 end
diff --git a/configs/components/rubygem-fast_gettext.rb b/configs/components/rubygem-fast_gettext.rb
index ae28f872..cfcfd976 100644
--- a/configs/components/rubygem-fast_gettext.rb
+++ b/configs/components/rubygem-fast_gettext.rb
@@ -10,7 +10,6 @@
   # PINNED
   pkg.version '2.4.0'
   pkg.sha256sum 'fd26c4c406aa10be34f0fd2847ce3ffdc1e9d9798de87538594757bbb9175fbf'
-  pkg.build_requires 'rubygem-prime'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-gettext.rb b/configs/components/rubygem-gettext.rb
index 5b9c5bd7..57f30ad4 100644
--- a/configs/components/rubygem-gettext.rb
+++ b/configs/components/rubygem-gettext.rb
@@ -9,7 +9,6 @@
   pkg.sha256sum '03ec7f71ea7e2cf1fdcd5e08682e98b81601922fdbee890b7bc6f63b0e1a512a'
   pkg.build_requires 'rubygem-erubi'
   pkg.build_requires 'rubygem-locale'
-  pkg.build_requires 'rubygem-prime'
   pkg.build_requires 'rubygem-text'
   ### End automated maintenance section ###
 
diff --git a/configs/components/rubygem-net-ftp.rb b/configs/components/rubygem-net-ftp.rb
deleted file mode 100644
index d376e8a2..00000000
--- a/configs/components/rubygem-net-ftp.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/net-ftp
-#   https://github.com/ruby/net-ftp/releases
-#####
-component 'rubygem-net-ftp' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.3.9'
-  pkg.sha256sum '307817ccf7f428f79d083f7e36dbb46a9d1d375e0d23027824de1866f0b13b65'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-prime.rb b/configs/components/rubygem-prime.rb
deleted file mode 100644
index 88eb911e..00000000
--- a/configs/components/rubygem-prime.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/prime
-#   https://github.com/ruby/prime/releases
-#####
-component 'rubygem-prime' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.1.4'
-  pkg.sha256sum '4d755ebf7c2994a6f3a3fee0d072063be3fff2d4042ebff6cd5eebd4747a225e'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/projects/agent-runtime-main.rb b/configs/projects/agent-runtime-main.rb
index 4a26c247..f3cf2028 100644
--- a/configs/projects/agent-runtime-main.rb
+++ b/configs/projects/agent-runtime-main.rb
@@ -55,10 +55,8 @@
   proj.component 'rubygem-hocon'
   proj.component 'rubygem-locale'
   proj.component 'rubygem-multi_json'
-  proj.component 'rubygem-net-ftp'
   proj.component 'rubygem-net-ssh'
   proj.component 'rubygem-optimist'
-  proj.component 'rubygem-prime'
   proj.component 'rubygem-semantic_puppet'
   proj.component 'rubygem-scanf'
   proj.component 'rubygem-text'
diff --git a/configs/projects/openbolt-runtime.rb b/configs/projects/openbolt-runtime.rb
index 4e65e99e..29a6ea27 100644
--- a/configs/projects/openbolt-runtime.rb
+++ b/configs/projects/openbolt-runtime.rb
@@ -131,7 +131,6 @@
   proj.component 'rubygem-text'
   proj.component 'rubygem-locale'
   proj.component 'rubygem-gettext'
-  proj.component 'rubygem-prime'
   proj.component 'rubygem-fast_gettext'
   proj.component 'rubygem-scanf'
   proj.component 'rubygem-semantic_puppet'
@@ -197,7 +196,6 @@
   proj.component 'rubygem-multi_json'
   proj.component 'rubygem-multipart-post'
   proj.component 'rubygem-net-http-persistent'
-  proj.component 'rubygem-net-ftp'
   proj.component 'rubygem-net-scp'
   proj.component 'rubygem-net-ssh'
   proj.component 'rubygem-net-ssh-krb'
diff --git a/tasks/update_gems.rake b/tasks/update_gems.rake
index 62bdca98..78d8b559 100644
--- a/tasks/update_gems.rake
+++ b/tasks/update_gems.rake
@@ -23,8 +23,9 @@ GEM_TYPE       = /^\s*#\s*GEM\s+TYPE:\s*(?<platform>[A-Za-z0-9\-_.]+)\s*$/
 PROJ_COMPONENT = /^\s*proj\.component\s+(?<quote>['"]?)(?<component>rubygem-[^'"\s]+)\k<quote>\s*$/
 
 TARGET_RUBY_VER = ENV['TARGET_RUBY']&.strip || '3.2'
-# Update this list when targeting a new Ruby version
-DEFAULT_GEMS = [
+# Update this list when targeting a new Ruby version. Comment out
+# gems that we specifically want to manage even if they are default or bundled.
+DEFAULT_AND_BUNDLED_GEMS = [
   'abbrev',
   'base64',
   'benchmark',
@@ -33,6 +34,7 @@ DEFAULT_GEMS = [
   'cgi',
   'csv',
   'date',
+  'debug',
   'delegate',
   'did_you_mean',
   'digest',
@@ -54,29 +56,41 @@ DEFAULT_GEMS = [
   'irb',
   'json',
   'logger',
+  'matrix',
+  'minitest',
   'mutex_m',
+  'net-ftp',
   'net-http',
+  'net-imap',
+  'net-pop',
   'net-protocol',
+  'net-smtp',
   'nkf',
   'observer',
+  'open-uri',
   'open3',
   'openssl',
-  'open-uri',
   'optparse',
   'ostruct',
   'pathname',
+  'power_assert',
   'pp',
   'prettyprint',
+  'prime',
   'pstore',
   'psych',
   'racc',
+  'rake',
+  'rbs',
   'rdoc',
+  # 'rexml',
   'readline',
   'readline-ext',
   'reline',
   'resolv',
   'resolv-replace',
   'rinda',
+  'rss',
   'ruby2_keywords',
   'rubygems',
   'securerandom',
@@ -85,15 +99,17 @@ DEFAULT_GEMS = [
   'singleton',
   'stringio',
   'strscan',
-  'syslog',
   'syntax_suggest',
+  'syslog',
   'tempfile',
+  'test-unit',
   'time',
   'timeout',
   'tmpdir',
   'tsort',
+  'typeprof',
   'un',
-  'uri',
+  # 'uri',
   'weakref',
   'win32ole',
   'yaml',
@@ -177,7 +193,7 @@ def get_metadata(name:, version: nil, platforms: ['ruby'])
   shas = platforms.to_h { |platform| [platform, find_sha(name, version, platform)] }
   deps = get_version_details(name, version).dig('dependencies', 'runtime') || []
   # Remove any default gems as we don't want to manage them unless specifically needed
-  deps.reject! { |d| DEFAULT_GEMS.include?(d['name']) }
+  deps.reject! { |d| DEFAULT_AND_BUNDLED_GEMS.include?(d['name']) }
   { 'version' => version, 'shas' => shas, 'dependencies' => deps }
 end
 

From 3511d908a5f284f1d56b76fce54328803e0d3906 Mon Sep 17 00:00:00 2001
From: nmburgan <13688219+nmburgan@users.noreply.github.com>
Date: Sun, 14 Dec 2025 16:28:18 -0800
Subject: [PATCH 07/10] Add net-http back

The version bundled is too old for modern faraday-net_http
---
 configs/components/rubygem-faraday-net_http.rb |  1 +
 configs/components/rubygem-net-http.rb         | 13 +++++++++++++
 configs/projects/openbolt-runtime.rb           |  1 +
 tasks/update_gems.rake                         |  2 +-
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 configs/components/rubygem-net-http.rb

diff --git a/configs/components/rubygem-faraday-net_http.rb b/configs/components/rubygem-faraday-net_http.rb
index 80a134f2..3bc80b6e 100644
--- a/configs/components/rubygem-faraday-net_http.rb
+++ b/configs/components/rubygem-faraday-net_http.rb
@@ -7,6 +7,7 @@
   ### Maintained by update_gems automation ###
   pkg.version '3.4.2'
   pkg.sha256sum 'f147758260d3526939bf57ecf911682f94926a3666502e24c69992765875906c'
+  pkg.build_requires 'rubygem-net-http'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-net-http.rb b/configs/components/rubygem-net-http.rb
new file mode 100644
index 00000000..f309dfd2
--- /dev/null
+++ b/configs/components/rubygem-net-http.rb
@@ -0,0 +1,13 @@
+#####
+# Component release information:
+#   https://rubygems.org/gems/net-http
+#####
+component 'rubygem-net-http' do |pkg, _settings, _platform|
+  ### Maintained by update_gems automation ###
+  pkg.version '0.8.0'
+  pkg.sha256sum 'df42c47ce9f9e95ad32a317c97c12f945bc1af365288837ea4ff259876ecb46d'
+  pkg.build_requires 'rubygem-uri'
+  ### End automated maintenance section ###
+
+  instance_eval File.read('configs/components/_base-rubygem.rb')
+end
diff --git a/configs/projects/openbolt-runtime.rb b/configs/projects/openbolt-runtime.rb
index 29a6ea27..c50d09cb 100644
--- a/configs/projects/openbolt-runtime.rb
+++ b/configs/projects/openbolt-runtime.rb
@@ -157,6 +157,7 @@
   proj.component 'rubygem-faraday-httpclient'
   proj.component 'rubygem-faraday-multipart'
   proj.component 'rubygem-faraday-net_http'
+  proj.component 'rubygem-net-http'
   proj.component 'rubygem-faraday-net_http_persistent'
   proj.component 'rubygem-faraday-patron'
   proj.component 'rubygem-patron'
diff --git a/tasks/update_gems.rake b/tasks/update_gems.rake
index 78d8b559..094a09b5 100644
--- a/tasks/update_gems.rake
+++ b/tasks/update_gems.rake
@@ -60,7 +60,7 @@ DEFAULT_AND_BUNDLED_GEMS = [
   'minitest',
   'mutex_m',
   'net-ftp',
-  'net-http',
+  # 'net-http',
   'net-imap',
   'net-pop',
   'net-protocol',

From 2dcd0dbb4eb0d5f3f690f8162bd8ac5d9487133a Mon Sep 17 00:00:00 2001
From: nmburgan <13688219+nmburgan@users.noreply.github.com>
Date: Mon, 15 Dec 2025 13:30:08 -0800
Subject: [PATCH 08/10] Add back base64

puppet_forge requires >= 0.2 and Ruby 3.2.9 has 0.1.
---
 configs/components/rubygem-CFPropertyList.rb |  1 +
 configs/components/rubygem-aws-sdk-core.rb   |  1 +
 configs/components/rubygem-aws-sdk-ec2.rb    |  4 ++--
 configs/components/rubygem-base64.rb         | 13 +++++++++++++
 configs/components/rubygem-em-socksify.rb    |  1 +
 configs/components/rubygem-jwt.rb            |  1 +
 configs/components/rubygem-openfact.rb       |  1 +
 configs/components/rubygem-openvox.rb        |  1 +
 configs/components/rubygem-puppet_forge.rb   |  1 +
 configs/components/rubygem-rubyntlm.rb       |  1 +
 configs/projects/agent-runtime-main.rb       |  1 +
 configs/projects/openbolt-runtime.rb         |  1 +
 tasks/update_gems.rake                       |  2 +-
 13 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 configs/components/rubygem-base64.rb

diff --git a/configs/components/rubygem-CFPropertyList.rb b/configs/components/rubygem-CFPropertyList.rb
index 795da431..b59f6474 100644
--- a/configs/components/rubygem-CFPropertyList.rb
+++ b/configs/components/rubygem-CFPropertyList.rb
@@ -10,6 +10,7 @@
   ### Maintained by update_gems automation ###
   pkg.version '4.0.0'
   pkg.sha256sum '385e7bbd7c27e176b23415275ca936ca0ece1727e5b890b08e36632076b00aff'
+  pkg.build_requires 'rubygem-base64'
   pkg.build_requires 'rubygem-rexml'
   ### End automated maintenance section ###
 
diff --git a/configs/components/rubygem-aws-sdk-core.rb b/configs/components/rubygem-aws-sdk-core.rb
index 6f2e561b..86d224f4 100644
--- a/configs/components/rubygem-aws-sdk-core.rb
+++ b/configs/components/rubygem-aws-sdk-core.rb
@@ -10,6 +10,7 @@
   pkg.build_requires 'rubygem-aws-eventstream'
   pkg.build_requires 'rubygem-aws-partitions'
   pkg.build_requires 'rubygem-aws-sigv4'
+  pkg.build_requires 'rubygem-base64'
   pkg.build_requires 'rubygem-jmespath'
   ### End automated maintenance section ###
 
diff --git a/configs/components/rubygem-aws-sdk-ec2.rb b/configs/components/rubygem-aws-sdk-ec2.rb
index 91e99d1b..3a817dab 100644
--- a/configs/components/rubygem-aws-sdk-ec2.rb
+++ b/configs/components/rubygem-aws-sdk-ec2.rb
@@ -5,8 +5,8 @@
 #####
 component 'rubygem-aws-sdk-ec2' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '1.584.0'
-  pkg.sha256sum 'cf4873be8035d70b6757269f9746249a64a4e845795485f709827fe7284136b6'
+  pkg.version '1.583.0'
+  pkg.sha256sum 'd35d4f58811b7619b27f2919f6b88ad87ef764974dfdf05b506d8bc7a2693e15'
   pkg.build_requires 'rubygem-aws-sdk-core'
   pkg.build_requires 'rubygem-aws-sigv4'
   ### End automated maintenance section ###
diff --git a/configs/components/rubygem-base64.rb b/configs/components/rubygem-base64.rb
new file mode 100644
index 00000000..4b1e5019
--- /dev/null
+++ b/configs/components/rubygem-base64.rb
@@ -0,0 +1,13 @@
+#####
+# Component release information:
+#   https://rubygems.org/gems/base64
+#   https://github.com/ruby/base64/releases
+#####
+component 'rubygem-base64' do |pkg, _settings, _platform|
+  ### Maintained by update_gems automation ###
+  pkg.version '0.3.0'
+  pkg.sha256sum '27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b'
+  ### End automated maintenance section ###
+
+  instance_eval File.read('configs/components/_base-rubygem.rb')
+end
diff --git a/configs/components/rubygem-em-socksify.rb b/configs/components/rubygem-em-socksify.rb
index aca9fe55..52777eb3 100644
--- a/configs/components/rubygem-em-socksify.rb
+++ b/configs/components/rubygem-em-socksify.rb
@@ -6,6 +6,7 @@
   ### Maintained by update_gems automation ###
   pkg.version '0.3.3'
   pkg.sha256sum '7d8d08a7a8acc1263173433a6b5540edd80a8a36e35a066b650c929a3a3974ed'
+  pkg.build_requires 'rubygem-base64'
   pkg.build_requires 'rubygem-eventmachine'
   ### End automated maintenance section ###
 
diff --git a/configs/components/rubygem-jwt.rb b/configs/components/rubygem-jwt.rb
index bc5e0fbc..c1e027c8 100644
--- a/configs/components/rubygem-jwt.rb
+++ b/configs/components/rubygem-jwt.rb
@@ -10,6 +10,7 @@
   # PINNED
   pkg.version '2.10.2'
   pkg.sha256sum '31e1ee46f7359883d5e622446969fe9c118c3da87a0b1dca765ce269c3a0c4f4'
+  pkg.build_requires 'rubygem-base64'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-openfact.rb b/configs/components/rubygem-openfact.rb
index b877fac2..8e3ac1ea 100644
--- a/configs/components/rubygem-openfact.rb
+++ b/configs/components/rubygem-openfact.rb
@@ -7,6 +7,7 @@
   ### Maintained by update_gems automation ###
   pkg.version '5.2.0'
   pkg.sha256sum 'b044fdbd45b4bb59aab7bf2d2f98065e6a65ecc3cf4cdd91ee32c79c0556d172'
+  pkg.build_requires 'rubygem-base64'
   pkg.build_requires 'rubygem-hocon'
   pkg.build_requires 'rubygem-thor'
   ### End automated maintenance section ###
diff --git a/configs/components/rubygem-openvox.rb b/configs/components/rubygem-openvox.rb
index c2f16c76..1688826d 100644
--- a/configs/components/rubygem-openvox.rb
+++ b/configs/components/rubygem-openvox.rb
@@ -9,6 +9,7 @@
   ### Maintained by update_gems automation ###
   pkg.version '8.24.1'
   pkg.sha256sum '420366b951972e390435353371d527aadd7c80f082fd5ad7b80cd50626a3d439'
+  pkg.build_requires 'rubygem-base64'
   pkg.build_requires 'rubygem-concurrent-ruby'
   pkg.build_requires 'rubygem-deep_merge'
   pkg.build_requires 'rubygem-fast_gettext'
diff --git a/configs/components/rubygem-puppet_forge.rb b/configs/components/rubygem-puppet_forge.rb
index 41cd1a9d..5c4ce50d 100644
--- a/configs/components/rubygem-puppet_forge.rb
+++ b/configs/components/rubygem-puppet_forge.rb
@@ -8,6 +8,7 @@
   ### Maintained by update_gems automation ###
   pkg.version '6.1.0'
   pkg.sha256sum 'e3bfe83282f0136adf0938f52180a53b45434b70464a5a453d6398df6563764b'
+  pkg.build_requires 'rubygem-base64'
   pkg.build_requires 'rubygem-faraday'
   pkg.build_requires 'rubygem-faraday-follow_redirects'
   pkg.build_requires 'rubygem-minitar'
diff --git a/configs/components/rubygem-rubyntlm.rb b/configs/components/rubygem-rubyntlm.rb
index ae0908b9..3b85701c 100644
--- a/configs/components/rubygem-rubyntlm.rb
+++ b/configs/components/rubygem-rubyntlm.rb
@@ -7,6 +7,7 @@
   ### Maintained by update_gems automation ###
   pkg.version '0.6.5'
   pkg.sha256sum '47013402b99ae29ee93f930af51edaec8c6008556f4be25705a422b4430314f5'
+  pkg.build_requires 'rubygem-base64'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/projects/agent-runtime-main.rb b/configs/projects/agent-runtime-main.rb
index f3cf2028..cc69ed49 100644
--- a/configs/projects/agent-runtime-main.rb
+++ b/configs/projects/agent-runtime-main.rb
@@ -79,6 +79,7 @@
   if platform.is_macos?
     proj.component 'readline'
     proj.component 'rubygem-CFPropertyList'
+    proj.component 'rubygem-base64'
   end
 
   unless platform.is_aix? || platform.is_windows?
diff --git a/configs/projects/openbolt-runtime.rb b/configs/projects/openbolt-runtime.rb
index c50d09cb..da7b3659 100644
--- a/configs/projects/openbolt-runtime.rb
+++ b/configs/projects/openbolt-runtime.rb
@@ -175,6 +175,7 @@
   proj.component 'rubygem-bindata'
   proj.component 'rubygem-builder'
   proj.component 'rubygem-CFPropertyList'
+  proj.component 'rubygem-base64'
   proj.component 'rubygem-rexml'
   proj.component 'rubygem-colored2'
   proj.component 'rubygem-concurrent-ruby'
diff --git a/tasks/update_gems.rake b/tasks/update_gems.rake
index 094a09b5..7c9824ae 100644
--- a/tasks/update_gems.rake
+++ b/tasks/update_gems.rake
@@ -27,7 +27,7 @@ TARGET_RUBY_VER = ENV['TARGET_RUBY']&.strip || '3.2'
 # gems that we specifically want to manage even if they are default or bundled.
 DEFAULT_AND_BUNDLED_GEMS = [
   'abbrev',
-  'base64',
+  # 'base64',
   'benchmark',
   'bigdecimal',
   'bundler',

From a8a20a38f7cc229246141e7ba8cc7172b41f5221 Mon Sep 17 00:00:00 2001
From: nmburgan <13688219+nmburgan@users.noreply.github.com>
Date: Mon, 15 Dec 2025 13:49:52 -0800
Subject: [PATCH 09/10] Update rubygem components

Component updates:
- rubygem-aws-sdk-ec2: version 1.583.0 -> 1.585.0
- rubygem-openfact: version 5.2.0 -> 5.2.1
- rubygem-openvox: version 8.24.1 -> 8.24.2
---
 configs/components/rubygem-aws-sdk-ec2.rb | 4 ++--
 configs/components/rubygem-openfact.rb    | 4 ++--
 configs/components/rubygem-openvox.rb     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configs/components/rubygem-aws-sdk-ec2.rb b/configs/components/rubygem-aws-sdk-ec2.rb
index 3a817dab..2edad258 100644
--- a/configs/components/rubygem-aws-sdk-ec2.rb
+++ b/configs/components/rubygem-aws-sdk-ec2.rb
@@ -5,8 +5,8 @@
 #####
 component 'rubygem-aws-sdk-ec2' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '1.583.0'
-  pkg.sha256sum 'd35d4f58811b7619b27f2919f6b88ad87ef764974dfdf05b506d8bc7a2693e15'
+  pkg.version '1.585.0'
+  pkg.sha256sum '72656489064ef23d676beec39a8f0940bbb20d019605ae0b6c39aa11d38bb963'
   pkg.build_requires 'rubygem-aws-sdk-core'
   pkg.build_requires 'rubygem-aws-sigv4'
   ### End automated maintenance section ###
diff --git a/configs/components/rubygem-openfact.rb b/configs/components/rubygem-openfact.rb
index 8e3ac1ea..782d3873 100644
--- a/configs/components/rubygem-openfact.rb
+++ b/configs/components/rubygem-openfact.rb
@@ -5,8 +5,8 @@
 #####
 component 'rubygem-openfact' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '5.2.0'
-  pkg.sha256sum 'b044fdbd45b4bb59aab7bf2d2f98065e6a65ecc3cf4cdd91ee32c79c0556d172'
+  pkg.version '5.2.1'
+  pkg.sha256sum '766543bc3ccb1ba5646aaef38e88ced5438c13bb0d72e09d2dd6f9a07fabda0b'
   pkg.build_requires 'rubygem-base64'
   pkg.build_requires 'rubygem-hocon'
   pkg.build_requires 'rubygem-thor'
diff --git a/configs/components/rubygem-openvox.rb b/configs/components/rubygem-openvox.rb
index 1688826d..5192a30c 100644
--- a/configs/components/rubygem-openvox.rb
+++ b/configs/components/rubygem-openvox.rb
@@ -7,8 +7,8 @@
 #####
 component 'rubygem-openvox' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '8.24.1'
-  pkg.sha256sum '420366b951972e390435353371d527aadd7c80f082fd5ad7b80cd50626a3d439'
+  pkg.version '8.24.2'
+  pkg.sha256sum '61ee735793703383c2af229d4b61eb9250788b30ec3ee86bac31ae006e908ea5'
   pkg.build_requires 'rubygem-base64'
   pkg.build_requires 'rubygem-concurrent-ruby'
   pkg.build_requires 'rubygem-deep_merge'

From 25e007e40acbf9c506a7204800e23d8b337c08ff Mon Sep 17 00:00:00 2001
From: nmburgan <13688219+nmburgan@users.noreply.github.com>
Date: Mon, 15 Dec 2025 13:56:02 -0800
Subject: [PATCH 10/10] Silence uninstall step for rubygems

Because we now defensively always try to uninstall old versions, we don't want to confuse people by showing the 'Gem not installed' message if there are no older versions.
---
 configs/components/_base-rubygem.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/components/_base-rubygem.rb b/configs/components/_base-rubygem.rb
index b775c220..ce25148b 100644
--- a/configs/components/_base-rubygem.rb
+++ b/configs/components/_base-rubygem.rb
@@ -40,7 +40,7 @@
 pkg.install do
   steps = []
   # Attempting to uninstall a default gem this way will fail, so ignore failures
-  steps << "#{gem_uninstall} --force #{name} || true"
+  steps << "#{gem_uninstall} --force --silent #{name} || true"
   steps << "#{settings[:gem_install]} #{name}-#{version}.gem #{gem_install_options || ''}"
   # If we are installing a newer version of a default gem, we need to remove the existing
   # specification file so that we don't get warnings. The corresponding gem directory is