From fe681d6a1de5729f15124bf22fcc68522389ddac Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 23 Nov 2021 14:20:44 +0100 Subject: [PATCH] Update to version 0.3.4; Fixes RHBZ#2025350 --- .gitignore | 1 + .rust2rpm.conf | 4 ---- cpp_demangle-fix-metadata.diff | 29 +++++++++++++++++++++++++++++ rust-cpp_demangle.spec | 11 ++++++----- sources | 2 +- 5 files changed, 37 insertions(+), 10 deletions(-) delete mode 100644 .rust2rpm.conf create mode 100644 cpp_demangle-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 4152871..0d4a9da 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /cpp_demangle-0.3.1.crate /cpp_demangle-0.3.2.crate /cpp_demangle-0.3.3.crate +/cpp_demangle-0.3.4.crate diff --git a/.rust2rpm.conf b/.rust2rpm.conf deleted file mode 100644 index 7961e6a..0000000 --- a/.rust2rpm.conf +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -unwanted-features = - afl - fuzz diff --git a/cpp_demangle-fix-metadata.diff b/cpp_demangle-fix-metadata.diff new file mode 100644 index 0000000..2f2e67b --- /dev/null +++ b/cpp_demangle-fix-metadata.diff @@ -0,0 +1,29 @@ +--- cpp_demangle-0.3.4/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ cpp_demangle-0.3.4/Cargo.toml 2021-11-23T13:16:55.556793+00:00 +@@ -22,16 +22,10 @@ + categories = ["development-tools::debugging", "development-tools::ffi"] + license = "Apache-2.0/MIT" + repository = "https://github.com/gimli-rs/cpp_demangle" ++autobins = false ++ + [profile.release] + debug = true +- +-[[bin]] +-name = "afl_runner" +-path = "src/bin/afl_runner.rs" +-required-features = ["afl"] +-[dependencies.afl] +-version = "0.11.0" +-optional = true + + [dependencies.cfg-if] + version = "1.0.0" +@@ -45,7 +39,6 @@ + alloc = [] + cppfilt = [] + default = ["std"] +-fuzz = ["afl"] + logging = [] + nightly = [] + run_libiberty_tests = [] diff --git a/rust-cpp_demangle.spec b/rust-cpp_demangle.spec index 2ebb7e4..d46348b 100644 --- a/rust-cpp_demangle.spec +++ b/rust-cpp_demangle.spec @@ -1,13 +1,11 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 18 %bcond_without check %global debug_package %{nil} -%global __cargo_is_bin() false - %global crate cpp_demangle Name: rust-%{crate} -Version: 0.3.3 +Version: 0.3.4 Release: %autorelease Summary: Crate for demangling C++ symbols @@ -15,6 +13,9 @@ Summary: Crate for demangling C++ symbols License: ASL 2.0 or MIT URL: https://crates.io/crates/cpp_demangle Source: %{crates_source} +# Initial patched metadata +# * drop unused support for the AFL fuzzer +Patch0: cpp_demangle-fix-metadata.diff ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -39,7 +40,7 @@ which use "%{crate}" crate. %files devel %license LICENSE-MIT LICENSE-APACHE -%doc CHANGELOG.md CONTRIBUTING.md 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 0f07f15..72f0fcd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cpp_demangle-0.3.3.crate) = e5bf5cda62c49b972d0d33ba2c53966cce75b7095897b300c22e33b39036136ff8897cecef71f0f2470acb90901996c1403c12a058e8a5bd9abc39893c88648b +SHA512 (cpp_demangle-0.3.4.crate) = 5e7bee24ecda970793ee3999361adfd55f8b2f1317ee3a7b948c40a89119b276a290b6797fb21a4eee382cbc5c09c1dbbd50262e2a6bfee8f096390111626587