Update to version 0.3.74; Fixes RHBZ#2310767

Signed-off-by: Michel Lind <salimma@fedoraproject.org>

.gitignore

@@ -27,3 +27,5 @@
 /backtrace-0.3.66.crate
 /backtrace-0.3.67.crate
 /backtrace-0.3.69.crate
+/backtrace-0.3.73.crate
+/backtrace-0.3.74.crate

backtrace-fix-metadata-auto.diff

@@ -1,26 +1,12 @@
---- backtrace-0.3.69/Cargo.toml	1970-01-01T00:00:01+00:00
+--- backtrace-0.3.74/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ backtrace-0.3.69/Cargo.toml	2023-11-29T18:35:10.063960+00:00
++++ backtrace-0.3.74/Cargo.toml	2024-09-16T21:48:56.255999+00:00
-@@ -104,16 +104,6 @@
+@@ -143,8 +143,6 @@
- std = []
- 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(not(all(windows, target_env = \"msvc\", not(target_vendor = \"uwp\"))))".dependencies.addr2line]
-@@ -140,6 +130,3 @@
  ]
  default-features = false
  
--[target."cfg(windows)".dependencies.winapi]
+-[target."cfg(windows)".dependencies.windows-targets]
--version = "0.3.9"
+-version = "0.52.6"
--optional = true
+-
+ [lints.rust]
+ unexpected_cfgs = "allow"
++

backtrace-fix-metadata.diff

@@ -1,20 +1,23 @@
---- backtrace-0.3.69/Cargo.toml	1970-01-01T00:00:01+00:00
+--- backtrace-0.3.74/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ backtrace-0.3.69/Cargo.toml	2023-11-29T18:35:41.541100+00:00
++++ backtrace-0.3.74/Cargo.toml	2024-09-16T21:49:07.938082+00:00
-@@ -49,17 +49,7 @@
+@@ -45,20 +45,8 @@
- edition = "2018"
+ required-features = ["std"]
  
  [[test]]
 -name = "accuracy"
+-path = "tests/accuracy/main.rs"
 -required-features = ["std"]
--edition = "2018"
+-edition = "2021"
 -
 -[[test]]
  name = "concurrent-panics"
+ path = "tests/concurrent-panics.rs"
 -harness = false
 -required-features = ["std"]
 -
 -[[test]]
 -name = "current-exe-mismatch"
+-path = "tests/current-exe-mismatch.rs"
  harness = false
  required-features = ["std"]
  

rust-backtrace.spec

@@ -1,11 +1,11 @@
-# Generated by rust2rpm 25
+# Generated by rust2rpm 26
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate backtrace
 
 Name:           rust-backtrace
-Version:        0.3.69
+Version:        0.3.74
 Release:        %autorelease
 Summary:        Library to acquire a stack trace (backtrace) at runtime in a Rust program
 
@@ -17,6 +17,7 @@ Patch:          backtrace-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
 # * drop "accuracy" test (requires crates to be built in dylib mode)
 # * drop "current-exe-mismatch" test (fails on i686 for unknown reasons)
+# * bump addr2line from 0.22.0 to 0.24.0
 Patch:          backtrace-fix-metadata.diff
 
 BuildRequires:  cargo-rpm-macros >= 24
@@ -66,40 +67,16 @@ use the "cpp_demangle" feature of the "%{crate}" crate.
 %files       -n %{name}+cpp_demangle-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+gimli-symbolize-devel
+%package     -n %{name}+dl_iterate_phdr-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+gimli-symbolize-devel %{_description}
+%description -n %{name}+dl_iterate_phdr-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "gimli-symbolize" feature of the "%{crate}" crate.
+use the "dl_iterate_phdr" feature of the "%{crate}" crate.
 
-%files       -n %{name}+gimli-symbolize-devel
+%files       -n %{name}+dl_iterate_phdr-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+libbacktrace-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+libbacktrace-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "libbacktrace" feature of the "%{crate}" crate.
-
-%files       -n %{name}+libbacktrace-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+rustc-serialize-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+rustc-serialize-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "rustc-serialize" feature of the "%{crate}" crate.
-
-%files       -n %{name}+rustc-serialize-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+serde-devel
@@ -114,18 +91,6 @@ use the "serde" feature of the "%{crate}" crate.
 %files       -n %{name}+serde-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+serialize-rustc-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+serialize-rustc-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "serialize-rustc" feature of the "%{crate}" crate.
-
-%files       -n %{name}+serialize-rustc-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+serialize-serde-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -169,11 +134,14 @@ rm tests/current-exe-mismatch.rs
 
 %if %{with check}
 %check
-# https://github.com/rust-lang/backtrace-rs/issues/204
+# * https://github.com/rust-lang/backtrace-rs/issues/204
 # * tests/smoke.rs/smoke_test_frames: fails on all architectures
-# * tests/smoke.rs/sp_smoke_test: crashes when frame pointers are enabled on x86_64
+# * tests/smoke.rs/sp_smoke_test: crashes when frame pointers are enabled on
-# * backtrace_new_unresolved_should_start_with_call_site_trace: fails on aarch64, ppc64le, s390x
+#   x86_64
-%cargo_test -- -- --skip smoke_test_frames --skip sp_smoke_test --skip backtrace_new_unresolved_should_start_with_call_site_trace
+# * backtrace_new_should_start_with_call_site_trace: fails on s390x
+# * backtrace_new_unresolved_should_start_with_call_site_trace: fails on
+#   aarch64, ppc64le, s390x
+%cargo_test -- -- --skip smoke_test_frames --skip sp_smoke_test --skip backtrace_new_should_start_with_call_site_trace --skip backtrace_new_unresolved_should_start_with_call_site_trace
 %endif
 
 %changelog

rust2rpm.toml

@@ -9,6 +9,27 @@ hide = [
     "kernel32",
     "libunwind",
     "unix-backtrace",
-    "verify-winapi",
 ]
 
+[scripts]
+prep.post = [
+  "# drop \"accuracy\" test (requires crates to be built in dylib mode)",
+  "# drop \"current-exe-mismatch\" test (fails on i686 for unknown reasons)",
+  "rm -r tests/accuracy/",
+  "rm tests/current-exe-mismatch.rs",
+]
+
+[tests]
+skip = [
+  "smoke_test_frames",
+  "sp_smoke_test",
+  "backtrace_new_should_start_with_call_site_trace",
+  "backtrace_new_unresolved_should_start_with_call_site_trace",
+]
+comments = [
+  "https://github.com/rust-lang/backtrace-rs/issues/204",
+  "tests/smoke.rs/smoke_test_frames: fails on all architectures",
+  "tests/smoke.rs/sp_smoke_test: crashes when frame pointers are enabled on x86_64",
+  "backtrace_new_should_start_with_call_site_trace: fails on s390x",
+  "backtrace_new_unresolved_should_start_with_call_site_trace: fails on aarch64, ppc64le, s390x",
+]

sources

@@ -1 +1 @@
-SHA512 (backtrace-0.3.69.crate) = 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244
+SHA512 (backtrace-0.3.74.crate) = 00cb2be0626f0bf6ec8b8f525bb129d3ac74c386c5e46ee0f343edb78c863222521f8132876057a5a1facacf40792dea51f2f20e986b35f3a85bca3dcf5c1520