public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-rustsec] f44: Update to version 0.33.0; Fixes RHBZ#2436955
@ 2026-07-01 10:59 Benjamin A. Beasley
0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-07-01 10:59 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/rust-rustsec
Branch : f44
Commit : aa7567355da24172444557fbe90108008e046b77
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2026-06-29T11:41:24+01:00
Stats : +18/-102 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/rust-rustsec/c/aa7567355da24172444557fbe90108008e046b77?branch=f44
Log:
Update to version 0.33.0; Fixes RHBZ#2436955
---
diff --git a/.gitignore b/.gitignore
index 2802a1b..af92119 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/rustsec-0.30.1.crate
/rustsec-0.30.2.crate
/rustsec-0.31.0.crate
+/rustsec-0.33.0.crate
diff --git a/0001-rustsec-upgrade-gix-to-0.78.patch b/0001-rustsec-upgrade-gix-to-0.78.patch
deleted file mode 100644
index 64d0049..0000000
--- a/0001-rustsec-upgrade-gix-to-0.78.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 0e60c1a24809cc1d8b1c32f0e8a17922209cd1f4 Mon Sep 17 00:00:00 2001
-From: Dirkjan Ochtman <dirkjan@ochtman.nl>
-Date: Wed, 4 Feb 2026 13:26:43 +0100
-Subject: [PATCH] rustsec: upgrade gix to 0.78
-
----
- rustsec/src/repository/git/commit.rs | 19 +-
- .../src/repository/git/modification_time.rs | 11 +-
- 4 files changed, 422 insertions(+), 274 deletions(-)
-
-diff --git rustsec/src/repository/git/commit.rs rustsec/src/repository/git/commit.rs
-index 5388ff1..8c7d514 100644
---- rustsec/src/repository/git/commit.rs
-+++ rustsec/src/repository/git/commit.rs
-@@ -58,16 +58,23 @@ impl Commit {
- })?;
-
- let commit_id = commit.id;
-- let Some(time) = gix::date::parse_header(cref.committer.time) else {
-- return Err(Error::new(
-+ let time = cref.time().map_err(|err| {
-+ Error::with_source(
- ErrorKind::Repo,
-- format!("unable to parse commit time: {}", cref.committer.time),
-- ));
-- };
-+ "unable to parse commit time".to_owned(),
-+ err,
-+ )
-+ })?;
-
- let timestamp = crate::repository::git::gix_time_to_time(time);
- let author = {
-- let sig = cref.author();
-+ let sig = cref.author().map_err(|err| {
-+ Error::with_source(
-+ ErrorKind::Repo,
-+ "unable to parse commit author".to_owned(),
-+ err,
-+ )
-+ })?;
- format!("{} <{}>", sig.name, sig.email)
- };
-
-diff --git rustsec/src/repository/git/modification_time.rs rustsec/src/repository/git/modification_time.rs
-index 44c8129..f22f53b 100644
---- rustsec/src/repository/git/modification_time.rs
-+++ rustsec/src/repository/git/modification_time.rs
-@@ -92,7 +92,16 @@ impl GitModificationTimes {
- .into_commit()
- .expect("id is actually a commit");
-
-- (commit.tree(), commit.time())
-+ (
-+ commit.tree(),
-+ commit.time().map_err(|err| {
-+ Error::with_source(
-+ ErrorKind::Repo,
-+ format!("unable to parse commit time for '{}'", info.id),
-+ err,
-+ )
-+ })?,
-+ )
- };
- let current_tree = db
- .try_find(&main_tree_id, &mut buf)
---
-2.54.0
-
diff --git a/rust-rustsec.spec b/rust-rustsec.spec
index a8d42ac..4927ab1 100644
--- a/rust-rustsec.spec
+++ b/rust-rustsec.spec
@@ -5,22 +5,18 @@
%global crate rustsec
Name: rust-rustsec
-Version: 0.31.0
+Version: 0.33.0
Release: %autorelease
Summary: Client library for the RustSec security advisory database
License: Apache-2.0 OR MIT
URL: https://crates.io/crates/rustsec
Source: %{crates_source}
-
-# * Bump gix to version 0.78
-# https://github.com/rustsec/rustsec/commit/0e60c1a24809cc1d8b1c32f0e8a17922209cd1f4
-Patch: 0001-rustsec-upgrade-gix-to-0.78.patch
# Manually created patch for downstream crate metadata changes
# * drop unused binary-scanning feature with missing dependencies
-# * Bump gix to version 0.83
-# https://github.com/rustsec/rustsec/commit/0e60c1a24809cc1d8b1c32f0e8a17922209cd1f4
+# * temporarily allow gix 0.83; upstream wants 0.84
Patch: rustsec-fix-metadata.diff
+
BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
@@ -133,9 +129,9 @@ use the "osv-export" feature of the "%{crate}" crate.
%check
# * skip tests that require internet connectivity
%{cargo_test -- -- --exact %{shrink:
- --skip query_vulnerabilitie
- --skip query_vulnerabilities_with_crate_scope
--skip enumerate_vulnerabilities
+ --skip query_vulnerabilities_with_crate_scope
+ --skip query_warnings_local_crates
--skip clone_into_existing_directory
--skip happy_path
}}
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 55c98dc..8a2829d 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,18 +1,15 @@
[package]
cargo-toml-patch-comments = [
"drop unused binary-scanning feature with missing dependencies",
- """\
- Bump gix to version 0.83, \
- https://github.com/rustsec/rustsec/commit/24d08569602a67b5d914b47f098cc897c222860a\
- """,
+ "temporarily allow gix 0.83; upstream wants 0.84",
]
[tests]
skip = [
# database
- "query_vulnerabilitie",
- "query_vulnerabilities_with_crate_scope",
"enumerate_vulnerabilities",
+ "query_vulnerabilities_with_crate_scope",
+ "query_warnings_local_crates",
# integration
"clone_into_existing_directory",
"happy_path",
diff --git a/rustsec-fix-metadata.diff b/rustsec-fix-metadata.diff
index b0381d4..25fa34f 100644
--- a/rustsec-fix-metadata.diff
+++ b/rustsec-fix-metadata.diff
@@ -1,5 +1,5 @@
---- rustsec-0.31.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ rustsec-0.31.0/Cargo.toml 2025-12-12T11:46:16.647007+00:00
+--- rustsec-0.33.0/Cargo.toml 2006-07-24T01:21:28+00:00
++++ rustsec-0.33.0/Cargo.toml 2026-06-29T10:41:14.597835+00:00
@@ -66,13 +66,6 @@
]
@@ -38,14 +38,14 @@
version = "3"
[dependencies.gix]
--version = "0.74"
-+version = "0.83"
+-version = "0.84"
++version = ">=0.83, <0.85"
features = [
+ "sha1",
"worktree-mutation",
- "revision",
-@@ -152,17 +132,9 @@
- version = "0.5"
- optional = true
+@@ -158,17 +138,9 @@
+ features = ["std"]
+ default-features = false
-[dependencies.once_cell]
-version = "1.15.0"
@@ -61,12 +61,3 @@
[dependencies.semver]
version = "1.0.23"
-@@ -173,7 +145,7 @@
- features = ["serde_derive"]
-
- [dependencies.tame-index]
--version = "0.24"
-+version = ">=0.24, <0.26"
- features = [
- "sparse",
- "native-certs",
diff --git a/sources b/sources
index 1efe9a0..d943c15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rustsec-0.31.0.crate) = 4e7a6ec9c4202a8ed0f61044cd9fef164f96efe20e14598d8fddde75e58f2126a98b553180f70d4628f8e5a6af202decebe3e9d83e7093324a61b5de06e3bae5
+SHA512 (rustsec-0.33.0.crate) = 4e63c906edb3402243723d47e39475524a59b381082f9aeec320ae87d5309378bee8c145e2cbc99006e3d2a8146717d799dad70be2a863240eb971ce297daf52
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-01 10:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-01 10:59 [rpms/rust-rustsec] f44: Update to version 0.33.0; Fixes RHBZ#2436955 Benjamin A. Beasley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox