From cfe5bf402becd90efb7f778b6572040abce0b6ab Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 21 Sep 2021 23:27:25 +0200 Subject: [PATCH] Update to version 0.26.2; Fixes RHBZ#1966865 --- .gitignore | 1 + object-fix-metadata.diff | 28 +++++++++++++++++----------- rust-object.spec | 8 ++++---- sources | 2 +- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index ff548ca..8fb4249 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /object-0.20.0.crate /object-0.22.0.crate /object-0.24.0.crate +/object-0.26.2.crate diff --git a/object-fix-metadata.diff b/object-fix-metadata.diff index 32706e5..592452b 100644 --- a/object-fix-metadata.diff +++ b/object-fix-metadata.diff @@ -1,6 +1,6 @@ ---- object-0.24.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ object-0.24.0/Cargo.toml 2021-05-08T18:20:50.956784+00:00 -@@ -46,19 +46,6 @@ +--- object-0.26.2/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ object-0.26.2/Cargo.toml 2021-09-21T21:07:44.960855+00:00 +@@ -45,19 +45,6 @@ [[example]] name = "readobj" required-features = ["read"] @@ -20,22 +20,28 @@ [dependencies.crc32fast] version = "1.2" -@@ -72,9 +59,6 @@ - version = "1.1" - optional = true +@@ -75,14 +62,11 @@ + version = "2.4.1" + default-features = false -[dependencies.wasmparser] -version = "0.57" -optional = true - [dev-dependencies.memmap] - version = "0.7" + [dev-dependencies.memmap2] + version = "0.3" -@@ -90,9 +74,7 @@ + [features] +-all = ["read", "write", "std", "compression", "wasm"] ++all = ["read", "write", "std", "compression"] + archive = [] + cargo-all = [] + coff = [] +@@ -93,9 +77,7 @@ pe = ["coff"] read = ["read_core", "archive", "coff", "elf", "macho", "pe", "unaligned"] read_core = [] --rustc-dep-of-std = ["core", "compiler_builtins", "alloc"] - std = [] +-rustc-dep-of-std = ["core", "compiler_builtins", "alloc", "memchr/rustc-dep-of-std"] + std = ["memchr/std"] unaligned = [] -wasm = ["wasmparser"] write = ["write_core", "coff", "elf", "macho"] diff --git a/rust-object.spec b/rust-object.spec index 54241e8..a2785a4 100644 --- a/rust-object.spec +++ b/rust-object.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 18 %bcond_without check %global debug_package %{nil} %global crate object Name: rust-%{crate} -Version: 0.24.0 +Version: 0.26.2 Release: %autorelease Summary: Unified interface for reading and writing object file formats @@ -14,7 +14,7 @@ License: ASL 2.0 or MIT URL: https://crates.io/crates/object Source: %{crates_source} # Initial patched metadata -# * Remove wasm deps +# * Disable WASM support (wasmparser dependency is very outdated) # * Drop dependencies on compiler internals Patch0: object-fix-metadata.diff @@ -41,7 +41,7 @@ which use "%{crate}" crate. %files devel %license LICENSE-APACHE LICENSE-MIT -%doc README.md +%doc README.md CHANGELOG.md %{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel diff --git a/sources b/sources index 3e941f2..47550a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (object-0.24.0.crate) = 5f1c21bbff324bc3117dcf26a04cc4ca6bcd86f43bb5a075f4637fc9e2d9ac5771fe5e9b52c26bb135f1059aeaa46301622bd570b626980e0fc43639c4a2904b +SHA512 (object-0.26.2.crate) = 42882e3b1063ad8326bedd3f402831d6206603f8736c5aecc3c16d296007d25360ce9143bb3f859a6d52f1a530809df1f1117d321f0d22f0b43c1831366eec6d