commit: c37f54c0ea1c6fbc27c0478ca4c1d455283b5370 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Nov 11 18:05:49 2024 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Wed Nov 13 08:34:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c37f54c0
dev-ruby/redcloth: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> .../files/redcloth-4.3.2-cve-2023-31606-1.patch | 22 ---------------- .../files/redcloth-4.3.2-cve-2023-31606-2.patch | 22 ---------------- .../files/redcloth-4.3.2-load-documents.patch | 30 ---------------------- 3 files changed, 74 deletions(-) diff --git a/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-1.patch b/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-1.patch deleted file mode 100644 index f5de833dafb3..000000000000 --- a/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 8d3b5c730596d254d0bbcfbab52f4158f03397b3 Mon Sep 17 00:00:00 2001 -From: Kornelius Kalnbach <[email protected]> -Date: Wed, 28 Jun 2023 17:24:55 +0200 -Subject: [PATCH] make regex faster with Atomic Grouping - ---- - lib/redcloth/formatters/html.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/redcloth/formatters/html.rb b/lib/redcloth/formatters/html.rb -index b241c99..aaeae34 100644 ---- a/lib/redcloth/formatters/html.rb -+++ b/lib/redcloth/formatters/html.rb -@@ -324,7 +324,7 @@ def before_transform(text) - # Clean unauthorized tags. - def clean_html( text, allowed_tags = BASIC_TAGS ) - text.gsub!( /<!\[CDATA\[/, '' ) -- text.gsub!( /<(\/*)([A-Za-z]\w*)([^>]*?)(\s?\/?)>/ ) do |m| -+ text.gsub!( /<(\/*)(?>[A-Za-z]\w*)([^>]*?)(\s?\/?)>/ ) do |m| - raw = $~ - tag = raw[2].downcase - if allowed_tags.has_key? tag diff --git a/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-2.patch b/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-2.patch deleted file mode 100644 index fd8de28f0e71..000000000000 --- a/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-2.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7429f32bdac4fccf9f5ab702afc9c47092a7b3df Mon Sep 17 00:00:00 2001 -From: Kornelius Kalnbach <[email protected]> -Date: Thu, 29 Jun 2023 00:31:50 +0200 -Subject: [PATCH] simplify fix - ---- - lib/redcloth/formatters/html.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/redcloth/formatters/html.rb b/lib/redcloth/formatters/html.rb -index aaeae34..396c2d0 100644 ---- a/lib/redcloth/formatters/html.rb -+++ b/lib/redcloth/formatters/html.rb -@@ -324,7 +324,7 @@ def before_transform(text) - # Clean unauthorized tags. - def clean_html( text, allowed_tags = BASIC_TAGS ) - text.gsub!( /<!\[CDATA\[/, '' ) -- text.gsub!( /<(\/*)(?>[A-Za-z]\w*)([^>]*?)(\s?\/?)>/ ) do |m| -+ text.gsub!( /<(\/*)([A-Za-z]\w*+)([^>]*?)(\s?\/?)>/ ) do |m| - raw = $~ - tag = raw[2].downcase - if allowed_tags.has_key? tag diff --git a/dev-ruby/redcloth/files/redcloth-4.3.2-load-documents.patch b/dev-ruby/redcloth/files/redcloth-4.3.2-load-documents.patch deleted file mode 100644 index f390afd58268..000000000000 --- a/dev-ruby/redcloth/files/redcloth-4.3.2-load-documents.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 00b55ace17ed408b1b6129e1ba6c90fd4f0a6d2c Mon Sep 17 00:00:00 2001 -From: Matijs van Zuijlen <[email protected]> -Date: Tue, 29 Aug 2017 08:08:36 +0200 -Subject: [PATCH] Replace deprecated YAML.load_documents - -The .load_documents method is deprecated and seems to have been removed -entirely in the upcoming Ruby 2.5. ---- - spec/spec_helper.rb | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb -index af6279a..74a5cae 100644 ---- a/spec/spec_helper.rb -+++ b/spec/spec_helper.rb -@@ -26,11 +26,11 @@ def fixtures - Dir[File.join(File.dirname(__FILE__), *%w[fixtures *.yml])].each do |testfile| - testgroup = File.basename(testfile, '.yml') - num = 0 -- YAML::load_documents(File.open(testfile)) do |doc| -+ YAML::load_stream(File.open(testfile)) do |doc| - name = doc['name'] || num - @fixtures["#{testgroup} #{name}"] = doc - num += 1 - end - end - @fixtures --end -\ No newline at end of file -+end
