From ef798a222d706c8c02f975d54100aa22f1d94133 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 9 Dec 2024 23:13:40 +0900 Subject: [PATCH 01/23] 1.17.0 --- ...nokogiri-pr3177-rubyzip-dep-optional.patch | 31 ------------------- rubygem-nokogiri.spec | 11 +++---- sources | 4 +-- 3 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 rubygem-nokogiri-pr3177-rubyzip-dep-optional.patch diff --git a/rubygem-nokogiri-pr3177-rubyzip-dep-optional.patch b/rubygem-nokogiri-pr3177-rubyzip-dep-optional.patch deleted file mode 100644 index c7b2b1c..0000000 --- a/rubygem-nokogiri-pr3177-rubyzip-dep-optional.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 26e5ba521208706ae68f19062d4ad24ad257aa47 Mon Sep 17 00:00:00 2001 -From: Jun Aruga -Date: Mon, 15 Apr 2024 15:46:30 +0200 -Subject: [PATCH] Make a test depending on the rubyzip gem optional. - -Because I still want to pass the nokogiri's unit tests in a downstream nokogiri -package on a Linux distro such as CentOS 10 Stream and RHEL 10, where we don't -want to manage the rubyzip gem[1]. - -[1] https://rubygems.org/gems/rubyzip ---- - test/xml/test_document_encoding.rb | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/test/xml/test_document_encoding.rb b/test/xml/test_document_encoding.rb -index cd8b1b4da2..c0cb93b283 100644 ---- a/test/xml/test_document_encoding.rb -+++ b/test/xml/test_document_encoding.rb -@@ -91,7 +91,11 @@ class TestDocumentEncoding < Nokogiri::TestCase - describe "pseudo-IO" do - it "serializes correctly with Zip::OutputStream objects" do - # https://github.com/sparklemotion/nokogiri/issues/2773 -- require "zip" -+ begin -+ require "zip" -+ rescue LoadError -+ skip("rubyzip is not installed") -+ end - - xml = <<~XML - diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 8bbb785..10d3c57 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.16.8 +%global mainver 1.17.0 #%%global prever .rc4 %global baserelease 1 @@ -29,9 +29,6 @@ Source1: rubygem-%{gem_name}-%{version}%{?prever}-full.tar.gz Source2: nokogiri-create-full-tarball.sh # Shut down libxml2 version unmatching warning Patch0: %{name}-1.11.0.rc4-shutdown-libxml2-warning.patch -# https://github.com/sparklemotion/nokogiri/pull/3177 -# Make rubygem-minizip dependency optional -Patch1: %{name}-pr3177-rubyzip-dep-optional.patch BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## @@ -88,7 +85,6 @@ mv ../%{gem_name}-%{version}.gemspec . # patches %patch -P0 -p1 -%patch -P1 -p1 # remove bundled external libraries sed -i \ @@ -109,7 +105,7 @@ sed -i -e '\@mini_portile@d' %{gem_name}-%{version}.gemspec sed -i \ ext/nokogiri/extconf.rb \ -e "s@^\(def process_recipe.*\)\$@\1 ; return true@" \ - -e "s@^\(append_cppflags\).*gumbo.*\$@\1(\"-I$(pwd)/gumbo-parser/src\")@" \ + -e "s@^\([ \t]*append_cppflags\).*gumbo.*\$@\1(\"-I$(pwd)/gumbo-parser/src\")@" \ -e "\@libs.*gumbo@s@File\.join.*@\"$(pwd)/gumbo-parser/src/libgumbo.a\"@" \ -e "\@LIBPATH.*gumbo@s|^\(.*\)\$|# \1|" \ %{nil} @@ -280,6 +276,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Dec 09 2024 Mamoru TASAKA - 1.17.0-1 +- 1.17.0 + * Thu Dec 05 2024 Mamoru TASAKA - 1.16.8-1 - 1.16.8 diff --git a/sources b/sources index 9424b65..a5d6c38 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.16.8.gem) = 5dfcdc303dc1a6955f9e3831ca15ea76dad385e10df7d18b2d0b363498206f5fd1b7c24b2849a0199b311e174b8b77c18059b503e6c33e6cae43fffc4d9b0382 -SHA512 (rubygem-nokogiri-1.16.8-full.tar.gz) = 2737ac2b0f0283719803a7471edd3aebc4b3ef230bc22f77de7e764c360d8bf099ab3d807787df1254688cc9cec4727655f86bea508986ca8f5d665f3e32887e +SHA512 (nokogiri-1.17.0.gem) = e935aa635407d8c91586e65e09a020046726d44af99d9afbf0d3c6088734997bca40a98998bf5889631fd8508e96e4dd11eeca19d371bfe11c45ef7598a667f6 +SHA512 (rubygem-nokogiri-1.17.0-full.tar.gz) = 322b91bc4ad81eb23f3dbe6018db9110650b6d38c2077b051b280652443cf3336bcc3d28766336156b4fe245ca9a3d420e7f913cb9c06b3773a40f043cb87b87 From d0b3530cf5b1e3091282c1017865f9c622dc2c5f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 11 Dec 2024 17:42:48 +0900 Subject: [PATCH 02/23] 1.17.1 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 10d3c57..0b7647a 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.17.0 +%global mainver 1.17.1 #%%global prever .rc4 %global baserelease 1 @@ -276,6 +276,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Dec 11 2024 Mamoru TASAKA - 1.17.1-1 +- 1.17.1 + * Mon Dec 09 2024 Mamoru TASAKA - 1.17.0-1 - 1.17.0 diff --git a/sources b/sources index a5d6c38..543d339 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.17.0.gem) = e935aa635407d8c91586e65e09a020046726d44af99d9afbf0d3c6088734997bca40a98998bf5889631fd8508e96e4dd11eeca19d371bfe11c45ef7598a667f6 -SHA512 (rubygem-nokogiri-1.17.0-full.tar.gz) = 322b91bc4ad81eb23f3dbe6018db9110650b6d38c2077b051b280652443cf3336bcc3d28766336156b4fe245ca9a3d420e7f913cb9c06b3773a40f043cb87b87 +SHA512 (nokogiri-1.17.1.gem) = 78fd03661569b123fe413a37b4918db8c0c3db4b0fe5374569fa424140be7cf933984f55ec458ee88eb50c116f6a23ae3cac94df1f1b34a1e49f14377c0c8d2e +SHA512 (rubygem-nokogiri-1.17.1-full.tar.gz) = a795f18e8fc756f53e5a205f13c7bd0fbc83f3c8fa1e20c43af9ba4a0400bb9a28dd9fb85f710c17b659b5471e88500c6248716756f3a9e22e253026a14411f6 From 941cbb1036f0cb01437ed79c838e4cccd0c190f1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 13 Dec 2024 11:33:53 +0900 Subject: [PATCH 03/23] 1.17.2 --- nokogiri-create-full-tarball.sh | 5 ++++- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/nokogiri-create-full-tarball.sh b/nokogiri-create-full-tarball.sh index d6fbd01..a204942 100644 --- a/nokogiri-create-full-tarball.sh +++ b/nokogiri-create-full-tarball.sh @@ -20,7 +20,10 @@ git reset --hard v$2 popd ln -sf $1 $1-$2 -tar czf ${CURRDIR}/rubygem-$1-$2-full.tar.gz $1-$2/./ +tar czf \ + ${CURRDIR}/rubygem-$1-$2-full.tar.gz \ + "--exclude=nokogiri-$2/./.git" \ + $1-$2/./ popd diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 0b7647a..3b01405 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.17.1 +%global mainver 1.17.2 #%%global prever .rc4 %global baserelease 1 @@ -276,6 +276,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Dec 13 2024 Mamoru TASAKA - 1.17.2-1 +- 1.17.2 + * Wed Dec 11 2024 Mamoru TASAKA - 1.17.1-1 - 1.17.1 diff --git a/sources b/sources index 543d339..d37af1f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.17.1.gem) = 78fd03661569b123fe413a37b4918db8c0c3db4b0fe5374569fa424140be7cf933984f55ec458ee88eb50c116f6a23ae3cac94df1f1b34a1e49f14377c0c8d2e -SHA512 (rubygem-nokogiri-1.17.1-full.tar.gz) = a795f18e8fc756f53e5a205f13c7bd0fbc83f3c8fa1e20c43af9ba4a0400bb9a28dd9fb85f710c17b659b5471e88500c6248716756f3a9e22e253026a14411f6 +SHA512 (rubygem-nokogiri-1.17.2-full.tar.gz) = b084f6147da307d4d18e20eebda56ef69369a14451b61781064ef3c652816e4b66c80e4104a95b942217cd920be344104d5d3dda537340b461ffd64d84cae86b +SHA512 (nokogiri-1.17.2.gem) = fc2afbb1599d5349a178b2588ec7e0238eace643fc3abe8aef476f64c0e6edd9802925f9f8fd987f0a561b075e14be79a6efb365eadec0095c716c44d4be02cb From a6711e5dec0d4536fd90519e40ef53e2a190bcff Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 28 Dec 2024 23:02:11 +0900 Subject: [PATCH 04/23] 1.18.0 --- rubygem-nokogiri.spec | 6 ++++-- sources | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 3b01405..542910f 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.17.2 +%global mainver 1.18.0 #%%global prever .rc4 %global baserelease 1 @@ -52,7 +52,6 @@ BuildRequires: libxslt-devel BuildRequires: ruby-devel # ruby27 needs this explicitly BuildRequires: rubygem(racc) -Requires: rubygem(racc) %description Nokogiri parses and searches XML/HTML very quickly, and also has @@ -276,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sat Dec 28 2024 Mamoru TASAKA - 1.18.0-1 +- 1.18.0 + * Fri Dec 13 2024 Mamoru TASAKA - 1.17.2-1 - 1.17.2 diff --git a/sources b/sources index d37af1f..d5e6cdf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rubygem-nokogiri-1.17.2-full.tar.gz) = b084f6147da307d4d18e20eebda56ef69369a14451b61781064ef3c652816e4b66c80e4104a95b942217cd920be344104d5d3dda537340b461ffd64d84cae86b -SHA512 (nokogiri-1.17.2.gem) = fc2afbb1599d5349a178b2588ec7e0238eace643fc3abe8aef476f64c0e6edd9802925f9f8fd987f0a561b075e14be79a6efb365eadec0095c716c44d4be02cb +SHA512 (rubygem-nokogiri-1.18.0-full.tar.gz) = c61057f4cf99a8ea24f74dd1e62905b8aa132dfce2780a10428ff19bd5282ede8f7bbfc42e1ad79924e8f759e6336ab3a1783e57348d36b69fef4d959c9a7e5f +SHA512 (nokogiri-1.18.0.gem) = 2a7420375b0316a73c3fb7a23a6d7496b82ce7af818e0698dc29cacb07645e726e4a97ea7e8413a1cb5f362ffdd40280544c85adac5d1ca3b4219b5aec732cf6 From e12aade9bb4f1fe613295edbc2990ab18642cc82 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Dec 2024 16:53:37 +0900 Subject: [PATCH 05/23] 1.18.1 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 542910f..fc87a72 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.0 +%global mainver 1.18.1 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Dec 30 2024 Mamoru TASAKA - 1.18.1-1 +- 1.18.1 + * Sat Dec 28 2024 Mamoru TASAKA - 1.18.0-1 - 1.18.0 diff --git a/sources b/sources index d5e6cdf..af1ee43 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rubygem-nokogiri-1.18.0-full.tar.gz) = c61057f4cf99a8ea24f74dd1e62905b8aa132dfce2780a10428ff19bd5282ede8f7bbfc42e1ad79924e8f759e6336ab3a1783e57348d36b69fef4d959c9a7e5f -SHA512 (nokogiri-1.18.0.gem) = 2a7420375b0316a73c3fb7a23a6d7496b82ce7af818e0698dc29cacb07645e726e4a97ea7e8413a1cb5f362ffdd40280544c85adac5d1ca3b4219b5aec732cf6 +SHA512 (nokogiri-1.18.1.gem) = 1767b70813504ae02a3cbad47897804ee1ba7596cf53979b890745165ea7b1016b62c67f0ed2b3bdef142062178cf7c0cae917b51391c006287e6157bdc047cf +SHA512 (rubygem-nokogiri-1.18.1-full.tar.gz) = 023a443ca137392eb181ecfe9d4a256525ce249a1e6be0aa612a47e046678769035f7596b90dfc0378276ddddc1796cb2612e82b7e136acf7b08e3ad19a6f784 From a59bd55ca7ab5c173531aa554ddff3f79ce9ff19 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Dec 2024 17:48:04 +0900 Subject: [PATCH 06/23] Backport PR3395 for SAX::ParserContex to prevent possible use-after-free --- ...95-sax-parsecontext-keep-referenence.patch | 73 +++++++++++++++++++ rubygem-nokogiri.spec | 8 +- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 rubygem-nokogiri-1.16.8-pr3395-sax-parsecontext-keep-referenence.patch diff --git a/rubygem-nokogiri-1.16.8-pr3395-sax-parsecontext-keep-referenence.patch b/rubygem-nokogiri-1.16.8-pr3395-sax-parsecontext-keep-referenence.patch new file mode 100644 index 0000000..7371b3a --- /dev/null +++ b/rubygem-nokogiri-1.16.8-pr3395-sax-parsecontext-keep-referenence.patch @@ -0,0 +1,73 @@ +From f2a9275e442178084db43505d6425354e016d259 Mon Sep 17 00:00:00 2001 +From: Mike Dalessio +Date: Sat, 28 Dec 2024 22:21:04 -0500 +Subject: [PATCH] fix: SAX::ParserContext keeps a reference to the input + +to prevent it from being GCed before we parse it. +--- + ext/nokogiri/xml_sax_parser_context.c | 10 ++++++++-- + test/test_memory_usage.rb | 24 ++++++++++++++++++++++++ + 2 files changed, 32 insertions(+), 2 deletions(-) + +diff --git a/ext/nokogiri/xml_sax_parser_context.c b/ext/nokogiri/xml_sax_parser_context.c +index 75fe2e4f017..0d2b65b599f 100644 +--- a/ext/nokogiri/xml_sax_parser_context.c ++++ b/ext/nokogiri/xml_sax_parser_context.c +@@ -68,7 +68,10 @@ parse_io(VALUE klass, VALUE io, VALUE encoding) + ctxt->sax = NULL; + } + +- return noko_xml_sax_parser_context_wrap(klass, ctxt); ++ VALUE rb_context = noko_xml_sax_parser_context_wrap(klass, ctxt); ++ rb_iv_set(rb_context, "@input", io); ++ ++ return rb_context; + } + + /* +@@ -114,7 +117,10 @@ parse_memory(VALUE klass, VALUE data) + ctxt->sax = NULL; + } + +- return noko_xml_sax_parser_context_wrap(klass, ctxt); ++ VALUE rb_context = noko_xml_sax_parser_context_wrap(klass, ctxt); ++ rb_iv_set(rb_context, "@input", data); ++ ++ return rb_context; + } + + static VALUE +diff --git a/test/test_memory_usage.rb b/test/test_memory_usage.rb +index a23bb675e07..1b2044b448f 100644 +--- a/test/test_memory_usage.rb ++++ b/test/test_memory_usage.rb +@@ -311,5 +311,29 @@ class TestMemoryUsage < Nokogiri::TestCase + # Expected error. This comment makes rubocop happy. + end + end ++ ++ it "XML::SAX::ParserContext.io holds a reference to IO input" do ++ content = File.read(XML_ATOM_FILE) ++ ++ memwatch(__method__) do ++ pc = Nokogiri::XML::SAX::ParserContext.io(StringIO.new(content), "ISO-8859-1") ++ parser = Nokogiri::XML::SAX::Parser.new(Nokogiri::SAX::TestCase::Doc.new) ++ GC.stress ++ pc.parse_with(parser) ++ ++ assert_equal(472, parser.document.data.length) ++ end ++ end ++ ++ it "XML::SAX::ParserContext.memory holds a reference to string input" do ++ memwatch(__method__) do ++ pc = Nokogiri::XML::SAX::ParserContext.memory(File.read(XML_ATOM_FILE), "ISO-8859-1") ++ parser = Nokogiri::XML::SAX::Parser.new(Nokogiri::SAX::TestCase::Doc.new) ++ GC.stress ++ pc.parse_with(parser) ++ ++ assert_equal(472, parser.document.data.length) ++ end ++ end + end if ENV["NOKOGIRI_MEMORY_SUITE"] && Nokogiri.uses_libxml? + end diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 8bbb785..0eccb0d 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.16.8 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -32,6 +32,8 @@ Patch0: %{name}-1.11.0.rc4-shutdown-libxml2-warning.patch # https://github.com/sparklemotion/nokogiri/pull/3177 # Make rubygem-minizip dependency optional Patch1: %{name}-pr3177-rubyzip-dep-optional.patch +# Backport: https://github.com/sparklemotion/nokogiri/pull/3395 +Patch2: %{name}-1.16.8-pr3395-sax-parsecontext-keep-referenence.patch BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## @@ -89,6 +91,7 @@ mv ../%{gem_name}-%{version}.gemspec . # patches %patch -P0 -p1 %patch -P1 -p1 +%patch -P2 -p1 # remove bundled external libraries sed -i \ @@ -280,6 +283,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Dec 30 2024 Mamoru TASAKA - 1.16.8-2 +- Backport PR3395 for SAX::ParserContex to prevent possible use-after-free + * Thu Dec 05 2024 Mamoru TASAKA - 1.16.8-1 - 1.16.8 From 37ea4b420c0fda264c5497aff61137760ff3b22a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Jan 2025 08:09:29 +0900 Subject: [PATCH 07/23] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index fc87a72..322f9de 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.18.1 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Tue Jan 07 2025 Mamoru TASAKA - 1.18.1-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 + * Mon Dec 30 2024 Mamoru TASAKA - 1.18.1-1 - 1.18.1 From e06b31a6f9d4ed36b3df75faf54d5dc92c84282d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 23:42:50 +0000 Subject: [PATCH 08/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 322f9de..a574429 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.18.1 #%%global prever .rc4 -%global baserelease 2 +%global baserelease 3 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.18.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Jan 07 2025 Mamoru TASAKA - 1.18.1-2 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 From 98347adc8c9c618f802ba17369b63be756577642 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 21 Jan 2025 09:03:11 +0900 Subject: [PATCH 09/23] 1.18.2 --- rubygem-nokogiri.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index a574429..c77d7a7 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.18.1 +%global mainver 1.18.2 #%%global prever .rc4 -%global baserelease 3 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Jan 20 2025 Mamoru TASAKA - 1.18.2-1 +- 1.18.2 + * Sat Jan 18 2025 Fedora Release Engineering - 1.18.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index af1ee43..23db84b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.1.gem) = 1767b70813504ae02a3cbad47897804ee1ba7596cf53979b890745165ea7b1016b62c67f0ed2b3bdef142062178cf7c0cae917b51391c006287e6157bdc047cf -SHA512 (rubygem-nokogiri-1.18.1-full.tar.gz) = 023a443ca137392eb181ecfe9d4a256525ce249a1e6be0aa612a47e046678769035f7596b90dfc0378276ddddc1796cb2612e82b7e136acf7b08e3ad19a6f784 +SHA512 (nokogiri-1.18.2.gem) = 205c863ee8027224503f26072c6ac69e42348e2927496b0e30408062ed81f705786c1e3f8fdcf1f7ee7d92d76f93c48f07f6879883ef50d9af0a08a75b2982de +SHA512 (rubygem-nokogiri-1.18.2-full.tar.gz) = d4020aefef2865eff6d17f6c41387d550668d777b51797fdb98e9613c0d75efba2440687b53ceb1402e30e32709e4228fdabf05e6ae7124cb50e3ab6ade66389 From 434ddac2596e65cdc8feef0b63e29c74078fb6dd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 19 Feb 2025 14:57:51 +0900 Subject: [PATCH 10/23] 1.18.3 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index c77d7a7..94dbbcd 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.2 +%global mainver 1.18.3 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Feb 19 2025 Mamoru TASAKA - 1.18.3-1 +- 1.18.3 + * Mon Jan 20 2025 Mamoru TASAKA - 1.18.2-1 - 1.18.2 diff --git a/sources b/sources index 23db84b..0a3d31b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.2.gem) = 205c863ee8027224503f26072c6ac69e42348e2927496b0e30408062ed81f705786c1e3f8fdcf1f7ee7d92d76f93c48f07f6879883ef50d9af0a08a75b2982de -SHA512 (rubygem-nokogiri-1.18.2-full.tar.gz) = d4020aefef2865eff6d17f6c41387d550668d777b51797fdb98e9613c0d75efba2440687b53ceb1402e30e32709e4228fdabf05e6ae7124cb50e3ab6ade66389 +SHA512 (nokogiri-1.18.3.gem) = 538f3e61b016e52f32aea234519fbdc16e7d64233e81227741a0aaa23ebf8b4e30c74e7cfbdaad19a7d66cc3660a5e8f5bf2323f9422e79f5d6dab2878b87171 +SHA512 (rubygem-nokogiri-1.18.3-full.tar.gz) = 6fba269485cd8ba6ac42d4c31a46b64c3999c5eeb6a57e396d938b474f67333047be752b7fa48f11f579e806a48532d109950f6bbac92b6eff716a27fda68fca From e17abae0b19d1715d0c7a6b01ce94aa93d2a9b0b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 16 Mar 2025 13:53:21 +0900 Subject: [PATCH 11/23] 1.18.4 --- nokogiri-create-full-tarball.sh | 13 +++++++++++++ rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/nokogiri-create-full-tarball.sh b/nokogiri-create-full-tarball.sh index a204942..1cb4822 100644 --- a/nokogiri-create-full-tarball.sh +++ b/nokogiri-create-full-tarball.sh @@ -1,5 +1,17 @@ #!/bin/bash +git_restore_timestamp() +{ + set +x + echo "Restore timestamps" + git ls-tree -r --name-only HEAD | while read f + do + unixtime=$(git log -n 1 --pretty='%ct' -- $f) + touch -d "@${unixtime}" $f + done + set -x +} + if [ $# -lt 2 ] then echo "$0 " @@ -17,6 +29,7 @@ pushd $TMPDIRPATH git clone https://github.com/sparklemotion/$1.git pushd $1 git reset --hard v$2 +git_restore_timestamp popd ln -sf $1 $1-$2 diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 94dbbcd..b1a30f3 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.3 +%global mainver 1.18.4 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sun Mar 16 2025 Mamoru TASAKA - 1.18.4-1 +- 1.18.4 + * Wed Feb 19 2025 Mamoru TASAKA - 1.18.3-1 - 1.18.3 diff --git a/sources b/sources index 0a3d31b..6a81b39 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.3.gem) = 538f3e61b016e52f32aea234519fbdc16e7d64233e81227741a0aaa23ebf8b4e30c74e7cfbdaad19a7d66cc3660a5e8f5bf2323f9422e79f5d6dab2878b87171 -SHA512 (rubygem-nokogiri-1.18.3-full.tar.gz) = 6fba269485cd8ba6ac42d4c31a46b64c3999c5eeb6a57e396d938b474f67333047be752b7fa48f11f579e806a48532d109950f6bbac92b6eff716a27fda68fca +SHA512 (nokogiri-1.18.4.gem) = c66683a1d216a615a40eadade8874b56fa5d6b4b3bfc836f7b245f4177746b755496c3d871c7a08ec3d6f393045b4709ba082ed8313b9496a127a90b20c0bf7c +SHA512 (rubygem-nokogiri-1.18.4-full.tar.gz) = 212d1c8497fe5161249e6155f49930d95a5db70812685af1716038344cb696fd272f800aacb574c5d1e971484e9738ae40ff0afeb001e6f094e88da90bb7567a From dd0fd3c652245c7539c7888bb3d033c2c78caa45 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 20 Mar 2025 12:13:02 +0900 Subject: [PATCH 12/23] 1.18.5 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index b1a30f3..fac780c 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.4 +%global mainver 1.18.5 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Mar 20 2025 Mamoru TASAKA - 1.18.5-1 +- 1.18.5 + * Sun Mar 16 2025 Mamoru TASAKA - 1.18.4-1 - 1.18.4 diff --git a/sources b/sources index 6a81b39..84eea72 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.4.gem) = c66683a1d216a615a40eadade8874b56fa5d6b4b3bfc836f7b245f4177746b755496c3d871c7a08ec3d6f393045b4709ba082ed8313b9496a127a90b20c0bf7c -SHA512 (rubygem-nokogiri-1.18.4-full.tar.gz) = 212d1c8497fe5161249e6155f49930d95a5db70812685af1716038344cb696fd272f800aacb574c5d1e971484e9738ae40ff0afeb001e6f094e88da90bb7567a +SHA512 (nokogiri-1.18.5.gem) = 70bcefca99d695d047f3b4c943a2a7ddc835a741f395685fe817cf71d2756e12b5ec250cea6df36daea758cffac238d866881eb913892d9a32254581835c2183 +SHA512 (rubygem-nokogiri-1.18.5-full.tar.gz) = 6652666ce4966f02851dbcc1e1867e217f93203e43bea9db909ea85a3ffde2dff9d0e15c190b4b91c5f2507aff45f3a264a77aee46e70ff8dc76fde2a73f70ca From ca10768dbd1349b23a727b79ddf346d5074022c7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 26 Mar 2025 16:00:41 +0900 Subject: [PATCH 13/23] Suppress warnings from Nokogiri::VERSION_INFO (bug 2354787) --- ...kogiri-1.11.0.rc4-shutdown-libxml2-warning.patch | 13 ++++++++----- rubygem-nokogiri.spec | 5 ++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/rubygem-nokogiri-1.11.0.rc4-shutdown-libxml2-warning.patch b/rubygem-nokogiri-1.11.0.rc4-shutdown-libxml2-warning.patch index c1ed61c..6a34634 100644 --- a/rubygem-nokogiri-1.11.0.rc4-shutdown-libxml2-warning.patch +++ b/rubygem-nokogiri-1.11.0.rc4-shutdown-libxml2-warning.patch @@ -1,10 +1,13 @@ ---- nokogiri-1.11.0.rc4/lib/nokogiri/version/info.rb.warn 2020-12-31 16:56:11.533949657 +0900 -+++ nokogiri-1.11.0.rc4/lib/nokogiri/version/info.rb 2020-12-31 16:59:38.576697147 +0900 -@@ -58,6 +58,7 @@ module Nokogiri +--- nokogiri-1.18.5/lib/nokogiri/version/info.rb.warn 2023-11-29 01:25:54.000000000 +0900 ++++ nokogiri-1.18.5/lib/nokogiri/version/info.rb 2025-03-26 15:51:51.468291434 +0900 +@@ -70,6 +70,10 @@ module Nokogiri + end def warnings ++ [] ++ end ++ ++ def warnings_original warnings = [] -+ return warnings if libxml2? - if compiled_libxml_version != loaded_libxml_version diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index fac780c..214daf5 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.18.5 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Mar 26 2025 Mamoru TASAKA - 1.18.5-2 +- Suppress warnings from Nokogiri::VERSION_INFO (bug 2354787) + * Thu Mar 20 2025 Mamoru TASAKA - 1.18.5-1 - 1.18.5 From c517880ca1ebfb9968699811d38cb82d66619e9f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 29 Mar 2025 14:29:20 +0900 Subject: [PATCH 14/23] 1.18.6 --- rubygem-nokogiri.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 214daf5..35e9346 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.18.5 +%global mainver 1.18.6 #%%global prever .rc4 -%global baserelease 2 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Sat Mar 29 2025 Mamoru TASAKA - 1.18.6-1 +- 1.18.6 + * Wed Mar 26 2025 Mamoru TASAKA - 1.18.5-2 - Suppress warnings from Nokogiri::VERSION_INFO (bug 2354787) diff --git a/sources b/sources index 84eea72..da4a41e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.5.gem) = 70bcefca99d695d047f3b4c943a2a7ddc835a741f395685fe817cf71d2756e12b5ec250cea6df36daea758cffac238d866881eb913892d9a32254581835c2183 -SHA512 (rubygem-nokogiri-1.18.5-full.tar.gz) = 6652666ce4966f02851dbcc1e1867e217f93203e43bea9db909ea85a3ffde2dff9d0e15c190b4b91c5f2507aff45f3a264a77aee46e70ff8dc76fde2a73f70ca +SHA512 (nokogiri-1.18.6.gem) = e751f5650affb5423038fe809e8206bf434e41fcc7fcf8c11878662f56d12c023e92e226b76ad0debd93acbbfe2dd5e3b21c8b5199ea66617182753e9fb0c4d5 +SHA512 (rubygem-nokogiri-1.18.6-full.tar.gz) = ab8d1b9ed0a17a226eef62db7ccadb8b686c90f7bbaee28fa30a96c36470329758d6433a083b0d5b6d0d963bc845304144a4217022af896f42d712b17cbafdd2 From 863c1b5775ab7c5c4e40dc821624771967d7b94d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 7 Apr 2025 16:14:38 +0900 Subject: [PATCH 15/23] 1.18.7 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 35e9346..d2a6bcf 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.6 +%global mainver 1.18.7 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Apr 07 2025 Mamoru TASAKA - 1.18.7-1 +- 1.18.7 + * Sat Mar 29 2025 Mamoru TASAKA - 1.18.6-1 - 1.18.6 diff --git a/sources b/sources index da4a41e..ebe953c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.6.gem) = e751f5650affb5423038fe809e8206bf434e41fcc7fcf8c11878662f56d12c023e92e226b76ad0debd93acbbfe2dd5e3b21c8b5199ea66617182753e9fb0c4d5 -SHA512 (rubygem-nokogiri-1.18.6-full.tar.gz) = ab8d1b9ed0a17a226eef62db7ccadb8b686c90f7bbaee28fa30a96c36470329758d6433a083b0d5b6d0d963bc845304144a4217022af896f42d712b17cbafdd2 +SHA512 (nokogiri-1.18.7.gem) = 96673311f4917617e303d90d92209d5b4ea348d3222298c52ae1e7ee2bcf7ff26a315f96b6f892894820a1e0abbe5b703dfda34565660ad985e7b56f01716a9b +SHA512 (rubygem-nokogiri-1.18.7-full.tar.gz) = 4e9d007c664752391708e93858c7f3a334cdc51a5505cf529f6af6e5729ce2bfe24b0dc6abaa11d44269e4212fbd30bbf11e167bb4bda65c6c1073515c5bd9a4 From 31378a8aa8b07d4f8cfc956af4dfe8d5dbe9ccb0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 23 Apr 2025 15:17:28 +0900 Subject: [PATCH 16/23] 1.18.8 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index d2a6bcf..2151041 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.7 +%global mainver 1.18.8 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Apr 23 2025 Mamoru TASAKA - 1.18.8-1 +- 1.18.8 + * Mon Apr 07 2025 Mamoru TASAKA - 1.18.7-1 - 1.18.7 diff --git a/sources b/sources index ebe953c..21e398b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.7.gem) = 96673311f4917617e303d90d92209d5b4ea348d3222298c52ae1e7ee2bcf7ff26a315f96b6f892894820a1e0abbe5b703dfda34565660ad985e7b56f01716a9b -SHA512 (rubygem-nokogiri-1.18.7-full.tar.gz) = 4e9d007c664752391708e93858c7f3a334cdc51a5505cf529f6af6e5729ce2bfe24b0dc6abaa11d44269e4212fbd30bbf11e167bb4bda65c6c1073515c5bd9a4 +SHA512 (nokogiri-1.18.8.gem) = 972f5d3aba21a2e9baa373c19344dcc4fe6bc6190b1ae7b6eccd34af5d4be025df1172c57e25ae82b4b3e71d95fd418e5e7a8e981958da6ff34a240ea90a4040 +SHA512 (rubygem-nokogiri-1.18.8-full.tar.gz) = 2be919e4e63a6ad162cdba7fae68e9f2a513ff0785773f4672249ebb7b25eaaacc8e4e824f9e7120144197dde8e29dc1595da6414b452ad624e96c6730e09628 From 7f3c8a2fe9124d596c0493b6865165f4788fd6ee Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 21 Jul 2025 17:43:50 +0900 Subject: [PATCH 17/23] 1.18.9 --- rubygem-nokogiri.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 2151041..ca38a21 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.18.8 +%global mainver 1.18.9 #%%global prever .rc4 %global baserelease 1 @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Jul 21 2025 Mamoru TASAKA - 1.18.9-1 +- 1.18.9 + * Wed Apr 23 2025 Mamoru TASAKA - 1.18.8-1 - 1.18.8 diff --git a/sources b/sources index 21e398b..04dcba3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.8.gem) = 972f5d3aba21a2e9baa373c19344dcc4fe6bc6190b1ae7b6eccd34af5d4be025df1172c57e25ae82b4b3e71d95fd418e5e7a8e981958da6ff34a240ea90a4040 -SHA512 (rubygem-nokogiri-1.18.8-full.tar.gz) = 2be919e4e63a6ad162cdba7fae68e9f2a513ff0785773f4672249ebb7b25eaaacc8e4e824f9e7120144197dde8e29dc1595da6414b452ad624e96c6730e09628 +SHA512 (nokogiri-1.18.9.gem) = 3d51fb952f5b63026c0753ccc81c6d553b0680b658f883e8fb13b53daf1374168997226ccbb696cef2d5d600a978ee9364959692d4d9586f77c8aee242c07241 +SHA512 (rubygem-nokogiri-1.18.9-full.tar.gz) = 873e1290f145959dedb012248ef1b56a4609ab8c2f819eddfd89b3a5416286e5a06dfe9f81673b7393b94248b1be26119b1130cf410e8d92f2d556ef9a64f199 From 1aa1d6422a7551b893cf1168fee050a6a26f3afd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:38:16 +0000 Subject: [PATCH 18/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index ca38a21..cf0aa28 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.18.9 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.18.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 21 2025 Mamoru TASAKA - 1.18.9-1 - 1.18.9 From 0af2370f2fe8e1b540489b91bf83c1cc237bd72c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Sep 2025 16:41:29 +0900 Subject: [PATCH 19/23] 1.18.10 --- rubygem-nokogiri.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index cf0aa28..700765b 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.18.9 +%global mainver 1.18.10 #%%global prever .rc4 -%global baserelease 2 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -275,6 +275,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Sep 15 2025 Mamoru TASAKA - 1.18.10-1 +- 1.18.10 + * Fri Jul 25 2025 Fedora Release Engineering - 1.18.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 04dcba3..2c3b067 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.9.gem) = 3d51fb952f5b63026c0753ccc81c6d553b0680b658f883e8fb13b53daf1374168997226ccbb696cef2d5d600a978ee9364959692d4d9586f77c8aee242c07241 -SHA512 (rubygem-nokogiri-1.18.9-full.tar.gz) = 873e1290f145959dedb012248ef1b56a4609ab8c2f819eddfd89b3a5416286e5a06dfe9f81673b7393b94248b1be26119b1130cf410e8d92f2d556ef9a64f199 +SHA512 (nokogiri-1.18.10.gem) = 82d7cefeedb3328cc427ce6eb6394ef07d18c6b5a4d495e3f3c0270320dcd64904b1229e427780fda48b8877bfae5043df000fd850bb303ed09735d3ba63f974 +SHA512 (rubygem-nokogiri-1.18.10-full.tar.gz) = a230b8da7ad7eb01f496a87b89c0e78799cccc7726e7d8ee8ee09841c82d819bf269700f98effce69ff2b8d2926de085cfda8e350c7d77a463ea25d875f12cf8 From 3c9b3b041ffce60176b3a8bf1ab0feead74d84f7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 24 Dec 2025 14:06:09 +0900 Subject: [PATCH 20/23] Handle minitest 6 compatibility --- rubygem-nokogiri-1.18.10-minitest6.patch | 11 +++++++++++ rubygem-nokogiri.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 rubygem-nokogiri-1.18.10-minitest6.patch diff --git a/rubygem-nokogiri-1.18.10-minitest6.patch b/rubygem-nokogiri-1.18.10-minitest6.patch new file mode 100644 index 0000000..f2e2b8f --- /dev/null +++ b/rubygem-nokogiri-1.18.10-minitest6.patch @@ -0,0 +1,11 @@ +diff -urp '--exclude=*~' nokogiri-1.18.10.orig/test/helper.rb nokogiri-1.18.10/test/helper.rb +--- nokogiri-1.18.10.orig/test/helper.rb 2025-12-24 12:29:06.569389292 +0900 ++++ nokogiri-1.18.10/test/helper.rb 2025-12-24 12:39:48.443826371 +0900 +@@ -41,6 +41,7 @@ warn + + require "minitest/autorun" + require "minitest/benchmark" ++require "minitest/mock" + + if !Nokogiri.jruby? && ENV["NCPU"].to_i > 1 + require "minitest/parallel_fork" diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 700765b..737f6a1 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.18.10 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -29,6 +29,8 @@ Source1: rubygem-%{gem_name}-%{version}%{?prever}-full.tar.gz Source2: nokogiri-create-full-tarball.sh # Shut down libxml2 version unmatching warning Patch0: %{name}-1.11.0.rc4-shutdown-libxml2-warning.patch +# Handle minitest 6 +Patch1: %{name}-1.18.10-minitest6.patch BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## @@ -37,6 +39,7 @@ BuildRequires: rubygem(minitest) %if !0%{?rhel} # For test/xml/test_document_encoding.rb # Drop rubygem(rubyzip) build dependency in RHEL +BuildRequires: rubygem(minitest-mock) BuildRequires: rubygem(rubyzip) %endif BuildRequires: rubygems-devel @@ -84,6 +87,7 @@ mv ../%{gem_name}-%{version}.gemspec . # patches %patch -P0 -p1 +%patch -P1 -p1 # remove bundled external libraries sed -i \ @@ -275,6 +279,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Dec 24 2025 Mamoru TASAKA - 1.18.10-2 +- Handle minitest 6 compatibility + * Mon Sep 15 2025 Mamoru TASAKA - 1.18.10-1 - 1.18.10 From 52f0942f45c0d1865345d94499bf785278a3950b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 30 Dec 2025 10:24:29 +0900 Subject: [PATCH 21/23] 1.19.0 --- rubygem-nokogiri.spec | 10 +++++----- sources | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 737f6a1..3dd5198 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ -%global mainver 1.18.10 +%global mainver 1.19.0 #%%global prever .rc4 -%global baserelease 2 +%global baserelease 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -29,8 +29,6 @@ Source1: rubygem-%{gem_name}-%{version}%{?prever}-full.tar.gz Source2: nokogiri-create-full-tarball.sh # Shut down libxml2 version unmatching warning Patch0: %{name}-1.11.0.rc4-shutdown-libxml2-warning.patch -# Handle minitest 6 -Patch1: %{name}-1.18.10-minitest6.patch BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## @@ -87,7 +85,6 @@ mv ../%{gem_name}-%{version}.gemspec . # patches %patch -P0 -p1 -%patch -P1 -p1 # remove bundled external libraries sed -i \ @@ -279,6 +276,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Tue Dec 30 2025 Mamoru TASAKA - 1.19.0-1 +- 1.19.0 + * Wed Dec 24 2025 Mamoru TASAKA - 1.18.10-2 - Handle minitest 6 compatibility diff --git a/sources b/sources index 2c3b067..52222fb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nokogiri-1.18.10.gem) = 82d7cefeedb3328cc427ce6eb6394ef07d18c6b5a4d495e3f3c0270320dcd64904b1229e427780fda48b8877bfae5043df000fd850bb303ed09735d3ba63f974 -SHA512 (rubygem-nokogiri-1.18.10-full.tar.gz) = a230b8da7ad7eb01f496a87b89c0e78799cccc7726e7d8ee8ee09841c82d819bf269700f98effce69ff2b8d2926de085cfda8e350c7d77a463ea25d875f12cf8 +SHA512 (rubygem-nokogiri-1.19.0-full.tar.gz) = 29dd894b176857d55eb5e670f50e69762e74c0a13e6949030af17e3c84b65f9dfe0087210b84a7c77749d3d1a4a33292d62f7005003745e8f087d822ee64f4b1 +SHA512 (nokogiri-1.19.0.gem) = d9326a2e60b6ea3152c5f9d53df738610f18ca57cffcd3bf2f8b07a2b08b30085d0fce2ca8206279ad6a0f1a613e9e76821c09aef45cf5e5b2d00ff766734872 From f276b8890f6f100a3ae3102836dfb0d0f3650daf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 10:50:05 +0900 Subject: [PATCH 22/23] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 --- rubygem-nokogiri.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 3dd5198..25eeff8 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.19.0 #%%global prever .rc4 -%global baserelease 1 +%global baserelease 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -276,6 +276,9 @@ popd %doc %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Thu Jan 08 2026 Mamoru TASAKA - 1.19.0-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 + * Tue Dec 30 2025 Mamoru TASAKA - 1.19.0-1 - 1.19.0 From f64183f18aa0570107595cd0173d9c1748aa19de Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 12 Jan 2026 19:06:43 -0500 Subject: [PATCH 23/23] Fix tests in ELN minitest-mock was split out of minitest 6 (F44+). While only needed for a few tests, the module is imported at the test helper level. --- rubygem-nokogiri.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 25eeff8..b28fa64 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -34,10 +34,10 @@ BuildRequires: ruby(rubygems) ## ## For %%check BuildRequires: rubygem(minitest) +BuildRequires: rubygem(minitest-mock) %if !0%{?rhel} # For test/xml/test_document_encoding.rb # Drop rubygem(rubyzip) build dependency in RHEL -BuildRequires: rubygem(minitest-mock) BuildRequires: rubygem(rubyzip) %endif BuildRequires: rubygems-devel