63 lines
2.0 KiB
Diff
63 lines
2.0 KiB
Diff
From 3926ad578c312ddd2ff5221b96ef077b9e24e612 Mon Sep 17 00:00:00 2001
|
|
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
|
|
Date: Thu, 9 Mar 2023 15:42:07 +0900
|
|
Subject: [PATCH] [rubygems/rubygems] Drop to support Psych 3.0 bundled at Ruby
|
|
2.5
|
|
|
|
https://github.com/rubygems/rubygems/commit/a6650c2c96
|
|
|
|
Reference:https://github.com/ruby/ruby/commit/3926ad578c312ddd2ff5221b96ef077b9e24e612
|
|
Conflict:use YAML module not Psych module.
|
|
---
|
|
lib/rubygems/safe_yaml.rb | 32 +++++---------------------------
|
|
1 file changed, 5 insertions(+), 27 deletions(-)
|
|
|
|
diff --git a/lib/rubygems/safe_yaml.rb b/lib/rubygems/safe_yaml.rb
|
|
index e905052..702d3c7 100644
|
|
--- a/lib/rubygems/safe_yaml.rb
|
|
+++ b/lib/rubygems/safe_yaml.rb
|
|
@@ -24,34 +24,12 @@ module Gem
|
|
runtime
|
|
].freeze
|
|
|
|
- if ::YAML.respond_to? :safe_load
|
|
- def self.safe_load(input)
|
|
- if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
|
|
- ::YAML.safe_load(input, permitted_classes: PERMITTED_CLASSES, permitted_symbols: PERMITTED_SYMBOLS, aliases: true)
|
|
- else
|
|
- ::YAML.safe_load(input, PERMITTED_CLASSES, PERMITTED_SYMBOLS, true)
|
|
- end
|
|
- end
|
|
-
|
|
- def self.load(input)
|
|
- if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
|
|
- ::YAML.safe_load(input, permitted_classes: [::Symbol])
|
|
- else
|
|
- ::YAML.safe_load(input, [::Symbol])
|
|
- end
|
|
- end
|
|
- else
|
|
- unless Gem::Deprecate.skip
|
|
- warn "YAML safe loading is not available. Please upgrade psych to a version that supports safe loading (>= 2.0)."
|
|
- end
|
|
-
|
|
- def self.safe_load(input, *args)
|
|
- ::YAML.load input
|
|
- end
|
|
+ def self.safe_load(input)
|
|
+ ::YAML.safe_load(input, permitted_classes: PERMITTED_CLASSES, permitted_symbols: PERMITTED_SYMBOLS, aliases: true)
|
|
+ end
|
|
|
|
- def self.load(input)
|
|
- ::YAML.load input
|
|
- end
|
|
+ def self.load(input)
|
|
+ ::YAML.safe_load(input, permitted_classes: [::Symbol])
|
|
end
|
|
end
|
|
end
|
|
--
|
|
2.33.0
|
|
|
|
|