update to version 0.3.54

.gitignore

@@ -19,3 +19,4 @@
 /backtrace-0.3.48.crate
 /backtrace-0.3.49.crate
 /backtrace-0.3.50.crate
+/backtrace-0.3.54.crate

0001-Revert-Bump-miniz-oxide-version-354.patch

@@ -1,35 +0,0 @@
-From bf4fb0003ba1a19cab61601a2ef6fd48d0326dee Mon Sep 17 00:00:00 2001
-From: Josh Stone <cuviper@gmail.com>
-Date: Wed, 22 Jul 2020 15:48:17 -0700
-Subject: [PATCH] Revert "Bump miniz-oxide version (#354)"
-
-This reverts commit b0f850276c119bf517d51b20513afa4719985736.
----
- src/symbolize/gimli/elf.rs | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/symbolize/gimli/elf.rs b/src/symbolize/gimli/elf.rs
-index 2ca57f88a4b4..281188faacb5 100644
---- a/src/symbolize/gimli/elf.rs
-+++ b/src/symbolize/gimli/elf.rs
-@@ -4,6 +4,7 @@ use object::elf::{ELFCOMPRESS_ZLIB, SHF_COMPRESSED};
- use object::read::elf::{CompressionHeader, FileHeader, SectionHeader, SectionTable, Sym};
- use object::read::StringTable;
- use object::{BigEndian, Bytes, NativeEndian};
-+use std::io::Cursor;
- 
- #[cfg(target_pointer_width = "32")]
- type Elf = object::elf::FileHeader32<NativeEndian>;
-@@ -174,8 +175,7 @@ fn decompress_zlib(input: &[u8], output: &mut [u8]) -> Option<()> {
-     let (status, in_read, out_read) = decompress(
-         &mut DecompressorOxide::new(),
-         input,
--        output,
--        0,
-+        &mut Cursor::new(output),
-         TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | TINFL_FLAG_PARSE_ZLIB_HEADER,
-     );
-     if status == TINFLStatus::Done && in_read == input.len() && out_read == output.len() {
--- 
-2.26.2
-

backtrace-fix-metadata.diff

@@ -1,14 +1,6 @@
---- backtrace-0.3.50/Cargo.toml	2020-07-07T14:05:52+00:00
+--- backtrace-0.3.54/Cargo.toml	2020-10-30T20:50:43+00:00
-+++ backtrace-0.3.50/Cargo.toml	2020-07-22T22:43:34.484053+00:00
++++ backtrace-0.3.54/Cargo.toml	2020-11-07T14:50:39.629548+00:00
-@@ -23,6 +23,7 @@
+@@ -43,11 +43,6 @@
- readme = "README.md"
- license = "MIT/Apache-2.0"
- repository = "https://github.com/rust-lang/backtrace-rs"
-+exclude = ["/ci/*", "/.github/*"]
- 
- [[example]]
- name = "backtrace"
-@@ -43,11 +44,6 @@
  [[test]]
  name = "smoke"
  required-features = ["std"]
@@ -20,32 +12,22 @@
  edition = "2018"
  
  [[test]]
-@@ -86,7 +82,7 @@
+@@ -102,19 +97,9 @@
- default-features = false
- 
- [dependencies.miniz_oxide]
--version = "0.4.0"
-+version = "0.3.7"
- optional = true
- default-features = false
- 
-@@ -111,20 +107,12 @@
  version = "0.6"
  
  [features]
 -coresymbolication = []
 -dbghelp = []
  default = ["std", "gimli-symbolize"]
- dladdr = []
+-dladdr = []
- gimli-symbolize = ["addr2line", "miniz_oxide", "object", "std"]
+ gimli-symbolize = ["addr2line", "miniz_oxide", "object"]
 -kernel32 = []
  libbacktrace = ["backtrace-sys/backtrace-sys"]
- libunwind = []
+-libunwind = []
--rustc-dep-of-std = ["backtrace-sys/rustc-dep-of-std", "cfg-if/rustc-dep-of-std", "core", "compiler_builtins", "libc/rustc-dep-of-std", "rustc-demangle/rustc-dep-of-std"]
  serialize-rustc = ["rustc-serialize"]
  serialize-serde = ["serde"]
  std = []
- unix-backtrace = []
+-unix-backtrace = []
 -verify-winapi = ["winapi/dbghelp", "winapi/handleapi", "winapi/libloaderapi", "winapi/memoryapi", "winapi/minwindef", "winapi/processthreadsapi", "winapi/synchapi", "winapi/tlhelp32", "winapi/winbase", "winapi/winnt"]
 -[target."cfg(windows)".dependencies.winapi]
 -version = "0.3.3"

rust-backtrace.spec

@@ -1,12 +1,12 @@
-# Generated by rust2rpm 13
+# Generated by rust2rpm 15
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate backtrace
 
 Name:           rust-%{crate}
-Version:        0.3.50
+Version:        0.3.54
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Library to acquire a stack trace (backtrace) at runtime in a Rust program
 
 # Upstream license specification: MIT/Apache-2.0
@@ -14,12 +14,9 @@ License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/backtrace
 Source:         %{crates_source}
 # Initial patched metadata
-# * No windows/osx
+# * No windows deps
-# * Exclude CI files, https://github.com/alexcrichton/backtrace-rs/pull/131
+# * No deprecated/internal features
-# * Remove accuracy test that requires workspace crates
-# * Downgrade miniz_oxide to 0.3 for now
 Patch0:         backtrace-fix-metadata.diff
-Patch1:         0001-Revert-Bump-miniz-oxide-version-354.patch
 
 ExclusiveArch:  %{rust_arches}
 %if %{__cargo_skip_build}
@@ -46,6 +43,7 @@ which use "%{crate}" crate.
 %license LICENSE-MIT LICENSE-APACHE
 %doc README.md
 %{cargo_registry}/%{crate}-%{version_no_tilde}/
+%exclude %{cargo_registry}/%{crate}-%{version_no_tilde}/{ci/,.github/,.gitmodules}
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -95,18 +93,6 @@ which use "cpp_demangle" feature of "%{crate}" crate.
 %files       -n %{name}+cpp_demangle-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
-%package     -n %{name}+dladdr-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+dladdr-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "dladdr" feature of "%{crate}" crate.
-
-%files       -n %{name}+dladdr-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
 %package     -n %{name}+gimli-symbolize-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -131,18 +117,6 @@ which use "libbacktrace" feature of "%{crate}" crate.
 %files       -n %{name}+libbacktrace-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
-%package     -n %{name}+libunwind-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+libunwind-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "libunwind" feature of "%{crate}" crate.
-
-%files       -n %{name}+libunwind-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
 %package     -n %{name}+miniz_oxide-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -227,22 +201,10 @@ which use "std" feature of "%{crate}" crate.
 %files       -n %{name}+std-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
-%package     -n %{name}+unix-backtrace-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+unix-backtrace-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "unix-backtrace" feature of "%{crate}" crate.
-
-%files       -n %{name}+unix-backtrace-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
-# Remove accuracy test that requires workspace crates
+# drop accuracy test (requires stuff to be built as dylib.so)
-rm -rf tests/accuracy/
+rm -r tests/accuracy/
 %cargo_prep
 
 %generate_buildrequires
@@ -257,7 +219,7 @@ rm -rf tests/accuracy/
 %if %{with check}
 %check
 # https://github.com/rust-lang/backtrace-rs/issues/204
-%ifarch %{ix86} ppc64le aarch64
+%ifarch %{ix86} ppc64le aarch64 s390x
   %cargo_test || :
 %else
   # some tests can't find symbols in release mode
@@ -266,6 +228,10 @@ rm -rf tests/accuracy/
 %endif
 
 %changelog
+* Sat Nov 07 2020 Fabio Valentini <decathorpe@gmail.com> - 0.3.54-1
+- Update to version 0.3.54.
+- Fixes RHBZ#1883637
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.50-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (backtrace-0.3.50.crate) = 8f2e7d9227408c4f97e9089ae82df2e043a2c247c1580252cdcd71eead7f6739bcda37022fb99e36aa1c9fe4a16029ed3ab64bf0b1cabaf9bf6fb16c33942a3a
+SHA512 (backtrace-0.3.54.crate) = 1d08dff8e6c7c4f3331a667eb4d758764d88d967dabe4d8dc6243cad440ff4f75315789a6429629161e5b4554b0ee95f2f372b5ea0eedc26368e57dff3205b9b