From e56f5e9b2405e6c2142d3738d459b1eae966e99c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 Oct 2023 00:13:29 +0100 Subject: gentoo auto-resync : 12:10:2023 - 00:13:28 --- dev-ruby/mail/files/mail-2.7.1-psych-4.patch | 122 --------------------------- 1 file changed, 122 deletions(-) delete mode 100644 dev-ruby/mail/files/mail-2.7.1-psych-4.patch (limited to 'dev-ruby/mail/files/mail-2.7.1-psych-4.patch') diff --git a/dev-ruby/mail/files/mail-2.7.1-psych-4.patch b/dev-ruby/mail/files/mail-2.7.1-psych-4.patch deleted file mode 100644 index ea3dff47910e..000000000000 --- a/dev-ruby/mail/files/mail-2.7.1-psych-4.patch +++ /dev/null @@ -1,122 +0,0 @@ -https://bugs.gentoo.org/835322 - -https://github.com/mikel/mail/commit/a20fdd591bd5b1596983f5e1ee6ffed4e0b1f5f9 -https://sources.debian.org/patches/ruby-mail/2.7.1%2Bdfsg1-2/0001-Add-Mail-YAML-load-compatible-with-Psych-3.x-and-Psy.patch/ - -From: =?utf-8?b?Sm9zZWYgxaBpbcOhbmVr?= -Date: Sun, 4 Dec 2022 15:18:33 -0300 -Subject: Add Mail::YAML#load compatible with Psych 3.x and Psych 4.x. -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Co-authored-by: Vít Ondruch -Backported-by: Antonio Terceiro -Origin: https://github.com/mikel/mail/commit/a20fdd591bd5b1596983f5e1ee6ffed4e0b1f5f9 ---- a/lib/mail/message.rb -+++ b/lib/mail/message.rb -@@ -1,6 +1,6 @@ - # encoding: utf-8 - # frozen_string_literal: true --require "yaml" -+require "mail/yaml" - - module Mail - # The Message class provides a single point of access to all things to do with an -@@ -1867,7 +1867,7 @@ module Mail - end - - def self.from_yaml(str) -- hash = YAML.load(str) -+ hash = Mail::YAML.load(str) - m = self.new(:headers => hash['headers']) - hash.delete('headers') - hash.each do |k,v| ---- /dev/null -+++ b/lib/mail/yaml.rb -@@ -0,0 +1,30 @@ -+require 'yaml' -+ -+module Mail -+ module YAML -+ def self.load(yaml) -+ permitted_classes = [ -+ Symbol, -+ -+ Mail::Body, -+ -+ # Delivery methods as listed in mail/configuration.rb -+ Mail::SMTP, -+ Mail::Sendmail, -+ Mail::Exim, -+ Mail::FileDelivery, -+ Mail::SMTPConnection, -+ Mail::TestMailer, -+ Mail::LoggerDelivery, -+ -+ Mail.delivery_method.class, -+ ] -+ -+ if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') -+ ::YAML.safe_load(yaml, :permitted_classes => permitted_classes) -+ else -+ ::YAML.safe_load(yaml, permitted_classes) -+ end -+ end -+ end -+end ---- a/spec/mail/message_spec.rb -+++ b/spec/mail/message_spec.rb -@@ -198,7 +198,7 @@ describe Mail::Message do - - it "should serialize the basic information to YAML" do - yaml = @yaml_mail.to_yaml -- yaml_output = YAML.load(yaml) -+ yaml_output = Mail::YAML.load(yaml) - expect(yaml_output['headers']['To']).to eq "someone@somewhere.com" - expect(yaml_output['headers']['Cc']).to eq "someoneelse@somewhere.com" - expect(yaml_output['headers']['Subject']).to eq "subject" -@@ -216,7 +216,7 @@ describe Mail::Message do - it "should serialize a Message with a custom delivery_handler" do - @yaml_mail.delivery_handler = DeliveryAgent - yaml = @yaml_mail.to_yaml -- yaml_output = YAML.load(yaml) -+ yaml_output = Mail::YAML.load(yaml) - expect(yaml_output['delivery_handler']).to eq "DeliveryAgent" - end - -@@ -228,7 +228,7 @@ describe Mail::Message do - - it "should not deserialize a delivery_handler that does not exist" do - yaml = @yaml_mail.to_yaml -- yaml_hash = YAML.load(yaml) -+ yaml_hash = Mail::YAML.load(yaml) - yaml_hash['delivery_handler'] = "NotARealClass" - deserialized = Mail::Message.from_yaml(yaml_hash.to_yaml) - expect(deserialized.delivery_handler).to be_nil ---- a/spec/mail/parts_list_spec.rb -+++ b/spec/mail/parts_list_spec.rb -@@ -89,6 +89,6 @@ describe "PartsList" do - - it "should have a round-tripping YAML serialization" do - p = Mail::PartsList.new([1, 2]) -- expect(YAML.load(YAML.dump(p))).to eq(p) -+ expect(Mail::YAML.load(YAML.dump(p))).to eq(p) - end - end ---- /dev/null -+++ b/spec/mail/yaml_spec.rb -@@ -0,0 +1,13 @@ -+# encoding: utf-8 -+# frozen_string_literal: true -+require 'spec_helper' -+ -+describe Mail::YAML do -+ -+ describe "#load" do -+ -+ it 'loads YAML' do -+ expect(Mail::YAML.load('{}')).to eq({}) -+ end -+ end -+end -- cgit v1.2.3