From e220da3c650ae6ea55c08591f36ead6d4a94f97e Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Tue, 18 Aug 2020 15:53:58 -0700
Subject: [PATCH] Add support for zlib-ng (#351)

* Add support for zlib-ng

Upgrade to libz-sys 1.1.0. Add a feature zlib-ng-compat to build with
zlib-ng in zlib-compat mode. This requires building our own curl (as
system curl will link with another zlib), so make zlib-ng-compat require
static-curl.

* Bump curl version to 0.4.32
---
 Cargo.toml          | 5 +++--
 curl-sys/Cargo.toml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a36481df65..870762d053 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "curl"
-version = "0.4.31"
+version = "0.4.32"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT"
 repository = "https://github.com/alexcrichton/curl-rust"
@@ -17,7 +17,7 @@ appveyor = { repository = "alexcrichton/curl-rust" }
 
 [dependencies]
 libc = "0.2.42"
-curl-sys = { path = "curl-sys", version = "0.4.33", default-features = false }
+curl-sys = { path = "curl-sys", version = "0.4.35", default-features = false }
 socket2 = "0.3.7"
 
 # Unix platforms use OpenSSL for now to provide SSL functionality
@@ -47,6 +47,7 @@ static-curl = ["curl-sys/static-curl"]
 static-ssl = ["curl-sys/static-ssl"]
 force-system-lib-on-osx = ['curl-sys/force-system-lib-on-osx']
 protocol-ftp = ["curl-sys/protocol-ftp"]
+zlib-ng-compat = ["curl-sys/zlib-ng-compat", "static-curl"]
 
 [[test]]
 name = "atexit"
diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml
index 2a4eca41c9..818e5f4a38 100644
--- a/curl-sys/Cargo.toml
+++ b/curl-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "curl-sys"
-version = "0.4.34+curl-7.71.1"
+version = "0.4.35+curl-7.71.1"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 links = "curl"
 build = "build.rs"
@@ -19,7 +19,7 @@ name = "curl_sys"
 path = "lib.rs"
 
 [dependencies]
-libz-sys = "1.0.18"
+libz-sys = { version = "1.0.18", default-features = false, features = ["libc"] }
 libc = "0.2.2"
 libnghttp2-sys = { optional = true, version = "0.1.3" }
 
@@ -51,3 +51,4 @@ static-ssl = ["openssl-sys/vendored"]
 spnego = []
 force-system-lib-on-osx = []
 protocol-ftp = []
+zlib-ng-compat = ["libz-sys/zlib-ng", "static-curl"]