From 1392a900eaf979ded850bc1840daa64694b61b93 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 22 Jul 2022 12:29:52 +0200 Subject: [PATCH] Update to version 0.4.44; Fixes RHBZ#2109771 --- .gitignore | 1 + curl-fix-metadata.diff | 41 +++++++++++++++++++++++++---------------- rust-curl.spec | 4 ++-- sources | 2 +- 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 7cef615..5a70872 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /curl-0.4.41.crate /curl-0.4.42.crate /curl-0.4.43.crate +/curl-0.4.44.crate diff --git a/curl-fix-metadata.diff b/curl-fix-metadata.diff index de6a732..e1fea4a 100644 --- a/curl-fix-metadata.diff +++ b/curl-fix-metadata.diff @@ -1,31 +1,40 @@ ---- curl-0.4.43/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ curl-0.4.43/Cargo.toml 2022-05-25T12:12:21.425575+00:00 -@@ -1,4 +1,4 @@ --# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO -+## THIS FILE IS AUTOMATICALLY GENERATED BY CARGO - # - # When uploading crates to the registry Cargo will automatically - # "normalize" Cargo.toml files for maximal compatibility -@@ -47,9 +47,6 @@ +--- curl-0.4.44/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ curl-0.4.44/Cargo.toml 2022-07-22T10:26:15.295988+00:00 +@@ -25,6 +25,9 @@ + ] + license = "MIT" + repository = "https://github.com/alexcrichton/curl-rust" ++exclude = [ ++ "/ci/", ++] + + [[example]] + name = "https" +@@ -52,10 +55,6 @@ + name = "multi-dl" path = "examples/multi-dl.rs" required-features = ["ssl"] - +- -[[test]] -name = "atexit" -harness = false + [dependencies.curl-sys] - version = "0.4.53" - default-features = false -@@ -90,12 +87,7 @@ - [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-sys] + version = "0.4.56" +@@ -107,16 +106,6 @@ version = "0.9.43" optional = true + -[target."cfg(target_env = \"msvc\")".dependencies.schannel] -version = "0.1.13" - +- -[target."cfg(target_env = \"msvc\")".dependencies.winapi] -version = "0.3" --features = ["libloaderapi", "wincrypt"] +-features = [ +- "libloaderapi", +- "wincrypt", +-] +- [badges.appveyor] repository = "alexcrichton/curl-rust" diff --git a/rust-curl.spec b/rust-curl.spec index 89541e1..2e16c4f 100644 --- a/rust-curl.spec +++ b/rust-curl.spec @@ -5,7 +5,7 @@ %global crate curl Name: rust-%{crate} -Version: 0.4.43 +Version: 0.4.44 Release: %autorelease Summary: Rust bindings to libcurl for making HTTP requests @@ -16,6 +16,7 @@ Source: %{crates_source} # Initial patched metadata # * drop windows- and mac OS-specific dependencies # * drop test binary that requires internet connectivity +# * exclude upstream CI files Patch0: curl-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -40,7 +41,6 @@ use the "%{crate}" crate. %license %{crate_instdir}/LICENSE %doc %{crate_instdir}/README.md %{crate_instdir}/ -%exclude %{crate_instdir}/ci/ %package -n %{name}+default-devel Summary: %{summary} diff --git a/sources b/sources index 6192655..86cce42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (curl-0.4.43.crate) = 13803b2b0903c57e17e17d4099f1dc68550449068d703418bb065599ee733ebd5a2a8839b8ea65d303509107b151b21ee61f04170228b83e06dc8c79350e70bf +SHA512 (curl-0.4.44.crate) = 499c3496cb019856773da10c5dcdf539c3fb7542a5e5dde4923d36e0f9274515b43a68bd31fc18a9adbfa9061d752fa698dfc2fbb6a6b1c1347001b3d112b3e5