public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/maturin] rawhide: Update cargo-cyclonedx from 0.5.9 to 0.5.10
@ 2026-11-22 10:37 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-11-22 10:37 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/maturin
Branch : rawhide
Commit : 85cd4c121010fb5c3e9322c4eb25da2cab70ac19
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-11-18T09:56:18+00:00
Stats  : +91/-6 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/maturin/c/85cd4c121010fb5c3e9322c4eb25da2cab70ac19?branch=rawhide

Log:
Update cargo-cyclonedx from 0.5.9 to 0.5.10

---
diff --git a/0001-drop-unavailable-features.patch b/0001-drop-unavailable-features.patch
index d6c139e..4a30494 100644
--- a/0001-drop-unavailable-features.patch
+++ b/0001-drop-unavailable-features.patch
@@ -1,7 +1,7 @@
 From f07532990acf9f869b0710f26b08b32f4f1b114e Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
 Date: Tue, 23 Sep 2025 22:46:35 +0200
-Subject: [PATCH 1/3] drop unavailable features
+Subject: [PATCH 1/4] drop unavailable features
 
 ---
  Cargo.toml | 76 ++----------------------------------------------------
@@ -134,5 +134,5 @@ index 1d814e8a..b848307a 100644
  inherits = "release"
  debug = true
 -- 
-2.56.0
+2.56.1
 

diff --git a/0002-drop-incompatible-cargo-flags-from-setuptools_rust.patch b/0002-drop-incompatible-cargo-flags-from-setuptools_rust.patch
index 283a7d4..413e328 100644
--- a/0002-drop-incompatible-cargo-flags-from-setuptools_rust.patch
+++ b/0002-drop-incompatible-cargo-flags-from-setuptools_rust.patch
@@ -1,7 +1,7 @@
 From 48cb9d2656a9fffc7e46ea990e6326b47a130d88 Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
 Date: Mon, 19 May 2025 21:57:43 +0200
-Subject: [PATCH 2/3] drop incompatible cargo flags from setuptools_rust
+Subject: [PATCH 2/4] drop incompatible cargo flags from setuptools_rust
 
 ---
  setup.py | 18 +-----------------
@@ -46,5 +46,5 @@ index a3a3eaa6..5fedb583 100644
      zip_safe=False,
  )
 -- 
-2.56.0
+2.56.1
 

diff --git a/0003-revert-to-using-setuptools-for-non-maturin-bootstrap.patch b/0003-revert-to-using-setuptools-for-non-maturin-bootstrap.patch
index a5af358..07a3547 100644
--- a/0003-revert-to-using-setuptools-for-non-maturin-bootstrap.patch
+++ b/0003-revert-to-using-setuptools-for-non-maturin-bootstrap.patch
@@ -1,7 +1,7 @@
 From 72d1dfbd9c5f280a5767ac2876b84669f0770232 Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
 Date: Tue, 23 Sep 2025 22:47:53 +0200
-Subject: [PATCH 3/3] revert to using setuptools for non-maturin bootstrap
+Subject: [PATCH 3/4] revert to using setuptools for non-maturin bootstrap
  build
 
 ---
@@ -26,5 +26,5 @@ index 05c67cc1..bf0641a0 100644
  [project]
  name = "maturin"
 -- 
-2.56.0
+2.56.1
 

