update to version 0.4.39+curl-7.74.0

.gitignore

@@ -26,3 +26,4 @@
 /curl-sys-0.4.32+curl-7.70.0.crate
 /curl-sys-0.4.33+curl-7.71.1.crate
 /curl-sys-0.4.36+curl-7.71.1.crate
+/curl-sys-0.4.39+curl-7.74.0.crate

0001-Make-static-curl-static-ssl-features-a-noop.patch

@@ -12,7 +12,7 @@ diff --git a/build.rs b/build.rs
 index 74b6a55..842ddb5 100644
 --- a/build.rs
 +++ b/build.rs
-@@ -19,28 +19,27 @@ fn main() {
+@@ -19,24 +19,21 @@ fn main() {
          return println!("cargo:rustc-flags=-l curl");
      }
  
@@ -20,15 +20,14 @@ index 74b6a55..842ddb5 100644
 -    if !cfg!(feature = "static-curl") {
 -        // OSX and Haiku ships libcurl by default, so we just use that version
 -        // so long as it has the right features enabled.
--        if target.contains("apple") || target.contains("haiku") {
--            if !cfg!(feature = "http2") || curl_config_reports_http2() {
--                return println!("cargo:rustc-flags=-l curl");
--            }
+-        if (target.contains("apple") || target.contains("haiku"))
+-            && (!cfg!(feature = "http2") || curl_config_reports_http2())
+-        {
 +    // OSX and Haiku ships libcurl by default, so we just use that version
 +    // so long as it has the right features enabled.
 +    if target.contains("apple") || target.contains("haiku") {
 +        if !cfg!(feature = "http2") || curl_config_reports_http2() {
-+            return println!("cargo:rustc-flags=-l curl");
+             return println!("cargo:rustc-flags=-l curl");
          }
 +    }
  
@@ -37,26 +36,14 @@ index 74b6a55..842ddb5 100644
 -            if try_vcpkg() {
 -                return;
 -            }
--        } else {
--            if try_pkg_config() {
--                return;
--            }
+-        } else if try_pkg_config() {
 +    // Next, fall back and try to use pkg-config if its available.
 +    if windows {
 +        if try_vcpkg() {
-+            return;
-+        }
-+    } else {
-+        if try_pkg_config() {
-+            return;
+             return;
          }
++    } else if try_pkg_config() {
++        return;
      }
  
-+    std::process::exit(1);
-+
      if !Path::new("curl/.git").exists() {
-         let _ = Command::new("git")
-             .args(&["submodule", "update", "--init"])
--- 
-2.26.2
-

curl-sys-fix-metadata.diff

@@ -1,11 +1,11 @@
---- curl-sys-0.4.36+curl-7.71.1/Cargo.toml	2020-08-19T05:24:14+00:00
-+++ curl-sys-0.4.36+curl-7.71.1/Cargo.toml	2020-08-20T00:11:53.519543+00:00
+--- curl-sys-0.4.39+curl-7.74.0/Cargo.toml	2020-12-09T16:18:44+00:00
++++ curl-sys-0.4.39+curl-7.74.0/Cargo.toml	2020-12-13T00:00:01.208983+00:00
 @@ -12,7 +12,7 @@
  
  [package]
  name = "curl-sys"
--version = "0.4.36+curl-7.71.1"
-+version = "0.4.36"
+-version = "0.4.39+curl-7.74.0"
++version = "0.4.39"
  authors = ["Alex Crichton <alex@alexcrichton.com>"]
  build = "build.rs"
  links = "curl"

rust-curl-sys.spec

@@ -1,12 +1,12 @@
-# Generated by rust2rpm 13
+# Generated by rust2rpm 16
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate curl-sys
-%global upstream_version 0.4.36+curl-7.71.1
+%global upstream_version 0.4.39+curl-7.74.0
 
 Name:           rust-%{crate}
-Version:        0.4.36
+Version:        0.4.39
 Release:        1%{?dist}
 Summary:        Native bindings to the libcurl library
 
@@ -29,6 +29,7 @@ BuildArch:      noarch
 %endif
 
 BuildRequires:  rust-packaging
+BuildRequires:  pkgconfig(libcurl)
 
 %global _description %{expand:
 Native bindings to the libcurl library.}
@@ -85,18 +86,6 @@ which use "http2" feature of "%{crate}" crate.
 %files       -n %{name}+http2-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
-%package     -n %{name}+mesalink-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+mesalink-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "mesalink" feature of "%{crate}" crate.
-
-%files       -n %{name}+mesalink-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
 %package     -n %{name}+protocol-ftp-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -165,7 +154,6 @@ rm -vrf curl
 
 %generate_buildrequires
 %cargo_generate_buildrequires
-echo 'pkgconfig(libcurl)'
 
 %build
 %cargo_build
@@ -179,6 +167,10 @@ echo 'pkgconfig(libcurl)'
 %endif
 
 %changelog
+* Sun Dec 13 2020 Fabio Valentini <decathorpe@gmail.com> - 0.4.39-1
+- Update to version 0.4.39+curl-7.74.0.
+- Fixes RHBZ#1888087
+
 * Thu Aug 20 2020 Josh Stone <jistone@redhat.com> - 0.4.36-1
 - Update to 0.4.36+curl-7.71.1
 

sources

@@ -1 +1 @@
-SHA512 (curl-sys-0.4.36+curl-7.71.1.crate) = 19e4ffaa47d598d9872e679f44faf6caa2d9294e2240059aeb547c7f41caccb5436b41fae15ff03d3c16edaedd118c9a66cb539a9d3c9342edda40545785f573
+SHA512 (curl-sys-0.4.39+curl-7.74.0.crate) = ce13ffe129f62f9967f15d18cefbe9c9c38fb4ad2fea9dd8b736981199c89b7ef8ccef2d7411b0f007c44a81bc1a357014a363bd0e715aa9311a517b04e7382c