Bump curl to 7.77.0 (#396)

* Bump curl to 7.77.0

* Include more files to build

* Bump curl-sys version

* See all failures on CI

* Update version structure/constants

* Fix macOS build

* Fix link on macOS

* Bump curl crate version

Co-authored-by: Alex Crichton <[email protected]>

Author: jonhoo

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "curl"
-version = "0.4.37"
+version = "0.4.38"
 authors = ["Alex Crichton <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/alexcrichton/curl-rust"
@@ -18,7 +18,7 @@ appveyor = { repository = "alexcrichton/curl-rust" }
 
 [dependencies]
 libc = "0.2.42"
-curl-sys = { path = "curl-sys", version = "0.4.43", default-features = false }
+curl-sys = { path = "curl-sys", version = "0.4.44", default-features = false }
 socket2 = "0.4.0"
 
 # Unix platforms use OpenSSL for now to provide SSL functionality

curl-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "curl-sys"
-version = "0.4.43+curl-7.76.0"
+version = "0.4.44+curl-7.77.0"
 authors = ["Alex Crichton <[email protected]>"]
 links = "curl"
 build = "build.rs"

curl-sys/build.rs

@@ -128,6 +128,8 @@ fn main() {
         .define("OS", "\"unknown\"") // TODO
         .define("HAVE_ZLIB_H", None)
         .define("HAVE_LIBZ", None)
+        .define("HAVE_BOOL_T", None)
+        .define("HAVE_STDBOOL_H", None)
         .file("curl/lib/asyn-thread.c")
         .file("curl/lib/altsvc.c")
         .file("curl/lib/base64.c")
@@ -156,6 +158,7 @@ fn main() {
         .file("curl/lib/hostcheck.c")
         .file("curl/lib/hostip.c")
         .file("curl/lib/hostip6.c")
+        .file("curl/lib/hsts.c")
         .file("curl/lib/http.c")
         .file("curl/lib/http2.c")
         .file("curl/lib/http_chunks.c")
@@ -383,6 +386,7 @@ fn main() {
     if target.contains("-apple-") {
         println!("cargo:rustc-link-lib=framework=Security");
         println!("cargo:rustc-link-lib=framework=CoreFoundation");
+        println!("cargo:rustc-link-lib=framework=SystemConfiguration");
     }
 }
 

curl-sys/curl

@@ -830,7 +830,8 @@ pub const CURLVERSION_SIXTH: CURLversion = 5;
 pub const CURLVERSION_SEVENTH: CURLversion = 6;
 pub const CURLVERSION_EIGHTH: CURLversion = 7;
 pub const CURLVERSION_NINTH: CURLversion = 8;
-pub const CURLVERSION_NOW: CURLversion = CURLVERSION_NINTH;
+pub const CURLVERSION_TENTH: CURLversion = 9;
+pub const CURLVERSION_NOW: CURLversion = CURLVERSION_TENTH;
 
 #[repr(C)]
 pub struct curl_version_info_data {
@@ -858,6 +859,7 @@ pub struct curl_version_info_data {
     pub zstd_ver_num: c_uint,
     pub zstd_version: *const c_char,
     pub hyper_version: *const c_char,
+    pub gsasl_version: *const c_char,
 }
 
 pub const CURL_VERSION_IPV6: c_int = 1 << 0;
@@ -879,7 +881,12 @@ pub const CURL_VERSION_NTLM_WB: c_int = 1 << 15;
 pub const CURL_VERSION_HTTP2: c_int = 1 << 16;
 pub const CURL_VERSION_UNIX_SOCKETS: c_int = 1 << 19;
 pub const CURL_VERSION_BROTLI: c_int = 1 << 23;
+pub const CURL_VERSION_ALTSVC: c_int = 1 << 24;
 pub const CURL_VERSION_HTTP3: c_int = 1 << 25;
+pub const CURL_VERSION_ZSTD: c_int = 1 << 26;
+pub const CURL_VERSION_UNICODE: c_int = 1 << 27;
+pub const CURL_VERSION_HSTS: c_int = 1 << 28;
+pub const CURL_VERSION_GSASL: c_int = 1 << 29;
 
 pub const CURLPAUSE_RECV: c_int = 1 << 0;
 pub const CURLPAUSE_RECV_CONT: c_int = 0;

curl-sys/lib.rs

@@ -151,6 +151,31 @@ impl Version {
         self.flag(curl_sys::CURL_VERSION_BROTLI)
     }
 
+    /// Returns whether libcurl was built with support for Alt-Svc.
+    pub fn feature_altsvc(&self) -> bool {
+        self.flag(curl_sys::CURL_VERSION_ALTSVC)
+    }
+
+    /// Returns whether libcurl was built with support for zstd
+    pub fn feature_zstd(&self) -> bool {
+        self.flag(curl_sys::CURL_VERSION_ZSTD)
+    }
+
+    /// Returns whether libcurl was built with support for unicode
+    pub fn feature_unicode(&self) -> bool {
+        self.flag(curl_sys::CURL_VERSION_UNICODE)
+    }
+
+    /// Returns whether libcurl was built with support for hsts
+    pub fn feature_hsts(&self) -> bool {
+        self.flag(curl_sys::CURL_VERSION_HSTS)
+    }
+
+    /// Returns whether libcurl was built with support for gsasl
+    pub fn feature_gsasl(&self) -> bool {
+        self.flag(curl_sys::CURL_VERSION_GSASL)
+    }
+
     fn flag(&self, flag: c_int) -> bool {
         unsafe { (*self.inner).features & flag != 0 }
     }
@@ -345,6 +370,17 @@ impl Version {
             }
         }
     }
+
+    /// If available, the human readable version of hyper
+    pub fn gsasl_version(&self) -> Option<&str> {
+        unsafe {
+            if (*self.inner).age >= curl_sys::CURLVERSION_TENTH {
+                crate::opt_str((*self.inner).gsasl_version)
+            } else {
+                None
+            }
+        }
+    }
 }
 
 impl fmt::Debug for Version {
@@ -371,7 +407,14 @@ impl fmt::Debug for Version {
             .field(
                 "feature_unix_domain_socket",
                 &self.feature_unix_domain_socket(),
-            );
+            )
+            .field("feature_altsvc", &self.feature_altsvc())
+            .field("feature_zstd", &self.feature_zstd())
+            .field("feature_unicode", &self.feature_unicode())
+            .field("feature_http3", &self.feature_http3())
+            .field("feature_http2", &self.feature_http2())
+            .field("feature_gsasl", &self.feature_gsasl())
+            .field("feature_brotli", &self.feature_brotli());
 
         if let Some(s) = self.ssl_version() {
             f.field("ssl_version", &s);
@@ -421,6 +464,9 @@ impl fmt::Debug for Version {
         if let Some(s) = self.hyper_version() {
             f.field("hyper_version", &s);
         }
+        if let Some(s) = self.gsasl_version() {
+            f.field("gsasl_version", &s);
+        }
 
         f.field("protocols", &self.protocols().collect::<Vec<_>>());
 

src/version.rs

@@ -64,9 +64,21 @@ fn main() {
     });
 
     cfg.skip_const(move |s| {
+        if version < 77 {
+            match s {
+                "CURLVERSION_TENTH"
+                | "CURLVERSION_NOW"
+                | "CURL_VERSION_ALTSVC"
+                | "CURL_VERSION_ZSTD"
+                | "CURL_VERSION_UNICODE"
+                | "CURL_VERSION_HSTS"
+                | "CURL_VERSION_GSASL" => return true,
+                _ => {}
+            }
+        }
         if version < 75 {
             match s {
-                "CURLVERSION_NINTH" | "CURLVERSION_NOW" => return true,
+                "CURLVERSION_NINTH" => return true,
                 _ => {}
             }
         }