diff --git a/0004-Update-cargo-cyclonedx-from-0.5.9-to-0.5.10-3360.patch b/0004-Update-cargo-cyclonedx-from-0.5.9-to-0.5.10-3360.patch
new file mode 100644
index 0000000..9805b9a
--- /dev/null
+++ b/0004-Update-cargo-cyclonedx-from-0.5.9-to-0.5.10-3360.patch
@@ -0,0 +1,81 @@
+From cfdea6176de183878544971c9e47ef8df2dc52c4 Mon Sep 17 00:00:00 2001
+From: Ben Beasley <code@musicinmybrain.net>
+Date: Mon, 16 Nov 2026 03:54:29 +0000
+Subject: [PATCH 4/4] Update cargo-cyclonedx from 0.5.9 to 0.5.10 (#3360)
+
+See https://github.com/PyO3/maturin/issues/3091 regarding exact-version
+pinning.
+
+See
+https://github.com/CycloneDX/cyclonedx-rust-cargo/compare/cargo-cyclonedx-0.5.9...cargo-cyclonedx-0.5.10.
+
+As far as I can tell, adding a direct dependency on `cyclonedx-bom` for
+the `SpecVersion` type is necessary here.
+---
+ Cargo.toml  |  5 +++--
+ src/sbom.rs | 12 ++++--------
+ 2 files changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index b848307a..c551399c 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -114,7 +114,8 @@ minijinja = { version = "2.5.0", optional = true }
+ schemars = { version = "1.0.4", optional = true }
+ 
+ # SBOM
+-cargo-cyclonedx = { version = "=0.5.9", optional = true }
++cargo-cyclonedx = { version = "=0.5.10", optional = true }
++cyclonedx-bom = { version = "0.9.0", optional = true }
+ pretty_assertions = { version = "1.3.0", optional = true }
+ which = { version = "8.0.0", optional = true }
+ 
+@@ -144,7 +145,7 @@ cli-completion = ["dep:clap_complete_command"]
+ 
+ schemars = ["dep:schemars", "dep:pretty_assertions"]
+ 
+-sbom = ["dep:cargo-cyclonedx", "dep:which"]
++sbom = ["dep:cargo-cyclonedx", "dep:cyclonedx-bom", "dep:which"]
+ 
+ # project scaffolding
+ scaffolding = ["dialoguer", "console", "minijinja", "unicode-xid"]
+diff --git a/src/sbom.rs b/src/sbom.rs
+index 263a8a2d..40add74e 100644
+--- a/src/sbom.rs
++++ b/src/sbom.rs
+@@ -11,6 +11,8 @@ use tracing::instrument;
+ use cargo_cyclonedx::config::SbomConfig as CyclonedxConfig;
+ #[cfg(feature = "sbom")]
+ use cargo_cyclonedx::generator::SbomGenerator;
++#[cfg(feature = "sbom")]
++use cyclonedx_bom::models::bom::SpecVersion;
+ 
+ /// Pre-generated SBOM data that can be reused across multiple wheel writes.
+ ///
+@@ -41,13 +43,7 @@ impl SbomData {
+                 target: Some(cargo_cyclonedx::config::Target::AllTargets),
+                 ..CyclonedxConfig::empty_config()
+             };
+-            // cargo-cyclonedx depends on cargo_metadata 0.18, while maturin uses
+-            // cargo_metadata 0.23. The Metadata structs are incompatible at the
+-            // type level but share the same JSON representation, so we bridge
+-            // them via a serde round-trip.
+-            let json = serde_json::to_value(context.project.cargo_metadata.as_ref())?;
+-            let metadata = serde_json::from_value(json)
+-                .context("Failed to convert cargo metadata for SBOM generation")?;
++            let metadata = context.project.cargo_metadata.as_ref().clone();
+             let sboms = SbomGenerator::create_sboms(metadata, &config)
+                 .map_err(|e| anyhow!("Failed to generate Rust SBOM: {}", e))?;
+ 
+@@ -61,7 +57,7 @@ impl SbomData {
+                 }
+                 let mut buf = Vec::new();
+                 sbom.bom
+-                    .output_as_json_v1_5(&mut buf)
++                    .output_as_json(&mut buf, SpecVersion::V1_5)
+                     .map_err(|e| anyhow!("Failed to serialize SBOM: {}", e))?;
+                 rust_sboms.push((sbom.package_name, buf));
+             }
+-- 
+2.56.1
+

diff --git a/maturin.spec b/maturin.spec
index cd613b2..12ca2cf 100644
--- a/maturin.spec
+++ b/maturin.spec
@@ -97,6 +97,10 @@ Patch:          0002-drop-incompatible-cargo-flags-from-setuptools_rust.patch
 # * revert to building maturin with setuptools instead of bootstrapping maturin
 Patch:          0003-revert-to-using-setuptools-for-non-maturin-bootstrap.patch
 
+# * update cargo-cyclonedx from 0.5.9 to 0.5.10 (from
+#   https://github.com/PyO3/maturin/pull/3360, without changes to Cargo.lock)
+Patch:          0004-Update-cargo-cyclonedx-from-0.5.9-to-0.5.10-3360.patch
+
 BuildRequires:  cargo-rpm-macros >= 24
 
 # Some sdist tests expect to see .gitignore files in the sdist, which only

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-22 10:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-22 10:37 [rpms/maturin] rawhide: Update cargo-cyclonedx from 0.5.9 to 0.5.10 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