From e7f4609331ba78f85a63737387e072ad719c56be Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Wed, 19 Aug 2020 17:19:47 -0700 Subject: [PATCH] Update to 0.4.36+curl-7.71.1 --- .gitignore | 1 + curl-sys-fix-metadata.diff | 16 +++++++++------- rust-curl-sys.spec | 10 +++++++--- sources | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index b96ed6a..6f3f8d9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /curl-sys-0.4.31+curl-7.70.0.crate /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 diff --git a/curl-sys-fix-metadata.diff b/curl-sys-fix-metadata.diff index 28ac236..f464769 100644 --- a/curl-sys-fix-metadata.diff +++ b/curl-sys-fix-metadata.diff @@ -1,15 +1,15 @@ ---- curl-sys-0.4.33+curl-7.71.1/Cargo.toml 2020-07-23T00:24:08+00:00 -+++ curl-sys-0.4.33+curl-7.71.1/Cargo.toml 2020-07-23T17:05:40.453462+00:00 +--- 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 @@ -12,7 +12,7 @@ [package] name = "curl-sys" --version = "0.4.33+curl-7.71.1" -+version = "0.4.33" +-version = "0.4.36+curl-7.71.1" ++version = "0.4.36" authors = ["Alex Crichton "] build = "build.rs" links = "curl" -@@ -28,18 +28,6 @@ +@@ -28,20 +28,6 @@ [dependencies.libc] version = "0.2.2" @@ -19,6 +19,8 @@ - -[dependencies.libz-sys] -version = "1.0.18" +-features = ["libc"] +-default-features = false - -[dependencies.mesalink] -version = "1.1.0-cratesio" @@ -28,19 +30,19 @@ [build-dependencies.cc] version = "1.0" -@@ -49,20 +37,13 @@ +@@ -51,21 +37,12 @@ [features] default = ["ssl"] force-system-lib-on-osx = [] -http2 = ["libnghttp2-sys"] +http2 = [] -+mesalink = [] protocol-ftp = [] spnego = [] -ssl = ["openssl-sys"] +ssl = [] static-curl = [] -static-ssl = ["openssl-sys/vendored"] +-zlib-ng-compat = ["libz-sys/zlib-ng", "static-curl"] -[target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-sys] -version = "0.9" -optional = true diff --git a/rust-curl-sys.spec b/rust-curl-sys.spec index b5b9b5e..279d440 100644 --- a/rust-curl-sys.spec +++ b/rust-curl-sys.spec @@ -3,11 +3,11 @@ %global debug_package %{nil} %global crate curl-sys -%global upstream_version 0.4.33+curl-7.71.1 +%global upstream_version 0.4.36+curl-7.71.1 Name: rust-%{crate} -Version: 0.4.33 -Release: 3%{?dist} +Version: 0.4.36 +Release: 1%{?dist} Summary: Native bindings to the libcurl library # Upstream license specification: MIT @@ -18,6 +18,7 @@ Source: %{crates_source %{crate} %{upstream_version}} # * Remove curl version from version field # * No windows # * Drop unused dependencies +# * No zlib-ng features Patch0: curl-sys-fix-metadata.diff # Make static-curl/static-ssl features a noop, not for upstream Patch0001: 0001-Make-static-curl-static-ssl-features-a-noop.patch @@ -178,6 +179,9 @@ echo 'pkgconfig(libcurl)' %endif %changelog +* Thu Aug 20 2020 Josh Stone - 0.4.36-1 +- Update to 0.4.36+curl-7.71.1 + * Sat Aug 01 2020 Fedora Release Engineering - 0.4.33-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 60cd5c9..c613597 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (curl-sys-0.4.33+curl-7.71.1.crate) = 2ef3a58bde943dd23594c691fb8552ee22514e5851e60bafe1cf4aa9884e9fbe2661930285ac07522d6c79f4c6fa75d572c58529af7b90e30f91a6fb4bc265e1 +SHA512 (curl-sys-0.4.36+curl-7.71.1.crate) = 19e4ffaa47d598d9872e679f44faf6caa2d9294e2240059aeb547c7f41caccb5436b41fae15ff03d3c16edaedd118c9a66cb539a9d3c9342edda40545785f573