From 4a6aac67556ef7361aae7f3c2344e869e465f3cd Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 5 Nov 2021 21:50:39 +0100 Subject: [PATCH] Update to version 0.4.50+curl-7.79.1; Fixes RHBZ#2004570 --- .gitignore | 1 + curl-sys-fix-metadata.diff | 15 ++++++++------- rust-curl-sys.spec | 18 +++++++++++++++--- sources | 2 +- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 6c4d4b6..11806be 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /curl-sys-0.4.36+curl-7.71.1.crate /curl-sys-0.4.39+curl-7.74.0.crate /curl-sys-0.4.45+curl-7.78.0.crate +/curl-sys-0.4.50+curl-7.79.1.crate diff --git a/curl-sys-fix-metadata.diff b/curl-sys-fix-metadata.diff index 3b77d46..8e898c5 100644 --- a/curl-sys-fix-metadata.diff +++ b/curl-sys-fix-metadata.diff @@ -1,15 +1,15 @@ ---- curl-sys-0.4.45+curl-7.78.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ curl-sys-0.4.45+curl-7.78.0/Cargo.toml 2021-07-29T12:01:11.492825+00:00 -@@ -13,7 +13,7 @@ +--- curl-sys-0.4.50+curl-7.79.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ curl-sys-0.4.50+curl-7.79.1/Cargo.toml 2021-11-05T20:27:55.281842+00:00 +@@ -12,7 +12,7 @@ [package] edition = "2018" name = "curl-sys" --version = "0.4.45+curl-7.78.0" -+version = "0.4.45" +-version = "0.4.50+curl-7.79.1" ++version = "0.4.50" authors = ["Alex Crichton "] build = "build.rs" links = "curl" -@@ -29,20 +29,6 @@ +@@ -28,20 +28,6 @@ [dependencies.libc] version = "0.2.2" @@ -30,12 +30,13 @@ [build-dependencies.cc] version = "1.0" -@@ -52,22 +38,16 @@ +@@ -51,23 +37,17 @@ [features] default = ["ssl"] force-system-lib-on-osx = [] -http2 = ["libnghttp2-sys"] +http2 = [] + poll_7_68_0 = [] protocol-ftp = [] spnego = [] -ssl = ["openssl-sys"] diff --git a/rust-curl-sys.spec b/rust-curl-sys.spec index e5e0348..2fb8dcc 100644 --- a/rust-curl-sys.spec +++ b/rust-curl-sys.spec @@ -3,10 +3,10 @@ %global debug_package %{nil} %global crate curl-sys -%global upstream_version 0.4.45+curl-7.78.0 +%global upstream_version 0.4.50+curl-7.79.1 Name: rust-%{crate} -Version: 0.4.45 +Version: 0.4.50 Release: %autorelease Summary: Native bindings to the libcurl library @@ -97,6 +97,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 @@ -171,7 +183,7 @@ which use "upkeep_7_62_0" feature of "%{crate}" crate. %prep %autosetup -n %{crate}-%{upstream_version} -p1 -# No bundled deps +# remove bundled curl sources rm -vrf curl %cargo_prep diff --git a/sources b/sources index 07e2ddd..f29afd5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (curl-sys-0.4.45+curl-7.78.0.crate) = 01f5ac6efcb95f5f6453736dc52fb8ba079ce4c09e62f9203913e36cc1e4d60a2b2154bd456e548bacd092934d74fa2eec70e67218bb5b9fe64bd42b239e0391 +SHA512 (curl-sys-0.4.50+curl-7.79.1.crate) = eed07500d29665269ce8cc6f6fe748d195c1184d2cd3b6127701f65d0c526fe0f054c84e1974d60d991cd399941cea0c90ed51356fefb28fc6693c574c81039f