Accepting request 1235766 from devel:languages:rust

OBS-URL: https://build.opensuse.org/request/show/1235766
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cargo-audit?expand=0&rev=23

0001-Skip-warnings.patch

@@ -0,0 +1,76 @@
+From 645cfd950abf7c2fff6fc12915e7562439007b57 Mon Sep 17 00:00:00 2001
+From: William Brown <william@blackhats.net.au>
+Date: Tue, 7 Jan 2025 10:08:13 +1000
+Subject: [PATCH] Skip warnings
+
+---
+ admin/src/bin/rustsec-admin/main.rs     | 2 +-
+ admin/src/lib.rs                        | 2 +-
+ admin/tests/acceptance.rs               | 2 +-
+ cargo-audit/src/bin/cargo-audit/main.rs | 2 +-
+ cargo-audit/tests/acceptance.rs         | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/admin/src/bin/rustsec-admin/main.rs b/admin/src/bin/rustsec-admin/main.rs
+index 36d5912..eda0452 100644
+--- a/admin/src/bin/rustsec-admin/main.rs
++++ b/admin/src/bin/rustsec-admin/main.rs
+@@ -1,6 +1,6 @@
+ //! Main entry point for the `rustsec-admin` CLI application
+ 
+-#![deny(warnings, missing_docs, trivial_casts, unused_qualifications)]
++#![deny(missing_docs, trivial_casts, unused_qualifications)]
+ #![forbid(unsafe_code)]
+ 
+ use rustsec_admin::application::APPLICATION;
+diff --git a/admin/src/lib.rs b/admin/src/lib.rs
+index 6f4b8ba..564de2e 100644
+--- a/admin/src/lib.rs
++++ b/admin/src/lib.rs
+@@ -2,7 +2,7 @@
+ //!
+ //! Administrative tool for the RustSec Advisory Database
+ 
+-#![deny(warnings, missing_docs, trivial_casts, unused_qualifications)]
++#![deny(missing_docs, trivial_casts, unused_qualifications)]
+ #![forbid(unsafe_code)]
+ 
+ pub mod application;
+diff --git a/admin/tests/acceptance.rs b/admin/tests/acceptance.rs
+index f559e4c..594dda8 100644
+--- a/admin/tests/acceptance.rs
++++ b/admin/tests/acceptance.rs
+@@ -1,4 +1,4 @@
+-#![deny(warnings, missing_docs, trivial_casts, unused_qualifications)]
++#![deny(missing_docs, trivial_casts, unused_qualifications)]
+ #![forbid(unsafe_code)]
+ 
+ use abscissa_core::testing::prelude::*;
+diff --git a/cargo-audit/src/bin/cargo-audit/main.rs b/cargo-audit/src/bin/cargo-audit/main.rs
+index 7f0c3c0..78ce4f3 100644
+--- a/cargo-audit/src/bin/cargo-audit/main.rs
++++ b/cargo-audit/src/bin/cargo-audit/main.rs
+@@ -1,6 +1,6 @@
+ //! Main entry point for `cargo audit`
+ 
+-#![deny(warnings, missing_docs, trivial_casts, unused_qualifications)]
++#![deny(missing_docs, trivial_casts, unused_qualifications)]
+ #![forbid(unsafe_code)]
+ 
+ use cargo_audit::application::APP;
+diff --git a/cargo-audit/tests/acceptance.rs b/cargo-audit/tests/acceptance.rs
+index 96d5529..982f8f3 100644
+--- a/cargo-audit/tests/acceptance.rs
++++ b/cargo-audit/tests/acceptance.rs
+@@ -4,7 +4,7 @@
+ //! For more information, see:
+ //! <https://docs.rs/abscissa_core/latest/abscissa_core/testing/index.html>
+ 
+-#![deny(warnings, missing_docs, trivial_casts, unused_qualifications)]
++#![deny(missing_docs, trivial_casts, unused_qualifications)]
+ #![forbid(unsafe_code)]
+ 
+ use abscissa_core::testing::prelude::*;
+-- 
+2.39.5 (Apple Git-154)
+

_service

@@ -20,7 +20,7 @@
   <service name="cargo_vendor" mode="disabled">
      <param name="srcdir">rustsec</param>
      <param name="compression">zst</param>
-     <param name="update">false</param>
+     <param name="update">true</param>
      <param name="i-accept-the-risk">RUSTSEC-2024-0019</param>
   </service>
   <service name="cargo_audit" mode="disabled">

cargo-audit.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan  7 00:30:30 UTC 2025 - William Brown <william.brown@suse.com>
+
+- add 0001-Skip-warnings.patch to allow building on rust 1.83
+
 -------------------------------------------------------------------
 Wed Oct 30 01:07:51 UTC 2024 - william.brown@suse.com
 

cargo-audit.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cargo-audit
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,9 +28,8 @@ Group:          Development/Languages/Rust
 URL:            https://github.com/RustSec/cargo-audit
 Source0:        %{workspace_name}-%{version}.tar.zst
 Source1:        vendor.tar.zst
-Source2:        cargo_config
+Patch0:         0001-Skip-warnings.patch
 
-BuildRequires:  cargo
 BuildRequires:  cargo-packaging
 BuildRequires:  pkgconfig(openssl)
 ExclusiveArch:  %{rust_tier1_arches}
@@ -41,8 +40,7 @@ Audit Cargo.lock files for crates with security vulnerabilities reported to the
 %prep
 %setup -q -n %{workspace_name}-%{version}
 %setup -qa1 -n %{workspace_name}-%{version}
-mkdir -p .cargo
-cp %{SOURCE2} .cargo/config
+%autopatch -p 1
 
 %build
 %{cargo_build}

cargo_config

@@ -1,5 +0,0 @@
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"

vendor.tar.zst

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:959c93c9f61cbace4d2a267819fdba74e162974c7c367e39b04425bce240cd38
-size 30609982
+oid sha256:430cb12fc7655fe88b8dc69ffcdc94563dd1fa94bce3343b2e2020c1c9a1e499
+size 31522507