From a16c2c9abfad6d49d746e266a9587c45871c89f3 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 5 Dec 2024 23:01:49 +0100
Subject: [PATCH] Update to version 0.9.3; Fixes RHBZ#2277901

---
 .gitignore                |  1 +
 adblock-fix-metadata.diff | 51 +++++++++++++++++++++------------------
 rust-adblock.spec         | 21 ++++------------
 rust2rpm.toml             |  2 +-
 sources                   |  2 +-
 5 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore
index ea0118a..4a19c4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /adblock-0.8.8.crate
+/adblock-0.9.3.crate
diff --git a/adblock-fix-metadata.diff b/adblock-fix-metadata.diff
index bf9ab53..404bf7f 100644
--- a/adblock-fix-metadata.diff
+++ b/adblock-fix-metadata.diff
@@ -1,33 +1,42 @@
---- adblock-0.8.8/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ adblock-0.8.8/Cargo.toml	2024-10-05T20:51:16.691988+00:00
-@@ -37,26 +37,6 @@
- [lib]
+--- adblock-0.9.3/Cargo.toml	1970-01-01T00:00:01+00:00
++++ adblock-0.9.3/Cargo.toml	2024-12-05T21:46:44.598116+00:00
+@@ -44,35 +44,6 @@
+ path = "src/lib.rs"
  bench = false
  
 -[[bench]]
--name = "bench_regex"
--harness = false
+-name = "bench_cosmetic_matching"
+-path = "benches/bench_cosmetic_matching.rs"
 -
 -[[bench]]
 -name = "bench_matching"
+-path = "benches/bench_matching.rs"
 -harness = false
 -
 -[[bench]]
--name = "bench_url"
+-name = "bench_redirect_performance"
+-path = "benches/bench_redirect_performance.rs"
+-harness = false
+-
+-[[bench]]
+-name = "bench_regex"
+-path = "benches/bench_regex.rs"
 -harness = false
 -
 -[[bench]]
 -name = "bench_rules"
+-path = "benches/bench_rules.rs"
 -harness = false
 -
 -[[bench]]
--name = "bench_redirect_performance"
+-name = "bench_url"
+-path = "benches/bench_url.rs"
 -harness = false
 -
  [dependencies.addr]
- version = "0.14"
+ version = "0.15"
  features = ["psl"]
-@@ -64,20 +44,16 @@
+@@ -80,20 +51,16 @@
  default-features = false
  
  [dependencies.base64]
@@ -35,7 +44,7 @@
 +version = "0.22"
  
  [dependencies.bitflags]
- version = "1.2"
+ version = "1.3"
  
 -[dependencies.cssparser]
 -version = "0.28"
@@ -51,7 +60,7 @@
  
  [dependencies.lifeguard]
  version = "^ 0.6.1"
-@@ -96,14 +72,10 @@
+@@ -112,14 +79,10 @@
  version = "1.5"
  
  [dependencies.rmp-serde]
@@ -67,31 +76,27 @@
  
  [dependencies.serde]
  version = "1.0"
-@@ -122,9 +94,6 @@
+@@ -137,9 +100,6 @@
  [dependencies.url]
  version = "2.2"
  
 -[dev-dependencies.criterion]
--version = "0.4"
+-version = "0.5"
 -
  [dev-dependencies.csv]
  version = "1"
  
-@@ -132,19 +101,14 @@
+@@ -147,15 +107,10 @@
  version = "0.3"
  
  [dev-dependencies.mock_instant]
--version = "0.2"
-+version = "0.3"
- features = ["sync"]
+-version = "0.5"
 -
 -[dev-dependencies.reqwest]
 -version = "0.11"
 -features = ["rustls-tls"]
 -default-features = false
- 
- [dev-dependencies.serde_json]
- version = "1.0"
++version = ">=0.3,<0.6"
  
  [dev-dependencies.sha2]
 -version = "0.9"
@@ -99,10 +104,10 @@
  
  [dev-dependencies.tokio]
  version = "1.24"
-@@ -152,10 +116,6 @@
+@@ -163,10 +118,6 @@
  
  [features]
- content-blocking = ["serde_json"]
+ content-blocking = []
 -css-validation = [
 -    "cssparser",
 -    "selectors",
diff --git a/rust-adblock.spec b/rust-adblock.spec
index deac4ee..b8ad37c 100644
--- a/rust-adblock.spec
+++ b/rust-adblock.spec
@@ -1,11 +1,12 @@
-# Generated by rust2rpm 26
-%bcond_without check
+# Generated by rust2rpm 27
+# * temporarily disable tests until mock_instant ^0.5 is available
+%bcond check 0
 %global debug_package %{nil}
 
 %global crate adblock
 
 Name:           rust-adblock
-Version:        0.8.8
+Version:        0.9.3
 Release:        %autorelease
 Summary:        Native Rust module for Adblock Plus syntax
 
@@ -17,7 +18,7 @@ Source:         %{crates_source}
 # * bump idna dependency from 0.2 to 0.5
 # * bump itertools dependency from 0.10 to 0.13
 # * bump rmp-serde dependency from 0.15 to 1
-# * bump mock_instant dev-dependency from 0.2 to 0.3
+# * 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
@@ -156,18 +157,6 @@ use the "resource-assembler" feature of the "%{crate}" crate.
 %files       -n %{name}+resource-assembler-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+serde_json-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+serde_json-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "serde_json" feature of the "%{crate}" crate.
-
-%files       -n %{name}+serde_json-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+unsync-regex-caching-devel
 Summary:        %{summary}
 BuildArch:      noarch
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 4d83551..0ab8666 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -4,7 +4,7 @@ cargo-toml-patch-comments = [
     "bump idna dependency from 0.2 to 0.5",
     "bump itertools dependency from 0.10 to 0.13",
     "bump rmp-serde dependency from 0.15 to 1",
-    "bump mock_instant dev-dependency from 0.2 to 0.3",
+    "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",
diff --git a/sources b/sources
index 86d2a0c..329adc2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (adblock-0.8.8.crate) = 7c6682cc18330440bd80505fe3a6f322ad2c10c9bbfa7d26fade7502dda464d6cd6871f18c9817011108bb624ce4b6615d9a2fa479fe7d353d6b1b06c5d20a76
+SHA512 (adblock-0.9.3.crate) = 69fd090d16e76c815d1cd332bbf3e5188e85e56b013029e331e987007b465cc03e4e500f92eb164837dc49a9904ba31ea4bc57eaa12e4e957ccfe6e77712bc8f