diff --git a/.gitignore b/.gitignore index 51e6453..0420ba4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /jwalk-0.5.1.crate /jwalk-0.5.2.crate /jwalk-0.6.0.crate +/jwalk-0.6.2.crate diff --git a/jwalk-fix-metadata.diff b/jwalk-fix-metadata.diff index 5aca5a4..22dd7cc 100644 --- a/jwalk-fix-metadata.diff +++ b/jwalk-fix-metadata.diff @@ -1,11 +1,14 @@ ---- jwalk-0.6.0/Cargo.toml 2021-01-06T22:42:05+00:00 -+++ jwalk-0.6.0/Cargo.toml 2022-11-04T18:02:27.108232+00:00 -@@ -32,8 +32,6 @@ +--- jwalk-0.6.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ jwalk-0.6.2/Cargo.toml 2022-12-20T23:18:27.194214+00:00 +@@ -43,10 +43,7 @@ + version = "0.8" [dependencies.rayon] - version = "1.5" +-version = "1.5" +- -[dev-dependencies.criterion] --version = "0.3" +-version = "0.4.0" ++version = "1.6.1" [dev-dependencies.fs_extra] - version = "1.1" + version = "1.2" diff --git a/rust-jwalk.spec b/rust-jwalk.spec index efe31ec..7f086f7 100644 --- a/rust-jwalk.spec +++ b/rust-jwalk.spec @@ -5,7 +5,7 @@ %global crate jwalk Name: rust-jwalk -Version: 0.6.0 +Version: 0.6.2 Release: %autorelease Summary: Filesystem walk performed in parallel with streamed and sorted results @@ -13,6 +13,7 @@ License: MIT URL: https://crates.io/crates/jwalk Source: %{crates_source} # Manually created patch for downstream crate metadata changes +# * bump rayon dependency from 1.5 to 1.6.1 to fix a deadlock in parallel code # * drop unused, benchmark-only criterion dev-dependency to speed up builds Patch: jwalk-fix-metadata.diff diff --git a/sources b/sources index 28362b5..68cfeda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jwalk-0.6.0.crate) = c39bec3bd93b001db7f32a3195f18c51838102ab697bf132c3d5851b9a347401cb103f4872fb5c8cba0817fc5367e78cf44e530e986e4ebf0a0fea4298848791 +SHA512 (jwalk-0.6.2.crate) = c73b8bafe77359b49dd07d2ecbf6428c228128df64886809cabb14a8c9ef7546f369f572ab80197078f8e2b3b27f1b23ac945a5e7783128d0d6114eaf510f301