From b0f92620d8251746ddbcfc443707d72d48fd5af7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 6 Jan 2023 15:51:44 -0500 Subject: gnu: ruby-sanitize: Update to 6.0.0. * gnu/packages/ruby.scm (ruby-sanitize): Update to 6.0.0. Re-indent inputs. [source]: Delete patch. * gnu/packages/patches/ruby-sanitize-system-libxml.patch: Delete patch. * gnu/local.mk (dist_patch_DATA): De-register it. --- .../patches/ruby-sanitize-system-libxml.patch | 38 ---------------------- 1 file changed, 38 deletions(-) delete mode 100644 gnu/packages/patches/ruby-sanitize-system-libxml.patch (limited to 'gnu/packages/patches') diff --git a/gnu/packages/patches/ruby-sanitize-system-libxml.patch b/gnu/packages/patches/ruby-sanitize-system-libxml.patch deleted file mode 100644 index d19eb07294..0000000000 --- a/gnu/packages/patches/ruby-sanitize-system-libxml.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fix test failures that occur when nokogiri is using system libxml: - - https://github.com/rgrove/sanitize/issues/198 - -Taken from upstream: -https://github.com/rgrove/sanitize/commit/21da9b62baf9ea659811d92e6b574130aee57eba - -diff --git a/test/test_malicious_html.rb b/test/test_malicious_html.rb -index 2c23074..0756de0 100644 ---- a/test/test_malicious_html.rb -+++ b/test/test_malicious_html.rb -@@ -135,6 +135,8 @@ - # The relevant libxml2 code is here: - # - describe 'unsafe libxml2 server-side includes in attributes' do -+ using_unpatched_libxml2 = Nokogiri::VersionInfo.instance.libxml2_using_system? -+ - tag_configs = [ - { - tag_name: 'a', -@@ -166,6 +168,8 @@ - input = %[<#{tag_name} #{attr_name}='example.com'>foo] - - it 'should escape unsafe characters in attributes' do -+ skip "behavior should only exist in nokogiri's patched libxml" if using_unpatched_libxml2 -+ - # This uses Nokogumbo's HTML-compliant serializer rather than - # libxml2's. - @s.fragment(input). -@@ -191,6 +195,8 @@ - input = %[<#{tag_name} #{attr_name}='example.com'>foo] - - it 'should not escape characters unnecessarily' do -+ skip "behavior should only exist in nokogiri's patched libxml" if using_unpatched_libxml2 -+ - # This uses Nokogumbo's HTML-compliant serializer rather than - # libxml2's. - @s.fragment(input). -- cgit 1.4.1