From b73e2dfa36b343e50354c05e7f992a30ffbae064 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 5 Nov 2021 21:50:57 +0100
Subject: [PATCH] Update to version 0.4.40

---
 .gitignore             |  1 +
 curl-fix-metadata.diff | 16 +++++++++++++---
 rust-curl.spec         | 41 ++++++++++++++++++++++++++++++++++-------
 sources                |  2 +-
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a5cc29..e245774 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /curl-0.4.30.crate
 /curl-0.4.31.crate
 /curl-0.4.33.crate
+/curl-0.4.40.crate
diff --git a/curl-fix-metadata.diff b/curl-fix-metadata.diff
index 1fa8517..6f9c08e 100644
--- a/curl-fix-metadata.diff
+++ b/curl-fix-metadata.diff
@@ -1,6 +1,16 @@
---- curl-0.4.33/Cargo.toml	2020-08-19T05:24:59+00:00
-+++ curl-0.4.33/Cargo.toml	2020-12-02T13:41:08.205229+00:00
-@@ -67,12 +67,7 @@
+--- curl-0.4.40/Cargo.toml	1970-01-01T00:00:01+00:00
++++ curl-0.4.40/Cargo.toml	2021-11-05T20:45:54.860037+00:00
+@@ -38,9 +38,6 @@
+ path = "examples/aws_sigv4.rs"
+ required-features = ["static-curl", "ssl"]
+ 
+-[[test]]
+-name = "atexit"
+-harness = false
+ [dependencies.curl-sys]
+ version = "0.4.50"
+ default-features = false
+@@ -79,12 +76,7 @@
  [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-sys]
  version = "0.9.43"
  optional = true
diff --git a/rust-curl.spec b/rust-curl.spec
index bc67ad1..970624d 100644
--- a/rust-curl.spec
+++ b/rust-curl.spec
@@ -1,12 +1,11 @@
-# Generated by rust2rpm 16
-# * Tests are too environment dependent
-%bcond_with check
+# Generated by rust2rpm 18
+%bcond_without check
 %global debug_package %{nil}
 
 %global crate curl
 
 Name:           rust-%{crate}
-Version:        0.4.33
+Version:        0.4.40
 Release:        %autorelease
 Summary:        Rust bindings to libcurl for making HTTP requests
 
@@ -15,7 +14,8 @@ License:        MIT
 URL:            https://crates.io/crates/curl
 Source:         %{crates_source}
 # Initial patched metadata
-# * No windows/osx
+# * drop windows- and mac OS-specific dependencies
+# * drop test binary that requires internet connectivity
 Patch0:         curl-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
@@ -43,7 +43,7 @@ which use "%{crate}" crate.
 %license LICENSE
 %doc README.md
 %{cargo_registry}/%{crate}-%{version_no_tilde}/
-%exclude %{cargo_registry}/%{crate}-%{version_no_tilde}/{ci/,.github/}
+%exclude %{cargo_registry}/%{crate}-%{version_no_tilde}/ci/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -93,6 +93,18 @@ which use "openssl-sys" feature of "%{crate}" crate.
 %files       -n %{name}+openssl-sys-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
+%package     -n %{name}+poll_7_68_0-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+poll_7_68_0-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "poll_7_68_0" feature of "%{crate}" crate.
+
+%files       -n %{name}+poll_7_68_0-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
 %package     -n %{name}+protocol-ftp-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -153,8 +165,22 @@ which use "static-ssl" feature of "%{crate}" crate.
 %files       -n %{name}+static-ssl-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
+%package     -n %{name}+upkeep_7_62_0-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+upkeep_7_62_0-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "upkeep_7_62_0" feature of "%{crate}" crate.
+
+%files       -n %{name}+upkeep_7_62_0-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
+# drop test binary that requires internet connectivity
+rm tests/atexit.rs
 %cargo_prep
 
 %generate_buildrequires
@@ -168,7 +194,8 @@ which use "static-ssl" feature of "%{crate}" crate.
 
 %if %{with check}
 %check
-%cargo_test
+# skip tests that require internet connectivity
+%cargo_test -- -- --skip src/easy/handle.rs --skip src/easy/handler.rs
 %endif
 
 %changelog
diff --git a/sources b/sources
index bb36aa7..bb71383 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (curl-0.4.33.crate) = 1b0ce46bf2b370150586db61081bf6945119867f05cf6c319a924a74375f1497dccfa0a3f1e92cf78a355167091d557886c54e26bd83814975149e41e28c25f4
+SHA512 (curl-0.4.40.crate) = f4cffff61d4c16122f435c13921cb0be82bb1f3d93252f0b01e269d85a70c0266d72be45c218c8cb5b6708b86b0a966574588bd305fa3aebd2a8926f72cf129a