public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-ammonia] f44: Update to version 4.1.3; Fixes RHBZ#2494801
@ 2026-07-14 22:15 Fabio Valentini
0 siblings, 0 replies; only message in thread
From: Fabio Valentini @ 2026-07-14 22:15 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/rust-ammonia
Branch : f44
Commit : 1fa4ab7649386b49ceb9a9f865ba551104143d3b
Author : Fabio Valentini <decathorpe@gmail.com>
Date : 2026-07-15T00:04:45+02:00
Stats : +11/-53 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/rust-ammonia/c/1fa4ab7649386b49ceb9a9f865ba551104143d3b?branch=f44
Log:
Update to version 4.1.3; Fixes RHBZ#2494801
---
diff --git a/.gitignore b/.gitignore
index 31eec0f..60168a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/ammonia-4.0.0.crate
/ammonia-4.1.1.crate
/ammonia-4.1.2.crate
+/ammonia-4.1.3.crate
diff --git a/0001-Revert-changes-for-cssparser-0.35.patch b/0001-Revert-changes-for-cssparser-0.35.patch
deleted file mode 100644
index b9b0268..0000000
--- a/0001-Revert-changes-for-cssparser-0.35.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5c1365f33464b32de89a3e41f848118ca724f307 Mon Sep 17 00:00:00 2001
-From: Fabio Valentini <decathorpe@gmail.com>
-Date: Tue, 19 Aug 2025 13:06:13 +0200
-Subject: [PATCH] Revert changes for cssparser 0.35+
-
----
- src/style.rs | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/style.rs b/src/style.rs
-index c9be2d8..b738b32 100644
---- a/src/style.rs
-+++ b/src/style.rs
-@@ -32,7 +32,7 @@
- //! [CSSATTR]: https://w3c.github.io/csswg-drafts/css-style-attr/
- use std::collections::HashSet;
-
--use cssparser::{BasicParseErrorKind, DeclarationParser, ParseError, ParseErrorKind, Parser, ParserInput, ParserState, ToCss, Token};
-+use cssparser::{BasicParseErrorKind, DeclarationParser, ParseError, ParseErrorKind, Parser, ParserInput, ToCss, Token};
-
-
-
-@@ -98,7 +98,7 @@ pub fn parse_one_declaration<'i, 't>(
- return Ok(("".into(), String::new()));
- }
- input.expect_colon()?;
-- Declarations.parse_value(name, input, &input.state())
-+ Declarations.parse_value(name, input)
- }
-
-
-@@ -111,7 +111,6 @@ impl <'i> DeclarationParser<'i> for Declarations {
- &mut self,
- name: cssparser::CowRcStr<'i>,
- input: &mut Parser<'i, 't>,
-- _declaration_start: &ParserState,
- ) -> Result<Self::Declaration, cssparser::ParseError<'i, Self::Error>> {
- let mut value = String::new();
- loop {
---
-2.50.1
-
diff --git a/ammonia-fix-metadata.diff b/ammonia-fix-metadata.diff
index 9c51b29..1f423cb 100644
--- a/ammonia-fix-metadata.diff
+++ b/ammonia-fix-metadata.diff
@@ -1,11 +1,11 @@
---- ammonia-4.1.2/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ ammonia-4.1.2/Cargo.toml 2025-09-22T11:35:04.761479+00:00
+--- ammonia-4.1.3/Cargo.toml 2006-07-24T01:21:28+00:00
++++ ammonia-4.1.3/Cargo.toml 2026-07-14T22:02:25.255763+00:00
@@ -50,7 +50,7 @@
path = "tests/version-numbers.rs"
[dependencies.cssparser]
--version = "0.35.0"
-+version = "0.31.0"
+-version = "0.37.0"
++version = ">=0.35,<0.38"
+ default-features = false
[dependencies.html5ever]
- version = "0.35"
diff --git a/rust-ammonia.spec b/rust-ammonia.spec
index c05a37c..55355dc 100644
--- a/rust-ammonia.spec
+++ b/rust-ammonia.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 27
+# Generated by rust2rpm 28
%bcond check 1
%global debug_package %{nil}
%global crate ammonia
Name: rust-ammonia
-Version: 4.1.2
+Version: 4.1.3
Release: %autorelease
Summary: HTML Sanitization
@@ -13,9 +13,8 @@ License: MIT OR Apache-2.0
URL: https://crates.io/crates/ammonia
Source: %{crates_source}
# Manually created patch for downstream crate metadata changes
-# * temporarily downgrade cssparser dependency from 0.35 to 0.31
+# * relax cssparser dependency to allow 0.35..=0.37
Patch: ammonia-fix-metadata.diff
-Patch: 0001-Revert-changes-for-cssparser-0.35.patch
BuildRequires: cargo-rpm-macros >= 24
diff --git a/rust2rpm.toml b/rust2rpm.toml
index c2bd8b5..fb45633 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,5 +1,5 @@
[package]
cargo-toml-patch-comments = [
- "temporarily downgrade cssparser dependency from 0.35 to 0.31",
+ "relax cssparser dependency to allow 0.35..=0.37",
]
diff --git a/sources b/sources
index 7f48b60..0b54d30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ammonia-4.1.2.crate) = c6fb9e0e3ece420471621457c48806a31e17afc6dfdc2b06184e0847238e53640f2c9ef89fc97153ea664de42ed968277c14068b4fb77bc2e6fd944faf123443
+SHA512 (ammonia-4.1.3.crate) = 3f7c5ed483e02611056ea0afe112524ca280cb50fdc68a311507c15a907997c823993d63db1c4251e84ff33306ecf9388dbffa7314e586d88c0e6102dc55b805
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-14 22:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-14 22:15 [rpms/rust-ammonia] f44: Update to version 4.1.3; Fixes RHBZ#2494801 Fabio Valentini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox