From 1f78c5c4138c580462ccaf11b35dc794ce0ede4f Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Thu, 26 Sep 2024 19:00:01 +0100 Subject: [PATCH 1/3] Upgrade zlib-rs to 0.3.0 to get multiple bugfixes: https://github.com/memorysafety/zlib-rs/pull/165 https://github.com/memorysafety/zlib-rs/issues/169 https://github.com/memorysafety/zlib-rs/issues/172 And possibly others. --- Cargo.toml | 2 +- src/ffi/c.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 47c7421d..00ed198c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ exclude = [".*"] [dependencies] libz-sys = { version = "1.1.20", optional = true, default-features = false } libz-ng-sys = { version = "1.1.16", optional = true } -libz-rs-sys = { version = "0.2.1", optional = true, default-features = false, features = ["std", "rust-allocator"] } +libz-rs-sys = { version = "0.3.0", optional = true, default-features = false, features = ["std", "rust-allocator"] } # this matches the default features, but we don't want to depend on the default features staying the same cloudflare-zlib-sys = { version = "0.3.0", optional = true } miniz_oxide = { version = "0.8.0", optional = true, default-features = false, features = ["with-alloc"] } crc32fast = "1.2.0" diff --git a/src/ffi/c.rs b/src/ffi/c.rs index 867f2f9e..05e50178 100644 --- a/src/ffi/c.rs +++ b/src/ffi/c.rs @@ -447,7 +447,7 @@ mod c_backend { #[cfg(feature = "zlib-ng")] const ZLIB_VERSION: &'static str = "2.1.0.devel\0"; #[cfg(all(not(feature = "zlib-ng"), feature = "zlib-rs"))] - const ZLIB_VERSION: &'static str = "0.1.0\0"; + const ZLIB_VERSION: &'static str = "1.3.0-zlib-rs-0.3.0\0"; #[cfg(not(any(feature = "zlib-ng", feature = "zlib-rs")))] const ZLIB_VERSION: &'static str = "1.2.8\0"; From 731df32113188f3372367402b9ea2bb049689203 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Thu, 26 Sep 2024 19:19:26 +0100 Subject: [PATCH 2/3] Update Cargo.toml Co-authored-by: Sebastian Thiel --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 00ed198c..ff815b47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,8 @@ exclude = [".*"] [dependencies] libz-sys = { version = "1.1.20", optional = true, default-features = false } libz-ng-sys = { version = "1.1.16", optional = true } -libz-rs-sys = { version = "0.3.0", optional = true, default-features = false, features = ["std", "rust-allocator"] } # this matches the default features, but we don't want to depend on the default features staying the same +# this matches the default features, but we don't want to depend on the default features staying the same +libz-rs-sys = { version = "0.3.0", optional = true, default-features = false, features = ["std", "rust-allocator"] } cloudflare-zlib-sys = { version = "0.3.0", optional = true } miniz_oxide = { version = "0.8.0", optional = true, default-features = false, features = ["with-alloc"] } crc32fast = "1.2.0" From da5c8cfd917b0ec2aeacc2e514b27b6bd50726e4 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Thu, 26 Sep 2024 19:34:42 +0100 Subject: [PATCH 3/3] Bump version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index ff815b47..1d79413d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "flate2" authors = ["Alex Crichton ", "Josh Triplett "] -version = "1.0.33" +version = "1.0.34" edition = "2018" license = "MIT OR Apache-2.0" readme = "README.md"