public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Fabio Valentini <decathorpe@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/rust-adblock] f43: Update to version 0.12.2; Fixes RHBZ#2366714
Date: Mon, 22 Jun 2026 21:29:37 GMT [thread overview]
Message-ID: <178216377748.1.475209791157052167.rpms-rust-adblock-433a7454bb8b@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/rust-adblock
Branch : f43
Commit : 433a7454bb8b54d09152889552d8c0593236dd25
Author : Fabio Valentini <decathorpe@gmail.com>
Date : 2026-04-21T22:51:33+02:00
Stats : +48/-142 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/rust-adblock/c/433a7454bb8b54d09152889552d8c0593236dd25?branch=f43
Log:
Update to version 0.12.2; Fixes RHBZ#2366714
---
diff --git a/.gitignore b/.gitignore
index 574b0b2..f02459b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/adblock-0.9.6.crate
/adblock-0.9.7.crate
/adblock-0.9.8.crate
+/adblock-0.12.2.crate
diff --git a/0001-drop-tests-that-require-unshipped-support-code.patch b/0001-drop-tests-that-require-unshipped-support-code.patch
deleted file mode 100644
index f1a2a4e..0000000
--- a/0001-drop-tests-that-require-unshipped-support-code.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From e6d5d53ac1400475562a779485fba615488680f1 Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Thu, 10 Apr 2025 06:15:57 -0400
-Subject: [PATCH] drop tests that require unshipped support code
-
----
- src/blocker.rs | 2 ++
- src/filters/network.rs | 2 ++
- src/lib.rs | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/src/blocker.rs b/src/blocker.rs
-index 1a3a9ff..dcd5e65 100644
---- a/src/blocker.rs
-+++ b/src/blocker.rs
-@@ -2153,6 +2153,8 @@ mod placeholder_string_tests {
- }
- }
-
-+// Downstream patch: these tests require support code not shipped in the crate
-+#[cfg(any())]
- #[cfg(test)]
- mod legacy_rule_parsing_tests {
- use crate::test_utils::rules_from_lists;
-diff --git a/src/filters/network.rs b/src/filters/network.rs
-index 6dd2e82..736db96 100644
---- a/src/filters/network.rs
-+++ b/src/filters/network.rs
-@@ -3405,6 +3405,8 @@ mod match_tests {
- }
- }
-
-+// Downstream patch: these tests require support code not shipped in the crate
-+#[cfg(any())]
- #[cfg(test)]
- mod hash_collision_tests {
- use super::*;
-diff --git a/src/lib.rs b/src/lib.rs
-index 956f082..2a57278 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -37,6 +37,8 @@ pub use engine::Engine;
- #[doc(inline)]
- pub use lists::FilterSet;
-
-+// Downstream patch: these tests require support code not shipped in the crate
-+#[cfg(any())]
- #[cfg(test)]
- #[path = "../tests/test_utils.rs"]
- mod test_utils;
---
-2.49.0
-
diff --git a/adblock-fix-metadata.diff b/adblock-fix-metadata.diff
index bcba7a9..820416e 100644
--- a/adblock-fix-metadata.diff
+++ b/adblock-fix-metadata.diff
@@ -1,5 +1,5 @@
---- adblock-0.9.8/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ adblock-0.9.8/Cargo.toml 2025-07-17T13:31:33.116266+00:00
+--- adblock-0.12.2/Cargo.toml 2006-07-24T01:21:28+00:00
++++ adblock-0.12.2/Cargo.toml 2026-04-21T20:50:09.975945+00:00
@@ -42,10 +42,6 @@
[features]
@@ -8,61 +8,53 @@
- "cssparser",
- "selectors",
-]
+ debug-info = []
default = [
"embedded-domain-resolver",
- "full-regex-handling",
-@@ -110,10 +106,6 @@
- [dependencies.bitflags]
- version = "1.3"
+@@ -118,10 +114,6 @@
+ version = "2.10.0"
+ features = ["serde"]
-[dependencies.cssparser]
--version = "0.29"
+-version = "0.34"
-optional = true
-
- [dependencies.idna]
- version = "1.0.3"
-
-@@ -137,14 +129,10 @@
- version = "1.5"
-
- [dependencies.rmp-serde]
--version = "0.15"
-+version = "1"
+ [dependencies.flatbuffers]
+ version = "25.9.23"
+@@ -150,10 +142,6 @@
[dependencies.seahash]
- version = "3"
--
+ version = "4.1.0"
+
-[dependencies.selectors]
--version = "0.24"
+-version = "0.26"
-optional = true
-
+-
[dependencies.serde]
- version = "1.0"
-@@ -162,9 +150,6 @@
+ version = "1.0.228"
+ features = [
+@@ -170,9 +158,6 @@
[dependencies.url]
version = "2.5"
-[dev-dependencies.criterion]
--version = "0.5"
+-version = "=0.5.1"
-
[dev-dependencies.csv]
- version = "1"
-
-@@ -172,15 +157,10 @@
- version = "0.3"
+ version = "=1.3.0"
+@@ -182,13 +167,8 @@
[dev-dependencies.mock_instant]
--version = "0.5"
--
+ version = "=0.5.1"
+
-[dev-dependencies.reqwest]
--version = "0.11"
+-version = "=0.12.19"
-features = ["rustls-tls"]
-default-features = false
-+version = ">=0.3,<0.6"
-
+-
[dev-dependencies.sha2]
--version = "0.9"
+-version = "=0.9.9"
+version = "0.10"
[dev-dependencies.tokio]
- version = "1.24"
+ version = "=1.45.1"
diff --git a/rust-adblock.spec b/rust-adblock.spec
index 0309ffc..4161fb7 100644
--- a/rust-adblock.spec
+++ b/rust-adblock.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 27
+# Generated by rust2rpm 28
# * temporarily disable tests until mock_instant ^0.5 is available
%bcond check 0
%global debug_package %{nil}
@@ -6,7 +6,7 @@
%global crate adblock
Name: rust-adblock
-Version: 0.9.8
+Version: 0.12.2
Release: %autorelease
Summary: Native Rust module for Adblock Plus syntax
@@ -14,15 +14,12 @@ License: MPL-2.0
URL: https://crates.io/crates/adblock
Source: %{crates_source}
# Manually created patch for downstream crate metadata changes
-# * bump rmp-serde dependency from 0.15 to 1
# * relax mock_instant dev-dependency
# * bump sha2 dev-dependency from 0.9 to 0.10
# * drop unused, benchmark-only criterion dev-dependency
# * drop unused, benchmark-only reqwest dev-dependency
# * drop unused css-validation feature with outdated dependencies
Patch: adblock-fix-metadata.diff
-# * drop tests that require unshipped support code
-Patch10: 0001-drop-tests-that-require-unshipped-support-code.patch
BuildRequires: cargo-rpm-macros >= 24
@@ -82,64 +79,40 @@ use the "content-blocking" feature of the "%{crate}" crate.
%files -n %{name}+content-blocking-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+embedded-domain-resolver-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+embedded-domain-resolver-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "embedded-domain-resolver" feature of the "%{crate}" crate.
-
-%files -n %{name}+embedded-domain-resolver-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+full-regex-handling-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+full-regex-handling-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "full-regex-handling" feature of the "%{crate}" crate.
-
-%files -n %{name}+full-regex-handling-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+lifeguard-devel
+%package -n %{name}+debug-info-devel
Summary: %{summary}
BuildArch: noarch
-%description -n %{name}+lifeguard-devel %{_description}
+%description -n %{name}+debug-info-devel %{_description}
This package contains library source intended for building other packages which
-use the "lifeguard" feature of the "%{crate}" crate.
+use the "debug-info" feature of the "%{crate}" crate.
-%files -n %{name}+lifeguard-devel
+%files -n %{name}+debug-info-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+object-pooling-devel
+%package -n %{name}+embedded-domain-resolver-devel
Summary: %{summary}
BuildArch: noarch
-%description -n %{name}+object-pooling-devel %{_description}
+%description -n %{name}+embedded-domain-resolver-devel %{_description}
This package contains library source intended for building other packages which
-use the "object-pooling" feature of the "%{crate}" crate.
+use the "embedded-domain-resolver" feature of the "%{crate}" crate.
-%files -n %{name}+object-pooling-devel
+%files -n %{name}+embedded-domain-resolver-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+regex-debug-info-devel
+%package -n %{name}+full-regex-handling-devel
Summary: %{summary}
BuildArch: noarch
-%description -n %{name}+regex-debug-info-devel %{_description}
+%description -n %{name}+full-regex-handling-devel %{_description}
This package contains library source intended for building other packages which
-use the "regex-debug-info" feature of the "%{crate}" crate.
+use the "full-regex-handling" feature of the "%{crate}" crate.
-%files -n %{name}+regex-debug-info-devel
+%files -n %{name}+full-regex-handling-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+resource-assembler-devel
@@ -154,16 +127,16 @@ use the "resource-assembler" feature of the "%{crate}" crate.
%files -n %{name}+resource-assembler-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+unsync-regex-caching-devel
+%package -n %{name}+single-thread-devel
Summary: %{summary}
BuildArch: noarch
-%description -n %{name}+unsync-regex-caching-devel %{_description}
+%description -n %{name}+single-thread-devel %{_description}
This package contains library source intended for building other packages which
-use the "unsync-regex-caching" feature of the "%{crate}" crate.
+use the "single-thread" feature of the "%{crate}" crate.
-%files -n %{name}+unsync-regex-caching-devel
+%files -n %{name}+single-thread-devel
%ghost %{crate_instdir}/Cargo.toml
%prep
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 38caa22..940b9ef 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,6 +1,5 @@
[package]
cargo-toml-patch-comments = [
- "bump rmp-serde dependency from 0.15 to 1",
"relax mock_instant dev-dependency",
"bump sha2 dev-dependency from 0.9 to 0.10",
"drop unused, benchmark-only criterion dev-dependency",
@@ -8,15 +7,9 @@ cargo-toml-patch-comments = [
"drop unused css-validation feature with outdated dependencies",
]
-[[package.extra-patches]]
-number = 10
-file = "0001-drop-tests-that-require-unshipped-support-code.patch"
-comments = [
- "drop tests that require unshipped support code",
-]
-
[tests]
-run = "none"
+run = false
comments = [
"temporarily disable tests until mock_instant ^0.5 is available",
]
+
diff --git a/sources b/sources
index 44aa2b9..274007a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (adblock-0.9.8.crate) = 07d318a5906ef393980d649aa043c39e5ea7026cbc14307eac82cd1de21cb1894cd670603cbd46c53f13771f54169bf778a69cf08f26013082c76d5fe45c2c6a
+SHA512 (adblock-0.12.2.crate) = 7baaad85dd9520a2fdce0ddbd753330ca9907c6a27a546e46d128ae68db310227a5c0e1b65b388a3a943759b55082feb27abd991438da5535de48a2b481a0af8
reply other threads:[~2026-06-22 21:29 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=178216377748.1.475209791157052167.rpms-rust-adblock-433a7454bb8b@fedoraproject.org \
--to=decathorpe@gmail.com \
--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