Update to 0.3.50

epel9
Josh Stone 5 years ago
parent 4df1a60980
commit 3d14ecb427

1
.gitignore vendored

@ -18,3 +18,4 @@
/backtrace-0.3.47.crate
/backtrace-0.3.48.crate
/backtrace-0.3.49.crate
/backtrace-0.3.50.crate

@ -0,0 +1,35 @@
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

@ -1,5 +1,5 @@
--- backtrace-0.3.49/Cargo.toml 2020-06-15T14:07:32+00:00
+++ backtrace-0.3.49/Cargo.toml 2020-06-15T23:24:28.411650+00:00
--- backtrace-0.3.50/Cargo.toml 2020-07-07T14:05:52+00:00
+++ backtrace-0.3.50/Cargo.toml 2020-07-22T22:43:34.484053+00:00
@@ -23,6 +23,7 @@
readme = "README.md"
license = "MIT/Apache-2.0"
@ -20,7 +20,16 @@
edition = "2018"
[[test]]
@@ -110,20 +106,12 @@
@@ -86,7 +82,7 @@
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]

@ -5,7 +5,7 @@
%global crate backtrace
Name: rust-%{crate}
Version: 0.3.49
Version: 0.3.50
Release: 1%{?dist}
Summary: Library to acquire a stack trace (backtrace) at runtime in a Rust program
@ -17,7 +17,9 @@ Source: %{crates_source}
# * No windows/osx
# * Exclude CI files, https://github.com/alexcrichton/backtrace-rs/pull/131
# * 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}
@ -264,6 +266,9 @@ rm -rf tests/accuracy/
%endif
%changelog
* Wed Jul 22 2020 Josh Stone <jistone@redhat.com> - 0.3.50-1
- Update to 0.3.50
* Mon Jun 15 2020 Josh Stone <jistone@redhat.com> - 0.3.49-1
- Update to 0.3.49

@ -1 +1 @@
SHA512 (backtrace-0.3.49.crate) = e85c3dde0b944f2c59909dc33902f20672a0bd1b8c6c941254af89be7573f3641a7352dbeca90bce89a2f9cf4242d78caceeeb889d3ee8857fd59a42889f2913
SHA512 (backtrace-0.3.50.crate) = 8f2e7d9227408c4f97e9089ae82df2e043a2c247c1580252cdcd71eead7f6739bcda37022fb99e36aa1c9fe4a16029ed3ab64bf0b1cabaf9bf6fb16c33942a3a

Loading…
Cancel
Save