public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/rubygem-loofah] rawhide: merge
Date: Sun, 20 Sep 2026 06:35:27 GMT [thread overview]
Message-ID: <178988612731.1.13260870315377402073.rpms-rubygem-loofah-b3e7c7b2a2ed@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/rubygem-loofah
Branch : rawhide
Commit : b3e7c7b2a2ed99c78e2fc4d77572ff0c8d5a946a
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date : 2026-09-20T15:35:03+09:00
Stats : +103/-4 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/rubygem-loofah/c/b3e7c7b2a2ed99c78e2fc4d77572ff0c8d5a946a?branch=rawhide
Log:
merge
---
diff --git a/loofah-pr298-testsuite-accept-libxml2-2_14.patch b/loofah-pr298-testsuite-accept-libxml2-2_14.patch
new file mode 100644
index 0000000..46f8499
--- /dev/null
+++ b/loofah-pr298-testsuite-accept-libxml2-2_14.patch
@@ -0,0 +1,62 @@
+From c7d9ea3c6777e9ae23ec00f6d4d3bdb9442c1fdb Mon Sep 17 00:00:00 2001
+From: Mike Dalessio <mike.dalessio@gmail.com>
+Date: Wed, 9 Jul 2025 10:05:37 -0400
+Subject: [PATCH] test: update tests to accept output from libxml 2.14
+
+See https://github.com/sparklemotion/nokogiri/pull/3499
+---
+ test/assets/testdata_sanitizer_tests1.dat | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/test/assets/testdata_sanitizer_tests1.dat b/test/assets/testdata_sanitizer_tests1.dat
+index a734ab5..312a505 100644
+--- a/test/assets/testdata_sanitizer_tests1.dat
++++ b/test/assets/testdata_sanitizer_tests1.dat
+@@ -106,8 +106,9 @@
+ {
+ "name": "double_open_angle_brackets_2 v2",
+ "input": "<div><script src=http://ha.ckers.org/scriptlet.html < </div>",
+- "libxml": "<div><script src=\"http://ha.ckers.org/scriptlet.html\"></script></div>",
+- "libgumbo": "<div><script src='http://ha.ckers.org/scriptlet.html' <='' div=''></script></div>",
++ "libxml": "<div><script src=\"http://ha.ckers.org/scriptlet.html\"></script></div>",
++ "libxml-2.14": "<div><script src='http://ha.ckers.org/scriptlet.html' < div></script></div>",
++ "libgumbo": "<div><script src='http://ha.ckers.org/scriptlet.html' <='' div=''></script></div>",
+ "jruby": "<div><script src='http://ha.ckers.org/scriptlet.html'>< </div></script></div>"
+ },
+
+@@ -165,8 +166,9 @@
+ {
+ "name": "non_alpha_non_digit",
+ "input": "<script/XSS src=\"http://ha.ckers.org/xss.js\"></script>",
+- "libxml": "<script src=\"http://ha.ckers.org/xss.js\"></script>",
+- "libgumbo": "<script xss='' src='http://ha.ckers.org/xss.js'></script>",
++ "libxml": "<script src=\"http://ha.ckers.org/xss.js\"></script>",
++ "libxml-2.14": "<script xss src='http://ha.ckers.org/xss.js'></script>",
++ "libgumbo": "<script xss='' src='http://ha.ckers.org/xss.js'></script>",
+ "jruby": "<script></script>"
+ },
+
+@@ -367,8 +369,9 @@
+ {
+ "name": "should_sanitize_invalid_script_tag",
+ "input": "<script/XSS SRC=\"http://ha.ckers.org/xss.js\"></script>",
+- "libxml": "<script src=\"http://ha.ckers.org/xss.js\"></script>",
+- "libgumbo": "<script xss='' src='http://ha.ckers.org/xss.js'></script>",
++ "libxml": "<script src=\"http://ha.ckers.org/xss.js\"></script>",
++ "libxml-2.14": "<script xss src='http://ha.ckers.org/xss.js'></script>",
++ "libgumbo": "<script xss='' src='http://ha.ckers.org/xss.js'></script>",
+ "jruby": "<script></script>"
+ },
+
+@@ -389,8 +392,9 @@
+ {
+ "name": "should_sanitize_script_tag_with_multiple_open_brackets_2b",
+ "input": "<div><iframe src=http://ha.ckers.org/scriptlet.html\n< </div>",
+- "libxml": "<div><iframe src=\"http://ha.ckers.org/scriptlet.html\"></iframe></div>",
+- "libgumbo": "<div><iframe src='http://ha.ckers.org/scriptlet.html' <='' div=''></iframe></div>",
++ "libxml": "<div><iframe src=\"http://ha.ckers.org/scriptlet.html\"></iframe></div>",
++ "libxml-2.14": "<div><iframe src='http://ha.ckers.org/scriptlet.html' < div></iframe></div>",
++ "libgumbo": "<div><iframe src='http://ha.ckers.org/scriptlet.html' <='' div=''></iframe></div>",
+ "jruby": "<div><iframe src='http://ha.ckers.org/scriptlet.html'>&lt; &lt;/div&gt;</iframe></div>"
+ },
+
diff --git a/rubygem-loofah.spec b/rubygem-loofah.spec
index 72de5f5..b71d11e 100644
--- a/rubygem-loofah.spec
+++ b/rubygem-loofah.spec
@@ -2,7 +2,7 @@
Name: rubygem-%{gem_name}
Version: 2.22.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Manipulate and transform HTML/XML documents and fragments
License: MIT
URL: https://github.com/flavorjones/loofah
@@ -12,9 +12,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
Source1: %{gem_name}-%{version}-test.tar.gz
# Fix minitest6 compatibility
Patch0: %{gem_name}-2.22.0-minitest6.patch
+# Make testsuite accept libxml2 2.14
+# https://github.com/flavorjones/loofah/pull/298
+Patch1: %{gem_name}-pr298-testsuite-accept-libxml2-2_14.patch
# https://github.com/flavorjones/loofah/pull/307
# Fix json 3 compatibility
-Patch1: %{gem_name}-pr307-support-json3-allow-comments.patch
+Patch2: %{gem_name}-pr307-support-json3-allow-comments.patch
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: ruby
@@ -45,6 +48,7 @@ Documentation for %{name}.
cd %{_builddir}
%patch -P0 -p1
%patch -P1 -p1
+%patch -P2 -p1
)
%build
@@ -79,9 +83,12 @@ popd
%doc %{gem_instdir}/SECURITY.md
%changelog
-* Sun Sep 13 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.22.0-10
+* Sun Sep 20 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.22.0-11
- Apply upstream patch to support json 3
+* Sat Sep 19 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.22.0-10
+- Backport upstream fix to accept libxml2 2.14 for testsuite
+
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.22.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
diff --git a/loofah-pr307-support-json3-allow-comments.patch b/loofah-pr307-support-json3-allow-comments.patch
new file mode 100644
index 0000000..dd7b0c3
--- /dev/null
+++ b/loofah-pr307-support-json3-allow-comments.patch
@@ -0,0 +1,23 @@
+From 2dfede9b40e0d1f9f06e3743b6ebbe0ff49808c4 Mon Sep 17 00:00:00 2001
+From: Mike Dalessio <mike.dalessio@gmail.com>
+Date: Wed, 15 Jul 2026 14:59:57 -0400
+Subject: [PATCH] test: opt into JSON comment parsing for sanitizer testdata
+
+json 2.20.0 deprecated parsing comments without `allow_comments: true`, and the testdata file has them.
+---
+ test/html5/test_sanitizer.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/html5/test_sanitizer.rb b/test/html5/test_sanitizer.rb
+index 096ea7d..e0d46f7 100755
+--- a/test/html5/test_sanitizer.rb
++++ b/test/html5/test_sanitizer.rb
+@@ -376,7 +376,7 @@ def test_figure_element_is_valid
+ ##
+ require "json"
+ Dir[File.join(File.dirname(__FILE__), "..", "assets", "testdata_sanitizer_tests1.dat")].each do |filename|
+- JSON.parse(File.read(filename)).each do |test|
++ JSON.parse(File.read(filename), allow_comments: true).each do |test|
+ it "testdata sanitizer #{test["name"]}" do
+ test.delete("name")
+ input = test.delete("input")
diff --git a/rubygem-loofah.spec b/rubygem-loofah.spec
index e44072f..b71d11e 100644
--- a/rubygem-loofah.spec
+++ b/rubygem-loofah.spec
@@ -2,7 +2,7 @@
Name: rubygem-%{gem_name}
Version: 2.22.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Manipulate and transform HTML/XML documents and fragments
License: MIT
URL: https://github.com/flavorjones/loofah
@@ -15,6 +15,9 @@ Patch0: %{gem_name}-2.22.0-minitest6.patch
# Make testsuite accept libxml2 2.14
# https://github.com/flavorjones/loofah/pull/298
Patch1: %{gem_name}-pr298-testsuite-accept-libxml2-2_14.patch
+# https://github.com/flavorjones/loofah/pull/307
+# Fix json 3 compatibility
+Patch2: %{gem_name}-pr307-support-json3-allow-comments.patch
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: ruby
@@ -45,6 +48,7 @@ Documentation for %{name}.
cd %{_builddir}
%patch -P0 -p1
%patch -P1 -p1
+%patch -P2 -p1
)
%build
@@ -79,6 +83,9 @@ popd
%doc %{gem_instdir}/SECURITY.md
%changelog
+* Sun Sep 20 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.22.0-11
+- Apply upstream patch to support json 3
+
* Sat Sep 19 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.22.0-10
- Backport upstream fix to accept libxml2 2.14 for testsuite
reply other threads:[~2026-09-20 6:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178988612731.1.13260870315377402073.rpms-rubygem-loofah-b3e7c7b2a2ed@fedoraproject.org \
--to=mtasaka@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox