From 5be33aa36aae9b85451d90dc5b1b2576b9286246b406e5d350d35289c62be179 Mon Sep 17 00:00:00 2001 From: William Brown Date: Fri, 15 Mar 2024 02:31:34 +0000 Subject: [PATCH] Accepting request 1154935 from home:uncomfyhalomacro:branches:devel:languages:rust:fix - Update specfile: * remove cargo_config file - Update service file: * replace obsoleted "disabled" mode with "manual" - Update to version 0.6.2~0: * Update the lockfile * New releases of cargo-auditable and auditable-serde * Use a separate project for the custom rustc path tests. Fixes intermittent test failures due to race conditions * Revert "add commit hashes to git sources" * Fix cyclic dependency graph being encoded * Revert "An unsuccessful attempt to fix cycles caused by dev-dependencies" * An unsuccessful attempt to fix cycles caused by dev-dependencies * Fix typo * Add comment * Add a test for an issue with cyclic dependencies reported at https://github.com/rustsec/rustsec/issues/1043 * Fix auditable-serde example not building * upgrade dependency miniz_oxide to 0.6.0 * fix formatting errors * apply clippy lints for --all-features * improve the internal docs and comments * apply clippy lints * add missing sources for one of test fixtures * add commit hashes to git sources * Run all tests on CI * cargo fmt * Run `cargo clean` in tests to get rid of stale binaries * Fix date in changelog * Populate changelog * Bump auditable-info version in rust-audit-info * Add auditable-info changelog * Bump versions following cargo-lock bump * auditable-serde: bump `cargo-lock` to v9 * switch to UNRELEASED * Update CHANGELOG.md * Print a better error if calling rustc fails * Drop unused import * placate Clippy * Don't inject audit info if --print argument is passed to rustc * Reflect the version change in Cargo.lock * Remove space from keywords * bump version to 0.6.1 * Fix date in changelog * Update CHANGELOG.md * Add publish=false * Commit the generated manpage * Add the code for generating a manpage; rather rudimentary so far, but it's a starting point * Explain relation to supply chain attacks * Add keywords to the Cargo manifest * Revert "generate a man page for cargo auditable" * fix formatting * fix review feedback, relocate file to under OUT_DIR, don't use anyhow and also commit the lock file * generate a man page for cargo auditable * Add Clippy suppression * placate clippy * commit Cargo.lock * Sync to latest object file writing code from rustc * Fix examples in docs * Allow redundant field names * Apply clippy suggestion: match -> if let * Check for clippy and format in CI * Apply clippy suggestions * Run CI with --locked OBS-URL: https://build.opensuse.org/request/show/1154935 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/cargo-auditable?expand=0&rev=5 --- _service | 14 +++---- _servicedata | 2 +- cargo-auditable-0.6.0~0.obscpio | 3 -- cargo-auditable-0.6.0~0.tar.zst | 3 -- cargo-auditable-0.6.2~0.obscpio | 3 ++ cargo-auditable-0.6.2~0.tar.zst | 3 ++ cargo-auditable.changes | 66 +++++++++++++++++++++++++++++++++ cargo-auditable.obsinfo | 6 +-- cargo-auditable.spec | 7 +--- cargo_config | 5 --- vendor.tar.zst | 4 +- 11 files changed, 87 insertions(+), 29 deletions(-) delete mode 100644 cargo-auditable-0.6.0~0.obscpio delete mode 100644 cargo-auditable-0.6.0~0.tar.zst create mode 100644 cargo-auditable-0.6.2~0.obscpio create mode 100644 cargo-auditable-0.6.2~0.tar.zst delete mode 100644 cargo_config diff --git a/_service b/_service index d774c33..422fb4a 100644 --- a/_service +++ b/_service @@ -1,27 +1,27 @@ - + https://github.com/rust-secure-code/cargo-auditable.git @PARENT_TAG@~@TAG_OFFSET@ git - v0.6.0 + v0.6.2 * v(\d+\.\d+\.\d+) \1 enable william.brown@suse.com - - + + *.tar zst - - + + cargo-auditable zst true - + cargo-auditable diff --git a/_servicedata b/_servicedata index 1dae6c6..dc0a86c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/rust-secure-code/cargo-auditable.git - e05d2776cff3d4db7b1d60c886563625bc589aba \ No newline at end of file + f56bb45509a8447dbb62331aa868e4a3b83806c2 \ No newline at end of file diff --git a/cargo-auditable-0.6.0~0.obscpio b/cargo-auditable-0.6.0~0.obscpio deleted file mode 100644 index 2246a82..0000000 --- a/cargo-auditable-0.6.0~0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b185c2a7e51d138c50c88668e54d29927549f2327a1732c618f9e58610739450 -size 184331 diff --git a/cargo-auditable-0.6.0~0.tar.zst b/cargo-auditable-0.6.0~0.tar.zst deleted file mode 100644 index 0095b61..0000000 --- a/cargo-auditable-0.6.0~0.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:189770e901af4dd1ab49bc67c1063d1bf1eab33e08a7b1ddf3b8b0fd2a3d1b2e -size 42519 diff --git a/cargo-auditable-0.6.2~0.obscpio b/cargo-auditable-0.6.2~0.obscpio new file mode 100644 index 0000000..4f73729 --- /dev/null +++ b/cargo-auditable-0.6.2~0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8c6b404b4841bc278f5a7712a12897a0fe3cae6187b1c46bd26be071478a496 +size 211979 diff --git a/cargo-auditable-0.6.2~0.tar.zst b/cargo-auditable-0.6.2~0.tar.zst new file mode 100644 index 0000000..bb1caf3 --- /dev/null +++ b/cargo-auditable-0.6.2~0.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:834ecaa076b10f08af899de7d07630ed0517b08296a73dcc4e030e4c47047564 +size 46049 diff --git a/cargo-auditable.changes b/cargo-auditable.changes index 5a17f2b..1e195f6 100644 --- a/cargo-auditable.changes +++ b/cargo-auditable.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Tue Mar 5 01:17:29 UTC 2024 - Soc Virnyl Estela + +- Update specfile: + * remove cargo_config file +- Update service file: + * replace obsoleted "disabled" mode with "manual" +- Update to version 0.6.2~0: + * Update the lockfile + * New releases of cargo-auditable and auditable-serde + * Use a separate project for the custom rustc path tests. Fixes intermittent test failures due to race conditions + * Revert "add commit hashes to git sources" + * Fix cyclic dependency graph being encoded + * Revert "An unsuccessful attempt to fix cycles caused by dev-dependencies" + * An unsuccessful attempt to fix cycles caused by dev-dependencies + * Fix typo + * Add comment + * Add a test for an issue with cyclic dependencies reported at https://github.com/rustsec/rustsec/issues/1043 + * Fix auditable-serde example not building + * upgrade dependency miniz_oxide to 0.6.0 + * fix formatting errors + * apply clippy lints for --all-features + * improve the internal docs and comments + * apply clippy lints + * add missing sources for one of test fixtures + * add commit hashes to git sources + * Run all tests on CI + * cargo fmt + * Run `cargo clean` in tests to get rid of stale binaries + * Fix date in changelog + * Populate changelog + * Bump auditable-info version in rust-audit-info + * Add auditable-info changelog + * Bump versions following cargo-lock bump + * auditable-serde: bump `cargo-lock` to v9 + * switch to UNRELEASED + * Update CHANGELOG.md + * Print a better error if calling rustc fails + * Drop unused import + * placate Clippy + * Don't inject audit info if --print argument is passed to rustc + * Reflect the version change in Cargo.lock + * Remove space from keywords + * bump version to 0.6.1 + * Fix date in changelog + * Update CHANGELOG.md + * Add publish=false + * Commit the generated manpage + * Add the code for generating a manpage; rather rudimentary so far, but it's a starting point + * Explain relation to supply chain attacks + * Add keywords to the Cargo manifest + * Revert "generate a man page for cargo auditable" + * fix formatting + * fix review feedback, relocate file to under OUT_DIR, don't use anyhow and also commit the lock file + * generate a man page for cargo auditable + * Add Clippy suppression + * placate clippy + * commit Cargo.lock + * Sync to latest object file writing code from rustc + * Fix examples in docs + * Allow redundant field names + * Apply clippy suggestion: match -> if let + * Check for clippy and format in CI + * Apply clippy suggestions + * Run CI with --locked + ------------------------------------------------------------------- Thu Feb 23 14:27:09 UTC 2023 - Andrea Manzini diff --git a/cargo-auditable.obsinfo b/cargo-auditable.obsinfo index ec304e3..ed81432 100644 --- a/cargo-auditable.obsinfo +++ b/cargo-auditable.obsinfo @@ -1,4 +1,4 @@ name: cargo-auditable -version: 0.6.0~0 -mtime: 1670449731 -commit: e05d2776cff3d4db7b1d60c886563625bc589aba +version: 0.6.2~0 +mtime: 1708367749 +commit: f56bb45509a8447dbb62331aa868e4a3b83806c2 diff --git a/cargo-auditable.spec b/cargo-auditable.spec index bbb9299..733573b 100644 --- a/cargo-auditable.spec +++ b/cargo-auditable.spec @@ -1,7 +1,7 @@ # # spec file for package cargo-auditable # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %define __cargo_common_opts %{?_smp_mflags} Name: cargo-auditable -Version: 0.6.0~0 +Version: 0.6.2~0 Release: 0 Summary: A tool to embed auditing information in ELF sections of rust binaries # If you know the license, put it's SPDX string here. @@ -33,7 +33,6 @@ Group: Development/Languages/Rust URL: https://github.com/rust-secure-code/cargo-auditable Source0: %{name}-%{version}.tar.zst Source1: vendor.tar.zst -Source2: cargo_config # We can't dep on cargo-packaging because we would create a dependency loop. # BuildRequires: cargo-packaging BuildRequires: cargo @@ -48,8 +47,6 @@ executable. %prep %autosetup -a1 -mkdir .cargo -cp %{SOURCE2} .cargo/config %build unset LIBSSH2_SYS_USE_PKG_CONFIG diff --git a/cargo_config b/cargo_config deleted file mode 100644 index 6fb4ff4..0000000 --- a/cargo_config +++ /dev/null @@ -1,5 +0,0 @@ -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" \ No newline at end of file diff --git a/vendor.tar.zst b/vendor.tar.zst index 97cd970..feed693 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8275e11ff15da2be091e4b6643dafa13a9b8c7e7514125e036572baa5db3fff9 -size 2451471 +oid sha256:35ac1e660312c58c48a99739ead4926dd0a69350f40c213780c8d5a5dcc0c1d5 +size 8237967